1+ import * as Exit from "effect/Exit" ;
12import * as EffectOutbox from "./EffectOutbox.ts" ;
23import * as EffectWorker from "./EffectWorker.ts" ;
34import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts" ;
@@ -2431,7 +2432,7 @@ it.layer(Layer.merge(layerTest, ProviderContinuationRequests.layer))(
24312432 } ) ,
24322433 ) ;
24332434
2434- it . effect . each ( [ "live" , "checkpoint-retry" ] as const ) (
2435+ it . effect . each ( [ "live" , "checkpoint-retry" , "checkpoint-offer-retry" ] as const ) (
24352436 "delivers the run a background command's wake starts after the original result (%s)" ,
24362437 ( delivery ) =>
24372438 Effect . gen ( function * ( ) {
@@ -2521,7 +2522,7 @@ it.layer(Layer.merge(layerTest, ProviderContinuationRequests.layer))(
25212522 delivery === "live"
25222523 ? CommandId . make ( `command:background-wake-finished-${ delivery } ` )
25232524 : reconcileCommandId ( `background-wake-finished-${ delivery } ` ) ;
2524- if ( delivery === "checkpoint-retry ") {
2525+ if ( delivery !== "live ") {
25252526 const outbox = yield * EffectOutbox . EffectOutboxV2 ;
25262527 yield * outbox . cancelUnsettled ( {
25272528 threadId : child . childThreadId ,
@@ -2585,9 +2586,25 @@ it.layer(Layer.merge(layerTest, ProviderContinuationRequests.layer))(
25852586 } ,
25862587 ] ,
25872588 } ) ;
2588- if ( delivery === "checkpoint-retry ") {
2589+ if ( delivery !== "live ") {
25892590 const worker = yield * EffectWorker . OrchestrationEffectWorkerV2 ;
2590- yield * worker . drain ( ) ;
2591+ if ( delivery === "checkpoint-offer-retry" ) {
2592+ using offer = vi
2593+ . spyOn ( requests , "offer" )
2594+ . mockImplementationOnce ( ( ) => Effect . die ( "wake offer failed" ) ) ;
2595+ const first = yield * Effect . exit (
2596+ orchestrator . recoverDelegatedTask ( child . childThreadId ) ,
2597+ ) ;
2598+ assert . isTrue ( Exit . isFailure ( first ) ) ;
2599+ const committed = ( yield * orchestrator . getThreadProjection (
2600+ parentThreadId ,
2601+ ) ) . subagents . find ( ( task ) => task . id === run . delegatedTaskId ) ! ;
2602+ assert . equal ( committed . result , "The background command finished cleanly." ) ;
2603+ yield * worker . drain ( ) ;
2604+ assert . lengthOf ( offer . mock . calls , 2 ) ;
2605+ } else {
2606+ yield * worker . drain ( ) ;
2607+ }
25912608 } else {
25922609 yield * eventSink . stream ( { afterSequence, eventType : "subagent.updated" } ) . pipe (
25932610 Stream . filter (
@@ -2600,9 +2617,16 @@ it.layer(Layer.merge(layerTest, ProviderContinuationRequests.layer))(
26002617 Stream . runDrain ,
26012618 ) ;
26022619 }
2603- const followup = ( yield * orchestrator . getThreadProjection ( parentThreadId ) ) . subagents . find (
2604- ( task ) => task . id === run . delegatedTaskId ,
2605- ) ! ;
2620+ const completed = yield * orchestrator . getThreadProjection ( parentThreadId ) ;
2621+ const followup = completed . subagents . find ( ( task ) => task . id === run . delegatedTaskId ) ! ;
2622+ assert . lengthOf (
2623+ completed . contextTransfers . filter (
2624+ ( transfer ) =>
2625+ transfer . type === "subagent_result" &&
2626+ transfer . sourceThreadId === child . childThreadId ,
2627+ ) ,
2628+ 2 ,
2629+ ) ;
26062630 assert . equal ( followup . status , "completed" ) ;
26072631 assert . equal ( followup . result , "The background command finished cleanly." ) ;
26082632 assert . equal ( followup . completionDelivery ?. state , "claimed" ) ;
0 commit comments