@bastani/atomic 0.9.44-alpha.6 → 0.9.44-alpha.7

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## [Unreleased]
 
+## [0.9.44-alpha.7] - 2026-10-25
+
+Workflow stages always get their queued Intercom messages and never wait forever to start, even around pauses, worker replacement and reconnects.
+
+- **No stuck stages:** a stage no longer waits forever before its first turn for a pattern message it receives live, and never waits more than 60 seconds without delivery progress; any message still queued is delivered afterwards ([#3958](https://github.com/bastani-inc/atomic/pull/3958))
+- **No lost messages:** a direct send to a paused, blocked or not-yet-started stage is queued for that stage and survives a pooled worker replacement, and messages missed while a stage was disconnected arrive after it reconnects, with their delivery mode and reply target intact ([#3958](https://github.com/bastani-inc/atomic/pull/3958), [#3959](https://github.com/bastani-inc/atomic/pull/3959))
+
+### Fixed
+
+- An Intercom message sent to one specific workflow stage while that stage is paused, blocked or awaiting input and has not started yet is now queued for that stage and reaches it when it starts. Previously the send was accepted as a message for a possible future stage (`notInKnownSet`) and matched only the stage's old id, so it was lost when the stage started under a new id, as it does when a pooled worker is replaced. Messages sent to the whole run (`workflow:<rootRunId>/**`) were not affected ([#3869](https://github.com/bastani-inc/atomic/issues/3869))
+- A workflow stage no longer waits forever before its first turn when an Intercom message to a pattern target such as `workflow:<run>/child-a/**` is queued just after the stage's queued messages were delivered at startup. The stage now starts once that startup delivery has finished, and later messages reach it as ordinary live messages. Before, the stage waited for a second delivery that never ran, so its prompt was never sent and its pooled work stayed leased with its lease still renewed. In a 640-child pooled load test this left 7 children (about 1%) stuck for 20–45 minutes.
+- A workflow stage never waits more than 60 seconds without delivery progress for its queued Intercom messages before it starts. If a startup delivery stops making progress, the stage logs one warning that names the undelivered messages and whether the delivery is still running. It then starts, and the messages stay queued: they arrive live or on the stage's next delivery.
+- A sticky Intercom message that could not reach a workflow stage while the stage was disconnected from the broker is now delivered when the stage reconnects, exactly as it would have arrived live: an `interrupt` still cancels the stage's running operation, and an ask becomes the stage's reply target. Messages the stage already has are not delivered again.
+
 ## [0.9.44-alpha.6] - 2026-10-25
 
 Large workflow fan-outs stay fast for the whole run and recover cleanly from a crash, even with hundreds of pooled child workflows messaging each other.

package/dist/builtin/intercom/index.bundle.mjs

@@ -7923,11 +7923,12 @@ function piIntercomExtension(pi, testOverrides = {}) {
       scheduleInboundFlush();
     return plan.notices ?? [];
   }
-  function handleIncomingMessage(ctx, from, message, channel, receivedBeforeStageStart = false) {
+  let redrainPendingStage = null;
+  function handleIncomingMessage(ctx, from, message, channel, receivedBeforeStageStart = false, recoveredAfterStageStart = false) {
     const messageGeneration = runtimeGeneration;
     const liveContext = getLiveContext(ctx, messageGeneration);
     if (!liveContext) {
-      if (receivedBeforeStageStart)
+      if (receivedBeforeStageStart || recoveredAfterStageStart)
         throw new Error("Intercom session retired before pending-stage delivery; message remains queued");
       return;
     }
@@ -7988,6 +7989,13 @@ function piIntercomExtension(pi, testOverrides = {}) {
       });
     }, () => foregroundDetachHandoff.claim(from, message, messageGeneration, () => Boolean(getLiveContext(liveContext, messageGeneration))), release);
     if (activeDelivery !== false) {
+      if (recoveredAfterStageStart) {
+        return activeDelivery.then(commit, (error) => {
+          replyTracker.forgetIncomingMessage(replyContext);
+          inboundDeliveries.release(reservation, toError3(error));
+          throw error;
+        });
+      }
       activeDelivery.then(commit, release);
       return;
     }
@@ -8553,6 +8561,8 @@ function piIntercomExtension(pi, testOverrides = {}) {
             if (nextClient.sessionId && nextClient.sessionId !== preferredSessionId) {
               await recordIntercomSessionIdentity(sessionIdAtStart, nextClient.sessionId);
             }
+            if (reason !== "startup")
+              redrainPendingStage?.();
             return nextClient;
           } catch (error) {
             if (client === nextClient) {
@@ -8788,18 +8798,36 @@ function piIntercomExtension(pi, testOverrides = {}) {
         await ensureConnected("startup");
       return;
     }
-    const deliverPending = async () => {
+    const generation = runtimeGeneration;
+    const deliverPending = async (started = false) => {
       const receivedMessageIds = ctx.sessionManager.getBranch().flatMap((entry) => {
         if (entry.type !== "custom_message" || entry.customType !== "intercom_message")
           return [];
         const id = entry.details?.message?.id;
         return typeof id === "string" ? [id] : [];
       });
-      await pendingStageDelivery.deliverPending((from, message) => handleIncomingMessage(ctx, from, message, undefined, true), { sessionId: ctx.sessionManager.getSessionId(), receivedMessageIds });
+      await pendingStageDelivery.deliverPending((from, message) => started ? handleIncomingMessage(ctx, from, message, undefined, false, true) : handleIncomingMessage(ctx, from, message, undefined, true), { sessionId: ctx.sessionManager.getSessionId(), receivedMessageIds });
     };
+    let startupDrained = false;
+    let redrainRequested = false;
+    const redrain = () => {
+      if (!getLiveContext(ctx, generation))
+        return;
+      if (!startupDrained) {
+        redrainRequested = true;
+        return;
+      }
+      deliverPending(true).catch(() => {});
+    };
+    redrainPendingStage = redrain;
     await deliverPending();
     await ensureConnected("startup");
     await deliverPending();
+    startupDrained = true;
+    if (redrainRequested) {
+      redrainRequested = false;
+      redrain();
+    }
   });
   pi.registerMessageRenderer("intercom_message", (message, _options, theme) => {
     const details = message.details;

package/dist/builtin/intercom/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/intercom",
-  "version": "0.9.44-alpha.6",
+  "version": "0.9.44-alpha.7",
   "private": true,
   "description": "Atomic extension providing a private coordination channel between parent and child agent sessions. Fork of: https://github.com/nicobailon/pi-intercom",
   "contributors": [

package/dist/builtin/mcp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/mcp",
-  "version": "0.9.44-alpha.6",
+  "version": "0.9.44-alpha.7",
   "private": true,
   "description": "Atomic's pi-compatible MCP integration for server connections, OAuth, tools, resources, and terminal management.",
   "contributors": [

package/dist/builtin/subagents/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/subagents",
-  "version": "0.9.44-alpha.6",
+  "version": "0.9.44-alpha.7",
   "private": true,
   "description": "Atomic extension for delegating tasks to subagents with parallel execution. Fork of: https://github.com/nicobailon/pi-subagents",
   "contributors": [

package/dist/builtin/web-access/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/web-access",
-  "version": "0.9.44-alpha.6",
+  "version": "0.9.44-alpha.7",
   "private": true,
   "description": "Atomic extension for web search, URL fetching, GitHub repo cloning, PDF/video extraction. Fork of: https://github.com/nicobailon/pi-web-access",
   "contributors": [

package/dist/builtin/workflows/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/workflows",
-  "version": "0.9.44-alpha.6",
+  "version": "0.9.44-alpha.7",
   "private": true,
   "description": "Atomic extension for multi-stage workflow authoring and execution.",
   "contributors": [

package/dist/builtin/workflows/src/extension/index.bundle.mjs

@@ -2072,6 +2072,9 @@ var init_workflow_stage_target = __esm(() => {
 });
 
 // dist/builtin/workflows/src/shared/pending-stage-status.ts
+function isAddressableStageStatus(status) {
+  return ADDRESSABLE_STAGE_STATUSES.has(status);
+}
 function workflowBoundarySegments(runs, runId) {
   return createWorkflowBoundarySegmentsResolver(runs)(runId);
 }
@@ -2220,9 +2223,17 @@ function pendingWorkflowStageStatuses(run, resolveOwningRunStatus, resolveBounda
     return pending === undefined ? [] : [pending];
   });
 }
+var ADDRESSABLE_STAGE_STATUSES;
 var init_pending_stage_status = __esm(() => {
   init_store_internal();
   init_workflow_stage_target();
+  ADDRESSABLE_STAGE_STATUSES = new Set([
+    "pending",
+    "running",
+    "awaiting_input",
+    "paused",
+    "blocked"
+  ]);
 });
 
 // dist/builtin/workflows/src/shared/timing.ts
@@ -62531,7 +62542,7 @@ function registerPendingStageIntercomBridge(pi, activeStore, ownsRun = () => tru
             stageName: stage.name,
             target: stageRouteTarget(runs, rootRunId, run.id, stage.id, resolveBoundarySegments),
             lifecycle: stage.sessionId === undefined && stage.sessionFile === undefined ? "pending" : "running",
-            routeEligible: stage.pendingStageDeliveryAvailable === true && (stage.status === "pending" || stage.status === "running" || stage.status === "awaiting_input" || stage.status === "paused" || stage.status === "blocked"),
+            routeEligible: stage.pendingStageDeliveryAvailable === true && isAddressableStageStatus(stage.status),
             group: stage.intercomGroup ?? workflowInvocationIntercomGroup(rootRunId)
           })),
           ...nonAgentNodes(run).map((node) => ({
@@ -63034,7 +63045,7 @@ function knownUninitializedStage(run, stageKey) {
   if (candidates.length !== 1)
     return;
   const stage = candidates[0];
-  return (stage.status === "pending" || stage.status === "running") && stage.sessionId === undefined && stage.sessionFile === undefined ? stage : undefined;
+  return isAddressableStageStatus(stage.status) && stage.sessionId === undefined && stage.sessionFile === undefined ? stage : undefined;
 }
 function pendingStageDestination(run, entry) {
   if (entry.stageId !== undefined) {
@@ -67730,15 +67741,74 @@ function isWorkflowPendingStageDeliveryFailure(error) {
     return true;
   return error?.code === "pending_stage_delivery_failed";
 }
-function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageName, commit = (action) => action()) {
+function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageName, commit = (action) => action(), options = {}) {
   let resolveReady;
   let rejectReady;
   let readyPromise;
   let drainError;
   let terminalError;
   let drainPromise;
+  let drainedSessionId;
   let currentRecipient;
-  const hasUndelivered = (sessionId) => activeStore.pendingStageMessagesFor(runId, stageId).length > 0 || stageId !== stageName && activeStore.pendingStageMessagesFor(runId, stageName).length > 0 || stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, sessionId === undefined ? undefined : { sessionId }).length > 0;
+  let lastProgressAt = Date.now();
+  let stallReported = false;
+  const progress = () => {
+    lastProgressAt = Date.now();
+  };
+  const progressingCommit = async (action) => {
+    try {
+      return await commit(action);
+    } finally {
+      progress();
+    }
+  };
+  const reportStall = (sessionId) => {
+    if (stallReported)
+      return;
+    stallReported = true;
+    const undelivered = [
+      ...activeStore.pendingStageMessagesFor(runId, stageId),
+      ...stageId === stageName ? [] : activeStore.pendingStageMessagesFor(runId, stageName)
+    ].map((entry) => `${entry.message.id} (direct → ${entry.stageKey})`).concat(stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, sessionId === undefined ? undefined : { sessionId }).map((entry) => `${entry.message.id} (sticky → ${entry.targetPath ?? entry.stageKey})`));
+    const listed = undelivered.slice(0, 10).join(", ");
+    const more = undelivered.length > 10 ? `, and ${undelivered.length - 10} more` : "";
+    const message = `atomic-workflows: stage "${stageName}" (${stageId}) is starting without its queued Intercom messages: ` + `no delivery progress for ${PENDING_STAGE_READY_STALL_MS / 1000}s; ` + `drain ${drainPromise === undefined ? "not running" : "running but hung"}; ` + `undelivered: ${listed.length === 0 ? "none" : `${listed}${more}`}. ` + "They stay queued and arrive live or on the stage's next drain.";
+    try {
+      (options.reportStall ?? console.warn)(message);
+    } catch {}
+  };
+  const watchStall = (pending, sessionId, onStall) => {
+    let timer;
+    let settled = false;
+    const check = () => {
+      if (settled)
+        return;
+      const remaining = lastProgressAt + PENDING_STAGE_READY_STALL_MS - Date.now();
+      if (remaining > 0) {
+        timer = setTimeout(check, remaining);
+        timer.unref?.();
+        return;
+      }
+      reportStall(sessionId);
+      onStall();
+    };
+    const stop = () => {
+      settled = true;
+      clearTimeout(timer);
+    };
+    pending.then(stop, stop);
+    check();
+  };
+  const boundedDrain = (drain, sessionId) => {
+    const waiting = new Promise((resolve, reject) => {
+      drain.then(resolve, reject);
+      watchStall(drain, sessionId, resolve);
+    });
+    waiting.catch(() => {});
+    return waiting;
+  };
+  const hasUndeliveredExact = () => activeStore.pendingStageMessagesFor(runId, stageId).length > 0 || stageId !== stageName && activeStore.pendingStageMessagesFor(runId, stageName).length > 0;
+  const hasUndelivered = (sessionId) => hasUndeliveredExact() || stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, sessionId === undefined ? undefined : { sessionId }).length > 0;
   const pendingReady = () => {
     if (readyPromise === undefined) {
       readyPromise = new Promise((resolve, reject) => {
@@ -67748,35 +67818,64 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
     }
     return readyPromise;
   };
+  let followUp;
+  const startDrain = (deliver, recipient) => {
+    if (terminalError !== undefined)
+      return Promise.resolve();
+    drainError = undefined;
+    progress();
+    const attempt = deliverPendingStageMessages(activeStore, runId, stageId, stageName, async (from, message) => {
+      progress();
+      await deliver(from, message);
+      progress();
+    }, progressingCommit, recipient);
+    const drain = attempt.then(() => {
+      progress();
+      drainedSessionId = recipient?.sessionId;
+      resolveReady?.();
+      readyPromise = undefined;
+      resolveReady = undefined;
+      rejectReady = undefined;
+      if (drainPromise === drain)
+        drainPromise = undefined;
+    }, (error) => {
+      progress();
+      drainError = error;
+      rejectReady?.(error);
+      readyPromise = undefined;
+      resolveReady = undefined;
+      rejectReady = undefined;
+      if (drainPromise === drain)
+        drainPromise = undefined;
+      throw error;
+    });
+    drainPromise = drain;
+    return boundedDrain(drain, recipient?.sessionId);
+  };
+  const requestDrain = (deliver, recipient) => {
+    const running = drainPromise;
+    if (running === undefined)
+      return startDrain(deliver, recipient);
+    if (followUp !== undefined) {
+      followUp.deliver = deliver;
+      followUp.recipient = recipient;
+      return boundedDrain(followUp.settled.promise, recipient?.sessionId);
+    }
+    const next = { deliver, recipient, settled: Promise.withResolvers() };
+    next.settled.promise.catch(() => {});
+    followUp = next;
+    running.catch(() => {}).then(() => {
+      if (followUp === next)
+        followUp = undefined;
+      return requestDrain(next.deliver, next.recipient);
+    }).then(next.settled.resolve, next.settled.reject);
+    return boundedDrain(next.settled.promise, recipient?.sessionId);
+  };
   return {
     routeCapability: workflowPendingStageRouteCapability(activeStore, runId),
     deliverPending(deliver, recipient) {
       currentRecipient = recipient;
-      if (drainPromise !== undefined)
-        return drainPromise;
-      if (terminalError !== undefined)
-        return Promise.resolve();
-      drainError = undefined;
-      const attempt = deliverPendingStageMessages(activeStore, runId, stageId, stageName, deliver, commit, recipient);
-      const drain = attempt.then(() => {
-        resolveReady?.();
-        readyPromise = undefined;
-        resolveReady = undefined;
-        rejectReady = undefined;
-        if (drainPromise === drain)
-          drainPromise = undefined;
-      }, (error) => {
-        drainError = error;
-        rejectReady?.(error);
-        readyPromise = undefined;
-        resolveReady = undefined;
-        rejectReady = undefined;
-        if (drainPromise === drain)
-          drainPromise = undefined;
-        throw error;
-      });
-      drainPromise = drain;
-      return drainPromise;
+      return requestDrain(deliver, recipient);
     },
     ready(sessionId) {
       if (!hasUndelivered(sessionId)) {
@@ -67786,6 +67885,8 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
         return Promise.reject(terminalError);
       if (drainError !== undefined)
         return Promise.reject(drainError);
+      if (drainPromise === undefined && sessionId !== undefined && drainedSessionId === sessionId && !hasUndeliveredExact())
+        return;
       const ready = pendingReady();
       if (sessionId !== undefined && activeStore.pendingStageMessagesFor(runId, stageId).length === 0 && activeStore.pendingStageMessagesFor(runId, stageName).length === 0) {
         const entries = stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, { sessionId });
@@ -67809,6 +67910,14 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
             rejectReady?.(error);
         });
       }
+      watchStall(ready, sessionId, () => {
+        if (readyPromise !== ready)
+          return;
+        resolveReady?.();
+        readyPromise = undefined;
+        resolveReady = undefined;
+        rejectReady = undefined;
+      });
       return ready;
     },
     fail(reason) {
@@ -67936,7 +68045,7 @@ function toPendingStageSender(entry) {
     lastActivity: entry.from.lastActivity ?? entry.message.timestamp
   };
 }
-var pendingDeliveryClaims, WorkflowPendingStageDeliveryFailedError;
+var pendingDeliveryClaims, WorkflowPendingStageDeliveryFailedError, PENDING_STAGE_READY_STALL_MS = 60000;
 var init_pending_stage_delivery2 = __esm(() => {
   init_run_owner_backend();
   init_store_backend();
@@ -90467,6 +90576,7 @@ init_sdk_recovery_scope();
 init_intercom_group();
 init_pending_stage_delivery();
 init_pending_stage_route_capability();
+init_pending_stage_status();
 
 // dist/builtin/workflows/src/shared/persistence-restore.ts
 init_persistence_restore_helpers();
@@ -90587,13 +90697,6 @@ var PENDING_STAGE_MESSAGE_EVENT3 = "atomic:workflow-pending-stage-message";
 var PENDING_STAGE_ROUTE_REVOKED_EVENT = "atomic:workflow-pending-stage-route-revoked";
 var DORMANT_RUN_SUBAGENT_HOLD_EVENT = "atomic:workflow-dormant-run-subagent-hold";
 var DORMANT_RUN_RECHECK_MS = 15000;
-var ADDRESSABLE_STAGE_STATUSES = new Set([
-  "pending",
-  "running",
-  "awaiting_input",
-  "paused",
-  "blocked"
-]);
 var DORMANT_ASK_REFUSAL = "Cannot ask a stage of an interrupted workflow run. Use send; Atomic will queue the message until the run is resumed.";
 function registerDormantRunIntercomRoutes(pi, activeStore, deps) {
   const reportWarning = createWorkflowBackgroundWarningReporter(pi);
@@ -90882,7 +90985,7 @@ function queueRefusal(result, target) {
   return { outcome: "refused", reason: "Target workflow run is in a different intercom group" };
 }
 function isAddressableStage(stage) {
-  return ADDRESSABLE_STAGE_STATUSES.has(stage.status) && stage.nodeKind !== "tool" && stage.replayKey?.startsWith("prompt:") !== true;
+  return isAddressableStageStatus(stage.status) && stage.nodeKind !== "tool" && stage.replayKey?.startsWith("prompt:") !== true;
 }
 function isDormantMessageEvent(value2) {
   if (typeof value2 !== "object" || value2 === null)

package/dist/builtin/workflows/src/extension/local-worker-entry.mjs

@@ -58349,6 +58349,9 @@ var init_workflow_stage_target = __esm(() => {
 });
 
 // dist/builtin/workflows/src/shared/pending-stage-status.ts
+function isAddressableStageStatus(status) {
+  return ADDRESSABLE_STAGE_STATUSES.has(status);
+}
 function workflowBoundarySegments(runs, runId) {
   return createWorkflowBoundarySegmentsResolver(runs)(runId);
 }
@@ -58471,9 +58474,17 @@ function createStagePathPatternIndex(patterns) {
     }
   };
 }
+var ADDRESSABLE_STAGE_STATUSES;
 var init_pending_stage_status = __esm(() => {
   init_store_internal();
   init_workflow_stage_target();
+  ADDRESSABLE_STAGE_STATUSES = new Set([
+    "pending",
+    "running",
+    "awaiting_input",
+    "paused",
+    "blocked"
+  ]);
 });
 
 // dist/builtin/workflows/src/shared/sticky-delivery-state-bound.ts
@@ -59187,7 +59198,7 @@ function registerPendingStageIntercomBridge(pi, activeStore, ownsRun = () => tru
             stageName: stage.name,
             target: stageRouteTarget(runs, rootRunId, run.id, stage.id, resolveBoundarySegments),
             lifecycle: stage.sessionId === undefined && stage.sessionFile === undefined ? "pending" : "running",
-            routeEligible: stage.pendingStageDeliveryAvailable === true && (stage.status === "pending" || stage.status === "running" || stage.status === "awaiting_input" || stage.status === "paused" || stage.status === "blocked"),
+            routeEligible: stage.pendingStageDeliveryAvailable === true && isAddressableStageStatus(stage.status),
             group: stage.intercomGroup ?? workflowInvocationIntercomGroup(rootRunId)
           })),
           ...nonAgentNodes(run).map((node) => ({
@@ -59690,7 +59701,7 @@ function knownUninitializedStage(run, stageKey) {
   if (candidates.length !== 1)
     return;
   const stage = candidates[0];
-  return (stage.status === "pending" || stage.status === "running") && stage.sessionId === undefined && stage.sessionFile === undefined ? stage : undefined;
+  return isAddressableStageStatus(stage.status) && stage.sessionId === undefined && stage.sessionFile === undefined ? stage : undefined;
 }
 function pendingStageDestination(run, entry) {
   if (entry.stageId !== undefined) {
@@ -64371,15 +64382,74 @@ function isWorkflowPendingStageDeliveryFailure(error) {
     return true;
   return error?.code === "pending_stage_delivery_failed";
 }
-function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageName, commit = (action) => action()) {
+function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageName, commit = (action) => action(), options = {}) {
   let resolveReady;
   let rejectReady;
   let readyPromise;
   let drainError;
   let terminalError;
   let drainPromise;
+  let drainedSessionId;
   let currentRecipient;
-  const hasUndelivered = (sessionId) => activeStore.pendingStageMessagesFor(runId, stageId).length > 0 || stageId !== stageName && activeStore.pendingStageMessagesFor(runId, stageName).length > 0 || stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, sessionId === undefined ? undefined : { sessionId }).length > 0;
+  let lastProgressAt = Date.now();
+  let stallReported = false;
+  const progress = () => {
+    lastProgressAt = Date.now();
+  };
+  const progressingCommit = async (action) => {
+    try {
+      return await commit(action);
+    } finally {
+      progress();
+    }
+  };
+  const reportStall = (sessionId) => {
+    if (stallReported)
+      return;
+    stallReported = true;
+    const undelivered = [
+      ...activeStore.pendingStageMessagesFor(runId, stageId),
+      ...stageId === stageName ? [] : activeStore.pendingStageMessagesFor(runId, stageName)
+    ].map((entry) => `${entry.message.id} (direct → ${entry.stageKey})`).concat(stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, sessionId === undefined ? undefined : { sessionId }).map((entry) => `${entry.message.id} (sticky → ${entry.targetPath ?? entry.stageKey})`));
+    const listed = undelivered.slice(0, 10).join(", ");
+    const more = undelivered.length > 10 ? `, and ${undelivered.length - 10} more` : "";
+    const message = `atomic-workflows: stage "${stageName}" (${stageId}) is starting without its queued Intercom messages: ` + `no delivery progress for ${PENDING_STAGE_READY_STALL_MS / 1000}s; ` + `drain ${drainPromise === undefined ? "not running" : "running but hung"}; ` + `undelivered: ${listed.length === 0 ? "none" : `${listed}${more}`}. ` + "They stay queued and arrive live or on the stage's next drain.";
+    try {
+      (options.reportStall ?? console.warn)(message);
+    } catch {}
+  };
+  const watchStall = (pending, sessionId, onStall) => {
+    let timer;
+    let settled = false;
+    const check = () => {
+      if (settled)
+        return;
+      const remaining = lastProgressAt + PENDING_STAGE_READY_STALL_MS - Date.now();
+      if (remaining > 0) {
+        timer = setTimeout(check, remaining);
+        timer.unref?.();
+        return;
+      }
+      reportStall(sessionId);
+      onStall();
+    };
+    const stop = () => {
+      settled = true;
+      clearTimeout(timer);
+    };
+    pending.then(stop, stop);
+    check();
+  };
+  const boundedDrain = (drain, sessionId) => {
+    const waiting = new Promise((resolve, reject) => {
+      drain.then(resolve, reject);
+      watchStall(drain, sessionId, resolve);
+    });
+    waiting.catch(() => {});
+    return waiting;
+  };
+  const hasUndeliveredExact = () => activeStore.pendingStageMessagesFor(runId, stageId).length > 0 || stageId !== stageName && activeStore.pendingStageMessagesFor(runId, stageName).length > 0;
+  const hasUndelivered = (sessionId) => hasUndeliveredExact() || stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, sessionId === undefined ? undefined : { sessionId }).length > 0;
   const pendingReady = () => {
     if (readyPromise === undefined) {
       readyPromise = new Promise((resolve, reject) => {
@@ -64389,35 +64459,64 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
     }
     return readyPromise;
   };
+  let followUp;
+  const startDrain = (deliver, recipient) => {
+    if (terminalError !== undefined)
+      return Promise.resolve();
+    drainError = undefined;
+    progress();
+    const attempt = deliverPendingStageMessages(activeStore, runId, stageId, stageName, async (from, message) => {
+      progress();
+      await deliver(from, message);
+      progress();
+    }, progressingCommit, recipient);
+    const drain = attempt.then(() => {
+      progress();
+      drainedSessionId = recipient?.sessionId;
+      resolveReady?.();
+      readyPromise = undefined;
+      resolveReady = undefined;
+      rejectReady = undefined;
+      if (drainPromise === drain)
+        drainPromise = undefined;
+    }, (error) => {
+      progress();
+      drainError = error;
+      rejectReady?.(error);
+      readyPromise = undefined;
+      resolveReady = undefined;
+      rejectReady = undefined;
+      if (drainPromise === drain)
+        drainPromise = undefined;
+      throw error;
+    });
+    drainPromise = drain;
+    return boundedDrain(drain, recipient?.sessionId);
+  };
+  const requestDrain = (deliver, recipient) => {
+    const running = drainPromise;
+    if (running === undefined)
+      return startDrain(deliver, recipient);
+    if (followUp !== undefined) {
+      followUp.deliver = deliver;
+      followUp.recipient = recipient;
+      return boundedDrain(followUp.settled.promise, recipient?.sessionId);
+    }
+    const next = { deliver, recipient, settled: Promise.withResolvers() };
+    next.settled.promise.catch(() => {});
+    followUp = next;
+    running.catch(() => {}).then(() => {
+      if (followUp === next)
+        followUp = undefined;
+      return requestDrain(next.deliver, next.recipient);
+    }).then(next.settled.resolve, next.settled.reject);
+    return boundedDrain(next.settled.promise, recipient?.sessionId);
+  };
   return {
     routeCapability: workflowPendingStageRouteCapability(activeStore, runId),
     deliverPending(deliver, recipient) {
       currentRecipient = recipient;
-      if (drainPromise !== undefined)
-        return drainPromise;
-      if (terminalError !== undefined)
-        return Promise.resolve();
-      drainError = undefined;
-      const attempt = deliverPendingStageMessages(activeStore, runId, stageId, stageName, deliver, commit, recipient);
-      const drain = attempt.then(() => {
-        resolveReady?.();
-        readyPromise = undefined;
-        resolveReady = undefined;
-        rejectReady = undefined;
-        if (drainPromise === drain)
-          drainPromise = undefined;
-      }, (error) => {
-        drainError = error;
-        rejectReady?.(error);
-        readyPromise = undefined;
-        resolveReady = undefined;
-        rejectReady = undefined;
-        if (drainPromise === drain)
-          drainPromise = undefined;
-        throw error;
-      });
-      drainPromise = drain;
-      return drainPromise;
+      return requestDrain(deliver, recipient);
     },
     ready(sessionId) {
       if (!hasUndelivered(sessionId)) {
@@ -64427,6 +64526,8 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
         return Promise.reject(terminalError);
       if (drainError !== undefined)
         return Promise.reject(drainError);
+      if (drainPromise === undefined && sessionId !== undefined && drainedSessionId === sessionId && !hasUndeliveredExact())
+        return;
       const ready = pendingReady();
       if (sessionId !== undefined && activeStore.pendingStageMessagesFor(runId, stageId).length === 0 && activeStore.pendingStageMessagesFor(runId, stageName).length === 0) {
         const entries = stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, { sessionId });
@@ -64450,6 +64551,14 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
             rejectReady?.(error);
         });
       }
+      watchStall(ready, sessionId, () => {
+        if (readyPromise !== ready)
+          return;
+        resolveReady?.();
+        readyPromise = undefined;
+        resolveReady = undefined;
+        rejectReady = undefined;
+      });
       return ready;
     },
     fail(reason) {
@@ -64577,7 +64686,7 @@ function toPendingStageSender(entry) {
     lastActivity: entry.from.lastActivity ?? entry.message.timestamp
   };
 }
-var pendingDeliveryClaims, WorkflowPendingStageDeliveryFailedError;
+var pendingDeliveryClaims, WorkflowPendingStageDeliveryFailedError, PENDING_STAGE_READY_STALL_MS = 60000;
 var init_pending_stage_delivery2 = __esm(() => {
   init_run_owner_backend();
   init_store_backend();

package/dist/builtin/workflows/src/index.js

@@ -59243,6 +59243,9 @@ var init_workflow_stage_target = __esm(() => {
 });
 
 // dist/builtin/workflows/src/shared/pending-stage-status.ts
+function isAddressableStageStatus(status) {
+  return ADDRESSABLE_STAGE_STATUSES.has(status);
+}
 function workflowBoundarySegments(runs, runId) {
   return createWorkflowBoundarySegmentsResolver(runs)(runId);
 }
@@ -59365,9 +59368,17 @@ function createStagePathPatternIndex(patterns) {
     }
   };
 }
+var ADDRESSABLE_STAGE_STATUSES;
 var init_pending_stage_status = __esm(() => {
   init_store_internal();
   init_workflow_stage_target();
+  ADDRESSABLE_STAGE_STATUSES = new Set([
+    "pending",
+    "running",
+    "awaiting_input",
+    "paused",
+    "blocked"
+  ]);
 });
 
 // dist/builtin/workflows/src/shared/sticky-delivery-state-bound.ts
@@ -60081,7 +60092,7 @@ function registerPendingStageIntercomBridge(pi, activeStore, ownsRun = () => tru
             stageName: stage.name,
             target: stageRouteTarget(runs, rootRunId, run.id, stage.id, resolveBoundarySegments),
             lifecycle: stage.sessionId === undefined && stage.sessionFile === undefined ? "pending" : "running",
-            routeEligible: stage.pendingStageDeliveryAvailable === true && (stage.status === "pending" || stage.status === "running" || stage.status === "awaiting_input" || stage.status === "paused" || stage.status === "blocked"),
+            routeEligible: stage.pendingStageDeliveryAvailable === true && isAddressableStageStatus(stage.status),
             group: stage.intercomGroup ?? workflowInvocationIntercomGroup(rootRunId)
           })),
           ...nonAgentNodes(run).map((node) => ({
@@ -60584,7 +60595,7 @@ function knownUninitializedStage(run, stageKey) {
   if (candidates.length !== 1)
     return;
   const stage = candidates[0];
-  return (stage.status === "pending" || stage.status === "running") && stage.sessionId === undefined && stage.sessionFile === undefined ? stage : undefined;
+  return isAddressableStageStatus(stage.status) && stage.sessionId === undefined && stage.sessionFile === undefined ? stage : undefined;
 }
 function pendingStageDestination(run, entry) {
   if (entry.stageId !== undefined) {
@@ -64158,15 +64169,74 @@ function isWorkflowPendingStageDeliveryFailure(error) {
     return true;
   return error?.code === "pending_stage_delivery_failed";
 }
-function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageName, commit = (action) => action()) {
+function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageName, commit = (action) => action(), options = {}) {
   let resolveReady;
   let rejectReady;
   let readyPromise;
   let drainError;
   let terminalError;
   let drainPromise;
+  let drainedSessionId;
   let currentRecipient;
-  const hasUndelivered = (sessionId) => activeStore.pendingStageMessagesFor(runId, stageId).length > 0 || stageId !== stageName && activeStore.pendingStageMessagesFor(runId, stageName).length > 0 || stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, sessionId === undefined ? undefined : { sessionId }).length > 0;
+  let lastProgressAt = Date.now();
+  let stallReported = false;
+  const progress = () => {
+    lastProgressAt = Date.now();
+  };
+  const progressingCommit = async (action) => {
+    try {
+      return await commit(action);
+    } finally {
+      progress();
+    }
+  };
+  const reportStall = (sessionId) => {
+    if (stallReported)
+      return;
+    stallReported = true;
+    const undelivered = [
+      ...activeStore.pendingStageMessagesFor(runId, stageId),
+      ...stageId === stageName ? [] : activeStore.pendingStageMessagesFor(runId, stageName)
+    ].map((entry) => `${entry.message.id} (direct → ${entry.stageKey})`).concat(stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, sessionId === undefined ? undefined : { sessionId }).map((entry) => `${entry.message.id} (sticky → ${entry.targetPath ?? entry.stageKey})`));
+    const listed = undelivered.slice(0, 10).join(", ");
+    const more = undelivered.length > 10 ? `, and ${undelivered.length - 10} more` : "";
+    const message = `atomic-workflows: stage "${stageName}" (${stageId}) is starting without its queued Intercom messages: ` + `no delivery progress for ${PENDING_STAGE_READY_STALL_MS / 1000}s; ` + `drain ${drainPromise === undefined ? "not running" : "running but hung"}; ` + `undelivered: ${listed.length === 0 ? "none" : `${listed}${more}`}. ` + "They stay queued and arrive live or on the stage's next drain.";
+    try {
+      (options.reportStall ?? console.warn)(message);
+    } catch {}
+  };
+  const watchStall = (pending, sessionId, onStall) => {
+    let timer;
+    let settled = false;
+    const check = () => {
+      if (settled)
+        return;
+      const remaining = lastProgressAt + PENDING_STAGE_READY_STALL_MS - Date.now();
+      if (remaining > 0) {
+        timer = setTimeout(check, remaining);
+        timer.unref?.();
+        return;
+      }
+      reportStall(sessionId);
+      onStall();
+    };
+    const stop = () => {
+      settled = true;
+      clearTimeout(timer);
+    };
+    pending.then(stop, stop);
+    check();
+  };
+  const boundedDrain = (drain, sessionId) => {
+    const waiting = new Promise((resolve, reject) => {
+      drain.then(resolve, reject);
+      watchStall(drain, sessionId, resolve);
+    });
+    waiting.catch(() => {});
+    return waiting;
+  };
+  const hasUndeliveredExact = () => activeStore.pendingStageMessagesFor(runId, stageId).length > 0 || stageId !== stageName && activeStore.pendingStageMessagesFor(runId, stageName).length > 0;
+  const hasUndelivered = (sessionId) => hasUndeliveredExact() || stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, sessionId === undefined ? undefined : { sessionId }).length > 0;
   const pendingReady = () => {
     if (readyPromise === undefined) {
       readyPromise = new Promise((resolve, reject) => {
@@ -64176,35 +64246,64 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
     }
     return readyPromise;
   };
+  let followUp;
+  const startDrain = (deliver, recipient) => {
+    if (terminalError !== undefined)
+      return Promise.resolve();
+    drainError = undefined;
+    progress();
+    const attempt = deliverPendingStageMessages(activeStore, runId, stageId, stageName, async (from, message) => {
+      progress();
+      await deliver(from, message);
+      progress();
+    }, progressingCommit, recipient);
+    const drain = attempt.then(() => {
+      progress();
+      drainedSessionId = recipient?.sessionId;
+      resolveReady?.();
+      readyPromise = undefined;
+      resolveReady = undefined;
+      rejectReady = undefined;
+      if (drainPromise === drain)
+        drainPromise = undefined;
+    }, (error) => {
+      progress();
+      drainError = error;
+      rejectReady?.(error);
+      readyPromise = undefined;
+      resolveReady = undefined;
+      rejectReady = undefined;
+      if (drainPromise === drain)
+        drainPromise = undefined;
+      throw error;
+    });
+    drainPromise = drain;
+    return boundedDrain(drain, recipient?.sessionId);
+  };
+  const requestDrain = (deliver, recipient) => {
+    const running = drainPromise;
+    if (running === undefined)
+      return startDrain(deliver, recipient);
+    if (followUp !== undefined) {
+      followUp.deliver = deliver;
+      followUp.recipient = recipient;
+      return boundedDrain(followUp.settled.promise, recipient?.sessionId);
+    }
+    const next = { deliver, recipient, settled: Promise.withResolvers() };
+    next.settled.promise.catch(() => {});
+    followUp = next;
+    running.catch(() => {}).then(() => {
+      if (followUp === next)
+        followUp = undefined;
+      return requestDrain(next.deliver, next.recipient);
+    }).then(next.settled.resolve, next.settled.reject);
+    return boundedDrain(next.settled.promise, recipient?.sessionId);
+  };
   return {
     routeCapability: workflowPendingStageRouteCapability(activeStore, runId),
     deliverPending(deliver, recipient) {
       currentRecipient = recipient;
-      if (drainPromise !== undefined)
-        return drainPromise;
-      if (terminalError !== undefined)
-        return Promise.resolve();
-      drainError = undefined;
-      const attempt = deliverPendingStageMessages(activeStore, runId, stageId, stageName, deliver, commit, recipient);
-      const drain = attempt.then(() => {
-        resolveReady?.();
-        readyPromise = undefined;
-        resolveReady = undefined;
-        rejectReady = undefined;
-        if (drainPromise === drain)
-          drainPromise = undefined;
-      }, (error) => {
-        drainError = error;
-        rejectReady?.(error);
-        readyPromise = undefined;
-        resolveReady = undefined;
-        rejectReady = undefined;
-        if (drainPromise === drain)
-          drainPromise = undefined;
-        throw error;
-      });
-      drainPromise = drain;
-      return drainPromise;
+      return requestDrain(deliver, recipient);
     },
     ready(sessionId) {
       if (!hasUndelivered(sessionId)) {
@@ -64214,6 +64313,8 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
         return Promise.reject(terminalError);
       if (drainError !== undefined)
         return Promise.reject(drainError);
+      if (drainPromise === undefined && sessionId !== undefined && drainedSessionId === sessionId && !hasUndeliveredExact())
+        return;
       const ready = pendingReady();
       if (sessionId !== undefined && activeStore.pendingStageMessagesFor(runId, stageId).length === 0 && activeStore.pendingStageMessagesFor(runId, stageName).length === 0) {
         const entries = stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, { sessionId });
@@ -64237,6 +64338,14 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
             rejectReady?.(error);
         });
       }
+      watchStall(ready, sessionId, () => {
+        if (readyPromise !== ready)
+          return;
+        resolveReady?.();
+        readyPromise = undefined;
+        resolveReady = undefined;
+        rejectReady = undefined;
+      });
       return ready;
     },
     fail(reason) {
@@ -64364,7 +64473,7 @@ function toPendingStageSender(entry) {
     lastActivity: entry.from.lastActivity ?? entry.message.timestamp
   };
 }
-var pendingDeliveryClaims, WorkflowPendingStageDeliveryFailedError;
+var pendingDeliveryClaims, WorkflowPendingStageDeliveryFailedError, PENDING_STAGE_READY_STALL_MS = 60000;
 var init_pending_stage_delivery2 = __esm(() => {
   init_run_owner_backend();
   init_store_backend();

package/dist/builtin/workflows/src/local-worker-entry.mjs

@@ -58349,6 +58349,9 @@ var init_workflow_stage_target = __esm(() => {
 });
 
 // dist/builtin/workflows/src/shared/pending-stage-status.ts
+function isAddressableStageStatus(status) {
+  return ADDRESSABLE_STAGE_STATUSES.has(status);
+}
 function workflowBoundarySegments(runs, runId) {
   return createWorkflowBoundarySegmentsResolver(runs)(runId);
 }
@@ -58471,9 +58474,17 @@ function createStagePathPatternIndex(patterns) {
     }
   };
 }
+var ADDRESSABLE_STAGE_STATUSES;
 var init_pending_stage_status = __esm(() => {
   init_store_internal();
   init_workflow_stage_target();
+  ADDRESSABLE_STAGE_STATUSES = new Set([
+    "pending",
+    "running",
+    "awaiting_input",
+    "paused",
+    "blocked"
+  ]);
 });
 
 // dist/builtin/workflows/src/shared/sticky-delivery-state-bound.ts
@@ -59187,7 +59198,7 @@ function registerPendingStageIntercomBridge(pi, activeStore, ownsRun = () => tru
             stageName: stage.name,
             target: stageRouteTarget(runs, rootRunId, run.id, stage.id, resolveBoundarySegments),
             lifecycle: stage.sessionId === undefined && stage.sessionFile === undefined ? "pending" : "running",
-            routeEligible: stage.pendingStageDeliveryAvailable === true && (stage.status === "pending" || stage.status === "running" || stage.status === "awaiting_input" || stage.status === "paused" || stage.status === "blocked"),
+            routeEligible: stage.pendingStageDeliveryAvailable === true && isAddressableStageStatus(stage.status),
             group: stage.intercomGroup ?? workflowInvocationIntercomGroup(rootRunId)
           })),
           ...nonAgentNodes(run).map((node) => ({
@@ -59690,7 +59701,7 @@ function knownUninitializedStage(run, stageKey) {
   if (candidates.length !== 1)
     return;
   const stage = candidates[0];
-  return (stage.status === "pending" || stage.status === "running") && stage.sessionId === undefined && stage.sessionFile === undefined ? stage : undefined;
+  return isAddressableStageStatus(stage.status) && stage.sessionId === undefined && stage.sessionFile === undefined ? stage : undefined;
 }
 function pendingStageDestination(run, entry) {
   if (entry.stageId !== undefined) {
@@ -64371,15 +64382,74 @@ function isWorkflowPendingStageDeliveryFailure(error) {
     return true;
   return error?.code === "pending_stage_delivery_failed";
 }
-function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageName, commit = (action) => action()) {
+function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageName, commit = (action) => action(), options = {}) {
   let resolveReady;
   let rejectReady;
   let readyPromise;
   let drainError;
   let terminalError;
   let drainPromise;
+  let drainedSessionId;
   let currentRecipient;
-  const hasUndelivered = (sessionId) => activeStore.pendingStageMessagesFor(runId, stageId).length > 0 || stageId !== stageName && activeStore.pendingStageMessagesFor(runId, stageName).length > 0 || stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, sessionId === undefined ? undefined : { sessionId }).length > 0;
+  let lastProgressAt = Date.now();
+  let stallReported = false;
+  const progress = () => {
+    lastProgressAt = Date.now();
+  };
+  const progressingCommit = async (action) => {
+    try {
+      return await commit(action);
+    } finally {
+      progress();
+    }
+  };
+  const reportStall = (sessionId) => {
+    if (stallReported)
+      return;
+    stallReported = true;
+    const undelivered = [
+      ...activeStore.pendingStageMessagesFor(runId, stageId),
+      ...stageId === stageName ? [] : activeStore.pendingStageMessagesFor(runId, stageName)
+    ].map((entry) => `${entry.message.id} (direct → ${entry.stageKey})`).concat(stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, sessionId === undefined ? undefined : { sessionId }).map((entry) => `${entry.message.id} (sticky → ${entry.targetPath ?? entry.stageKey})`));
+    const listed = undelivered.slice(0, 10).join(", ");
+    const more = undelivered.length > 10 ? `, and ${undelivered.length - 10} more` : "";
+    const message = `atomic-workflows: stage "${stageName}" (${stageId}) is starting without its queued Intercom messages: ` + `no delivery progress for ${PENDING_STAGE_READY_STALL_MS / 1000}s; ` + `drain ${drainPromise === undefined ? "not running" : "running but hung"}; ` + `undelivered: ${listed.length === 0 ? "none" : `${listed}${more}`}. ` + "They stay queued and arrive live or on the stage's next drain.";
+    try {
+      (options.reportStall ?? console.warn)(message);
+    } catch {}
+  };
+  const watchStall = (pending, sessionId, onStall) => {
+    let timer;
+    let settled = false;
+    const check = () => {
+      if (settled)
+        return;
+      const remaining = lastProgressAt + PENDING_STAGE_READY_STALL_MS - Date.now();
+      if (remaining > 0) {
+        timer = setTimeout(check, remaining);
+        timer.unref?.();
+        return;
+      }
+      reportStall(sessionId);
+      onStall();
+    };
+    const stop = () => {
+      settled = true;
+      clearTimeout(timer);
+    };
+    pending.then(stop, stop);
+    check();
+  };
+  const boundedDrain = (drain, sessionId) => {
+    const waiting = new Promise((resolve, reject) => {
+      drain.then(resolve, reject);
+      watchStall(drain, sessionId, resolve);
+    });
+    waiting.catch(() => {});
+    return waiting;
+  };
+  const hasUndeliveredExact = () => activeStore.pendingStageMessagesFor(runId, stageId).length > 0 || stageId !== stageName && activeStore.pendingStageMessagesFor(runId, stageName).length > 0;
+  const hasUndelivered = (sessionId) => hasUndeliveredExact() || stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, sessionId === undefined ? undefined : { sessionId }).length > 0;
   const pendingReady = () => {
     if (readyPromise === undefined) {
       readyPromise = new Promise((resolve, reject) => {
@@ -64389,35 +64459,64 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
     }
     return readyPromise;
   };
+  let followUp;
+  const startDrain = (deliver, recipient) => {
+    if (terminalError !== undefined)
+      return Promise.resolve();
+    drainError = undefined;
+    progress();
+    const attempt = deliverPendingStageMessages(activeStore, runId, stageId, stageName, async (from, message) => {
+      progress();
+      await deliver(from, message);
+      progress();
+    }, progressingCommit, recipient);
+    const drain = attempt.then(() => {
+      progress();
+      drainedSessionId = recipient?.sessionId;
+      resolveReady?.();
+      readyPromise = undefined;
+      resolveReady = undefined;
+      rejectReady = undefined;
+      if (drainPromise === drain)
+        drainPromise = undefined;
+    }, (error) => {
+      progress();
+      drainError = error;
+      rejectReady?.(error);
+      readyPromise = undefined;
+      resolveReady = undefined;
+      rejectReady = undefined;
+      if (drainPromise === drain)
+        drainPromise = undefined;
+      throw error;
+    });
+    drainPromise = drain;
+    return boundedDrain(drain, recipient?.sessionId);
+  };
+  const requestDrain = (deliver, recipient) => {
+    const running = drainPromise;
+    if (running === undefined)
+      return startDrain(deliver, recipient);
+    if (followUp !== undefined) {
+      followUp.deliver = deliver;
+      followUp.recipient = recipient;
+      return boundedDrain(followUp.settled.promise, recipient?.sessionId);
+    }
+    const next = { deliver, recipient, settled: Promise.withResolvers() };
+    next.settled.promise.catch(() => {});
+    followUp = next;
+    running.catch(() => {}).then(() => {
+      if (followUp === next)
+        followUp = undefined;
+      return requestDrain(next.deliver, next.recipient);
+    }).then(next.settled.resolve, next.settled.reject);
+    return boundedDrain(next.settled.promise, recipient?.sessionId);
+  };
   return {
     routeCapability: workflowPendingStageRouteCapability(activeStore, runId),
     deliverPending(deliver, recipient) {
       currentRecipient = recipient;
-      if (drainPromise !== undefined)
-        return drainPromise;
-      if (terminalError !== undefined)
-        return Promise.resolve();
-      drainError = undefined;
-      const attempt = deliverPendingStageMessages(activeStore, runId, stageId, stageName, deliver, commit, recipient);
-      const drain = attempt.then(() => {
-        resolveReady?.();
-        readyPromise = undefined;
-        resolveReady = undefined;
-        rejectReady = undefined;
-        if (drainPromise === drain)
-          drainPromise = undefined;
-      }, (error) => {
-        drainError = error;
-        rejectReady?.(error);
-        readyPromise = undefined;
-        resolveReady = undefined;
-        rejectReady = undefined;
-        if (drainPromise === drain)
-          drainPromise = undefined;
-        throw error;
-      });
-      drainPromise = drain;
-      return drainPromise;
+      return requestDrain(deliver, recipient);
     },
     ready(sessionId) {
       if (!hasUndelivered(sessionId)) {
@@ -64427,6 +64526,8 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
         return Promise.reject(terminalError);
       if (drainError !== undefined)
         return Promise.reject(drainError);
+      if (drainPromise === undefined && sessionId !== undefined && drainedSessionId === sessionId && !hasUndeliveredExact())
+        return;
       const ready = pendingReady();
       if (sessionId !== undefined && activeStore.pendingStageMessagesFor(runId, stageId).length === 0 && activeStore.pendingStageMessagesFor(runId, stageName).length === 0) {
         const entries = stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, { sessionId });
@@ -64450,6 +64551,14 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
             rejectReady?.(error);
         });
       }
+      watchStall(ready, sessionId, () => {
+        if (readyPromise !== ready)
+          return;
+        resolveReady?.();
+        readyPromise = undefined;
+        resolveReady = undefined;
+        rejectReady = undefined;
+      });
       return ready;
     },
     fail(reason) {
@@ -64577,7 +64686,7 @@ function toPendingStageSender(entry) {
     lastActivity: entry.from.lastActivity ?? entry.message.timestamp
   };
 }
-var pendingDeliveryClaims, WorkflowPendingStageDeliveryFailedError;
+var pendingDeliveryClaims, WorkflowPendingStageDeliveryFailedError, PENDING_STAGE_READY_STALL_MS = 60000;
 var init_pending_stage_delivery2 = __esm(() => {
   init_run_owner_backend();
   init_store_backend();

package/npm-shrinkwrap.json

@@ -1,16 +1,16 @@
 {
 	"name": "@bastani/atomic",
-	"version": "0.9.44-alpha.6",
+	"version": "0.9.44-alpha.7",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@bastani/atomic",
-			"version": "0.9.44-alpha.6",
+			"version": "0.9.44-alpha.7",
 			"license": "MIT",
 			"dependencies": {
-				"@bastani/atomic-natives": "0.9.44-alpha.6",
-				"@bastani/pi-ai": "0.9.44-alpha.6",
+				"@bastani/atomic-natives": "0.9.44-alpha.7",
+				"@bastani/pi-ai": "0.9.44-alpha.7",
 				"@earendil-works/pi-agent-core": "1.4.0",
 				"@earendil-works/pi-codemode": "1.4.0",
 				"@earendil-works/pi-tui": "1.4.0",
@@ -427,18 +427,18 @@
 			}
 		},
 		"node_modules/@bastani/atomic-natives": {
-			"version": "0.9.44-alpha.6",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives/-/atomic-natives-0.9.44-alpha.6.tgz",
+			"version": "0.9.44-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives/-/atomic-natives-0.9.44-alpha.7.tgz",
 			"license": "MIT",
 			"optionalDependencies": {
-				"@bastani/atomic-natives-darwin-arm64": "0.9.44-alpha.6",
-				"@bastani/atomic-natives-darwin-x64": "0.9.44-alpha.6",
-				"@bastani/atomic-natives-linux-arm64-gnu": "0.9.44-alpha.6",
-				"@bastani/atomic-natives-linux-arm64-musl": "0.9.44-alpha.6",
-				"@bastani/atomic-natives-linux-x64-gnu": "0.9.44-alpha.6",
-				"@bastani/atomic-natives-linux-x64-musl": "0.9.44-alpha.6",
-				"@bastani/atomic-natives-win32-arm64-msvc": "0.9.44-alpha.6",
-				"@bastani/atomic-natives-win32-x64-msvc": "0.9.44-alpha.6"
+				"@bastani/atomic-natives-darwin-arm64": "0.9.44-alpha.7",
+				"@bastani/atomic-natives-darwin-x64": "0.9.44-alpha.7",
+				"@bastani/atomic-natives-linux-arm64-gnu": "0.9.44-alpha.7",
+				"@bastani/atomic-natives-linux-arm64-musl": "0.9.44-alpha.7",
+				"@bastani/atomic-natives-linux-x64-gnu": "0.9.44-alpha.7",
+				"@bastani/atomic-natives-linux-x64-musl": "0.9.44-alpha.7",
+				"@bastani/atomic-natives-win32-arm64-msvc": "0.9.44-alpha.7",
+				"@bastani/atomic-natives-win32-x64-msvc": "0.9.44-alpha.7"
 			},
 			"engines": {
 				"bun": ">=1.4.2",
@@ -446,8 +446,8 @@
 			}
 		},
 		"node_modules/@bastani/atomic-natives-darwin-arm64": {
-			"version": "0.9.44-alpha.6",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-darwin-arm64/-/atomic-natives-darwin-arm64-0.9.44-alpha.6.tgz",
+			"version": "0.9.44-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-darwin-arm64/-/atomic-natives-darwin-arm64-0.9.44-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"darwin"
@@ -458,8 +458,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-darwin-x64": {
-			"version": "0.9.44-alpha.6",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-darwin-x64/-/atomic-natives-darwin-x64-0.9.44-alpha.6.tgz",
+			"version": "0.9.44-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-darwin-x64/-/atomic-natives-darwin-x64-0.9.44-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"darwin"
@@ -470,8 +470,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-linux-arm64-gnu": {
-			"version": "0.9.44-alpha.6",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-arm64-gnu/-/atomic-natives-linux-arm64-gnu-0.9.44-alpha.6.tgz",
+			"version": "0.9.44-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-arm64-gnu/-/atomic-natives-linux-arm64-gnu-0.9.44-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"linux"
@@ -485,8 +485,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-linux-arm64-musl": {
-			"version": "0.9.44-alpha.6",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-arm64-musl/-/atomic-natives-linux-arm64-musl-0.9.44-alpha.6.tgz",
+			"version": "0.9.44-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-arm64-musl/-/atomic-natives-linux-arm64-musl-0.9.44-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"linux"
@@ -500,8 +500,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-linux-x64-gnu": {
-			"version": "0.9.44-alpha.6",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-x64-gnu/-/atomic-natives-linux-x64-gnu-0.9.44-alpha.6.tgz",
+			"version": "0.9.44-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-x64-gnu/-/atomic-natives-linux-x64-gnu-0.9.44-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"linux"
@@ -515,8 +515,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-linux-x64-musl": {
-			"version": "0.9.44-alpha.6",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-x64-musl/-/atomic-natives-linux-x64-musl-0.9.44-alpha.6.tgz",
+			"version": "0.9.44-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-x64-musl/-/atomic-natives-linux-x64-musl-0.9.44-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"linux"
@@ -530,8 +530,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-win32-arm64-msvc": {
-			"version": "0.9.44-alpha.6",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-win32-arm64-msvc/-/atomic-natives-win32-arm64-msvc-0.9.44-alpha.6.tgz",
+			"version": "0.9.44-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-win32-arm64-msvc/-/atomic-natives-win32-arm64-msvc-0.9.44-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"win32"
@@ -542,8 +542,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-win32-x64-msvc": {
-			"version": "0.9.44-alpha.6",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-win32-x64-msvc/-/atomic-natives-win32-x64-msvc-0.9.44-alpha.6.tgz",
+			"version": "0.9.44-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-win32-x64-msvc/-/atomic-natives-win32-x64-msvc-0.9.44-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"win32"
@@ -554,8 +554,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/pi-ai": {
-			"version": "0.9.44-alpha.6",
-			"resolved": "https://registry.npmjs.org/@bastani/pi-ai/-/pi-ai-0.9.44-alpha.6.tgz",
+			"version": "0.9.44-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/pi-ai/-/pi-ai-0.9.44-alpha.7.tgz",
 			"license": "MIT",
 			"dependencies": {
 				"@anthropic-ai/sdk": "0.129.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/atomic",
-  "version": "0.9.44-alpha.6",
+  "version": "0.9.44-alpha.7",
   "description": "Atomic coding agent CLI with read, bash, edit, write tools and session management",
   "type": "module",
   "atomicConfig": {
@@ -89,8 +89,8 @@
     "prepublishOnly": "bun run clean && bun run build && bun run shrinkwrap"
   },
   "dependencies": {
-    "@bastani/atomic-natives": "0.9.44-alpha.6",
-    "@bastani/pi-ai": "0.9.44-alpha.6",
+    "@bastani/atomic-natives": "0.9.44-alpha.7",
+    "@bastani/pi-ai": "0.9.44-alpha.7",
     "@earendil-works/pi-agent-core": "1.4.0",
     "@earendil-works/pi-codemode": "1.4.0",
     "@earendil-works/pi-tui": "1.4.0",