@@ -1091,7 +1091,7 @@ function claudeLiveSelectionFlagSettings(
10911091
10921092export function makeClaudeQueryOptions ( input : {
10931093 readonly modelSelection : ModelSelection ;
1094- readonly modelCatalog ?: ClaudeModelCatalog ;
1094+ readonly compiledSelection ?: CompiledClaudeModelSelection ;
10951095 readonly nativeThreadId : string ;
10961096 readonly resume : boolean ;
10971097 readonly resumeSessionAt ?: string ;
@@ -1110,7 +1110,8 @@ export function makeClaudeQueryOptions(input: {
11101110 readonly supportedDialogKinds ?: ClaudeQueryOptions [ "supportedDialogKinds" ] ;
11111111 readonly allowDangerouslySkipPermissions ?: boolean ;
11121112} ) : ClaudeAgentSdkQueryOptions {
1113- const compiledSelection = compileClaudeModelSelection ( input . modelSelection , input . modelCatalog ) ;
1113+ const compiledSelection =
1114+ input . compiledSelection ?? compileClaudeModelSelection ( input . modelSelection ) ;
11141115 const {
11151116 "permission-mode" : launchArgPermissionMode ,
11161117 "dangerously-skip-permissions" : launchArgSkipPermissions ,
@@ -3003,9 +3004,8 @@ function formatClaudeUsageLimitWait(waitMs: number): string {
30033004interface ActiveClaudeTurnContext {
30043005 readonly input : ProviderAdapter . ProviderAdapterV2TurnInput ;
30053006 readonly nativeThreadId : string ;
3006- // The catalog this turn compiled against. Its steers and subagents reuse it.
30073007 readonly modelCatalog : ClaudeModelCatalog ;
3008- // What the turn's process runs. A continuation keeps an older process's selection .
3008+ // Continuations inherit the retained process selection, even after a catalog refresh .
30093009 readonly selection : CompiledClaudeModelSelection ;
30103010 readonly nativeTurnId : string ;
30113011 nativeMessageCursor : string | null ;
@@ -3424,7 +3424,7 @@ export interface ClaudeAdapterV2Options {
34243424 readonly crypto : Crypto . Crypto ;
34253425 readonly idAllocator : IdAllocator . IdAllocatorV2 [ "Service" ] ;
34263426 readonly queryRunner : ClaudeAgentSdkQueryRunnerShape ;
3427- /** The live model catalog the provider snapshot shows; defaults to the bundled one . */
3427+ /** Must read synchronously after its first load for getModelContextWindow . */
34283428 readonly modelCatalog ?: Effect . Effect < ClaudeModelCatalog > ;
34293429 readonly scopedLimitNames ?: Ref . Ref < ClaudeScopedLimitNames > ;
34303430 readonly onUsageLimits ?: ManagedServerProvider [ "applyUsageLimits" ] ;
@@ -3476,8 +3476,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
34763476 function * ( input : ProviderAdapter . ProviderAdapterV2OpenSessionInput ) {
34773477 const sessionScope = yield * Effect . scope ;
34783478 const now = yield * DateTime . now ;
3479- // The first read loads the manifest's disk cache. Later reads never
3480- // suspend, so getModelContextWindow can run them synchronously .
3479+ // ModelManifest.current only suspends on its first disk- cache read.
3480+ // Warm it before exposing the synchronous context-window callback .
34813481 yield * scopedModelCatalog ;
34823482 const session = providerSession ( {
34833483 providerSessionId : input . providerSessionId ,
@@ -3763,18 +3763,15 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
37633763 const emitProviderEvent = ( event : ProviderAdapter . ProviderAdapterV2Event ) =>
37643764 Queue . offer ( events , event ) . pipe ( Effect . asVoid ) ;
37653765
3766- // Reports one root request's usage as the current context, measured
3767- // against the window of the process that sent it. Usage without input
3768- // is a placeholder, never a measurement.
3766+ // Usage without input is a placeholder, never a measurement.
37693767 const emitContextUsage = Effect . fnUntraced ( function * (
37703768 context : ActiveClaudeTurnContext ,
37713769 usage : ClaudeMessageUsage ,
3772- selection : CompiledClaudeModelSelection ,
37733770 ) {
37743771 const now = yield * DateTime . now ;
37753772 const tokenUsage = claudeProviderTurnTokenUsage (
37763773 usage ,
3777- selection . contextWindowTokens ?? null ,
3774+ context . selection . contextWindowTokens ?? null ,
37783775 DateTime . formatIso ( now ) ,
37793776 ) ;
37803777 if ( tokenUsage . inputTokens <= 0 ) return ;
@@ -7006,13 +7003,13 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
70067003 const usage : ClaudeMessageUsage | undefined = event . message . usage ;
70077004 context . streamUsage =
70087005 usage === undefined ? null : { messageId : event . message . id , usage } ;
7009- if ( usage !== undefined ) yield * emitContextUsage ( context , usage , liveQuery . selection ) ;
7006+ if ( usage !== undefined ) yield * emitContextUsage ( context , usage ) ;
70107007 } else if ( event . type === "message_delta" ) {
70117008 const usage : typeof event . usage | undefined = event . usage ;
70127009 const stream = context . streamUsage ;
70137010 if ( stream ?. usage && usage !== undefined ) {
70147011 stream . usage = mergeClaudeStreamUsage ( stream . usage , usage ) ;
7015- yield * emitContextUsage ( context , stream . usage , liveQuery . selection ) ;
7012+ yield * emitContextUsage ( context , stream . usage ) ;
70167013 }
70177014 } else if (
70187015 event . type === "content_block_start" &&
@@ -7157,7 +7154,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
71577154 completedAt : null ,
71587155 tokenUsage : {
71597156 usedTokens : afterTokenCount ,
7160- maxTokens : liveQuery . selection . contextWindowTokens ?? null ,
7157+ maxTokens : context . selection . contextWindowTokens ?? null ,
71617158 updatedAt : DateTime . formatIso ( now ) ,
71627159 } ,
71637160 } ,
@@ -7298,7 +7295,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
72987295 if ( stream === null || stream . messageId !== message . message . id ) {
72997296 // Remember the request so a compaction can mark its later snapshots stale.
73007297 context . streamUsage = { messageId : message . message . id , usage : snapshotUsage } ;
7301- yield * emitContextUsage ( context , snapshotUsage , liveQuery . selection ) ;
7298+ yield * emitContextUsage ( context , snapshotUsage ) ;
73027299 } else if (
73037300 stream . usage !== null &&
73047301 claudeMessageInputTokens ( stream . usage ) <= 0 &&
@@ -7308,7 +7305,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
73087305 ...snapshotUsage ,
73097306 output_tokens : Math . max ( snapshotUsage . output_tokens , stream . usage . output_tokens ) ,
73107307 } ;
7311- yield * emitContextUsage ( context , stream . usage , liveQuery . selection ) ;
7308+ yield * emitContextUsage ( context , stream . usage ) ;
73127309 }
73137310 }
73147311 const parentToolUseId = message . parent_tool_use_id ;
@@ -8428,7 +8425,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
84288425 const openQuery = Effect . fnUntraced ( function * (
84298426 turnInput : ProviderAdapter . ProviderAdapterV2TurnInput ,
84308427 nativeThreadId : string ,
8431- modelCatalog : ClaudeModelCatalog ,
8428+ compiledSelection : CompiledClaudeModelSelection ,
84328429 ) {
84338430 const queryPolicy = claudeRuntimeQueryPolicyForRuntimePolicy ( turnInput . runtimePolicy ) ;
84348431 const mcpOverrides = claudeMcpQueryOverrides ( {
@@ -8440,10 +8437,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
84408437 : { allowedTools : queryPolicy . allowedTools } ) ,
84418438 } ) ;
84428439 const queryPolicyKey = claudeEffectiveQueryPolicyKey ( queryPolicy , mcpOverrides ) ;
8443- const compiledSelection = compileClaudeModelSelection (
8444- turnInput . modelSelection ,
8445- modelCatalog ,
8446- ) ;
84478440 const resumeSessionAt = yield * getNativeConversationHeadId ( turnInput . providerThread ) ;
84488441 const existing = yield * Ref . get ( queryContext ) ;
84498442 // A continuation prompts nothing: it drains output the live process
@@ -8482,15 +8475,15 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
84828475 existing . queryPolicyKey === queryPolicyKey &&
84838476 existing . selection . queryIdentity === compiledSelection . queryIdentity
84848477 ) {
8485- // Same identity, but a refreshed catalog can still change the window.
8486- existing . selection = compiledSelection ;
84878478 // Claude can switch its own mode mid-session (EnterPlanMode), and
84888479 // a denied ExitPlanMode leaves it there. Put the live process back
84898480 // in the thread's mode before the next prompt.
84908481 if ( existing . permissionMode !== existing . openedPermissionMode ) {
84918482 yield * existing . query . setPermissionMode ( existing . openedPermissionMode ) ;
84928483 existing . permissionMode = existing . openedPermissionMode ;
84938484 }
8485+ // Same identity, but a refreshed catalog can still change the window or prompt effort.
8486+ existing . selection = compiledSelection ;
84948487 return existing ;
84958488 }
84968489
@@ -8527,7 +8520,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
85278520 resumeSessionAt !== undefined || openedWithResume || hasPersistedProviderTurn ;
85288521 const queryOptions = makeClaudeQueryOptions ( {
85298522 modelSelection : turnInput . modelSelection ,
8530- modelCatalog,
85318523 nativeThreadId,
85328524 resume : shouldResume ,
85338525 ...( resumeSessionAt === undefined ? { } : { resumeSessionAt } ) ,
@@ -8551,6 +8543,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
85518543 canUseTool,
85528544 onUserDialog,
85538545 supportedDialogKinds : [ "resume_return" ] ,
8546+ compiledSelection,
85548547 } ) ;
85558548 const querySession = yield * queryRunner
85568549 . open ( {
@@ -8712,7 +8705,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
87128705 skillNames : yield * userInvocableSkillNames ( turnInput . runtimePolicy . cwd ) ,
87138706 uuid : promptUuid ,
87148707 } ) ;
8715- const querySession = yield * openQuery ( turnInput , nativeThreadId , modelCatalog ) ;
8708+ const querySession = yield * openQuery ( turnInput , nativeThreadId , selection ) ;
87168709 const context : ActiveClaudeTurnContext = {
87178710 input : turnInput ,
87188711 nativeThreadId,
0 commit comments