@@ -56,14 +56,14 @@ const driver = ProviderDriverKind.make("claudeAgent");
5656const instanceId = ProviderInstanceId . make ( "claudeAgent" ) ;
5757const modelSelection = { instanceId, model : "claude-test" } ;
5858
59- // A delegated child ends its turn while a background native subagent (#17154) or shell (#16739)
60- // it started keeps running. task_cancel arrives after the run settles, during its checkpoint, or
61- // while the turn runs; "recorded" exits before anything settles. Each case then restarts.
59+ // Cancellation races with turn completion and checkpoint capture; "recorded" restarts before the Stop outbox runs.
6260const cancelBackgroundOnlyTask = (
6361 background : "subagent" | "command" ,
6462 {
6563 cancelAt = "settled" ,
66- } : { readonly cancelAt ?: "settled" | "checkpoint" | "turn" | "recorded" | "monitor" } = { } ,
64+ } : {
65+ readonly cancelAt ?: "settled" | "checkpoint" | "turn" | "recorded" | "monitor" | "refused" ;
66+ } = { } ,
6767) =>
6868 Effect . scoped (
6969 Effect . gen ( function * ( ) {
@@ -171,7 +171,33 @@ const cancelBackgroundOnlyTask = (
171171 ) ;
172172 const layerOrchestration = Layer . merge (
173173 layerOrchestrator ,
174- ThreadManagementService . layer . pipe (
174+ Layer . effect (
175+ ThreadManagementService . ThreadManagementService ,
176+ Effect . map ( ThreadManagementService . ThreadManagementService , ( service ) =>
177+ cancelAt === "refused"
178+ ? {
179+ ...service ,
180+ stopDelegatedTasks : ( ) =>
181+ Effect . fail (
182+ new Orchestrator . OrchestratorDispatchError ( {
183+ commandId : CommandId . make ( "refused-descendant-stop" ) ,
184+ commandType : "thread.stop" ,
185+ cause : "descendant refused stop" ,
186+ } ) ,
187+ ) ,
188+ }
189+ : service ,
190+ ) ,
191+ ) . pipe (
192+ Layer . provide (
193+ ThreadManagementService . layer . pipe (
194+ Layer . provide ( layerOrchestrator ) ,
195+ Layer . provide ( ServerSettings . layerTest ( ) ) ,
196+ Layer . provide (
197+ CommandReceiptStore . layer . pipe ( Layer . provide ( SqlitePersistence . layerMemory ) ) ,
198+ ) ,
199+ ) ,
200+ ) ,
175201 Layer . provide ( layerOrchestrator ) ,
176202 Layer . provide ( ServerSettings . layerTest ( ) ) ,
177203 Layer . provide (
@@ -412,7 +438,8 @@ const cancelBackgroundOnlyTask = (
412438 yield * Fiber . join ( waiting ) ;
413439 } ) ;
414440 if ( cancelAt !== "turn" ) yield * endTurn ;
415- const turnSettled = cancelAt !== "checkpoint" && cancelAt !== "turn" ;
441+ const turnSettled =
442+ cancelAt !== "checkpoint" && cancelAt !== "turn" && cancelAt !== "recorded" ;
416443 if ( turnSettled ) yield * worker . drain ( ) ;
417444 if ( cancelAt === "monitor" ) {
418445 // A monitor notification then ran and completed while the shell kept running.
@@ -452,29 +479,45 @@ const cancelBackgroundOnlyTask = (
452479 parent . subagents . find ( ( entry ) => entry . id === task . id ) ,
453480 ) ;
454481 if ( cancelAt === "recorded" ) {
455- const unsettled = ( yield * parentTask ) ! ;
456- yield * ( yield * EventSink . EventSinkV2 ) . write ( {
457- commandId : CommandId . make ( "command:runtime-reconcile:cancel-recorded" ) ,
458- events : [
459- {
460- id : EventId . make ( "event:cancel-recorded" ) ,
461- type : "subagent.updated" ,
462- threadId : parentThreadId ,
463- nodeId : task . id ,
464- occurredAt : now ,
465- payload : { ...unsettled , cancelRequestedAt : now } ,
466- } ,
467- ] ,
468- } ) ;
469- yield * orchestrator . dispatch ( {
470- type : "thread.stop" ,
471- commandId : CommandId . make ( "stop-recorded" ) ,
472- threadId : task . childThreadId ! ,
482+ const commandId = CommandId . make ( "stop-recorded" ) ;
483+ yield * orchestrator . cancelDelegatedTask ( {
484+ parentThreadId,
485+ taskId : task . id ,
486+ command : {
487+ type : "thread.stop" ,
488+ commandId,
489+ threadId : task . childThreadId ! ,
490+ stopDelegatedTasks : false ,
491+ } ,
492+ stopDescendants : Effect . void ,
473493 } ) ;
474- yield * worker . drain ( ) ;
494+ const committed = yield * eventSink . readByCommandId ( { commandId } ) . pipe ( Stream . runCollect ) ;
495+ assert . isTrue (
496+ committed . some (
497+ ( { event } ) =>
498+ event . type === "subagent.updated" && event . payload . cancelledRunId !== undefined ,
499+ ) ,
500+ ) ;
501+ assert . isTrue (
502+ committed . some (
503+ ( { event } ) =>
504+ event . type === "turn-item.updated" &&
505+ event . payload . type === "run_interrupt_request" ,
506+ ) ,
507+ ) ;
475508 assert . equal ( ( yield * parentTask ) ?. status , "running" ) ;
476509 return { scope, taskId : task . id , settled : undefined } ;
477510 }
511+ if ( cancelAt === "refused" ) {
512+ yield * Effect . flip (
513+ service . cancelTask ( scope , { taskId : task . id , clientRequestId : "refused-cancel" } ) ,
514+ ) ;
515+ const after = yield * parentTask ;
516+ assert . equal ( after ?. status , "running" ) ;
517+ assert . equal ( after ?. result , null ) ;
518+ assert . isUndefined ( after ?. cancelledRunId ) ;
519+ return undefined ;
520+ }
478521 // Settling the task ends the async question it left, after its own row.
479522 const settled = yield * watch (
480523 ( event ) =>
@@ -532,12 +575,15 @@ const cancelBackgroundOnlyTask = (
532575
533576 return { scope, taskId : task . id , settled : settledTask } ;
534577 } ) . pipe ( Effect . provide ( layerTest ) ) ;
578+ if ( stopped === undefined ) return ;
535579 restarted = true ;
536580
537581 // A server restarted on the same database runs startup recovery and keeps the outcome.
538582 yield * Effect . gen ( function * ( ) {
539583 const service = yield * OrchestratorMcpService . OrchestratorMcpService ;
540584 const orchestrator = yield * Orchestrator . OrchestratorV2 ;
585+ yield * ( yield * EffectWorker . OrchestrationEffectWorkerV2 ) . drain ( ) ;
586+ yield * orchestrator . recoverDelegatedTasks ;
541587 const task = ( yield * orchestrator . getThreadProjection (
542588 stopped . scope . thread ! . threadId ,
543589 ) ) . subagents . find ( ( entry ) => entry . id === stopped . taskId ) ;
@@ -571,6 +617,10 @@ it.effect("task_cancel ends the shell's question though a monitor ran after the
571617 cancelBackgroundOnlyTask ( "command" , { cancelAt : "monitor" } ) ,
572618) ;
573619
574- it . effect ( "a recorded cancel settles at startup when the server exited before settling it " , ( ) =>
620+ it . effect ( "cancellation and Stop commit together and recover before the outbox ran " , ( ) =>
575621 cancelBackgroundOnlyTask ( "subagent" , { cancelAt : "recorded" } ) ,
576622) ;
623+
624+ it . effect ( "a refused descendant stop does not settle or dispose its parent task" , ( ) =>
625+ cancelBackgroundOnlyTask ( "command" , { cancelAt : "refused" } ) ,
626+ ) ;
0 commit comments