@@ -18,6 +18,7 @@ import { createModelCapabilities } from "@t3tools/shared/model";
1818import { resolveSpawnCommand } from "@t3tools/shared/shell" ;
1919import {
2020 query as claudeQuery ,
21+ type ModelInfo as ClaudeModelInfo ,
2122 type Options as ClaudeQueryOptions ,
2223 type SlashCommand as ClaudeSlashCommand ,
2324 type SDKControlGetUsageResponse ,
@@ -48,6 +49,7 @@ import {
4849import {
4950 BUNDLED_CLAUDE_MODEL_CATALOG ,
5051 type ClaudeModelCatalog ,
52+ claudeReportedModels ,
5153 formatClaudeVersionUpgradeMessage ,
5254 resolveClaudeModelsForVersion ,
5355 resolveClaudeUpdateRequiredModels ,
@@ -241,6 +243,7 @@ export type ClaudeCapabilitiesProbe = {
241243 /** OAuth applies only to firstParty; Bedrock uses external AWS credentials and omits subscription/token fields. */
242244 readonly apiProvider : string | undefined ;
243245 readonly slashCommands : ReadonlyArray < ServerProviderSlashCommand > ;
246+ readonly models ?: ReadonlyArray < ClaudeModelInfo > ;
244247 /** Undefined means get_usage failed; absent windows on success mean no subscription windows, as with API keys. */
245248 readonly usage ?: Pick < SDKControlGetUsageResponse , "rate_limits_available" | "rate_limits" > ;
246249 readonly usageCheckedAt ?: string ;
@@ -318,6 +321,20 @@ function waitForAbortSignal(signal: AbortSignal): Promise<void> {
318321 } ) ;
319322}
320323
324+ /**
325+ * With gateway model discovery on, Claude Code refreshes its model cache in the background after
326+ * initialization, so the probe subprocess outlives init by Claude Code's discovery timeout.
327+ */
328+ function claudeGatewayDiscoveryGraceMs ( environment : Readonly < Record < string , unknown > > ) : number {
329+ const enabled = String ( environment . CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY ?? "" )
330+ . trim ( )
331+ . toLowerCase ( ) ;
332+ if ( ! enabled || enabled === "0" || enabled === "false" ) return 0 ;
333+ if ( ! String ( environment . ANTHROPIC_BASE_URL ?? "" ) . trim ( ) ) return 0 ;
334+ const configured = Number ( environment . CLAUDE_CODE_GATEWAY_MODEL_DISCOVERY_TIMEOUT_MS ) ;
335+ return Number . isFinite ( configured ) && configured > 0 ? configured : 3_000 ;
336+ }
337+
321338/** A never-yielding prompt allows local initialization IPC without sending an Anthropic request. */
322339const probeClaudeCapabilities = (
323340 claudeSettings : ClaudeSettings ,
@@ -326,13 +343,23 @@ const probeClaudeCapabilities = (
326343 includeUsage = true ,
327344) => {
328345 const abort = new AbortController ( ) ;
346+ const abortProbe = Effect . sync ( ( ) => {
347+ if ( ! abort . signal . aborted ) abort . abort ( ) ;
348+ } ) ;
329349 return Effect . gen ( function * ( ) {
330350 const claudeEnvironment = yield * makeClaudeEnvironment ( claudeSettings , environment ) ;
331351 const executablePath = yield * resolveClaudeSdkExecutablePath (
332352 claudeSettings . binaryPath ,
333353 claudeEnvironment ,
334354 ) ;
335355 const managedMcpConfig = yield * hasClaudeManagedMcpConfig ( ) ;
356+ // Workspace probes (no usage) discard models; the machine probe refreshes the shared cache.
357+ const graceMs = includeUsage
358+ ? claudeGatewayDiscoveryGraceMs ( {
359+ ...claudeEnvironment ,
360+ ...( yield * readClaudeSettingsEnv ( claudeSettings , cwd , claudeEnvironment ) ) ,
361+ } )
362+ : 0 ;
336363 return yield * Effect . tryPromise ( async ( ) => {
337364 const q = claudeQuery ( {
338365 // oxlint-disable-next-line require-yield -- never yields, so no prompt reaches the API
@@ -348,11 +375,11 @@ const probeClaudeCapabilities = (
348375 } ) ,
349376 } ) ;
350377 const init = await q . initializationResult ( ) ;
351- return { q, init } ;
378+ return { q, init, graceMs } ;
352379 } ) ;
353380 } ) . pipe (
354381 Effect . timeout ( CAPABILITIES_PROBE_TIMEOUT_MS ) ,
355- Effect . flatMap ( ( { q, init } ) =>
382+ Effect . flatMap ( ( { q, init, graceMs } ) =>
356383 Effect . gen ( function * ( ) {
357384 // Usage has its own deadline so a slow optional request cannot discard initialization.
358385 // Only the rate limits are read, so skip the local transcript scan that fills
@@ -386,15 +413,18 @@ const probeClaudeCapabilities = (
386413 apiKeySource : account ?. apiKeySource ,
387414 apiProvider : account ?. apiProvider ,
388415 slashCommands : parseClaudeInitializationCommands ( init . commands ) ,
416+ ...( init . models ?. length ? { models : init . models } : { } ) ,
389417 ...( usage ? { usage, usageCheckedAt } : { } ) ,
390418 } satisfies ClaudeCapabilitiesProbe ;
391- } ) ,
392- ) ,
393- Effect . ensuring (
394- Effect . sync ( ( ) => {
395- if ( ! abort . signal . aborted ) abort . abort ( ) ;
396- } ) ,
419+ } ) . pipe (
420+ Effect . tap ( ( ) =>
421+ graceMs > 0
422+ ? Effect . sleep ( graceMs ) . pipe ( Effect . andThen ( abortProbe ) , Effect . forkDetach )
423+ : abortProbe ,
424+ ) ,
425+ ) ,
397426 ) ,
427+ Effect . onError ( ( ) => abortProbe ) ,
398428 Effect . tapError ( ( error ) =>
399429 Effect . logWarning ( "Claude capability probe failed." , { errorTag : error . _tag } ) ,
400430 ) ,
@@ -557,11 +587,6 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
557587 } ) ;
558588 }
559589
560- const models = providerModelsFromSettings (
561- resolveClaudeModelsForVersion ( modelCatalog , parsedVersion ) ,
562- claudeSettings . customModels ,
563- DEFAULT_CLAUDE_MODEL_CAPABILITIES ,
564- ) ;
565590 const updateRequiredModels = resolveClaudeUpdateRequiredModels ( modelCatalog , parsedVersion ) ;
566591 const versionUpgradeMessage = formatClaudeVersionUpgradeMessage ( modelCatalog , parsedVersion ) ;
567592
@@ -572,6 +597,14 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
572597 probeResult && Result . isSuccess ( probeResult ) ? probeResult . success : undefined ;
573598 const probeFailure =
574599 probeResult && Result . isFailure ( probeResult ) ? probeResult . failure : undefined ;
600+ const models = providerModelsFromSettings (
601+ [
602+ ...resolveClaudeModelsForVersion ( modelCatalog , parsedVersion ) ,
603+ ...claudeReportedModels ( modelCatalog , claudeSettings . customModels , capabilities ?. models ) ,
604+ ] ,
605+ claudeSettings . customModels ,
606+ DEFAULT_CLAUDE_MODEL_CAPABILITIES ,
607+ ) ;
575608 const skills = yield * discoverClaudeSkills ( claudeSettings , cwd , resolvedEnvironment ) ;
576609 const slashCommands = [ COMPACT_SLASH_COMMAND , ...( capabilities ?. slashCommands ?? [ ] ) ] ;
577610 const dedupedSlashCommands = dedupeSlashCommands ( slashCommands ) ;
0 commit comments