@@ -5369,14 +5369,18 @@ describe("ClaudeAdapterLive", () => {
53695369 ) ;
53705370 } ) ;
53715371
5372- it . effect ( "follows a persistent refusal fallback to the model that ran" , ( ) => {
5372+ it . effect . each ( [
5373+ { scope : undefined , expectedWindow : 200_000 } ,
5374+ { scope : "session" as const , expectedWindow : 200_000 } ,
5375+ { scope : "local" as const , expectedWindow : 1_000_000 } ,
5376+ ] ) ( "uses the parent window after a $scope refusal fallback" , ( { scope, expectedWindow } ) => {
53735377 const harness = makeHarness ( ) ;
53745378 return Effect . gen ( function * ( ) {
53755379 const adapter = yield * ClaudeAdapter ;
5376- const runtimeEvents : Array < ProviderRuntimeEvent > = [ ] ;
5377- const runtimeEventsFiber = yield * Stream . runForEach ( adapter . streamEvents , ( event ) =>
5378- Effect . sync ( ( ) => runtimeEvents . push ( event ) ) ,
5379- ) . pipe ( Effect . forkChild ) ;
5380+ const runtimeEventsFiber = yield * Stream . takeUntil (
5381+ adapter . streamEvents ,
5382+ ( event ) => event . type === "turn.completed" ,
5383+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
53805384
53815385 yield * adapter . startSession ( {
53825386 threadId : THREAD_ID ,
@@ -5393,20 +5397,21 @@ describe("ClaudeAdapterLive", () => {
53935397 harness . query . emit ( {
53945398 type : "system" ,
53955399 subtype : "init" ,
5396- model : SYNTHETIC_CLAUDE_STANDARD_MODEL ,
5400+ model : ` ${ SYNTHETIC_CLAUDE_CAPABLE_MODEL } [expanded]` ,
53975401 session_id : "sdk-session-refusal" ,
53985402 uuid : "refusal-init" ,
53995403 } as unknown as SDKMessage ) ;
54005404
5401- // A refusal retry swaps the model for the rest of the session, so the
5402- // window has to be measured against the model that actually ran.
5405+ // Session fallbacks change the parent model; local fallbacks do not.
54035406 harness . query . emit ( {
54045407 type : "system" ,
54055408 subtype : "model_refusal_fallback" ,
54065409 trigger : "refusal" ,
54075410 direction : "retry" ,
5408- original_model : SYNTHETIC_CLAUDE_STANDARD_MODEL ,
5409- fallback_model : `${ SYNTHETIC_CLAUDE_CAPABLE_MODEL } [expanded]` ,
5411+ ...( scope !== undefined ? { scope } : { } ) ,
5412+ original_model : `${ SYNTHETIC_CLAUDE_CAPABLE_MODEL } [expanded]` ,
5413+ fallback_model : SYNTHETIC_CLAUDE_STANDARD_MODEL ,
5414+ content : "Retrying with the fallback model." ,
54105415 request_id : null ,
54115416 session_id : "sdk-session-refusal" ,
54125417 uuid : "refusal-swap" ,
@@ -5430,18 +5435,14 @@ describe("ClaudeAdapterLive", () => {
54305435 } as unknown as SDKMessage ) ;
54315436 harness . query . finish ( ) ;
54325437
5433- yield * Effect . yieldNow ;
5434- yield * Effect . yieldNow ;
5435- yield * Effect . yieldNow ;
5436- yield * Fiber . interrupt ( runtimeEventsFiber ) ;
5437-
5438+ const runtimeEvents = Array . from ( yield * Fiber . join ( runtimeEventsFiber ) ) ;
54385439 const usageEvents = runtimeEvents . filter (
54395440 ( event ) => event . type === "thread.token-usage.updated" ,
54405441 ) ;
54415442 const latest = usageEvents . at ( - 1 ) ;
54425443 assert . equal ( latest ?. type , "thread.token-usage.updated" ) ;
54435444 if ( latest ?. type === "thread.token-usage.updated" ) {
5444- assert . equal ( latest . payload . usage . maxTokens , 1_000_000 ) ;
5445+ assert . equal ( latest . payload . usage . maxTokens , expectedWindow ) ;
54455446 }
54465447 } ) . pipe (
54475448 Effect . provideService ( Random . Random , makeDeterministicRandomService ( ) ) ,
0 commit comments