@@ -4962,10 +4962,10 @@ describe("ClaudeAdapterLive", () => {
49624962 const harness = makeHarness ( ) ;
49634963 return Effect . gen ( function * ( ) {
49644964 const adapter = yield * ClaudeAdapter ;
4965- const runtimeEvents : Array < ProviderRuntimeEvent > = [ ] ;
4966- const runtimeEventsFiber = yield * Stream . runForEach ( adapter . streamEvents , ( event ) =>
4967- Effect . sync ( ( ) => runtimeEvents . push ( event ) ) ,
4968- ) . pipe ( Effect . forkChild ) ;
4965+ const runtimeEventsFiber = yield * Stream . takeUntil (
4966+ adapter . streamEvents ,
4967+ ( event ) => event . type === "task.completed" ,
4968+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
49694969
49704970 yield * adapter . startSession ( {
49714971 threadId : THREAD_ID ,
@@ -5007,12 +5007,18 @@ describe("ClaudeAdapterLive", () => {
50075007 session_id : "sdk-session-total-floor" ,
50085008 uuid : "total-floor-large" ,
50095009 } as unknown as SDKMessage ) ;
5010+ harness . query . emit ( {
5011+ type : "system" ,
5012+ subtype : "task_notification" ,
5013+ task_id : "task-total-floor" ,
5014+ status : "completed" ,
5015+ summary : "Child finished" ,
5016+ usage : { total_tokens : 5_000 } ,
5017+ session_id : "sdk-session-total-floor" ,
5018+ uuid : "total-floor-completed" ,
5019+ } as unknown as SDKMessage ) ;
50105020
5011- yield * Effect . yieldNow ;
5012- yield * Effect . yieldNow ;
5013- yield * Effect . yieldNow ;
5014- yield * Fiber . interrupt ( runtimeEventsFiber ) ;
5015-
5021+ const runtimeEvents = Array . from ( yield * Fiber . join ( runtimeEventsFiber ) ) ;
50165022 const usageEvents = runtimeEvents . filter (
50175023 ( event ) => event . type === "thread.token-usage.updated" ,
50185024 ) ;
@@ -5036,10 +5042,10 @@ describe("ClaudeAdapterLive", () => {
50365042 const harness = makeHarness ( ) ;
50375043 return Effect . gen ( function * ( ) {
50385044 const adapter = yield * ClaudeAdapter ;
5039- const runtimeEvents : Array < ProviderRuntimeEvent > = [ ] ;
5040- const runtimeEventsFiber = yield * Stream . runForEach ( adapter . streamEvents , ( event ) =>
5041- Effect . sync ( ( ) => runtimeEvents . push ( event ) ) ,
5042- ) . pipe ( Effect . forkChild ) ;
5045+ const runtimeEventsFiber = yield * Stream . takeUntil (
5046+ adapter . streamEvents ,
5047+ ( event ) => event . type === "task.completed" ,
5048+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
50435049
50445050 yield * adapter . startSession ( {
50455051 threadId : THREAD_ID ,
@@ -5078,13 +5084,18 @@ describe("ClaudeAdapterLive", () => {
50785084 session_id : "sdk-session-child-usage" ,
50795085 uuid : "task-child-progress-1" ,
50805086 } as unknown as SDKMessage ) ;
5081- harness . query . finish ( ) ;
5082-
5083- yield * Effect . yieldNow ;
5084- yield * Effect . yieldNow ;
5085- yield * Effect . yieldNow ;
5086- yield * Fiber . interrupt ( runtimeEventsFiber ) ;
5087+ harness . query . emit ( {
5088+ type : "system" ,
5089+ subtype : "task_notification" ,
5090+ task_id : "task-child-1" ,
5091+ status : "completed" ,
5092+ summary : "Background agent finished" ,
5093+ usage : { total_tokens : 900_000 , tool_uses : 40 , duration_ms : 1_000 } ,
5094+ session_id : "sdk-session-child-usage" ,
5095+ uuid : "task-child-completed-1" ,
5096+ } as unknown as SDKMessage ) ;
50875097
5098+ const runtimeEvents = Array . from ( yield * Fiber . join ( runtimeEventsFiber ) ) ;
50885099 const usageEvents = runtimeEvents . filter (
50895100 ( event ) => event . type === "thread.token-usage.updated" ,
50905101 ) ;
@@ -5107,10 +5118,10 @@ describe("ClaudeAdapterLive", () => {
51075118 return Effect . gen ( function * ( ) {
51085119 const adapter = yield * ClaudeAdapter ;
51095120
5110- const runtimeEvents : Array < ProviderRuntimeEvent > = [ ] ;
5111- const runtimeEventsFiber = yield * Stream . runForEach ( adapter . streamEvents , ( event ) =>
5112- Effect . sync ( ( ) => runtimeEvents . push ( event ) ) ,
5113- ) . pipe ( Effect . forkChild ) ;
5121+ const runtimeEventsFiber = yield * Stream . takeUntil (
5122+ adapter . streamEvents ,
5123+ ( event ) => event . type === "turn.completed" ,
5124+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
51145125
51155126 const session = yield * adapter . startSession ( {
51165127 threadId : THREAD_ID ,
@@ -5143,10 +5154,7 @@ describe("ClaudeAdapterLive", () => {
51435154 } ,
51445155 } as unknown as SDKMessage ) ;
51455156
5146- yield * Effect . yieldNow ;
5147- yield * Effect . yieldNow ;
5148- yield * Effect . yieldNow ;
5149- yield * Fiber . interrupt ( runtimeEventsFiber ) ;
5157+ const runtimeEvents = Array . from ( yield * Fiber . join ( runtimeEventsFiber ) ) ;
51505158 const usageEvents = runtimeEvents . filter (
51515159 ( event ) => event . type === "thread.token-usage.updated" ,
51525160 ) ;
@@ -5166,10 +5174,10 @@ describe("ClaudeAdapterLive", () => {
51665174 const harness = makeHarness ( ) ;
51675175 return Effect . gen ( function * ( ) {
51685176 const adapter = yield * ClaudeAdapter ;
5169- const runtimeEvents : Array < ProviderRuntimeEvent > = [ ] ;
5170- const runtimeEventsFiber = yield * Stream . runForEach ( adapter . streamEvents , ( event ) =>
5171- Effect . sync ( ( ) => runtimeEvents . push ( event ) ) ,
5172- ) . pipe ( Effect . forkChild ) ;
5177+ const runtimeEventsFiber = yield * Stream . takeUntil (
5178+ adapter . streamEvents ,
5179+ ( event ) => event . type === "turn.completed" ,
5180+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
51735181
51745182 yield * adapter . startSession ( {
51755183 threadId : THREAD_ID ,
@@ -5209,13 +5217,8 @@ describe("ClaudeAdapterLive", () => {
52095217 [ `${ SYNTHETIC_CLAUDE_CAPABLE_MODEL } [expanded]` ] : { contextWindow : 1_000_000 } ,
52105218 } ,
52115219 } as unknown as SDKMessage ) ;
5212- harness . query . finish ( ) ;
5213-
5214- yield * Effect . yieldNow ;
5215- yield * Effect . yieldNow ;
5216- yield * Effect . yieldNow ;
5217- yield * Fiber . interrupt ( runtimeEventsFiber ) ;
52185220
5221+ const runtimeEvents = Array . from ( yield * Fiber . join ( runtimeEventsFiber ) ) ;
52195222 const usageEvents = runtimeEvents . filter (
52205223 ( event ) => event . type === "thread.token-usage.updated" ,
52215224 ) ;
@@ -5234,10 +5237,10 @@ describe("ClaudeAdapterLive", () => {
52345237 const harness = makeHarness ( ) ;
52355238 return Effect . gen ( function * ( ) {
52365239 const adapter = yield * ClaudeAdapter ;
5237- const runtimeEvents : Array < ProviderRuntimeEvent > = [ ] ;
5238- const runtimeEventsFiber = yield * Stream . runForEach ( adapter . streamEvents , ( event ) =>
5239- Effect . sync ( ( ) => runtimeEvents . push ( event ) ) ,
5240- ) . pipe ( Effect . forkChild ) ;
5240+ const runtimeEventsFiber = yield * Stream . takeUntil (
5241+ adapter . streamEvents ,
5242+ ( event ) => event . type === "turn.completed" ,
5243+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
52415244
52425245 yield * adapter . startSession ( {
52435246 threadId : THREAD_ID ,
@@ -5275,12 +5278,15 @@ describe("ClaudeAdapterLive", () => {
52755278 session_id : "sdk-session-running-total" ,
52765279 uuid : "task-running-total-progress" ,
52775280 } as unknown as SDKMessage ) ;
5281+ harness . query . emit ( {
5282+ type : "result" ,
5283+ subtype : "success" ,
5284+ is_error : false ,
5285+ session_id : "sdk-session-running-total" ,
5286+ uuid : "running-total-result" ,
5287+ } as unknown as SDKMessage ) ;
52785288
5279- yield * Effect . yieldNow ;
5280- yield * Effect . yieldNow ;
5281- yield * Effect . yieldNow ;
5282- yield * Fiber . interrupt ( runtimeEventsFiber ) ;
5283-
5289+ const runtimeEvents = Array . from ( yield * Fiber . join ( runtimeEventsFiber ) ) ;
52845290 const usageEvents = runtimeEvents . filter (
52855291 ( event ) => event . type === "thread.token-usage.updated" ,
52865292 ) ;
@@ -5300,10 +5306,10 @@ describe("ClaudeAdapterLive", () => {
53005306 const harness = makeHarness ( ) ;
53015307 return Effect . gen ( function * ( ) {
53025308 const adapter = yield * ClaudeAdapter ;
5303- const runtimeEvents : Array < ProviderRuntimeEvent > = [ ] ;
5304- const runtimeEventsFiber = yield * Stream . runForEach ( adapter . streamEvents , ( event ) =>
5305- Effect . sync ( ( ) => runtimeEvents . push ( event ) ) ,
5306- ) . pipe ( Effect . forkChild ) ;
5309+ const runtimeEventsFiber = yield * Stream . takeUntil (
5310+ adapter . streamEvents ,
5311+ ( event ) => event . type === "turn.completed" ,
5312+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
53075313
53085314 yield * adapter . startSession ( {
53095315 threadId : THREAD_ID ,
@@ -5347,12 +5353,8 @@ describe("ClaudeAdapterLive", () => {
53475353 usage : { input_tokens : 4_000 , output_tokens : 200 } ,
53485354 modelUsage : { [ SYNTHETIC_CLAUDE_CAPABLE_MODEL ] : { contextWindow : 200_000 } } ,
53495355 } as unknown as SDKMessage ) ;
5350- harness . query . finish ( ) ;
53515356
5352- yield * Effect . yieldNow ;
5353- yield * Effect . yieldNow ;
5354- yield * Effect . yieldNow ;
5355- yield * Fiber . interrupt ( runtimeEventsFiber ) ;
5357+ const runtimeEvents = Array . from ( yield * Fiber . join ( runtimeEventsFiber ) ) ;
53565358 const ev = runtimeEvents . filter ( ( e ) => e . type === "thread.token-usage.updated" ) ;
53575359 const latest = ev . at ( - 1 ) ;
53585360 assert . equal ( latest ?. type , "thread.token-usage.updated" ) ;
@@ -5454,28 +5456,30 @@ describe("ClaudeAdapterLive", () => {
54545456 const harness = makeHarness ( ) ;
54555457 return Effect . gen ( function * ( ) {
54565458 const adapter = yield * ClaudeAdapter ;
5457- const runtimeEvents : Array < ProviderRuntimeEvent > = [ ] ;
5458- const runtimeEventsFiber = yield * Stream . runForEach ( adapter . streamEvents , ( event ) =>
5459- Effect . sync ( ( ) => runtimeEvents . push ( event ) ) ,
5460- ) . pipe ( Effect . forkChild ) ;
54615459
54625460 yield * adapter . startSession ( {
54635461 threadId : THREAD_ID ,
54645462 provider : ProviderDriverKind . make ( "claudeAgent" ) ,
54655463 runtimeMode : "full-access" ,
54665464 } ) ;
54675465
5466+ const initEventsFiber = yield * Stream . takeUntil (
5467+ adapter . streamEvents ,
5468+ ( event ) => event . type === "session.configured" ,
5469+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
54685470 harness . query . emit ( {
54695471 type : "system" ,
54705472 subtype : "init" ,
54715473 model : `${ SYNTHETIC_CLAUDE_CAPABLE_MODEL } [expanded]` ,
54725474 session_id : "sdk-session-switch" ,
54735475 uuid : "switch-init" ,
54745476 } as unknown as SDKMessage ) ;
5475- yield * Effect . yieldNow ;
5476- yield * Effect . yieldNow ;
5477- yield * Effect . yieldNow ;
5477+ yield * Fiber . join ( initEventsFiber ) ;
54785478
5479+ const runtimeEventsFiber = yield * Stream . takeUntil (
5480+ adapter . streamEvents ,
5481+ ( event ) => event . type === "turn.completed" ,
5482+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
54795483 // The user switches to a 200k model partway through the thread.
54805484 yield * adapter . sendTurn ( {
54815485 threadId : THREAD_ID ,
@@ -5504,13 +5508,8 @@ describe("ClaudeAdapterLive", () => {
55045508 [ SYNTHETIC_CLAUDE_STANDARD_MODEL ] : { contextWindow : 200_000 } ,
55055509 } ,
55065510 } as unknown as SDKMessage ) ;
5507- harness . query . finish ( ) ;
5508-
5509- yield * Effect . yieldNow ;
5510- yield * Effect . yieldNow ;
5511- yield * Effect . yieldNow ;
5512- yield * Fiber . interrupt ( runtimeEventsFiber ) ;
55135511
5512+ const runtimeEvents = Array . from ( yield * Fiber . join ( runtimeEventsFiber ) ) ;
55145513 const usageEvents = runtimeEvents . filter (
55155514 ( event ) => event . type === "thread.token-usage.updated" ,
55165515 ) ;
@@ -5529,10 +5528,10 @@ describe("ClaudeAdapterLive", () => {
55295528 const harness = makeHarness ( ) ;
55305529 return Effect . gen ( function * ( ) {
55315530 const adapter = yield * ClaudeAdapter ;
5532- const runtimeEventsFiber = yield * Stream . runForEach (
5531+ const firstTurnEventsFiber = yield * Stream . takeUntil (
55335532 adapter . streamEvents ,
5534- ( ) => Effect . void ,
5535- ) . pipe ( Effect . forkChild ) ;
5533+ ( event ) => event . type === "turn.completed" ,
5534+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
55365535
55375536 yield * adapter . startSession ( {
55385537 threadId : THREAD_ID ,
@@ -5578,9 +5577,7 @@ describe("ClaudeAdapterLive", () => {
55785577 session_id : "sdk-session-refusal-resend" ,
55795578 usage : { input_tokens : 1_000 , output_tokens : 10 } ,
55805579 } as unknown as SDKMessage ) ;
5581- yield * Effect . yieldNow ;
5582- yield * Effect . yieldNow ;
5583- yield * Effect . yieldNow ;
5580+ yield * Fiber . join ( firstTurnEventsFiber ) ;
55845581
55855582 // The selection has not changed, so the second turn must not call
55865583 // setModel at all — least of all with the model the API just refused.
@@ -5593,8 +5590,6 @@ describe("ClaudeAdapterLive", () => {
55935590 assert . deepEqual ( harness . query . setModelCalls , [
55945591 `${ SYNTHETIC_CLAUDE_CAPABLE_MODEL } [expanded]` ,
55955592 ] ) ;
5596-
5597- yield * Fiber . interrupt ( runtimeEventsFiber ) ;
55985593 } ) . pipe (
55995594 Effect . provideService ( Random . Random , makeDeterministicRandomService ( ) ) ,
56005595 Effect . provide ( harness . layer ) ,
@@ -5852,10 +5847,10 @@ describe("ClaudeAdapterLive", () => {
58525847 return Effect . gen ( function * ( ) {
58535848 const adapter = yield * ClaudeAdapter ;
58545849
5855- const runtimeEvents : Array < ProviderRuntimeEvent > = [ ] ;
5856- const runtimeEventsFiber = yield * Stream . runForEach ( adapter . streamEvents , ( event ) =>
5857- Effect . sync ( ( ) => runtimeEvents . push ( event ) ) ,
5858- ) . pipe ( Effect . forkChild ) ;
5850+ const runtimeEventsFiber = yield * Stream . takeUntil (
5851+ adapter . streamEvents ,
5852+ ( event ) => event . type === "turn.completed" ,
5853+ ) . pipe ( Stream . runCollect , Effect . forkChild ) ;
58595854
58605855 yield * adapter . startSession ( {
58615856 threadId : THREAD_ID ,
@@ -5922,12 +5917,8 @@ describe("ClaudeAdapterLive", () => {
59225917 } ,
59235918 } ,
59245919 } as unknown as SDKMessage ) ;
5925- harness . query . finish ( ) ;
59265920
5927- yield * Effect . yieldNow ;
5928- yield * Effect . yieldNow ;
5929- yield * Effect . yieldNow ;
5930- yield * Fiber . interrupt ( runtimeEventsFiber ) ;
5921+ const runtimeEvents = Array . from ( yield * Fiber . join ( runtimeEventsFiber ) ) ;
59315922 const usageEvents = runtimeEvents . filter (
59325923 ( event ) => event . type === "thread.token-usage.updated" ,
59335924 ) ;
0 commit comments