@@ -2605,22 +2605,32 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
26052605 const automaticQueuedRuns = projection . runs . filter (
26062606 ( run ) => run . status === "queued" && automaticMessageIds . has ( run . userMessageId ) ,
26072607 ) ;
2608- const activeRunExists = projection . runs . some (
2609- ( run ) =>
2610- [ "preparing" , "queued" , "starting" , "running" , "waiting" ] . includes ( run . status ) &&
2611- ! automaticQueuedRuns . includes ( run ) ,
2608+ const runningRunExists = projection . runs . some ( ( run ) =>
2609+ [ "preparing" , "starting" , "running" , "waiting" ] . includes ( run . status ) ,
2610+ ) ;
2611+ // Includes a queue held after a Stop, which otherwise shows no activity.
2612+ const queuedMessageExists = projection . runs . some (
2613+ ( run ) => run . status === "queued" && ! automaticQueuedRuns . includes ( run ) ,
26122614 ) ;
26132615 const pendingRequests = projection . runtimeRequests . filter (
26142616 ( request ) => request . status === "pending" ,
26152617 ) ;
26162618 const blockingRequestExists = pendingRequests . some (
26172619 ( request ) => request . kind !== "user_input" || request . responseCapability . type !== "message" ,
26182620 ) ;
2619- if ( activeRunExists || blockingRequestExists ) {
2621+ // The reason is shown to the user, so it names what to clear first.
2622+ const blocker = blockingRequestExists
2623+ ? "is waiting on an approval or question. Answer it before settling."
2624+ : runningRunExists
2625+ ? "is still running. Stop it before settling."
2626+ : queuedMessageExists
2627+ ? "has a queued message. Send it or remove it from the queue before settling."
2628+ : null ;
2629+ if ( blocker !== null ) {
26202630 return yield * new OrchestratorDispatchError ( {
26212631 commandId : command . commandId ,
26222632 commandType : command . type ,
2623- cause : `Thread ${ command . threadId } has active or blocked work and cannot be settled. ` ,
2633+ cause : `Thread ${ command . threadId } ${ blocker } ` ,
26242634 } ) ;
26252635 }
26262636
0 commit comments