@@ -2100,10 +2100,10 @@ describe("ClaudeAdapterLive", () => {
21002100 return Effect . gen ( function * ( ) {
21012101 const adapter = yield * ClaudeAdapter ;
21022102
2103- const runtimeEventsFiber = yield * Stream . take ( adapter . streamEvents , 6 ) . pipe (
2104- Stream . runCollect ,
2105- Effect . forkChild ,
2106- ) ;
2103+ const runtimeEventsFiber = yield * Stream . takeUntil (
2104+ adapter . streamEvents ,
2105+ ( event ) => event . type === "task.progress" ,
2106+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
21072107
21082108 yield * adapter . startSession ( {
21092109 threadId : THREAD_ID ,
@@ -2287,15 +2287,15 @@ describe("ClaudeAdapterLive", () => {
22872287 ) ;
22882288 } ) ;
22892289
2290- it . effect ( "emits thread token usage updates from Claude task progress " , ( ) => {
2290+ it . effect ( "keeps Claude task progress usage out of the parent context window " , ( ) => {
22912291 const harness = makeHarness ( ) ;
22922292 return Effect . gen ( function * ( ) {
22932293 const adapter = yield * ClaudeAdapter ;
22942294
2295- const runtimeEventsFiber = yield * Stream . take ( adapter . streamEvents , 6 ) . pipe (
2296- Stream . runCollect ,
2297- Effect . forkChild ,
2298- ) ;
2295+ const runtimeEventsFiber = yield * Stream . takeUntil (
2296+ adapter . streamEvents ,
2297+ ( event ) => event . type === "task.progress" ,
2298+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
22992299
23002300 yield * adapter . startSession ( {
23012301 threadId : THREAD_ID ,
@@ -2320,20 +2320,14 @@ describe("ClaudeAdapterLive", () => {
23202320 const runtimeEvents = Array . from ( yield * Fiber . join ( runtimeEventsFiber ) ) ;
23212321 const usageEvent = runtimeEvents . find ( ( event ) => event . type === "thread.token-usage.updated" ) ;
23222322 const progressEvent = runtimeEvents . find ( ( event ) => event . type === "task.progress" ) ;
2323- assert . equal ( usageEvent ?. type , "thread.token-usage.updated" ) ;
2324- if ( usageEvent ?. type === "thread.token-usage.updated" ) {
2325- assert . deepEqual ( usageEvent . payload , {
2326- usage : {
2327- usedTokens : 321 ,
2328- lastUsedTokens : 321 ,
2329- toolUses : 2 ,
2330- durationMs : 654 ,
2331- } ,
2332- } ) ;
2333- }
2323+ assert . equal ( usageEvent , undefined ) ;
23342324 assert . equal ( progressEvent ?. type , "task.progress" ) ;
2335- if ( usageEvent && progressEvent ) {
2336- assert . notStrictEqual ( usageEvent . eventId , progressEvent . eventId ) ;
2325+ if ( progressEvent ?. type === "task.progress" ) {
2326+ assert . deepEqual ( progressEvent . payload . typedUsage , {
2327+ totalTokens : 321 ,
2328+ toolUses : 2 ,
2329+ durationMs : 654 ,
2330+ } ) ;
23372331 }
23382332 } ) . pipe (
23392333 Effect . provideService ( Random . Random , makeDeterministicRandomService ( ) ) ,
@@ -2408,15 +2402,15 @@ describe("ClaudeAdapterLive", () => {
24082402 ) ;
24092403 } ) ;
24102404
2411- it . effect ( "clamps oversized Claude usage to the reported context window " , ( ) => {
2405+ it . effect ( "does not treat total-only Claude result usage as active context" , ( ) => {
24122406 const harness = makeHarness ( ) ;
24132407 return Effect . gen ( function * ( ) {
24142408 const adapter = yield * ClaudeAdapter ;
24152409
2416- const runtimeEventsFiber = yield * Stream . take ( adapter . streamEvents , 7 ) . pipe (
2417- Stream . runCollect ,
2418- Effect . forkChild ,
2419- ) ;
2410+ const runtimeEventsFiber = yield * Stream . takeUntil (
2411+ adapter . streamEvents ,
2412+ ( event ) => event . type === "turn.completed" ,
2413+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
24202414
24212415 yield * adapter . startSession ( {
24222416 threadId : THREAD_ID ,
@@ -2454,103 +2448,104 @@ describe("ClaudeAdapterLive", () => {
24542448
24552449 const runtimeEvents = Array . from ( yield * Fiber . join ( runtimeEventsFiber ) ) ;
24562450 const usageEvent = runtimeEvents . find ( ( event ) => event . type === "thread.token-usage.updated" ) ;
2457- assert . equal ( usageEvent ?. type , "thread.token-usage.updated" ) ;
2458- if ( usageEvent ?. type === "thread.token-usage.updated" ) {
2459- assert . deepEqual ( usageEvent . payload , {
2460- usage : {
2461- usedTokens : 200000 ,
2462- lastUsedTokens : 200000 ,
2463- totalProcessedTokens : 535000 ,
2464- maxTokens : 200000 ,
2465- } ,
2466- } ) ;
2467- }
2451+ assert . equal ( usageEvent , undefined ) ;
24682452 } ) . pipe (
24692453 Effect . provideService ( Random . Random , makeDeterministicRandomService ( ) ) ,
24702454 Effect . provide ( harness . layer ) ,
24712455 ) ;
24722456 } ) ;
24732457
2474- it . effect (
2475- "preserves oversized Claude result totals after task progress snapshots are recorded" ,
2476- ( ) => {
2477- const harness = makeHarness ( ) ;
2478- return Effect . gen ( function * ( ) {
2479- const adapter = yield * ClaudeAdapter ;
2458+ it . effect ( "keeps subagent totals out of parent context when the result is total-only" , ( ) => {
2459+ const harness = makeHarness ( ) ;
2460+ return Effect . gen ( function * ( ) {
2461+ const adapter = yield * ClaudeAdapter ;
24802462
2481- const runtimeEventsFiber = yield * Stream . take ( adapter . streamEvents , 9 ) . pipe (
2482- Stream . runCollect ,
2483- Effect . forkChild ,
2484- ) ;
2463+ const runtimeEventsFiber = yield * Stream . takeUntil (
2464+ adapter . streamEvents ,
2465+ ( event ) => event . type === "turn.completed" ,
2466+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
24852467
2486- yield * adapter . startSession ( {
2487- threadId : THREAD_ID ,
2488- provider : ProviderDriverKind . make ( "claudeAgent" ) ,
2489- runtimeMode : "full-access" ,
2490- } ) ;
2468+ yield * adapter . startSession ( {
2469+ threadId : THREAD_ID ,
2470+ provider : ProviderDriverKind . make ( "claudeAgent" ) ,
2471+ runtimeMode : "full-access" ,
2472+ } ) ;
24912473
2492- yield * adapter . sendTurn ( {
2493- threadId : THREAD_ID ,
2494- input : "hello" ,
2495- attachments : [ ] ,
2496- } ) ;
2474+ yield * adapter . sendTurn ( {
2475+ threadId : THREAD_ID ,
2476+ input : "hello" ,
2477+ attachments : [ ] ,
2478+ } ) ;
24972479
2498- harness . query . emit ( {
2499- type : "system" ,
2500- subtype : "task_progress" ,
2501- task_id : "task-usage-clamped" ,
2502- description : "Thinking through the patch" ,
2503- usage : {
2504- total_tokens : 190000 ,
2505- } ,
2506- session_id : "sdk-session-task-usage-clamped" ,
2507- uuid : "task-usage-progress-clamped" ,
2508- } as unknown as SDKMessage ) ;
2480+ harness . query . emit ( {
2481+ type : "system" ,
2482+ subtype : "task_progress" ,
2483+ task_id : "task-usage-clamped" ,
2484+ description : "Thinking through the patch" ,
2485+ usage : {
2486+ total_tokens : 190000 ,
2487+ } ,
2488+ session_id : "sdk-session-task-usage-clamped" ,
2489+ uuid : "task-usage-progress-clamped" ,
2490+ } as unknown as SDKMessage ) ;
25092491
2510- harness . query . emit ( {
2511- type : "result" ,
2512- subtype : "success" ,
2513- is_error : false ,
2514- duration_ms : 1234 ,
2515- duration_api_ms : 1200 ,
2516- num_turns : 1 ,
2517- result : "done" ,
2518- stop_reason : "end_turn" ,
2519- session_id : "sdk-session-result-usage-clamped-after-progress" ,
2520- usage : {
2521- total_tokens : 535000 ,
2522- } ,
2523- modelUsage : {
2524- "claude-opus-4-6" : {
2525- contextWindow : 200000 ,
2526- maxOutputTokens : 64000 ,
2527- } ,
2492+ harness . query . emit ( {
2493+ type : "system" ,
2494+ subtype : "task_notification" ,
2495+ task_id : "task-usage-clamped" ,
2496+ status : "completed" ,
2497+ summary : "Task finished" ,
2498+ usage : {
2499+ total_tokens : 250000 ,
2500+ tool_uses : 100 ,
2501+ duration_ms : 900000 ,
2502+ } ,
2503+ session_id : "sdk-session-task-usage-clamped" ,
2504+ uuid : "task-usage-completed-clamped" ,
2505+ } as unknown as SDKMessage ) ;
2506+
2507+ harness . query . emit ( {
2508+ type : "result" ,
2509+ subtype : "success" ,
2510+ is_error : false ,
2511+ duration_ms : 1234 ,
2512+ duration_api_ms : 1200 ,
2513+ num_turns : 1 ,
2514+ result : "done" ,
2515+ stop_reason : "end_turn" ,
2516+ session_id : "sdk-session-result-usage-clamped-after-progress" ,
2517+ usage : {
2518+ total_tokens : 535000 ,
2519+ } ,
2520+ modelUsage : {
2521+ "claude-opus-4-6" : {
2522+ contextWindow : 200000 ,
2523+ maxOutputTokens : 64000 ,
25282524 } ,
2529- } as unknown as SDKMessage ) ;
2530- harness . query . finish ( ) ;
2525+ } ,
2526+ } as unknown as SDKMessage ) ;
2527+ harness . query . finish ( ) ;
25312528
2532- const runtimeEvents = Array . from ( yield * Fiber . join ( runtimeEventsFiber ) ) ;
2533- const usageEvents = runtimeEvents . filter (
2534- ( event ) => event . type === "thread.token-usage.updated" ,
2535- ) ;
2536- const finalUsageEvent = usageEvents . at ( - 1 ) ;
2537- assert . equal ( finalUsageEvent ?. type , "thread.token-usage.updated" ) ;
2538- if ( finalUsageEvent ?. type === "thread.token-usage.updated" ) {
2539- assert . deepEqual ( finalUsageEvent . payload , {
2540- usage : {
2541- usedTokens : 190000 ,
2542- lastUsedTokens : 190000 ,
2543- totalProcessedTokens : 535000 ,
2544- maxTokens : 200000 ,
2545- } ,
2546- } ) ;
2547- }
2548- } ) . pipe (
2549- Effect . provideService ( Random . Random , makeDeterministicRandomService ( ) ) ,
2550- Effect . provide ( harness . layer ) ,
2529+ const runtimeEvents = Array . from ( yield * Fiber . join ( runtimeEventsFiber ) ) ;
2530+ const usageEvents = runtimeEvents . filter (
2531+ ( event ) => event . type === "thread.token-usage.updated" ,
25512532 ) ;
2552- } ,
2553- ) ;
2533+ assert . deepEqual ( usageEvents , [ ] ) ;
2534+ const progressEvent = runtimeEvents . find ( ( event ) => event . type === "task.progress" ) ;
2535+ const completedEvent = runtimeEvents . find ( ( event ) => event . type === "task.completed" ) ;
2536+ assert . equal ( progressEvent ?. type , "task.progress" ) ;
2537+ assert . equal ( completedEvent ?. type , "task.completed" ) ;
2538+ if ( progressEvent ?. type === "task.progress" ) {
2539+ assert . equal ( progressEvent . payload . typedUsage ?. totalTokens , 190000 ) ;
2540+ }
2541+ if ( completedEvent ?. type === "task.completed" ) {
2542+ assert . equal ( completedEvent . payload . typedUsage ?. totalTokens , 250000 ) ;
2543+ }
2544+ } ) . pipe (
2545+ Effect . provideService ( Random . Random , makeDeterministicRandomService ( ) ) ,
2546+ Effect . provide ( harness . layer ) ,
2547+ ) ;
2548+ } ) ;
25542549
25552550 it . effect (
25562551 "emits completion only after turn result when assistant frames arrive before deltas" ,
0 commit comments