@bastani/atomic 0.9.61 → 0.9.62

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

@@ -2378,15 +2378,12 @@ class JournalDurableBackend {
   commitCheckpoint(checkpoint, options) {
     if (options?.signal?.aborted)
       return Promise.reject(new JournalOperationAbortedError(checkpoint.workflowId, options.signal.reason instanceof Error ? options.signal.reason : undefined));
-    return this.serialize(checkpoint.workflowId, () => this.checkpoint(checkpoint));
-  }
-  *checkpoint(checkpoint) {
-    validateCheckpointInvocationFingerprint(checkpoint);
-    if (!(yield* this.current(checkpoint.workflowId)))
-      return;
-    yield* this.append(checkpoint.workflowId, { type: RUN_EVENT_TYPES.checkpointRecorded, payload: checkpoint }, {
-      key: JSON.stringify([RUN_EVENT_TYPES.checkpointRecorded, checkpoint.kind, checkpoint.checkpointId])
-    });
+    try {
+      validateCheckpointInvocationFingerprint(checkpoint);
+    } catch (error) {
+      return Promise.reject(error);
+    }
+    return this.queueAppend(checkpoint.workflowId, { type: RUN_EVENT_TYPES.checkpointRecorded, payload: checkpoint }, JSON.stringify([RUN_EVENT_TYPES.checkpointRecorded, checkpoint.kind, checkpoint.checkpointId]), true);
   }
   async commitAdditiveCheckpointBestEffort(checkpoint) {
     try {
@@ -2523,7 +2520,7 @@ class JournalDurableBackend {
       payload: { messageId, delivery, ...accounting === undefined ? {} : { accounting } }
     });
   }
-  queueAppend(runId, event, key) {
+  queueAppend(runId, event, key, requiresRegisteredRun = false) {
     try {
       this.ensureOpen();
       this.assertExecutionActive();
@@ -2536,6 +2533,7 @@ class JournalDurableBackend {
       batch.push({
         event,
         ...key === undefined ? {} : { key },
+        ...requiresRegisteredRun ? { requiresRegisteredRun } : {},
         context: AsyncLocalStorage.snapshot(),
         resolve,
         reject
@@ -2550,9 +2548,12 @@ class JournalDurableBackend {
     }
     return queued;
   }
-  *appendBatch(runId, batch) {
-    if (this.appendBatches.get(runId) === batch)
+  *appendBatch(runId, queued) {
+    if (this.appendBatches.get(runId) === queued)
       this.appendBatches.delete(runId);
+    const batch = yield* this.registeredAppends(runId, queued);
+    if (batch.length === 0)
+      return;
     const appendMany = runJournalAppendMany(this.journal);
     if (appendMany === undefined || batch.length === 1) {
       for (const append of batch) {
@@ -2590,6 +2591,25 @@ class JournalDurableBackend {
         append.reject(failure);
     }
   }
+  *registeredAppends(runId, batch) {
+    if (!batch.some((append) => append.requiresRegisteredRun === true))
+      return [...batch];
+    let registered;
+    try {
+      registered = (yield* this.current(runId)) !== undefined;
+    } catch (error) {
+      for (const append of batch)
+        if (append.requiresRegisteredRun === true)
+          append.reject(error);
+      return batch.filter((append) => append.requiresRegisteredRun !== true);
+    }
+    if (registered)
+      return [...batch];
+    for (const append of batch)
+      if (append.requiresRegisteredRun === true)
+        append.resolve();
+    return batch.filter((append) => append.requiresRegisteredRun !== true);
+  }
   getToolOutput(...args) {
     return this.projection.getToolOutput(...args);
   }
@@ -17442,7 +17462,7 @@ class SqlResourceAdmission {
     signal?.throwIfAborted();
     const operation = randomUUID6();
     const release = (reason = "resource cleanup confirmed") => this.storage.transaction(async (tx) => {
-      await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = ? WHERE operation = ? AND state != 'released'`, reason, operation);
+      await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = ? WHERE operation = ? AND (state != 'released' OR reason = ?)`, reason, operation, FENCED_WAITER_REASON);
     });
     release.bindProcess = async (identity) => {
       if (kind !== "process" || identity.kind !== "unix-process-group" || !Number.isSafeInteger(identity.id) || identity.id <= 0)
@@ -17454,6 +17474,15 @@ class SqlResourceAdmission {
           throw new Error("Resource process permit is no longer held");
       });
     };
+    const keepWaiting = async (tx) => {
+      const permit = await tx.get(`SELECT state, reason FROM ${this.permits} WHERE operation = ?`, operation);
+      if (permit?.state === "released" && permit.reason === FENCED_WAITER_REASON)
+        await tx.run(`UPDATE ${this.permits} SET state = 'waiting', reason = NULL WHERE operation = ?`, operation);
+      else if (permit === undefined)
+        throw new AdmissionHolderStoppedError("permit no longer recorded");
+      else if (permit.state !== "waiting")
+        throw new AdmissionHolderStoppedError(permit.reason === null ? undefined : String(permit.reason));
+    };
     await this.storage.transaction(async (tx) => {
       await tx.run(`UPDATE ${this.owners} SET expires_at = CAST(unixepoch('subsec') * 1000 AS INTEGER) + ? WHERE id = ?`, OWNER_LEASE_MS, this.owner);
       await tx.run(`INSERT INTO ${this.permits}(operation, root, holder, kind, state, owner, attempt) VALUES (?, ?, ?, ?, 'waiting', ?, ?)`, operation, this.options.root, this.options.holder, kind, this.owner, this.options.attempt ? JSON.stringify({
@@ -17476,11 +17505,12 @@ class SqlResourceAdmission {
         const granted = await this.storage.transaction(async (tx) => {
           quarantined = undefined;
           await tx.run(`UPDATE ${this.owners} SET expires_at = CAST(unixepoch('subsec') * 1000 AS INTEGER) + ? WHERE id = ?`, OWNER_LEASE_MS, this.owner);
+          await keepWaiting(tx);
           const { root } = this.options;
           if (!await this.assertCurrentAttempt(tx)) {
             const waiting = await tx.run(`UPDATE ${this.permits} SET reason = ? WHERE operation = ? AND state = 'waiting'`, LATE_ATTEMPT_REASON, operation);
             if (waiting.changes !== 1)
-              throw new Error("Resource admission holder was stopped");
+              throw new AdmissionHolderStoppedError(undefined);
             return false;
           }
           let reason = hostReason;
@@ -17523,7 +17553,7 @@ class SqlResourceAdmission {
           const stageStart = kind === "session" && request?.delegated !== true;
           const updated = await tx.run(`UPDATE ${this.permits} SET state = ?, reason = ?, granted_at = CASE WHEN ? IS NULL AND ? THEN ${NOW_MS} ELSE NULL END WHERE operation = ? AND state = 'waiting'`, reason ? "waiting" : "granted", reason ?? null, reason ?? null, stageStart ? 1 : 0, operation);
           if (updated.changes !== 1)
-            throw new Error("Resource admission holder was stopped");
+            throw new AdmissionHolderStoppedError(undefined);
           return !reason;
         });
         if (granted) {
@@ -17565,7 +17595,7 @@ class SqlResourceAdmission {
 				WHERE p.state IN ('waiting', 'granted')`);
       if (live.some((permit) => this.needsFencing(permit, fence)))
         return true;
-      return !!await db.get(`SELECT 1 AS prunable FROM ${this.permits} WHERE +state = 'released' AND ticket <= ${this.prunableBefore} LIMIT 1`, RELEASED_PERMIT_RETENTION);
+      return !!await db.get(`SELECT 1 AS prunable FROM ${this.permits} r WHERE ${this.prunable} LIMIT 1`, RELEASED_PERMIT_RETENTION, FENCED_WAITER_REASON, FENCED_WAITER_RETENTION_MS);
     });
     if (!pending)
       return;
@@ -17574,7 +17604,7 @@ class SqlResourceAdmission {
       const owners = await tx.all(`SELECT o.* FROM ${this.owners} o WHERE o.id IN (SELECT owner FROM ${this.permits} WHERE state IN ('waiting', 'granted'))`);
       for (const owner of owners) {
         const { rebooted, stopped } = fence(owner);
-        await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = 'abandoned waiter fenced' WHERE owner = ? AND state = 'waiting' AND (? OR EXISTS (SELECT 1 FROM ${this.owners} WHERE id = ? AND expires_at < ${NOW_MS}))`, owner.id, stopped ? 1 : 0, owner.id);
+        await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = ? WHERE owner = ? AND state = 'waiting' AND (? OR EXISTS (SELECT 1 FROM ${this.owners} WHERE id = ? AND expires_at < ${NOW_MS}))`, FENCED_WAITER_REASON, owner.id, stopped ? 1 : 0, owner.id);
         if (rebooted) {
           await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = 'host reboot confirmed' WHERE owner = ? AND state = 'granted'`, owner.id);
         } else if (stopped) {
@@ -17592,13 +17622,17 @@ class SqlResourceAdmission {
       }
       await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = 'legacy waiter fenced' WHERE owner IS NULL AND state = 'waiting'`);
       await tx.run(`UPDATE ${this.permits} SET reason = ? WHERE owner IS NULL AND state = 'granted' AND reason IS NOT ?`, ANONYMOUS_REASON, ANONYMOUS_REASON);
-      await tx.run(`DELETE FROM ${this.permits} WHERE ticket IN (SELECT ticket FROM ${this.permits} WHERE +state = 'released'
-				AND ticket <= ${this.prunableBefore} ORDER BY ticket LIMIT ?)`, RELEASED_PERMIT_RETENTION, RELEASED_PERMIT_PRUNE_BATCH);
+      await tx.run(`DELETE FROM ${this.permits} WHERE ticket IN (SELECT ticket FROM ${this.permits} r WHERE ${this.prunable}
+				ORDER BY ticket LIMIT ?)`, RELEASED_PERMIT_RETENTION, FENCED_WAITER_REASON, FENCED_WAITER_RETENTION_MS, RELEASED_PERMIT_PRUNE_BATCH);
     });
   }
   get prunableBefore() {
     return `(SELECT ticket FROM ${this.permits} WHERE state = 'released' ORDER BY ticket DESC LIMIT 1 OFFSET ?)`;
   }
+  get prunable() {
+    return `+r.state = 'released' AND r.ticket <= ${this.prunableBefore} AND (r.reason IS NOT ? OR NOT EXISTS
+			(SELECT 1 FROM ${this.owners} o WHERE o.id = r.owner AND o.expires_at >= ${NOW_MS} - ?))`;
+  }
   needsFencing(permit, fence) {
     if (permit.owner === null)
       return permit.state === "waiting" || permit.reason !== ANONYMOUS_REASON;
@@ -17623,6 +17657,7 @@ class SqlResourceAdmission {
     await this.reconcile();
     return this.storage.transaction(async (tx) => {
       await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = 'worker exit confirmed' WHERE root = ? AND holder = ? AND state IN ('waiting', 'granted') AND (kind = 'session' OR state = 'waiting')`, this.options.root, holder);
+      await tx.run(`UPDATE ${this.permits} SET reason = 'worker exit confirmed' WHERE root = ? AND holder = ? AND state = 'released' AND reason = ?`, this.options.root, holder, FENCED_WAITER_REASON);
       await tx.run(`UPDATE ${this.permits} SET reason = ? WHERE root = ? AND holder = ? AND kind = 'process' AND state = 'granted' AND reason IS NOT ?`, UNCONFIRMED_REASON, this.options.root, holder, QUARANTINED_REASON);
       const held = await tx.get(`SELECT COUNT(*) AS count FROM ${this.permits} WHERE root = ? AND holder = ? AND kind = 'process' AND state = 'granted'`, this.options.root, holder);
       return Number(held?.count);
@@ -17695,7 +17730,7 @@ async function reapProcessGroups(journal, root, scope) {
     return { survivors: [], unprobeable: [] };
   return settleProcessGroups(storage, root, scope, true);
 }
-var OWNER_LEASE_MS = 30000, REAP_TERM_GRACE_MS = 5000, REAP_KILL_GRACE_MS = 1e4, REAP_POLL_MS = 50, RELEASED_PERMIT_RETENTION = 256, RELEASED_PERMIT_PRUNE_BATCH = 1000, EXPIRED_REASON = "owner expired; cleanup unconfirmed", UNCONFIRMED_REASON = "cleanup unconfirmed", QUARANTINED_REASON = "cleanup unconfirmed; permit quarantined", ANONYMOUS_REASON = "owner identity unavailable; cleanup unconfirmed", QUARANTINED_CAPACITY_WAIT_MS, QuarantinedCapacityError, NOW_MS = "CAST(unixepoch('subsec') * 1000 AS INTEGER)", LATE_ATTEMPT_POLL_MS = 100, LATE_ATTEMPT_REASON = "waiting for its attempt lease", STAGE_START_SPACING_MS = 5000, STAGE_START_PRESSURE_REASON = "paced for host load";
+var OWNER_LEASE_MS = 30000, REAP_TERM_GRACE_MS = 5000, REAP_KILL_GRACE_MS = 1e4, REAP_POLL_MS = 50, RELEASED_PERMIT_RETENTION = 256, RELEASED_PERMIT_PRUNE_BATCH = 1000, EXPIRED_REASON = "owner expired; cleanup unconfirmed", UNCONFIRMED_REASON = "cleanup unconfirmed", QUARANTINED_REASON = "cleanup unconfirmed; permit quarantined", ANONYMOUS_REASON = "owner identity unavailable; cleanup unconfirmed", QUARANTINED_CAPACITY_WAIT_MS, QuarantinedCapacityError, FENCED_WAITER_REASON = "abandoned waiter fenced", FENCED_WAITER_RETENTION_MS, AdmissionHolderStoppedError, NOW_MS = "CAST(unixepoch('subsec') * 1000 AS INTEGER)", LATE_ATTEMPT_POLL_MS = 100, LATE_ATTEMPT_REASON = "waiting for its attempt lease", STAGE_START_SPACING_MS = 5000, STAGE_START_PRESSURE_REASON = "paced for host load";
 var init_resource_admission = __esm(() => {
   init_internal();
   init_sql_run_journal();
@@ -17709,6 +17744,12 @@ var init_resource_admission = __esm(() => {
       super("worker_cleanup_unconfirmed", `Local worker process cleanup unconfirmed; process permit refused after ${Math.round(waitedMs)} ms: ${limits} ${capacity.length === 1 ? "is" : "are"} held by quarantined permits of process groups ${groups} that survived SIGKILL`);
     }
   };
+  FENCED_WAITER_RETENTION_MS = 10 * 60000;
+  AdmissionHolderStoppedError = class AdmissionHolderStoppedError extends WorkflowInfrastructureError {
+    constructor(reason) {
+      super("stale_work_lease", `Stale resource admission attempt: the admission holder was stopped${reason === undefined ? "" : ` (${reason})`}`);
+    }
+  };
 });
 
 // dist/builtin/workflows/src/workers/admission-binding.ts
@@ -65111,6 +65152,37 @@ var init_workflow_route_owner = __esm(() => {
 });
 
 // dist/builtin/workflows/src/runs/foreground/sdk-intercom.ts
+function indexRoots(runs) {
+  const runById = new Map(runs.map((run) => [run.id, run]));
+  const rootOf = new Map;
+  const deliverable = new Set;
+  for (const run of runs) {
+    const root = reciprocalWorkflowRootRunId(runById, run.id);
+    rootOf.set(run.id, root);
+    if (root !== undefined && run.stages.some((stage) => stage.pendingStageDeliveryAvailable === true))
+      deliverable.add(root);
+  }
+  return { rootOf, deliverable };
+}
+function createStandaloneRouteOwnership(store, roots) {
+  const activated = new Set;
+  let index;
+  const dispose = store.subscribeInvalidation(() => {
+    index = undefined;
+  });
+  return {
+    owns: (runId) => {
+      index ??= indexRoots(store.runs());
+      const root = index.rootOf.get(runId) ?? runId;
+      if (!roots.has(root))
+        return false;
+      if (!activated.has(root) && index.deliverable.has(root))
+        activated.add(root);
+      return activated.has(root);
+    },
+    dispose
+  };
+}
 function releaseRoot(owner, runId) {
   const remaining = (owner.roots.get(runId) ?? 1) - 1;
   if (remaining > 0) {
@@ -65126,22 +65198,14 @@ async function acquireStandaloneIntercom(store, runId, cwd) {
     if (hasWorkflowPendingStageRouteOwner(store))
       return async () => {};
     const roots = new Map;
-    const activated = new Set;
     owner = {
       roots,
       ready: outsideWorkflowExecutions(async () => {
         await Promise.resolve().then(() => init_workflow_route_owner());
         const routes = createWorkflowRouteOwner(cwd);
-        const bridge = registerPendingStageIntercomBridge({ events: routes.events }, store, (id) => {
-          const runs = store.runs();
-          const root = durableRootRunIdForRun(runs, id) ?? id;
-          if (!roots.has(root))
-            return false;
-          if (!activated.has(root) && runs.some((run) => durableRootRunIdForRun(runs, run.id) === root && run.stages.some((stage) => stage.pendingStageDeliveryAvailable === true)))
-            activated.add(root);
-          return activated.has(root);
-        });
-        return { routes, bridge };
+        const ownership = createStandaloneRouteOwnership(store, roots);
+        const bridge = registerPendingStageIntercomBridge({ events: routes.events }, store, ownership.owns);
+        return { routes, bridge, unwatch: ownership.dispose };
       })
     };
     owners2.set(store, owner);
@@ -65165,6 +65229,7 @@ async function acquireStandaloneIntercom(store, runId, cwd) {
         initialized.bridge.refresh();
         if (retained.roots.size === 0) {
           initialized.bridge();
+          initialized.unwatch();
           if (owners2.get(store) === retained)
             owners2.delete(store);
         }
@@ -65176,10 +65241,10 @@ async function acquireStandaloneIntercom(store, runId, cwd) {
 var owners2;
 var init_sdk_intercom = __esm(() => {
   init_execution_context_boundary();
-  init_run_owner_backend();
   init_pending_stage_intercom();
   init_intercom_group();
   init_pending_stage_route_readiness();
+  init_workflow_run_ownership();
   owners2 = new WeakMap;
 });
 
@@ -82001,7 +82066,7 @@ async function runWorker(start) {
           try {
             return await admission.acquire(kind, signal, requestOptions);
           } catch (error) {
-            if (error instanceof QuarantinedCapacityError && !attemptFenced) {
+            if ((error instanceof QuarantinedCapacityError || error instanceof AdmissionHolderStoppedError) && !attemptFenced) {
               poolFault = error.message;
               attemptFenced = true;
               controller.abort(new WorkAttemptFencedError(error.message));

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

@@ -12229,15 +12229,12 @@ class JournalDurableBackend {
   commitCheckpoint(checkpoint, options) {
     if (options?.signal?.aborted)
       return Promise.reject(new JournalOperationAbortedError(checkpoint.workflowId, options.signal.reason instanceof Error ? options.signal.reason : undefined));
-    return this.serialize(checkpoint.workflowId, () => this.checkpoint(checkpoint));
-  }
-  *checkpoint(checkpoint) {
-    validateCheckpointInvocationFingerprint(checkpoint);
-    if (!(yield* this.current(checkpoint.workflowId)))
-      return;
-    yield* this.append(checkpoint.workflowId, { type: RUN_EVENT_TYPES.checkpointRecorded, payload: checkpoint }, {
-      key: JSON.stringify([RUN_EVENT_TYPES.checkpointRecorded, checkpoint.kind, checkpoint.checkpointId])
-    });
+    try {
+      validateCheckpointInvocationFingerprint(checkpoint);
+    } catch (error) {
+      return Promise.reject(error);
+    }
+    return this.queueAppend(checkpoint.workflowId, { type: RUN_EVENT_TYPES.checkpointRecorded, payload: checkpoint }, JSON.stringify([RUN_EVENT_TYPES.checkpointRecorded, checkpoint.kind, checkpoint.checkpointId]), true);
   }
   async commitAdditiveCheckpointBestEffort(checkpoint) {
     try {
@@ -12374,7 +12371,7 @@ class JournalDurableBackend {
       payload: { messageId, delivery, ...accounting === undefined ? {} : { accounting } }
     });
   }
-  queueAppend(runId, event, key) {
+  queueAppend(runId, event, key, requiresRegisteredRun = false) {
     try {
       this.ensureOpen();
       this.assertExecutionActive();
@@ -12387,6 +12384,7 @@ class JournalDurableBackend {
       batch.push({
         event,
         ...key === undefined ? {} : { key },
+        ...requiresRegisteredRun ? { requiresRegisteredRun } : {},
         context: AsyncLocalStorage3.snapshot(),
         resolve,
         reject
@@ -12401,9 +12399,12 @@ class JournalDurableBackend {
     }
     return queued;
   }
-  *appendBatch(runId, batch) {
-    if (this.appendBatches.get(runId) === batch)
+  *appendBatch(runId, queued) {
+    if (this.appendBatches.get(runId) === queued)
       this.appendBatches.delete(runId);
+    const batch = yield* this.registeredAppends(runId, queued);
+    if (batch.length === 0)
+      return;
     const appendMany = runJournalAppendMany(this.journal);
     if (appendMany === undefined || batch.length === 1) {
       for (const append of batch) {
@@ -12441,6 +12442,25 @@ class JournalDurableBackend {
         append.reject(failure);
     }
   }
+  *registeredAppends(runId, batch) {
+    if (!batch.some((append) => append.requiresRegisteredRun === true))
+      return [...batch];
+    let registered;
+    try {
+      registered = (yield* this.current(runId)) !== undefined;
+    } catch (error) {
+      for (const append of batch)
+        if (append.requiresRegisteredRun === true)
+          append.reject(error);
+      return batch.filter((append) => append.requiresRegisteredRun !== true);
+    }
+    if (registered)
+      return [...batch];
+    for (const append of batch)
+      if (append.requiresRegisteredRun === true)
+        append.resolve();
+    return batch.filter((append) => append.requiresRegisteredRun !== true);
+  }
   getToolOutput(...args) {
     return this.projection.getToolOutput(...args);
   }
@@ -17553,7 +17573,7 @@ class SqlResourceAdmission {
     signal?.throwIfAborted();
     const operation = randomUUID7();
     const release = (reason = "resource cleanup confirmed") => this.storage.transaction(async (tx) => {
-      await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = ? WHERE operation = ? AND state != 'released'`, reason, operation);
+      await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = ? WHERE operation = ? AND (state != 'released' OR reason = ?)`, reason, operation, FENCED_WAITER_REASON);
     });
     release.bindProcess = async (identity) => {
       if (kind !== "process" || identity.kind !== "unix-process-group" || !Number.isSafeInteger(identity.id) || identity.id <= 0)
@@ -17565,6 +17585,15 @@ class SqlResourceAdmission {
           throw new Error("Resource process permit is no longer held");
       });
     };
+    const keepWaiting = async (tx) => {
+      const permit = await tx.get(`SELECT state, reason FROM ${this.permits} WHERE operation = ?`, operation);
+      if (permit?.state === "released" && permit.reason === FENCED_WAITER_REASON)
+        await tx.run(`UPDATE ${this.permits} SET state = 'waiting', reason = NULL WHERE operation = ?`, operation);
+      else if (permit === undefined)
+        throw new AdmissionHolderStoppedError("permit no longer recorded");
+      else if (permit.state !== "waiting")
+        throw new AdmissionHolderStoppedError(permit.reason === null ? undefined : String(permit.reason));
+    };
     await this.storage.transaction(async (tx) => {
       await tx.run(`UPDATE ${this.owners} SET expires_at = CAST(unixepoch('subsec') * 1000 AS INTEGER) + ? WHERE id = ?`, OWNER_LEASE_MS, this.owner);
       await tx.run(`INSERT INTO ${this.permits}(operation, root, holder, kind, state, owner, attempt) VALUES (?, ?, ?, ?, 'waiting', ?, ?)`, operation, this.options.root, this.options.holder, kind, this.owner, this.options.attempt ? JSON.stringify({
@@ -17587,11 +17616,12 @@ class SqlResourceAdmission {
         const granted = await this.storage.transaction(async (tx) => {
           quarantined = undefined;
           await tx.run(`UPDATE ${this.owners} SET expires_at = CAST(unixepoch('subsec') * 1000 AS INTEGER) + ? WHERE id = ?`, OWNER_LEASE_MS, this.owner);
+          await keepWaiting(tx);
           const { root } = this.options;
           if (!await this.assertCurrentAttempt(tx)) {
             const waiting = await tx.run(`UPDATE ${this.permits} SET reason = ? WHERE operation = ? AND state = 'waiting'`, LATE_ATTEMPT_REASON, operation);
             if (waiting.changes !== 1)
-              throw new Error("Resource admission holder was stopped");
+              throw new AdmissionHolderStoppedError(undefined);
             return false;
           }
           let reason = hostReason;
@@ -17634,7 +17664,7 @@ class SqlResourceAdmission {
           const stageStart = kind === "session" && request?.delegated !== true;
           const updated = await tx.run(`UPDATE ${this.permits} SET state = ?, reason = ?, granted_at = CASE WHEN ? IS NULL AND ? THEN ${NOW_MS} ELSE NULL END WHERE operation = ? AND state = 'waiting'`, reason ? "waiting" : "granted", reason ?? null, reason ?? null, stageStart ? 1 : 0, operation);
           if (updated.changes !== 1)
-            throw new Error("Resource admission holder was stopped");
+            throw new AdmissionHolderStoppedError(undefined);
           return !reason;
         });
         if (granted) {
@@ -17676,7 +17706,7 @@ class SqlResourceAdmission {
 				WHERE p.state IN ('waiting', 'granted')`);
       if (live.some((permit) => this.needsFencing(permit, fence)))
         return true;
-      return !!await db.get(`SELECT 1 AS prunable FROM ${this.permits} WHERE +state = 'released' AND ticket <= ${this.prunableBefore} LIMIT 1`, RELEASED_PERMIT_RETENTION);
+      return !!await db.get(`SELECT 1 AS prunable FROM ${this.permits} r WHERE ${this.prunable} LIMIT 1`, RELEASED_PERMIT_RETENTION, FENCED_WAITER_REASON, FENCED_WAITER_RETENTION_MS);
     });
     if (!pending)
       return;
@@ -17685,7 +17715,7 @@ class SqlResourceAdmission {
       const owners = await tx.all(`SELECT o.* FROM ${this.owners} o WHERE o.id IN (SELECT owner FROM ${this.permits} WHERE state IN ('waiting', 'granted'))`);
       for (const owner of owners) {
         const { rebooted, stopped } = fence(owner);
-        await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = 'abandoned waiter fenced' WHERE owner = ? AND state = 'waiting' AND (? OR EXISTS (SELECT 1 FROM ${this.owners} WHERE id = ? AND expires_at < ${NOW_MS}))`, owner.id, stopped ? 1 : 0, owner.id);
+        await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = ? WHERE owner = ? AND state = 'waiting' AND (? OR EXISTS (SELECT 1 FROM ${this.owners} WHERE id = ? AND expires_at < ${NOW_MS}))`, FENCED_WAITER_REASON, owner.id, stopped ? 1 : 0, owner.id);
         if (rebooted) {
           await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = 'host reboot confirmed' WHERE owner = ? AND state = 'granted'`, owner.id);
         } else if (stopped) {
@@ -17703,13 +17733,17 @@ class SqlResourceAdmission {
       }
       await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = 'legacy waiter fenced' WHERE owner IS NULL AND state = 'waiting'`);
       await tx.run(`UPDATE ${this.permits} SET reason = ? WHERE owner IS NULL AND state = 'granted' AND reason IS NOT ?`, ANONYMOUS_REASON, ANONYMOUS_REASON);
-      await tx.run(`DELETE FROM ${this.permits} WHERE ticket IN (SELECT ticket FROM ${this.permits} WHERE +state = 'released'
-				AND ticket <= ${this.prunableBefore} ORDER BY ticket LIMIT ?)`, RELEASED_PERMIT_RETENTION, RELEASED_PERMIT_PRUNE_BATCH);
+      await tx.run(`DELETE FROM ${this.permits} WHERE ticket IN (SELECT ticket FROM ${this.permits} r WHERE ${this.prunable}
+				ORDER BY ticket LIMIT ?)`, RELEASED_PERMIT_RETENTION, FENCED_WAITER_REASON, FENCED_WAITER_RETENTION_MS, RELEASED_PERMIT_PRUNE_BATCH);
     });
   }
   get prunableBefore() {
     return `(SELECT ticket FROM ${this.permits} WHERE state = 'released' ORDER BY ticket DESC LIMIT 1 OFFSET ?)`;
   }
+  get prunable() {
+    return `+r.state = 'released' AND r.ticket <= ${this.prunableBefore} AND (r.reason IS NOT ? OR NOT EXISTS
+			(SELECT 1 FROM ${this.owners} o WHERE o.id = r.owner AND o.expires_at >= ${NOW_MS} - ?))`;
+  }
   needsFencing(permit, fence) {
     if (permit.owner === null)
       return permit.state === "waiting" || permit.reason !== ANONYMOUS_REASON;
@@ -17734,6 +17768,7 @@ class SqlResourceAdmission {
     await this.reconcile();
     return this.storage.transaction(async (tx) => {
       await tx.run(`UPDATE ${this.permits} SET state = 'released', reason = 'worker exit confirmed' WHERE root = ? AND holder = ? AND state IN ('waiting', 'granted') AND (kind = 'session' OR state = 'waiting')`, this.options.root, holder);
+      await tx.run(`UPDATE ${this.permits} SET reason = 'worker exit confirmed' WHERE root = ? AND holder = ? AND state = 'released' AND reason = ?`, this.options.root, holder, FENCED_WAITER_REASON);
       await tx.run(`UPDATE ${this.permits} SET reason = ? WHERE root = ? AND holder = ? AND kind = 'process' AND state = 'granted' AND reason IS NOT ?`, UNCONFIRMED_REASON, this.options.root, holder, QUARANTINED_REASON);
       const held = await tx.get(`SELECT COUNT(*) AS count FROM ${this.permits} WHERE root = ? AND holder = ? AND kind = 'process' AND state = 'granted'`, this.options.root, holder);
       return Number(held?.count);
@@ -17806,7 +17841,7 @@ async function reapProcessGroups(journal, root, scope) {
     return { survivors: [], unprobeable: [] };
   return settleProcessGroups(storage, root, scope, true);
 }
-var OWNER_LEASE_MS = 30000, REAP_TERM_GRACE_MS = 5000, REAP_KILL_GRACE_MS = 1e4, REAP_POLL_MS = 50, RELEASED_PERMIT_RETENTION = 256, RELEASED_PERMIT_PRUNE_BATCH = 1000, EXPIRED_REASON = "owner expired; cleanup unconfirmed", UNCONFIRMED_REASON = "cleanup unconfirmed", QUARANTINED_REASON = "cleanup unconfirmed; permit quarantined", ANONYMOUS_REASON = "owner identity unavailable; cleanup unconfirmed", QUARANTINED_CAPACITY_WAIT_MS, QuarantinedCapacityError, NOW_MS = "CAST(unixepoch('subsec') * 1000 AS INTEGER)", LATE_ATTEMPT_POLL_MS = 100, LATE_ATTEMPT_REASON = "waiting for its attempt lease", STAGE_START_SPACING_MS = 5000, STAGE_START_PRESSURE_REASON = "paced for host load";
+var OWNER_LEASE_MS = 30000, REAP_TERM_GRACE_MS = 5000, REAP_KILL_GRACE_MS = 1e4, REAP_POLL_MS = 50, RELEASED_PERMIT_RETENTION = 256, RELEASED_PERMIT_PRUNE_BATCH = 1000, EXPIRED_REASON = "owner expired; cleanup unconfirmed", UNCONFIRMED_REASON = "cleanup unconfirmed", QUARANTINED_REASON = "cleanup unconfirmed; permit quarantined", ANONYMOUS_REASON = "owner identity unavailable; cleanup unconfirmed", QUARANTINED_CAPACITY_WAIT_MS, QuarantinedCapacityError, FENCED_WAITER_REASON = "abandoned waiter fenced", FENCED_WAITER_RETENTION_MS, AdmissionHolderStoppedError, NOW_MS = "CAST(unixepoch('subsec') * 1000 AS INTEGER)", LATE_ATTEMPT_POLL_MS = 100, LATE_ATTEMPT_REASON = "waiting for its attempt lease", STAGE_START_SPACING_MS = 5000, STAGE_START_PRESSURE_REASON = "paced for host load";
 var init_resource_admission = __esm(() => {
   init_internal();
   init_sql_run_journal();
@@ -17820,6 +17855,12 @@ var init_resource_admission = __esm(() => {
       super("worker_cleanup_unconfirmed", `Local worker process cleanup unconfirmed; process permit refused after ${Math.round(waitedMs)} ms: ${limits} ${capacity.length === 1 ? "is" : "are"} held by quarantined permits of process groups ${groups} that survived SIGKILL`);
     }
   };
+  FENCED_WAITER_RETENTION_MS = 10 * 60000;
+  AdmissionHolderStoppedError = class AdmissionHolderStoppedError extends WorkflowInfrastructureError {
+    constructor(reason) {
+      super("stale_work_lease", `Stale resource admission attempt: the admission holder was stopped${reason === undefined ? "" : ` (${reason})`}`);
+    }
+  };
 });
 
 // dist/builtin/workflows/src/workers/admission-binding.ts
@@ -65222,6 +65263,37 @@ var init_workflow_route_owner = __esm(() => {
 });
 
 // dist/builtin/workflows/src/runs/foreground/sdk-intercom.ts
+function indexRoots(runs) {
+  const runById = new Map(runs.map((run) => [run.id, run]));
+  const rootOf = new Map;
+  const deliverable = new Set;
+  for (const run of runs) {
+    const root = reciprocalWorkflowRootRunId(runById, run.id);
+    rootOf.set(run.id, root);
+    if (root !== undefined && run.stages.some((stage) => stage.pendingStageDeliveryAvailable === true))
+      deliverable.add(root);
+  }
+  return { rootOf, deliverable };
+}
+function createStandaloneRouteOwnership(store, roots) {
+  const activated = new Set;
+  let index;
+  const dispose = store.subscribeInvalidation(() => {
+    index = undefined;
+  });
+  return {
+    owns: (runId) => {
+      index ??= indexRoots(store.runs());
+      const root = index.rootOf.get(runId) ?? runId;
+      if (!roots.has(root))
+        return false;
+      if (!activated.has(root) && index.deliverable.has(root))
+        activated.add(root);
+      return activated.has(root);
+    },
+    dispose
+  };
+}
 function releaseRoot(owner, runId) {
   const remaining = (owner.roots.get(runId) ?? 1) - 1;
   if (remaining > 0) {
@@ -65237,22 +65309,14 @@ async function acquireStandaloneIntercom(store, runId, cwd) {
     if (hasWorkflowPendingStageRouteOwner(store))
       return async () => {};
     const roots = new Map;
-    const activated = new Set;
     owner = {
       roots,
       ready: outsideWorkflowExecutions(async () => {
         await Promise.resolve().then(() => init_workflow_route_owner());
         const routes = createWorkflowRouteOwner(cwd);
-        const bridge = registerPendingStageIntercomBridge({ events: routes.events }, store, (id) => {
-          const runs = store.runs();
-          const root = durableRootRunIdForRun(runs, id) ?? id;
-          if (!roots.has(root))
-            return false;
-          if (!activated.has(root) && runs.some((run) => durableRootRunIdForRun(runs, run.id) === root && run.stages.some((stage) => stage.pendingStageDeliveryAvailable === true)))
-            activated.add(root);
-          return activated.has(root);
-        });
-        return { routes, bridge };
+        const ownership = createStandaloneRouteOwnership(store, roots);
+        const bridge = registerPendingStageIntercomBridge({ events: routes.events }, store, ownership.owns);
+        return { routes, bridge, unwatch: ownership.dispose };
       })
     };
     owners2.set(store, owner);
@@ -65276,6 +65340,7 @@ async function acquireStandaloneIntercom(store, runId, cwd) {
         initialized.bridge.refresh();
         if (retained.roots.size === 0) {
           initialized.bridge();
+          initialized.unwatch();
           if (owners2.get(store) === retained)
             owners2.delete(store);
         }
@@ -65287,10 +65352,10 @@ async function acquireStandaloneIntercom(store, runId, cwd) {
 var owners2;
 var init_sdk_intercom = __esm(() => {
   init_execution_context_boundary();
-  init_run_owner_backend();
   init_pending_stage_intercom();
   init_intercom_group();
   init_pending_stage_route_readiness();
+  init_workflow_run_ownership();
   owners2 = new WeakMap;
 });