@bastani/atomic 0.9.26-alpha.3 → 0.9.26-alpha.4

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

@@ -67501,10 +67501,10 @@ function recordPendingStageMessageDeliveries(messages, runId, messageId, records
   if (index < 0)
     return messages;
   const entry = messages[index];
-  const recorded = new Set((entry.deliveries ?? []).map((delivery) => `${delivery.runId}\x00${delivery.stageId}`));
+  const recorded = new Set((entry.deliveries ?? []).map((delivery) => JSON.stringify([delivery.runId, delivery.stageId, delivery.sessionId, delivery.admission])));
   const additions = [];
   for (const record of records) {
-    const key = `${record.runId}\x00${record.stageId}`;
+    const key = JSON.stringify([record.runId, record.stageId, record.sessionId, record.admission]);
     if (recorded.has(key))
       continue;
     recorded.add(key);
@@ -67512,6 +67512,8 @@ function recordPendingStageMessageDeliveries(messages, runId, messageId, records
       runId: record.runId,
       stageId: record.stageId,
       ...record.stageName === undefined ? {} : { stageName: record.stageName },
+      ...record.sessionId === undefined ? {} : { sessionId: record.sessionId },
+      ...record.admission === undefined ? {} : { admission: record.admission },
       deliveredAt
     });
   }
@@ -92282,6 +92284,292 @@ function observeRunExecution(run, now = Date.now()) {
   };
 }
 
+// dist/builtin/workflows/src/durable/prompt-reservations.ts
+function durablePromptScope(backend, workflowId) {
+  return backend.promptReservationScope(workflowId);
+}
+function claimDurablePromptToken(backend, workflowId, reservationId) {
+  return backend.pendingPromptToken(workflowId, reservationId);
+}
+function reserveDurablePrompt(backend, workflowId, reservationId) {
+  return backend.reservePendingPrompt(workflowId, reservationId);
+}
+function releaseDurablePrompt(backend, workflowId, reservationId, token) {
+  backend.releasePendingPrompt(workflowId, reservationId, token);
+}
+
+// dist/builtin/workflows/src/durable/scoped-backend.ts
+class ScopedDurableBackend {
+  persistent;
+  inner;
+  scope;
+  constructor(inner, scope) {
+    this.inner = inner;
+    this.scope = scope;
+    this.persistent = inner.persistent;
+  }
+  registerWorkflow(_handle) {}
+  persistPendingStageMessages(workflowId, messages, logicalRunId = workflowId) {
+    return this.inner.persistPendingStageMessages(this.scope.rootWorkflowId, messages, logicalRunId);
+  }
+  recordCheckpoint(checkpoint) {
+    this.inner.recordCheckpoint(this.remap(checkpoint));
+  }
+  async recordCheckpointAsync(checkpoint, options) {
+    await this.inner.recordCheckpointAsync(this.remap(checkpoint), options);
+  }
+  async recordAdditiveCheckpointBestEffort(checkpoint) {
+    return await this.inner.recordAdditiveCheckpointBestEffort(this.remap(checkpoint));
+  }
+  flush(workflowId) {
+    return workflowId === undefined ? this.inner.flush() : this.inner.flush(this.scope.rootWorkflowId);
+  }
+  getToolOutput(_workflowId, argsHash) {
+    return this.inner.getToolOutput(this.scope.rootWorkflowId, this.scopeKey(argsHash));
+  }
+  getToolCheckpoint(_workflowId, argsHash) {
+    return this.inner.getToolCheckpoint(this.scope.rootWorkflowId, this.scopeKey(argsHash));
+  }
+  getUiResponse(_workflowId, promptHash) {
+    return this.inner.getUiResponse(this.scope.rootWorkflowId, this.scopeKey(promptHash));
+  }
+  getStageOutput(_workflowId, replayKey) {
+    return this.inner.getStageOutput(this.scope.rootWorkflowId, this.scopeKey(replayKey));
+  }
+  getStageSession(_workflowId, replayKey) {
+    return this.inner.getStageSession(this.scope.rootWorkflowId, this.scopeKey(replayKey));
+  }
+  listCheckpoints(workflowId) {
+    const prefix = `${this.scope.scopePrefix}:`;
+    return this.inner.listCheckpoints(this.scope.rootWorkflowId).filter((checkpoint) => checkpointHasPrefix(checkpoint, prefix)).map((checkpoint) => localCheckpoint(checkpoint, workflowId, prefix));
+  }
+  getWorkflow(_workflowId) {
+    return;
+  }
+  getLoadableWorkflow(_workflowId) {
+    return;
+  }
+  setWorkflowStatus(_workflowId, _status, _pendingPrompts, _resumable) {}
+  async transitionWorkflowStatus(_workflowId, _expectedStatuses, _status, _pendingPrompts, _resumable) {
+    return false;
+  }
+  adjustPendingPrompts(_workflowId, delta) {
+    this.inner.adjustPendingPrompts(this.scope.rootWorkflowId, delta);
+  }
+  promptReservationScope(_workflowId) {
+    return this.effectivePromptScope();
+  }
+  pendingPromptToken(_workflowId, reservationId) {
+    return claimDurablePromptToken(this.inner, this.scope.rootWorkflowId, reservationId);
+  }
+  reservePendingPrompt(_workflowId, reservationId) {
+    return reserveDurablePrompt(this.inner, this.scope.rootWorkflowId, reservationId);
+  }
+  releasePendingPrompt(_workflowId, reservationId, token) {
+    releaseDurablePrompt(this.inner, this.scope.rootWorkflowId, reservationId, token);
+  }
+  listResumableWorkflows() {
+    return [];
+  }
+  listCompletedWorkflows() {
+    return [];
+  }
+  async prepareWorkflowCatalog() {
+    return { resumable: [], completed: [] };
+  }
+  toMetadata(_workflowId) {
+    return;
+  }
+  async deleteWorkflow(_workflowId) {}
+  async deleteWorkflowIfInactive(_workflowId) {
+    return { ok: false, reason: "not_found" };
+  }
+  isWorkflowLoadable(_workflowId) {
+    return false;
+  }
+  reset() {}
+  hydrateWorkflow(_workflowId) {
+    return Promise.resolve();
+  }
+  hydrateWorkflowForInspection(_workflowId) {
+    return Promise.resolve({ kind: "absent" });
+  }
+  hydrateResumableWorkflows() {
+    return Promise.resolve();
+  }
+  effectivePromptScope() {
+    const parent = durablePromptScope(this.inner, this.scope.rootWorkflowId);
+    const scope = parent.scope === "root" ? this.scope.scopePrefix : `${parent.scope}:${this.scope.scopePrefix}`;
+    return {
+      rootWorkflowId: parent.rootWorkflowId,
+      scope
+    };
+  }
+  scopeKey(key) {
+    return `${this.scope.scopePrefix}:${key}`;
+  }
+  remap(checkpoint) {
+    const workflowId = this.scope.rootWorkflowId;
+    if (checkpoint.kind === "tool") {
+      return {
+        ...checkpoint,
+        workflowId,
+        checkpointId: this.scopeKey(checkpoint.checkpointId),
+        argsHash: this.scopeKey(checkpoint.argsHash)
+      };
+    }
+    if (checkpoint.kind === "ui") {
+      return {
+        ...checkpoint,
+        workflowId,
+        checkpointId: this.scopeKey(checkpoint.checkpointId),
+        promptHash: this.scopeKey(checkpoint.promptHash)
+      };
+    }
+    return {
+      ...checkpoint,
+      workflowId,
+      checkpointId: this.scopeKey(checkpoint.checkpointId),
+      replayKey: this.scopeKey(checkpoint.replayKey),
+      ...remappedBoundaryScope(checkpoint, this.scopeKey(checkpoint.topology?.boundary?.replayScope ?? ""))
+    };
+  }
+}
+function checkpointHasPrefix(checkpoint, prefix) {
+  if (!checkpoint.checkpointId.startsWith(prefix))
+    return false;
+  if (checkpoint.kind === "tool")
+    return checkpoint.argsHash.startsWith(prefix);
+  if (checkpoint.kind === "ui")
+    return checkpoint.promptHash.startsWith(prefix);
+  return checkpoint.replayKey.startsWith(prefix);
+}
+function localCheckpoint(checkpoint, workflowId, prefix) {
+  const checkpointId = checkpoint.checkpointId.slice(prefix.length);
+  if (checkpoint.kind === "tool") {
+    return { ...checkpoint, workflowId, checkpointId, argsHash: checkpoint.argsHash.slice(prefix.length) };
+  }
+  if (checkpoint.kind === "ui") {
+    return { ...checkpoint, workflowId, checkpointId, promptHash: checkpoint.promptHash.slice(prefix.length) };
+  }
+  const replayKey = checkpoint.replayKey.slice(prefix.length);
+  const replayScope = stripOnePrefix(checkpoint.topology?.boundary?.replayScope, prefix);
+  return {
+    ...checkpoint,
+    workflowId,
+    checkpointId,
+    replayKey,
+    ...remappedBoundaryScope(checkpoint, replayScope)
+  };
+}
+function remappedBoundaryScope(checkpoint, replayScope) {
+  const topology = checkpoint.topology;
+  if (topology?.boundary === undefined || replayScope === undefined)
+    return {};
+  return {
+    topology: {
+      ...topology,
+      boundary: { ...topology.boundary, replayScope }
+    }
+  };
+}
+function stripOnePrefix(value2, prefix) {
+  if (value2 === undefined || !value2.startsWith(prefix))
+    return value2;
+  return value2.slice(prefix.length);
+}
+
+// dist/builtin/workflows/src/durable/run-owner-backend.ts
+function durableRootRunIdForRun(runs, runId) {
+  return reciprocalWorkflowRootRunId(new Map(runs.map((run) => [run.id, run])), runId);
+}
+function durableBackendForRun(backend, runs, runId) {
+  const rootRunId = durableRootRunIdForRun(runs, runId);
+  if (rootRunId === undefined)
+    return;
+  const runById = new Map(runs.map((run) => [run.id, run]));
+  if (rootRunId === runId)
+    return backend;
+  const scopes = [];
+  let current = runById.get(runId);
+  while (current !== undefined && current.id !== rootRunId) {
+    const parent = current.parentRunId === undefined ? undefined : runById.get(current.parentRunId);
+    const boundary = parent?.stages.find((stage) => stage.id === current?.parentStageId);
+    if (parent === undefined || boundary?.replayKey === undefined)
+      return;
+    scopes.push(boundary.replayKey);
+    current = parent;
+  }
+  if (current?.id !== rootRunId)
+    return;
+  let view = backend;
+  for (const scopePrefix of scopes.reverse()) {
+    view = new ScopedDurableBackend(view, { rootWorkflowId: rootRunId, scopePrefix });
+  }
+  return view;
+}
+
+// dist/builtin/workflows/src/shared/sticky-stage-delivery-status.ts
+function stickyStageDeliveryStatuses(runs, rootRunId) {
+  const root = runs.find((run) => run.id === rootRunId);
+  const entries = (root?.pendingStageMessages ?? []).filter((entry) => entry.sticky === true);
+  const result = [];
+  for (const run of runs) {
+    if (run.id !== rootRunId && run.rootRunId !== rootRunId && durableRootRunIdForRun(runs, run.id) !== rootRunId)
+      continue;
+    const resolved = durableRootRunIdForRun(runs, run.id) === rootRunId;
+    const hops = workflowBoundaryHops(runs, run.id);
+    for (const stage of run.stages) {
+      if (stage.nodeKind === "tool" || stage.replayKey?.startsWith("prompt:") === true || stage.replayKey?.startsWith("workflow:") === true || stage.workflowChildRun !== undefined || stage.workflowChild !== undefined)
+        continue;
+      for (const entry of entries) {
+        const target = entry.targetPath ?? entry.stageKey;
+        const parsed = parseWorkflowStageTarget(target);
+        if (!parsed || parsed.rootRunId !== rootRunId)
+          continue;
+        if (resolved && hops && !stageMatchesPathPattern(parsed.segments, hops, [stage.id, stage.name]))
+          continue;
+        const receipts = (entry.deliveries ?? []).filter((delivery) => delivery.runId === run.id && delivery.stageId === stage.id);
+        const delivered = receipts.some((delivery) => delivery.admission === "context" && delivery.sessionId !== undefined && (stage.sessionId === undefined || delivery.sessionId === stage.sessionId));
+        let state;
+        let reason;
+        if (!resolved || !hops) {
+          state = "root-unresolved";
+          reason = "Repair reciprocal parent/boundary ownership before startup";
+        } else if (delivered) {
+          state = "delivered";
+          reason = "Startup context admission confirmed; sticky subscription remains for future stages";
+        } else if (["completed", "failed", "skipped"].includes(stage.status)) {
+          state = "stage-terminal";
+          reason = `${stage.error ? `${stage.error}; ` : ""}Stage ended without confirmed context admission; steer a live stage or start a new stage`;
+        } else if (receipts.some((delivery) => delivery.admission !== "context" && (delivery.sessionId === undefined || stage.sessionId === undefined || delivery.sessionId === stage.sessionId))) {
+          state = "receipt-unverified";
+          reason = "Legacy or live transport receipt only; inspect the session transcript to confirm context admission";
+        } else if (stage.pendingStageDeliveryAvailable !== true) {
+          state = "delivery-unavailable";
+          reason = "Stage has no pre-start Intercom helper; enable Intercom in the invocation group";
+        } else if (receipts.length > 0) {
+          state = "session-replaced";
+          reason = "Only a previous session has a receipt; replacement must drain before its first turn";
+        } else {
+          state = "queued";
+          reason = "No delivery receipt; stage startup must drain before its first turn";
+        }
+        result.push({
+          messageId: entry.message.id,
+          target,
+          runId: run.id,
+          stageId: stage.id,
+          ...stage.sessionId === undefined ? {} : { sessionId: stage.sessionId },
+          state,
+          reason
+        });
+      }
+    }
+  }
+  return result;
+}
+
 // dist/builtin/workflows/src/runs/background/run-inspect.ts
 function inspectRun(runId, opts) {
   const activeStore = opts?.store ?? store;
@@ -92312,6 +92600,7 @@ function inspectRun(runId, opts) {
     inputs: copy.inputs,
     stages: expandedStages.map((stage) => structuredClone(stage)),
     tools: expandedGraph.tools.map((tool) => structuredClone(tool)),
+    deliveryStates: stickyStageDeliveryStatuses(activeStore.runs(), copy.rootRunId ?? copy.id).filter((delivery) => copy.id === (copy.rootRunId ?? copy.id) || delivery.runId === copy.id),
     result: copy.result,
     error: copy.error ?? (strandedRoot ? IMPOSSIBLE_ROOT_LIVENESS_MESSAGE : effectiveRunStatus(copy) === copy.status ? undefined : structuredRecoverableWorkflowFailureText(copy) ?? actionableReturnedStatusText(copy.result)),
     exited: copy.exited,
@@ -102244,201 +102533,6 @@ function hasInvocationData(checkpoints, replayKey) {
 // dist/builtin/workflows/src/engine/run.ts
 init_dbos_admission();
 
-// dist/builtin/workflows/src/durable/prompt-reservations.ts
-function durablePromptScope(backend, workflowId) {
-  return backend.promptReservationScope(workflowId);
-}
-function claimDurablePromptToken(backend, workflowId, reservationId) {
-  return backend.pendingPromptToken(workflowId, reservationId);
-}
-function reserveDurablePrompt(backend, workflowId, reservationId) {
-  return backend.reservePendingPrompt(workflowId, reservationId);
-}
-function releaseDurablePrompt(backend, workflowId, reservationId, token) {
-  backend.releasePendingPrompt(workflowId, reservationId, token);
-}
-
-// dist/builtin/workflows/src/durable/scoped-backend.ts
-class ScopedDurableBackend {
-  persistent;
-  inner;
-  scope;
-  constructor(inner, scope) {
-    this.inner = inner;
-    this.scope = scope;
-    this.persistent = inner.persistent;
-  }
-  registerWorkflow(_handle) {}
-  persistPendingStageMessages(workflowId, messages, logicalRunId = workflowId) {
-    return this.inner.persistPendingStageMessages(this.scope.rootWorkflowId, messages, logicalRunId);
-  }
-  recordCheckpoint(checkpoint) {
-    this.inner.recordCheckpoint(this.remap(checkpoint));
-  }
-  async recordCheckpointAsync(checkpoint, options) {
-    await this.inner.recordCheckpointAsync(this.remap(checkpoint), options);
-  }
-  async recordAdditiveCheckpointBestEffort(checkpoint) {
-    return await this.inner.recordAdditiveCheckpointBestEffort(this.remap(checkpoint));
-  }
-  flush(workflowId) {
-    return workflowId === undefined ? this.inner.flush() : this.inner.flush(this.scope.rootWorkflowId);
-  }
-  getToolOutput(_workflowId, argsHash) {
-    return this.inner.getToolOutput(this.scope.rootWorkflowId, this.scopeKey(argsHash));
-  }
-  getToolCheckpoint(_workflowId, argsHash) {
-    return this.inner.getToolCheckpoint(this.scope.rootWorkflowId, this.scopeKey(argsHash));
-  }
-  getUiResponse(_workflowId, promptHash) {
-    return this.inner.getUiResponse(this.scope.rootWorkflowId, this.scopeKey(promptHash));
-  }
-  getStageOutput(_workflowId, replayKey) {
-    return this.inner.getStageOutput(this.scope.rootWorkflowId, this.scopeKey(replayKey));
-  }
-  getStageSession(_workflowId, replayKey) {
-    return this.inner.getStageSession(this.scope.rootWorkflowId, this.scopeKey(replayKey));
-  }
-  listCheckpoints(workflowId) {
-    const prefix = `${this.scope.scopePrefix}:`;
-    return this.inner.listCheckpoints(this.scope.rootWorkflowId).filter((checkpoint) => checkpointHasPrefix(checkpoint, prefix)).map((checkpoint) => localCheckpoint(checkpoint, workflowId, prefix));
-  }
-  getWorkflow(_workflowId) {
-    return;
-  }
-  getLoadableWorkflow(_workflowId) {
-    return;
-  }
-  setWorkflowStatus(_workflowId, _status, _pendingPrompts, _resumable) {}
-  async transitionWorkflowStatus(_workflowId, _expectedStatuses, _status, _pendingPrompts, _resumable) {
-    return false;
-  }
-  adjustPendingPrompts(_workflowId, delta) {
-    this.inner.adjustPendingPrompts(this.scope.rootWorkflowId, delta);
-  }
-  promptReservationScope(_workflowId) {
-    return this.effectivePromptScope();
-  }
-  pendingPromptToken(_workflowId, reservationId) {
-    return claimDurablePromptToken(this.inner, this.scope.rootWorkflowId, reservationId);
-  }
-  reservePendingPrompt(_workflowId, reservationId) {
-    return reserveDurablePrompt(this.inner, this.scope.rootWorkflowId, reservationId);
-  }
-  releasePendingPrompt(_workflowId, reservationId, token) {
-    releaseDurablePrompt(this.inner, this.scope.rootWorkflowId, reservationId, token);
-  }
-  listResumableWorkflows() {
-    return [];
-  }
-  listCompletedWorkflows() {
-    return [];
-  }
-  async prepareWorkflowCatalog() {
-    return { resumable: [], completed: [] };
-  }
-  toMetadata(_workflowId) {
-    return;
-  }
-  async deleteWorkflow(_workflowId) {}
-  async deleteWorkflowIfInactive(_workflowId) {
-    return { ok: false, reason: "not_found" };
-  }
-  isWorkflowLoadable(_workflowId) {
-    return false;
-  }
-  reset() {}
-  hydrateWorkflow(_workflowId) {
-    return Promise.resolve();
-  }
-  hydrateWorkflowForInspection(_workflowId) {
-    return Promise.resolve({ kind: "absent" });
-  }
-  hydrateResumableWorkflows() {
-    return Promise.resolve();
-  }
-  effectivePromptScope() {
-    const parent = durablePromptScope(this.inner, this.scope.rootWorkflowId);
-    const scope = parent.scope === "root" ? this.scope.scopePrefix : `${parent.scope}:${this.scope.scopePrefix}`;
-    return {
-      rootWorkflowId: parent.rootWorkflowId,
-      scope
-    };
-  }
-  scopeKey(key) {
-    return `${this.scope.scopePrefix}:${key}`;
-  }
-  remap(checkpoint) {
-    const workflowId = this.scope.rootWorkflowId;
-    if (checkpoint.kind === "tool") {
-      return {
-        ...checkpoint,
-        workflowId,
-        checkpointId: this.scopeKey(checkpoint.checkpointId),
-        argsHash: this.scopeKey(checkpoint.argsHash)
-      };
-    }
-    if (checkpoint.kind === "ui") {
-      return {
-        ...checkpoint,
-        workflowId,
-        checkpointId: this.scopeKey(checkpoint.checkpointId),
-        promptHash: this.scopeKey(checkpoint.promptHash)
-      };
-    }
-    return {
-      ...checkpoint,
-      workflowId,
-      checkpointId: this.scopeKey(checkpoint.checkpointId),
-      replayKey: this.scopeKey(checkpoint.replayKey),
-      ...remappedBoundaryScope(checkpoint, this.scopeKey(checkpoint.topology?.boundary?.replayScope ?? ""))
-    };
-  }
-}
-function checkpointHasPrefix(checkpoint, prefix) {
-  if (!checkpoint.checkpointId.startsWith(prefix))
-    return false;
-  if (checkpoint.kind === "tool")
-    return checkpoint.argsHash.startsWith(prefix);
-  if (checkpoint.kind === "ui")
-    return checkpoint.promptHash.startsWith(prefix);
-  return checkpoint.replayKey.startsWith(prefix);
-}
-function localCheckpoint(checkpoint, workflowId, prefix) {
-  const checkpointId = checkpoint.checkpointId.slice(prefix.length);
-  if (checkpoint.kind === "tool") {
-    return { ...checkpoint, workflowId, checkpointId, argsHash: checkpoint.argsHash.slice(prefix.length) };
-  }
-  if (checkpoint.kind === "ui") {
-    return { ...checkpoint, workflowId, checkpointId, promptHash: checkpoint.promptHash.slice(prefix.length) };
-  }
-  const replayKey = checkpoint.replayKey.slice(prefix.length);
-  const replayScope = stripOnePrefix(checkpoint.topology?.boundary?.replayScope, prefix);
-  return {
-    ...checkpoint,
-    workflowId,
-    checkpointId,
-    replayKey,
-    ...remappedBoundaryScope(checkpoint, replayScope)
-  };
-}
-function remappedBoundaryScope(checkpoint, replayScope) {
-  const topology = checkpoint.topology;
-  if (topology?.boundary === undefined || replayScope === undefined)
-    return {};
-  return {
-    topology: {
-      ...topology,
-      boundary: { ...topology.boundary, replayScope }
-    }
-  };
-}
-function stripOnePrefix(value2, prefix) {
-  if (value2 === undefined || !value2.startsWith(prefix))
-    return value2;
-  return value2.slice(prefix.length);
-}
-
 // dist/builtin/workflows/src/runs/foreground/executor-direct-helpers.ts
 import { isAbsolute as isAbsolute12, join as join28, resolve as resolve12 } from "node:path";
 import { CONFIG_DIR_NAME as CONFIG_DIR_NAME2 } from "@bastani/atomic";
@@ -109433,36 +109527,6 @@ function createReplayStageContext(input) {
   };
 }
 
-// dist/builtin/workflows/src/durable/run-owner-backend.ts
-function durableRootRunIdForRun(runs, runId) {
-  return reciprocalWorkflowRootRunId(new Map(runs.map((run) => [run.id, run])), runId);
-}
-function durableBackendForRun(backend, runs, runId) {
-  const rootRunId = durableRootRunIdForRun(runs, runId);
-  if (rootRunId === undefined)
-    return;
-  const runById = new Map(runs.map((run) => [run.id, run]));
-  if (rootRunId === runId)
-    return backend;
-  const scopes = [];
-  let current = runById.get(runId);
-  while (current !== undefined && current.id !== rootRunId) {
-    const parent = current.parentRunId === undefined ? undefined : runById.get(current.parentRunId);
-    const boundary = parent?.stages.find((stage) => stage.id === current?.parentStageId);
-    if (parent === undefined || boundary?.replayKey === undefined)
-      return;
-    scopes.push(boundary.replayKey);
-    current = parent;
-  }
-  if (current?.id !== rootRunId)
-    return;
-  let view = backend;
-  for (const scopePrefix of scopes.reverse()) {
-    view = new ScopedDurableBackend(view, { rootWorkflowId: rootRunId, scopePrefix });
-  }
-  return view;
-}
-
 // dist/builtin/workflows/src/shared/pending-stage-route-capability.ts
 import { randomUUID as randomUUID9 } from "node:crypto";
 var routeCapabilities = new WeakMap;
@@ -109521,14 +109585,21 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
   };
   return {
     routeCapability: workflowPendingStageRouteCapability(activeStore, runId),
-    deliverPending(deliver) {
+    deliverPending(deliver, recipient) {
       if (drainPromise !== undefined)
         return drainPromise;
       if (terminalError !== undefined)
         return Promise.resolve();
       drainError = undefined;
-      const attempt = deliverPendingStageMessages(activeStore, runId, stageId, stageName, deliver);
-      const drain = attempt.then(() => resolveReady?.(), (error) => {
+      const attempt = deliverPendingStageMessages(activeStore, runId, stageId, stageName, deliver, recipient);
+      const drain = attempt.then(() => {
+        resolveReady?.();
+        readyPromise = undefined;
+        resolveReady = undefined;
+        rejectReady = undefined;
+        if (drainPromise === drain)
+          drainPromise = undefined;
+      }, (error) => {
         drainError = error;
         rejectReady?.(error);
         readyPromise = undefined;
@@ -109541,8 +109612,8 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
       drainPromise = drain;
       return drainPromise;
     },
-    ready() {
-      if (activeStore.pendingStageMessagesFor(runId, stageId).length === 0 && (stageId === stageName || activeStore.pendingStageMessagesFor(runId, stageName).length === 0) && stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName).length === 0) {
+    ready(sessionId) {
+      if (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) {
         return;
       }
       if (terminalError !== undefined)
@@ -109560,8 +109631,8 @@ function createWorkflowPendingStageDelivery(activeStore, runId, stageId, stageNa
     }
   };
 }
-async function deliverPendingStageMessages(activeStore, runId, stageId, stageName, deliver) {
-  const stickyEntries = stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName);
+async function deliverPendingStageMessages(activeStore, runId, stageId, stageName, deliver, recipient) {
+  const stickyEntries = stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, recipient);
   const candidateIds = new Set([
     ...activeStore.pendingStageMessagesFor(runId, stageId),
     ...activeStore.pendingStageMessagesFor(runId, stageName),
@@ -109583,7 +109654,8 @@ async function deliverPendingStageMessages(activeStore, runId, stageId, stageNam
     if (releaseClaim === undefined)
       continue;
     try {
-      await deliver(toPendingStageSender(entry), entry.message);
+      if (!recipient?.receivedMessageIds.includes(entry.message.id))
+        await deliver(toPendingStageSender(entry), entry.message);
       if (entry.sticky === true) {
         const entryBackend = durableBackendForRun(rootBackend, activeStore.runs(), entry.runId);
         if (entryBackend === undefined) {
@@ -109593,7 +109665,8 @@ async function deliverPendingStageMessages(activeStore, runId, stageId, stageNam
           {
             runId,
             stageId,
-            ...stageName === stageId ? {} : { stageName }
+            ...stageName === stageId ? {} : { stageName },
+            ...recipient === undefined ? {} : { sessionId: recipient.sessionId, admission: "context" }
           }
         ], new Date().toISOString(), entryBackend)) {
           throw new Error(`atomic-workflows: pending-stage message ${entry.id} changed during delivery`);
@@ -109608,7 +109681,7 @@ async function deliverPendingStageMessages(activeStore, runId, stageId, stageNam
     }
   }
 }
-function stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName) {
+function stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageName, recipient) {
   const runs = activeStore.runs();
   const rootRunId = durableRootRunIdForRun(runs, runId);
   if (rootRunId === undefined)
@@ -109625,9 +109698,8 @@ function stickyPendingStageEntriesForStage(activeStore, runId, stageId, stageNam
     const parsed = entry.targetPath === undefined ? undefined : parseWorkflowStageTarget(entry.targetPath);
     if (parsed === undefined || parsed.rootRunId !== rootRunId)
       return false;
-    if ((entry.deliveries ?? []).some((delivery) => delivery.runId === runId && delivery.stageId === stageId)) {
+    if ((entry.deliveries ?? []).some((delivery) => delivery.runId === runId && delivery.stageId === stageId && (recipient === undefined || delivery.admission === "context" && delivery.sessionId === recipient.sessionId && (recipient.receivedMessageIds === undefined || recipient.receivedMessageIds.includes(entry.message.id)))))
       return false;
-    }
     return stageMatchesPathPattern(parsed.segments, hops, [stageId, stageName]);
   });
 }
@@ -112155,7 +112227,7 @@ class StageSessionController {
     const attachedSession = session instanceof Promise ? await session : session;
     this.reportStartupPhase("delivery-readiness");
     try {
-      await this.sharedOrchestrationContext?.pendingStageDelivery?.ready();
+      await this.sharedOrchestrationContext?.pendingStageDelivery?.ready(attachedSession.sessionId);
       await this.opts.onSessionReady?.();
       if (this.disposed || this.opts.signal?.aborted || this.abortGeneration !== startGeneration)
         throw this.staleCreationReason(startGeneration);
@@ -117623,6 +117695,22 @@ function possibleStageRows(runs, rootRunId, rootRun) {
       return segments !== undefined && segments.length === 1 && segments[0] === "**";
     }).length
   });
+  const statuses = stickyStageDeliveryStatuses(runs, rootRunId);
+  for (const target of new Set(statuses.map((status) => status.target))) {
+    if (rows.some((row) => row.target === target))
+      continue;
+    rows.push({
+      target,
+      queuedCount: stickyQueued.filter((entry) => (entry.targetPath ?? entry.stageKey) === target).length,
+      deliveryOnly: true
+    });
+  }
+  for (let index = 0;index < rows.length; index++) {
+    const row = rows[index];
+    const deliveryStates = statuses.filter((status) => status.target === row.target);
+    if (deliveryStates.length > 0)
+      rows[index] = { ...row, deliveryStates };
+  }
   return rows;
 }
 function materializedStageMatches(runs, rootRunId, entrySegments) {
@@ -117863,7 +117951,9 @@ async function recordConfirmedStickyDeliveries(activeStore, event) {
   const records = matchingLiveStages(runs, rootRunId, parsedTarget.segments).filter((match) => delivered.has(match.target)).map((match) => ({
     runId: match.run.id,
     stageId: match.stage.id,
-    ...match.stage.name === match.stage.id ? {} : { stageName: match.stage.name }
+    ...match.stage.name === match.stage.id ? {} : { stageName: match.stage.name },
+    ...match.stage.sessionId === undefined ? {} : { sessionId: match.stage.sessionId },
+    admission: "transport"
   }));
   if (records.length === 0)
     return false;
@@ -120870,6 +120960,7 @@ function summarizeRunSnapshot(run, now = Date.now(), options) {
       status: stage.status
     })),
     pendingStages: pendingWorkflowStageStatuses(run, options?.owningRunStatus, options?.resolveBoundarySegments),
+    deliveryStates: stickyStageDeliveryStatuses(options?.allRuns ?? [run], run.id),
     tools: (run.toolNodes ?? []).map((tool) => {
       const owner = tool;
       return {
@@ -121158,6 +121249,9 @@ function renderStatusToolContent(result) {
     }
     for (const entry of run.awaitingInput)
       lines.push(statusAwaitingInputLine(entry));
+    for (const delivery of run.deliveryStates ?? stickyStageDeliveryStatuses(allRuns, run.runId)) {
+      lines.push(`    Intercom delivery ${delivery.messageId} target=${delivery.target} stage=${delivery.runId}/${delivery.stageId}${delivery.sessionId === undefined ? "" : ` session=${delivery.sessionId}`} state=${delivery.state} — ${delivery.reason}`);
+    }
     for (const stage of run.pendingStages.slice(0, STATUS_PENDING_STAGE_LIMIT)) {
       lines.push(statusPendingStageLine(stage));
     }
@@ -122334,6 +122428,7 @@ function makeExecuteWorkflowTool(runtime, reloadWorkflowResources, ensureWorkflo
         const statusByRunId = new Map(capturedRuns.map((run) => [run.id, run.status]));
         const listing = buildWorkflowStatusListing(topLevelExpandedSnapshots(store), args.statusFilter ?? "all", Date.now(), {
           toolControlRegistry,
+          allRuns: capturedRuns,
           owningRunStatus: (owningRunId) => statusByRunId.get(owningRunId),
           resolveBoundarySegments: (runId) => workflowBoundarySegments(capturedRuns, runId)
         });