lody 0.92.0 → 0.92.1

package/dist/chunks/{review-viewer-CEr3NCEE.js → review-viewer-DqtXyKjy.js}

@@ -80,7 +80,7 @@ let __tla = Promise.all([
     }
   })()
 ]).then(async () => {
-  const reviewViewerVersion = "0.92.0";
+  const reviewViewerVersion = "0.92.1";
   const reviewViewerSha256 = "dc9c7fc1dde49bb39c5fe86392d69219b469c0cab4fd492d8b562045e7f676e4";
   const reviewViewerFileName = "standalone.html";
   const DEFAULT_CDN_BASES = [

package/dist/index.js

@@ -4325,7 +4325,7 @@ Upgrade Node, then re-run: npx lody@latest`;
   }
   const name$2 = "lody";
   const name$1 = "@lody/cli-cloud";
-  const version$9 = "0.92.0";
+  const version$9 = "0.92.1";
   const type$2 = "module";
   const scripts = {
     "dev": "node dev.mjs",
@@ -14381,9 +14381,16 @@ Requirements:
       progressMessageId: string$1().trim().min(1).optional(),
       completion: unknown(),
       continuation: object$1({
-        status: literal$1("not_started"),
+        status: _enum$1([
+          "not_started",
+          "uncertain"
+        ]),
         reason: object$1({
-          code: literal$1("CONFIGURATION_UNAVAILABLE"),
+          code: _enum$1([
+            "CONFIGURATION_UNAVAILABLE",
+            "DELIVERY_ATTEMPTS_EXHAUSTED",
+            "DELIVERY_EXECUTION_UNCERTAIN"
+          ]),
           message: string$1()
         }).strict()
       }).strict().optional()
@@ -105122,6 +105129,7 @@ ${value}`;
       this.mirror = new Mirror({
         doc: handle.doc,
         schema: sessionDocSchema,
+        validateUpdates: false,
         ignoreUnknownProperties: true,
         initialState: merged
       });
@@ -135090,12 +135098,22 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
   }
   class SessionTurnHalted extends TaggedError("SessionTurnHalted") {
   }
+  class SessionTurnClaimContended extends TaggedError("SessionTurnClaimContended") {
+  }
+  class SessionTurnStartFenceFailed extends TaggedError("SessionTurnStartFenceFailed") {
+  }
   const isSessionTurnCancelled = (error2) => {
     return typeof error2 === "object" && error2 !== null && "_tag" in error2 && error2._tag === "SessionTurnCancelled";
   };
   const isSessionTurnHalted = (error2) => {
     return typeof error2 === "object" && error2 !== null && "_tag" in error2 && error2._tag === "SessionTurnHalted";
   };
+  const isSessionTurnClaimContended = (error2) => {
+    return typeof error2 === "object" && error2 !== null && "_tag" in error2 && error2._tag === "SessionTurnClaimContended";
+  };
+  const isSessionTurnStartFenceFailed = (error2) => {
+    return typeof error2 === "object" && error2 !== null && "_tag" in error2 && error2._tag === "SessionTurnStartFenceFailed";
+  };
   function truncateAnalyticsString$1(value, maxLength = 1e3) {
     return value.length > maxLength ? `${value.slice(0, maxLength)}...` : value;
   }
@@ -135636,6 +135654,9 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
             requesterUserId: options.userId,
             inputConfig: options.inputConfig
           };
+          await this.settleVisibleTurn(runtime, "handled", {
+            force: true
+          });
           try {
             await this.finalizeYieldedTurnOutput(runtime, options.sessionId, previousTurnId);
           } catch (error2) {
@@ -135827,9 +135848,27 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         cancelFinalized: false,
         interruptRequested: false,
         terminateSessionOnCancel: false,
+        ...options.onTurnSettled ? {
+          settlement: {
+            callback: options.onTurnSettled,
+            completed: false
+          }
+        } : {},
         yieldedFinalization: Promise.resolve()
       };
     }
+    async settleVisibleTurn(runtime, outcome, options = {}) {
+      const settlement = runtime.settlement;
+      if (!settlement || settlement.completed) return;
+      if (options.force) settlement.forcedOutcome = outcome;
+      const effectiveOutcome = settlement.forcedOutcome ?? outcome;
+      try {
+        await settlement.callback(effectiveOutcome);
+        settlement.completed = true;
+      } catch (error2) {
+        this.deps.logger.error(`[${runtime.sessionId}] Failed to persist ${effectiveOutcome} turn settlement: ${formatErrorMessage(error2)}`);
+      }
+    }
     getTurnRuntime(sessionId, turnId) {
       const runtime = this.turnRuntimeBySession.get(sessionId);
       return runtime?.turnId === turnId ? runtime : void 0;
@@ -136351,6 +136390,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
     }
     async runVisibleSessionTurn(options, body2) {
       const { sessionId, sessionDoc, userTurnId } = options;
+      const assistantEntryParentTurnId = options.assistantEntryParentTurnId ?? userTurnId;
       const span2 = startTraceSpan(this.deps.logger, "execution.visible_turn", {
         sessionId,
         ...userTurnId ? {
@@ -136383,7 +136423,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       let turnId;
       let runtime;
       try {
-        turnId = this.deps.beginConversationTurn(sessionId, userTurnId, {
+        turnId = this.deps.beginConversationTurn(sessionId, assistantEntryParentTurnId, {
           ...options.dispatchSource ? {
             dispatchSource: options.dispatchSource
           } : {},
@@ -136484,7 +136524,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
               userTurnId
             } : {},
             alreadyOpened: wasOpened
-          }, async () => await self2.deps.createAssistantEntryForTurn(sessionId, sessionDoc, runtime.turnId, runtime.session?.agentClient?.currentModel, userTurnId)));
+          }, async () => await self2.deps.createAssistantEntryForTurn(sessionId, sessionDoc, runtime.turnId, runtime.session?.agentClient?.currentModel, assistantEntryParentTurnId)));
           if (wasOpened) {
             return void 0;
           }
@@ -136523,6 +136563,20 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
             yield* fail(new Error("Agent session was not ready"));
             return void 0;
           }
+          if (!runtime.promptStarted && options.onTurnStarted) {
+            const started = yield* self2.tryPromise(options.onTurnStarted).pipe(mapError$1((cause) => new SessionTurnStartFenceFailed({
+              sessionId,
+              turnId: runtime.turnId,
+              cause
+            })), tapError(() => self2.ignoreWithWarning(sessionId, "Failed to finalize a rejected Delivery start fence", self2.tryPromise(() => self2.handleTurnError(sessionId, sessionDoc)))));
+            if (!started) {
+              yield* fail(new SessionTurnClaimContended({
+                sessionId,
+                turnId: runtime.turnId
+              }));
+              return void 0;
+            }
+          }
           runtime.terminateSessionOnCancel = false;
           self2.deps.activateConversationTurnForACPUpdates(sessionId, runtime.turnId);
           runtime.promptStarted = true;
@@ -136564,13 +136618,21 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       }))));
       const fiber = runFork(program2);
       runtime.fiber = fiber;
+      let settlement;
       try {
         await this.awaitTurnFiber(fiber, sessionId, turnId);
         if (outcome === "unknown") {
           outcome = "completed";
         }
+        settlement = "handled";
       } catch (error2) {
-        if (isSessionTurnHalted(error2)) {
+        if (isSessionTurnClaimContended(error2)) {
+          outcome = "claim-contended";
+        } else if (isSessionTurnStartFenceFailed(error2)) {
+          outcome = "start-fence-failed";
+          this.deps.logger.warn(`[${sessionId}] Delivery start fence failed before provider execution: ${formatErrorMessage(error2.cause)}`);
+          settlement = "not_started";
+        } else if (isSessionTurnHalted(error2)) {
           outcome = `halted-${error2.reason}`;
           await this.finalizeHaltedTurn({
             sessionId,
@@ -136578,23 +136640,25 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
             turnId: runtime.turnId,
             reason: error2.reason
           });
-          return outcome;
-        }
-        if (isSessionTurnCancelled(error2) || runtime.cancelFinalized || runtime.cancelRequested || this.isTurnCancelled(sessionId, runtime.turnId) || await this.isUserTurnCancelled(sessionDoc, runtime.userTurnId)) {
+          settlement = "handled";
+        } else if (isSessionTurnCancelled(error2) || runtime.cancelFinalized || runtime.cancelRequested || this.isTurnCancelled(sessionId, runtime.turnId) || await this.isUserTurnCancelled(sessionDoc, runtime.userTurnId)) {
           outcome = "cancelled";
-          return outcome;
+          const explicitlyCancelled = runtime.cancelRequested || this.isTurnCancelled(sessionId, runtime.turnId) || await this.isUserTurnCancelled(sessionDoc, runtime.userTurnId);
+          settlement = explicitlyCancelled ? "cancelled" : runtime.promptStarted ? "uncertain" : "not_started";
+        } else {
+          await this.handleVisibleTurnUnhandledError({
+            sessionId,
+            sessionDoc,
+            userTurnId: runtime.userTurnId,
+            runtime,
+            error: error2,
+            code: effectiveErrorContext.code,
+            describe: effectiveErrorContext.describe,
+            onUnhandledError: effectiveErrorContext.onUnhandledError
+          });
+          outcome = "unhandled-error-recorded";
+          settlement = "handled";
         }
-        await this.handleVisibleTurnUnhandledError({
-          sessionId,
-          sessionDoc,
-          userTurnId: runtime.userTurnId,
-          runtime,
-          error: error2,
-          code: effectiveErrorContext.code,
-          describe: effectiveErrorContext.describe,
-          onUnhandledError: effectiveErrorContext.onUnhandledError
-        });
-        outcome = "unhandled-error-recorded";
       } finally {
         if (!runtime.promptStarted) {
           this.deps.clearConversationTurn(sessionId, runtime.turnId);
@@ -136604,6 +136668,9 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
           turnId
         });
       }
+      if (settlement) {
+        await this.settleVisibleTurn(runtime, settlement);
+      }
       return outcome;
     }
     markCurrentTurn(sessionId, turnId) {
@@ -136866,7 +136933,10 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       })) {
         return;
       }
-      const body2 = dispatchOptions?.onTurnClaimed ? (ctx) => promise$1(dispatchOptions.onTurnClaimed).pipe(flatMap$2(() => turn.body(ctx))) : turn.body;
+      const body2 = dispatchOptions?.onTurnClaimed ? (ctx) => promise$1(dispatchOptions.onTurnClaimed).pipe(flatMap$2((claimed) => claimed ? turn.body(ctx) : fail(new SessionTurnClaimContended({
+        sessionId: message.sessionId,
+        turnId: ctx.turnId
+      })))) : turn.body;
       await this.runVisibleSessionTurn(turn.options, body2);
     }
     async prepareContinueSessionTurn(message, dispatchOptions, prepareOptions) {
@@ -137330,6 +137400,15 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
             requesterUserId: userId,
             inputConfig: acpSessionConfig
           },
+          ...dispatchOptions?.dispatchSource === "delivery" ? {
+            assistantEntryParentTurnId: userTurnId
+          } : {},
+          ...dispatchOptions?.onTurnStarted ? {
+            onTurnStarted: dispatchOptions.onTurnStarted
+          } : {},
+          ...dispatchOptions?.onTurnSettled ? {
+            onTurnSettled: dispatchOptions.onTurnSettled
+          } : {},
           ...dispatchOptions?.dispatchSource ? {
             dispatchSource: dispatchOptions.dispatchSource
           } : {},
@@ -141616,6 +141695,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
   const DAY_MS = 24 * 60 * 60 * 1e3;
   const TERMINAL_RETENTION_MS = 7 * DAY_MS;
   const MATERIALIZATION_CLAIM_MS = 6e4;
+  const DELIVERY_MAX_ATTEMPTS = 2;
   const OperationKindSchema = _enum$1([
     "session_create",
     "session_create_many",
@@ -141732,6 +141812,33 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
     completion_json: string$1(),
     consumed_at: string$1().nullable()
   }).strict();
+  const DeliveryReadRowSchema = DeliveryRowSchema.extend({
+    execution_phase: _enum$1([
+      "ready",
+      "claimed",
+      "prepared",
+      "started",
+      "uncertain"
+    ]),
+    attempt_count: number$4().int().nonnegative(),
+    active_claim_id: string$1().nullable(),
+    active_claim_worker_boot_id: string$1().nullable()
+  }).strict();
+  const DELIVERY_READ_COLUMNS = `
+  deliveries.sequence,
+  deliveries.workspace_id,
+  deliveries.requester_session_id,
+  deliveries.operation_id,
+  deliveries.delivery_id,
+  deliveries.system_turn_id,
+  deliveries.state,
+  deliveries.initiator_chain_depth,
+  deliveries.completion_json,
+  deliveries.consumed_at,
+  delivery_execution_state.execution_phase,
+  delivery_execution_state.attempt_count,
+  delivery_execution_state.active_claim_id,
+  delivery_execution_state.active_claim_worker_boot_id`;
   class LodyOperationStoreError extends Error {
     constructor(code2, message, retryable) {
       super(message);
@@ -142134,16 +142241,320 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       return transaction.immediate();
     }
     listPendingDeliveries(workspaceId, requesterSessionId) {
-      const rows = requesterSessionId ? this.db.prepare(`SELECT * FROM deliveries
-             WHERE workspace_id = ? AND requester_session_id = ? AND state = 'pending'
-             ORDER BY sequence ASC`).all(workspaceId, requesterSessionId) : this.db.prepare(`SELECT * FROM deliveries
-             WHERE workspace_id = ? AND state = 'pending'
-             ORDER BY sequence ASC`).all(workspaceId);
+      const rows = requesterSessionId ? this.db.prepare(`SELECT ${DELIVERY_READ_COLUMNS}
+             FROM deliveries
+             JOIN delivery_execution_state USING (requester_session_id, operation_id)
+             WHERE deliveries.workspace_id = ?
+               AND deliveries.requester_session_id = ?
+               AND deliveries.state = 'pending'
+             ORDER BY deliveries.sequence ASC`).all(workspaceId, requesterSessionId) : this.db.prepare(`SELECT ${DELIVERY_READ_COLUMNS}
+             FROM deliveries
+             JOIN delivery_execution_state USING (requester_session_id, operation_id)
+             WHERE deliveries.workspace_id = ? AND deliveries.state = 'pending'
+             ORDER BY deliveries.sequence ASC`).all(workspaceId);
       return rows.map((row) => this.decodeDelivery(row));
     }
-    consumeDelivery(requesterSessionId, operationId, consumedAt = new Date(this.now()).toISOString()) {
-      this.db.prepare(`UPDATE deliveries SET state = 'consumed', consumed_at = ?
-         WHERE requester_session_id = ? AND operation_id = ? AND state = 'pending'`).run(consumedAt, requesterSessionId, operationId);
+    getDelivery(requesterSessionId, operationId) {
+      const row = this.db.prepare(`SELECT ${DELIVERY_READ_COLUMNS}
+         FROM deliveries
+         JOIN delivery_execution_state USING (requester_session_id, operation_id)
+         WHERE deliveries.requester_session_id = ? AND deliveries.operation_id = ?`).get(requesterSessionId, operationId);
+      if (row === void 0) {
+        throw new LodyOperationStoreError("DELIVERY_NOT_FOUND", `Delivery not found for Operation: ${operationId}`, false);
+      }
+      return this.decodeDelivery(row);
+    }
+    recoverOrphanedDeliveryClaims(workspaceId, workerBootId) {
+      const result = this.db.prepare(`UPDATE delivery_execution_state
+         SET execution_phase = CASE
+               WHEN execution_phase = 'started' THEN 'uncertain'
+               WHEN execution_phase IN ('claimed', 'prepared') THEN 'ready'
+               ELSE execution_phase
+             END,
+             active_claim_id = NULL,
+             active_claim_worker_boot_id = NULL
+         WHERE (active_claim_id IS NOT NULL OR active_claim_worker_boot_id IS NOT NULL)
+           AND (
+             active_claim_id IS NULL
+             OR active_claim_worker_boot_id IS NULL
+             OR active_claim_worker_boot_id <> ?
+           )
+           AND EXISTS (
+             SELECT 1 FROM deliveries
+             WHERE deliveries.requester_session_id = delivery_execution_state.requester_session_id
+               AND deliveries.operation_id = delivery_execution_state.operation_id
+               AND deliveries.workspace_id = ? AND deliveries.state = 'pending'
+           )`).run(workerBootId, workspaceId);
+      return result.changes;
+    }
+    abandonDeliveryClaimsOwnedBy(workspaceId, workerBootId) {
+      const result = this.db.prepare(`UPDATE delivery_execution_state
+         SET execution_phase = CASE
+               WHEN execution_phase = 'started' THEN 'uncertain'
+               WHEN execution_phase IN ('claimed', 'prepared') THEN 'ready'
+               ELSE execution_phase
+             END,
+             active_claim_id = NULL,
+             active_claim_worker_boot_id = NULL
+         WHERE active_claim_worker_boot_id = ?
+           AND EXISTS (
+             SELECT 1 FROM deliveries
+             WHERE deliveries.requester_session_id = delivery_execution_state.requester_session_id
+               AND deliveries.operation_id = delivery_execution_state.operation_id
+               AND deliveries.workspace_id = ? AND deliveries.state = 'pending'
+           )`).run(workerBootId, workspaceId);
+      return result.changes;
+    }
+    claimDeliveryExecution(requesterSessionId, operationId, claim) {
+      const transaction = this.db.transaction(() => {
+        const current2 = this.getDelivery(requesterSessionId, operationId);
+        if (current2.state === "consumed") return {
+          status: "consumed",
+          delivery: current2
+        };
+        if (current2.activeClaimId === claim.claimId && current2.activeClaimWorkerBootId === claim.workerBootId) {
+          return {
+            status: "claimed",
+            delivery: current2
+          };
+        }
+        if (current2.activeClaimId !== void 0 || current2.activeClaimWorkerBootId !== void 0) {
+          return {
+            status: "in_flight",
+            delivery: current2
+          };
+        }
+        if (current2.executionPhase !== "ready") {
+          return {
+            status: "in_flight",
+            delivery: current2
+          };
+        }
+        if (current2.attemptCount >= DELIVERY_MAX_ATTEMPTS) {
+          return {
+            status: "exhausted",
+            delivery: current2
+          };
+        }
+        const result = this.db.prepare(`UPDATE delivery_execution_state
+           SET execution_phase = 'claimed', active_claim_id = ?, active_claim_worker_boot_id = ?
+           WHERE requester_session_id = ? AND operation_id = ?
+             AND attempt_count < ?
+             AND execution_phase = 'ready'
+             AND active_claim_id IS NULL AND active_claim_worker_boot_id IS NULL
+             AND EXISTS (
+               SELECT 1 FROM deliveries
+               WHERE deliveries.requester_session_id = delivery_execution_state.requester_session_id
+                 AND deliveries.operation_id = delivery_execution_state.operation_id
+                 AND deliveries.state = 'pending'
+             )`).run(claim.claimId, claim.workerBootId, requesterSessionId, operationId, DELIVERY_MAX_ATTEMPTS);
+        if (result.changes !== 1) {
+          const latest2 = this.getDelivery(requesterSessionId, operationId);
+          if (latest2.state === "consumed") return {
+            status: "consumed",
+            delivery: latest2
+          };
+          if (latest2.activeClaimId !== void 0 || latest2.activeClaimWorkerBootId !== void 0) {
+            return {
+              status: "in_flight",
+              delivery: latest2
+            };
+          }
+          return {
+            status: "exhausted",
+            delivery: latest2
+          };
+        }
+        return {
+          status: "claimed",
+          delivery: this.getDelivery(requesterSessionId, operationId)
+        };
+      });
+      return transaction.immediate();
+    }
+    prepareClaimedDeliveryExecution(requesterSessionId, operationId, workerBootId, claimId) {
+      const transaction = this.db.transaction(() => {
+        const current2 = this.getDelivery(requesterSessionId, operationId);
+        if (current2.activeClaimWorkerBootId === workerBootId && current2.activeClaimId === claimId && (current2.executionPhase === "prepared" || current2.executionPhase === "started")) {
+          return {
+            prepared: true,
+            delivery: current2
+          };
+        }
+        const result = this.db.prepare(`UPDATE delivery_execution_state
+           SET execution_phase = 'prepared', attempt_count = attempt_count + 1
+           WHERE requester_session_id = ? AND operation_id = ?
+             AND attempt_count < ?
+             AND execution_phase = 'claimed'
+             AND active_claim_worker_boot_id = ? AND active_claim_id = ?
+             AND EXISTS (
+               SELECT 1 FROM deliveries
+               WHERE deliveries.requester_session_id = delivery_execution_state.requester_session_id
+                 AND deliveries.operation_id = delivery_execution_state.operation_id
+                 AND deliveries.state = 'pending'
+             )`).run(requesterSessionId, operationId, DELIVERY_MAX_ATTEMPTS, workerBootId, claimId);
+        return {
+          prepared: result.changes === 1,
+          delivery: this.getDelivery(requesterSessionId, operationId)
+        };
+      });
+      return transaction.immediate();
+    }
+    markClaimedDeliveryExecutionStarted(requesterSessionId, operationId, workerBootId, claimId) {
+      const result = this.db.prepare(`UPDATE delivery_execution_state
+         SET execution_phase = 'started'
+         WHERE requester_session_id = ? AND operation_id = ?
+           AND execution_phase = 'prepared'
+           AND active_claim_worker_boot_id = ? AND active_claim_id = ?
+           AND EXISTS (
+             SELECT 1 FROM deliveries
+             WHERE deliveries.requester_session_id = delivery_execution_state.requester_session_id
+               AND deliveries.operation_id = delivery_execution_state.operation_id
+               AND deliveries.state = 'pending'
+           )`).run(requesterSessionId, operationId, workerBootId, claimId);
+      if (result.changes === 1) return true;
+      const current2 = this.getDelivery(requesterSessionId, operationId);
+      return current2.executionPhase === "started" && current2.activeClaimWorkerBootId === workerBootId && current2.activeClaimId === claimId;
+    }
+    markClaimedDeliveryExecutionUncertain(requesterSessionId, operationId, workerBootId, claimId) {
+      const result = this.db.prepare(`UPDATE delivery_execution_state
+         SET execution_phase = 'uncertain',
+             active_claim_id = NULL,
+             active_claim_worker_boot_id = NULL
+         WHERE requester_session_id = ? AND operation_id = ?
+           AND execution_phase = 'started'
+           AND active_claim_worker_boot_id = ? AND active_claim_id = ?
+           AND EXISTS (
+             SELECT 1 FROM deliveries
+             WHERE deliveries.requester_session_id = delivery_execution_state.requester_session_id
+               AND deliveries.operation_id = delivery_execution_state.operation_id
+               AND deliveries.state = 'pending'
+           )`).run(requesterSessionId, operationId, workerBootId, claimId);
+      return result.changes === 1;
+    }
+    claimDeliveryFinalization(requesterSessionId, operationId, claim) {
+      const transaction = this.db.transaction(() => {
+        const current2 = this.getDelivery(requesterSessionId, operationId);
+        if (current2.state === "consumed") return {
+          status: "consumed",
+          delivery: current2
+        };
+        if (current2.activeClaimId === claim.claimId && current2.activeClaimWorkerBootId === claim.workerBootId) {
+          return {
+            status: "claimed",
+            delivery: current2
+          };
+        }
+        if (current2.activeClaimId !== void 0 || current2.activeClaimWorkerBootId !== void 0) {
+          return {
+            status: "in_flight",
+            delivery: current2
+          };
+        }
+        const minimumAttemptCount = claim.requireAttemptsExhausted ? DELIVERY_MAX_ATTEMPTS : 0;
+        const requiredExecutionPhase = claim.requiredExecutionPhase ?? "ready";
+        if (current2.attemptCount < minimumAttemptCount) {
+          return {
+            status: "not_ready",
+            delivery: current2
+          };
+        }
+        if (current2.executionPhase !== requiredExecutionPhase) {
+          return {
+            status: "not_ready",
+            delivery: current2
+          };
+        }
+        const result = this.db.prepare(`UPDATE delivery_execution_state
+           SET active_claim_id = ?, active_claim_worker_boot_id = ?
+           WHERE requester_session_id = ? AND operation_id = ?
+             AND attempt_count >= ?
+             AND execution_phase = ?
+             AND active_claim_id IS NULL AND active_claim_worker_boot_id IS NULL
+             AND EXISTS (
+               SELECT 1 FROM deliveries
+               WHERE deliveries.requester_session_id = delivery_execution_state.requester_session_id
+                 AND deliveries.operation_id = delivery_execution_state.operation_id
+                 AND deliveries.state = 'pending'
+             )`).run(claim.claimId, claim.workerBootId, requesterSessionId, operationId, minimumAttemptCount, requiredExecutionPhase);
+        if (result.changes !== 1) {
+          const latest2 = this.getDelivery(requesterSessionId, operationId);
+          if (latest2.state === "consumed") return {
+            status: "consumed",
+            delivery: latest2
+          };
+          if (latest2.activeClaimId !== void 0 || latest2.activeClaimWorkerBootId !== void 0) {
+            return {
+              status: "in_flight",
+              delivery: latest2
+            };
+          }
+          return {
+            status: "not_ready",
+            delivery: latest2
+          };
+        }
+        return {
+          status: "claimed",
+          delivery: this.getDelivery(requesterSessionId, operationId)
+        };
+      });
+      return transaction.immediate();
+    }
+    releaseDeliveryClaim(requesterSessionId, operationId, workerBootId, claimId) {
+      const result = this.db.prepare(`UPDATE delivery_execution_state
+         SET execution_phase = CASE
+               WHEN execution_phase IN ('claimed', 'prepared') THEN 'ready'
+               ELSE execution_phase
+             END,
+             active_claim_id = NULL,
+             active_claim_worker_boot_id = NULL
+         WHERE requester_session_id = ? AND operation_id = ?
+           AND active_claim_worker_boot_id = ? AND active_claim_id = ?
+           AND execution_phase <> 'started'
+           AND EXISTS (
+             SELECT 1 FROM deliveries
+             WHERE deliveries.requester_session_id = delivery_execution_state.requester_session_id
+               AND deliveries.operation_id = delivery_execution_state.operation_id
+               AND deliveries.state = 'pending'
+           )`).run(requesterSessionId, operationId, workerBootId, claimId);
+      return result.changes === 1;
+    }
+    consumeClaimedDelivery(requesterSessionId, operationId, workerBootId, claimId, consumedAt = new Date(this.now()).toISOString()) {
+      const transaction = this.db.transaction(() => {
+        const current2 = this.getDelivery(requesterSessionId, operationId);
+        if (current2.state === "consumed" || current2.activeClaimWorkerBootId !== workerBootId || current2.activeClaimId !== claimId) {
+          return {
+            consumed: false,
+            delivery: current2
+          };
+        }
+        const result = this.db.prepare(`UPDATE deliveries
+           SET state = 'consumed', consumed_at = ?
+           WHERE requester_session_id = ? AND operation_id = ? AND state = 'pending'
+             AND EXISTS (
+               SELECT 1 FROM delivery_execution_state
+               WHERE delivery_execution_state.requester_session_id = deliveries.requester_session_id
+                 AND delivery_execution_state.operation_id = deliveries.operation_id
+                 AND delivery_execution_state.active_claim_worker_boot_id = ?
+                 AND delivery_execution_state.active_claim_id = ?
+             )`).run(consumedAt, requesterSessionId, operationId, workerBootId, claimId);
+        if (result.changes === 1) {
+          const released = this.db.prepare(`UPDATE delivery_execution_state
+             SET active_claim_id = NULL, active_claim_worker_boot_id = NULL
+             WHERE requester_session_id = ? AND operation_id = ?
+               AND active_claim_worker_boot_id = ? AND active_claim_id = ?`).run(requesterSessionId, operationId, workerBootId, claimId);
+          if (released.changes !== 1) {
+            throw new Error("Consumed Delivery lost its active claim during transaction.");
+          }
+        }
+        const latest2 = this.getDelivery(requesterSessionId, operationId);
+        return {
+          consumed: result.changes === 1,
+          delivery: latest2
+        };
+      });
+      return transaction.immediate();
     }
     deleteRequesterSession(requesterSessionId) {
       this.db.prepare("DELETE FROM operations WHERE requester_session_id = ?").run(requesterSessionId);
@@ -142220,7 +142631,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       };
     }
     decodeDelivery(row) {
-      const parsed = DeliveryRowSchema.parse(row);
+      const parsed = DeliveryReadRowSchema.parse(row);
       return {
         sequence: parsed.sequence,
         workspaceId: parsed.workspace_id,
@@ -142229,6 +142640,14 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         deliveryId: parsed.delivery_id,
         systemTurnId: parsed.system_turn_id,
         state: parsed.state,
+        executionPhase: parsed.execution_phase,
+        attemptCount: parsed.attempt_count,
+        ...parsed.active_claim_id ? {
+          activeClaimId: parsed.active_claim_id
+        } : {},
+        ...parsed.active_claim_worker_boot_id ? {
+          activeClaimWorkerBootId: parsed.active_claim_worker_boot_id
+        } : {},
         initiatorChainDepth: parsed.initiator_chain_depth,
         completion: parseJson$1(parsed.completion_json, OperationCompletionSchema, "Delivery completion"),
         ...parsed.consumed_at ? {
@@ -142287,7 +142706,11 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       }).immediate();
     }
     migrate() {
-      this.db.exec(`
+      if (!this.isMigrationRequired()) return;
+      this.db.transaction(() => {
+        const hadDeliveryExecutionState = this.db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'delivery_execution_state'").get() !== void 0;
+        const hadDeliveryExecutionPhase = hadDeliveryExecutionState && this.db.prepare(`PRAGMA table_info(delivery_execution_state)`).all().some((column) => column.name === "execution_phase");
+        this.db.exec(`
       CREATE TABLE IF NOT EXISTS operations (
         workspace_id TEXT NOT NULL,
         owner_machine_id TEXT NOT NULL,
@@ -142330,6 +142753,28 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       CREATE INDEX IF NOT EXISTS deliveries_pending_session
       ON deliveries (workspace_id, requester_session_id, state, sequence);
 
+      CREATE TABLE IF NOT EXISTS delivery_execution_state (
+        requester_session_id TEXT NOT NULL,
+        operation_id TEXT NOT NULL,
+        execution_phase TEXT NOT NULL DEFAULT 'ready'
+          CHECK (execution_phase IN ('ready', 'claimed', 'prepared', 'started', 'uncertain')),
+        attempt_count INTEGER NOT NULL DEFAULT 0,
+        active_claim_id TEXT,
+        active_claim_worker_boot_id TEXT,
+        PRIMARY KEY (requester_session_id, operation_id),
+        FOREIGN KEY (requester_session_id, operation_id)
+          REFERENCES operations (requester_session_id, operation_id)
+          ON DELETE CASCADE
+      );
+
+      CREATE TRIGGER IF NOT EXISTS deliveries_insert_execution_state
+      AFTER INSERT ON deliveries
+      BEGIN
+        INSERT OR IGNORE INTO delivery_execution_state (
+          requester_session_id, operation_id, execution_phase, attempt_count
+        ) VALUES (NEW.requester_session_id, NEW.operation_id, 'ready', 0);
+      END;
+
       CREATE TABLE IF NOT EXISTS operation_item_materializations (
         requester_session_id TEXT NOT NULL,
         operation_id TEXT NOT NULL,
@@ -142355,6 +142800,47 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         value TEXT NOT NULL
       );
     `);
+        if (hadDeliveryExecutionState && !hadDeliveryExecutionPhase) {
+          this.db.exec(`ALTER TABLE delivery_execution_state
+             ADD COLUMN execution_phase TEXT NOT NULL DEFAULT 'ready'`);
+          this.db.exec(`UPDATE delivery_execution_state
+             SET execution_phase = CASE
+               WHEN attempt_count > 0
+                 OR active_claim_id IS NOT NULL
+                 OR active_claim_worker_boot_id IS NOT NULL
+               THEN 'uncertain'
+               ELSE 'ready'
+             END`);
+        }
+        this.db.prepare(`INSERT OR IGNORE INTO delivery_execution_state (
+               requester_session_id, operation_id, execution_phase, attempt_count
+             )
+             SELECT requester_session_id, operation_id,
+               CASE WHEN state = 'pending' THEN ? ELSE 'ready' END,
+               0
+             FROM deliveries`).run(hadDeliveryExecutionState ? "ready" : "uncertain");
+      }).immediate();
+    }
+    isMigrationRequired() {
+      const requiredObjects = /* @__PURE__ */ new Set([
+        "table:operations",
+        "index:operations_active_owner",
+        "table:deliveries",
+        "index:deliveries_pending_session",
+        "table:delivery_execution_state",
+        "trigger:deliveries_insert_execution_state",
+        "table:operation_item_materializations",
+        "table:operation_progress_settlements",
+        "table:orchestration_meta"
+      ]);
+      const existingObjects = this.db.prepare(`SELECT type, name FROM sqlite_master
+         WHERE type IN ('table', 'index', 'trigger')`).all();
+      for (const { type: type2, name: name2 } of existingObjects) {
+        requiredObjects.delete(`${type2}:${name2}`);
+      }
+      if (requiredObjects.size > 0) return true;
+      const executionStateColumns = this.db.prepare(`PRAGMA table_info(delivery_execution_state)`).all();
+      return !executionStateColumns.some((column) => column.name === "execution_phase");
     }
     repairTerminalDeliveries() {
       this.db.transaction(() => {
@@ -142463,20 +142949,20 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
     }
     const isProgressRow = (entry) => entry.role === "system" && (entry.id === id2 || entry.id.startsWith(duplicatePrefix));
     const timestamp2 = new Date(now2()).toISOString();
-    await sessionDoc.updateHistory((history) => {
-      const existingIndex = history.findIndex((entry2) => entry2.id === id2 && entry2.role === "system");
-      const duplicates = history.filter(isProgressRow);
+    const updateHistory = (history2) => {
+      const existingIndex = history2.findIndex((entry2) => entry2.id === id2 && entry2.role === "system");
+      const duplicates = history2.filter(isProgressRow);
       const existing = duplicates[0];
       const existingProgress = duplicates.flatMap((entry2) => entry2.items ?? []).filter((item) => item.type === "operation_progress").reduce((merged2, item) => mergeOperationProgressContent(merged2, item), void 0);
       const materializedTargets = new Set((existingProgress?.items ?? []).map((item) => getOperationProgressTargetKey(item.target)));
       const content = buildOperationProgressContent(operation, statusByTarget, materializedTargets);
-      if (!content) return history;
+      if (!content) return history2;
       const merged = mergeOperationProgressContent(existingProgress, content);
       const nextItems = [
         merged
       ];
       if (duplicates.length === 1 && existing && JSON.stringify(existing.items ?? []) === JSON.stringify(nextItems)) {
-        return history;
+        return history2;
       }
       const entry = {
         ...existing ?? {},
@@ -142489,20 +142975,24 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         finished: true
       };
       if (existingIndex < 0) return [
-        ...history,
+        ...history2,
         entry
       ];
-      return history.flatMap((candidate, index) => index === existingIndex ? [
+      return history2.flatMap((candidate, index) => index === existingIndex ? [
         entry
       ] : isProgressRow(candidate) ? [] : [
         candidate
       ]);
-    });
+    };
+    const history = await sessionDoc.getHistory();
+    if (updateHistory(history) === history) return;
+    await sessionDoc.updateHistory(updateHistory);
   };
   const TARGET_OUTPUT_PREVIEW_MAX_BYTES = 8 * 1024;
   const MATERIALIZATION_RETRY_MIN_MS = 1e3;
   const MATERIALIZATION_RETRY_MAX_MS = 3e4;
   const DELIVERY_EXPIRY_GRACE_MS = 8 * 60 * 60 * 1e3;
+  const WORKER_BOOT_ID = randomUUID();
   const truncateTargetOutput = (text) => {
     const originalBytes = Buffer.byteLength(text, "utf8");
     if (originalBytes <= TARGET_OUTPUT_PREVIEW_MAX_BYTES) return {
@@ -142540,7 +143030,8 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
     const text = (assistant.items ?? []).filter((item) => item.type === "text").map((item) => item.text).filter((item) => item.length > 0).join("\n\n");
     return text.length > 0 ? truncateTargetOutput(text) : void 0;
   };
-  const terminalAssistantFor = (history, userTurnId) => history.find((entry) => entry.role === "assistant" && entry.userTurnId === userTurnId && (entry.finished === true || typeof entry.endedAt === "number"));
+  const isTerminalAssistantEntry = (entry) => entry.role === "assistant" && (entry.finished === true || typeof entry.endedAt === "number");
+  const terminalAssistantFor = (history, userTurnId) => history.find((entry) => entry.userTurnId === userTurnId && isTerminalAssistantEntry(entry));
   const completionText = (operation) => [
     `Lody Operation ${operation.operationId} (${operation.kind}) finished.`,
     "Use the structured completion below to continue the user task. Do not restart completed targets.",
@@ -142552,6 +143043,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       const storePath = options.storePath ?? getLodyOperationStorePath(options.machineId);
       this.storeFactory = options.storeFactory ?? (() => new LodyOperationStore(storePath));
       this.now = options.now ?? getServerNow;
+      this.workerBootId = options.workerBootId ?? WORKER_BOOT_ID;
     }
     storeFactory;
     now;
@@ -142563,7 +143055,8 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
     reconcileChains = /* @__PURE__ */ new Map();
     deliveryChains = /* @__PURE__ */ new Map();
     queuedDeliveryIds = /* @__PURE__ */ new Set();
-    dirtyDeliveryReasons = /* @__PURE__ */ new Map();
+    dirtyDeliveryIds = /* @__PURE__ */ new Set();
+    observedDeliverySettlements = /* @__PURE__ */ new Map();
     operationAbortControllers = /* @__PURE__ */ new Map();
     metaWatch = null;
     store = null;
@@ -142572,6 +143065,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
     storeWakeTimer = null;
     started = false;
     materializationClaimToken = randomUUID();
+    workerBootId;
     start() {
       if (this.started) return;
       this.started = true;
@@ -142584,6 +143078,10 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         ]
       });
       this.store = this.storeFactory();
+      const recoveredClaims = this.store.recoverOrphanedDeliveryClaims(this.options.workspaceId, this.workerBootId);
+      if (recoveredClaims > 0) {
+        this.options.logger.warn(`[orchestration] Recovered ${recoveredClaims} orphaned Delivery claim(s) from an exited Worker`);
+      }
       const storePath = this.options.storePath ?? getLodyOperationStorePath(this.options.machineId);
       const storeBasename = path__default.basename(storePath);
       const watchOperationStore = this.options.operationStoreWatchFactory ?? ((directory, onChange) => watch(directory, (_event, filename) => onChange(filename)));
@@ -142609,6 +143107,16 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       this.storeWakeTimer = null;
       if (this.progressRetryTimer) clearTimeout(this.progressRetryTimer);
       this.progressRetryTimer = null;
+      if (this.store) {
+        try {
+          const abandonedClaims = this.store.abandonDeliveryClaimsOwnedBy(this.options.workspaceId, this.workerBootId);
+          if (abandonedClaims > 0) {
+            this.options.logger.warn(`[orchestration] Abandoned ${abandonedClaims} Delivery claim(s) while stopping the workspace coordinator`);
+          }
+        } catch (error2) {
+          this.options.logger.warn(`[orchestration] Could not abandon Delivery claims during coordinator stop: ${error2 instanceof Error ? error2.message : String(error2)}`);
+        }
+      }
       this.store?.close();
       this.store = null;
       for (const subscription of this.targetSubscriptions.values()) {
@@ -142627,7 +143135,8 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       this.reconcileChains.clear();
       this.deliveryChains.clear();
       this.queuedDeliveryIds.clear();
-      this.dirtyDeliveryReasons.clear();
+      this.dirtyDeliveryIds.clear();
+      this.observedDeliverySettlements.clear();
       for (const controller of this.operationAbortControllers.values()) controller.abort();
       this.operationAbortControllers.clear();
     }
@@ -143074,7 +143583,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
     }
     enqueueDelivery(delivery, reason) {
       if (this.queuedDeliveryIds.has(delivery.deliveryId)) {
-        this.dirtyDeliveryReasons.set(delivery.deliveryId, reason);
+        this.dirtyDeliveryIds.add(delivery.deliveryId);
         return;
       }
       this.queuedDeliveryIds.add(delivery.deliveryId);
@@ -143083,29 +143592,28 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       const next2 = previous.catch(() => void 0).then(async () => {
         let attemptReason = reason;
         for (; ; ) {
-          this.dirtyDeliveryReasons.delete(delivery.deliveryId);
+          this.dirtyDeliveryIds.delete(delivery.deliveryId);
           try {
             await this.deliverIfRunnable(delivery, attemptReason);
           } catch (error2) {
             this.options.logger.warn(`[orchestration] Delivery ${delivery.deliveryId} failed: ${error2 instanceof Error ? error2.message : String(error2)}`);
           }
-          const coalescedReason = this.dirtyDeliveryReasons.get(delivery.deliveryId);
-          if (!this.started || !coalescedReason || !this.isDeliveryPending(delivery)) {
+          const retry2 = this.dirtyDeliveryIds.delete(delivery.deliveryId);
+          if (!this.started || !retry2 || !this.isDeliveryPending(delivery)) {
             return;
           }
-          attemptReason = coalescedReason;
+          attemptReason = "coalesced";
         }
       }).catch((error2) => {
         this.options.logger.warn(`[orchestration] Delivery ${delivery.deliveryId} coalesced retry failed: ${error2 instanceof Error ? error2.message : String(error2)}`);
       }).finally(() => {
-        const lateCoalescedReason = this.dirtyDeliveryReasons.get(delivery.deliveryId);
+        const lateRetry = this.dirtyDeliveryIds.delete(delivery.deliveryId);
         this.queuedDeliveryIds.delete(delivery.deliveryId);
-        this.dirtyDeliveryReasons.delete(delivery.deliveryId);
         if (this.deliveryChains.get(sessionId) === next2) {
           this.deliveryChains.delete(sessionId);
         }
-        if (this.started && lateCoalescedReason && this.isDeliveryPending(delivery)) {
-          this.enqueueDelivery(delivery, lateCoalescedReason);
+        if (this.started && lateRetry && this.isDeliveryPending(delivery)) {
+          this.enqueueDelivery(delivery, "coalesced");
         }
       });
       this.deliveryChains.set(sessionId, next2);
@@ -143113,8 +143621,62 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
     isDeliveryPending(delivery) {
       return this.withStore((store) => store.listPendingDeliveries(this.options.workspaceId, delivery.requesterSessionId).some((candidate) => candidate.deliveryId === delivery.deliveryId));
     }
+    async settleObservedDeliveryClaim(delivery, settlement) {
+      const previous = this.observedDeliverySettlements.get(delivery.deliveryId);
+      if (!previous || previous.claimId === settlement.claimId) {
+        this.observedDeliverySettlements.set(delivery.deliveryId, settlement);
+      }
+      if (settlement.outcome === "finalize" && settlement.pendingHistoryWrite) {
+        const current22 = this.withStore((store) => store.getDelivery(delivery.requesterSessionId, delivery.operationId));
+        if (current22.activeClaimWorkerBootId !== this.workerBootId || current22.activeClaimId !== settlement.claimId) {
+          if (this.observedDeliverySettlements.get(delivery.deliveryId) === settlement) {
+            this.observedDeliverySettlements.delete(delivery.deliveryId);
+          }
+          return current22;
+        }
+        await settlement.pendingHistoryWrite();
+        delete settlement.pendingHistoryWrite;
+      }
+      const current2 = this.withStore((store) => {
+        let latest2 = store.getDelivery(delivery.requesterSessionId, delivery.operationId);
+        if (latest2.activeClaimWorkerBootId !== this.workerBootId || latest2.activeClaimId !== settlement.claimId) {
+          return latest2;
+        }
+        if (settlement.outcome === "handled" || settlement.outcome === "cancelled" || settlement.outcome === "finalize") {
+          return store.consumeClaimedDelivery(delivery.requesterSessionId, delivery.operationId, this.workerBootId, settlement.claimId).delivery;
+        }
+        if (settlement.outcome === "uncertain") {
+          store.markClaimedDeliveryExecutionUncertain(delivery.requesterSessionId, delivery.operationId, this.workerBootId, settlement.claimId);
+        } else {
+          store.releaseDeliveryClaim(delivery.requesterSessionId, delivery.operationId, this.workerBootId, settlement.claimId);
+        }
+        latest2 = store.getDelivery(delivery.requesterSessionId, delivery.operationId);
+        return latest2;
+      });
+      if (current2.activeClaimWorkerBootId !== this.workerBootId || current2.activeClaimId !== settlement.claimId) {
+        if (this.observedDeliverySettlements.get(delivery.deliveryId) === settlement) {
+          this.observedDeliverySettlements.delete(delivery.deliveryId);
+        }
+      }
+      return current2;
+    }
     async deliverIfRunnable(delivery, reason) {
       if (!this.started) return;
+      delivery = this.withStore((store) => store.getDelivery(delivery.requesterSessionId, delivery.operationId));
+      if (delivery.state === "consumed") {
+        this.observedDeliverySettlements.delete(delivery.deliveryId);
+        return;
+      }
+      if (delivery.activeClaimId || delivery.activeClaimWorkerBootId) {
+        const settlement = this.observedDeliverySettlements.get(delivery.deliveryId);
+        if (settlement && delivery.activeClaimWorkerBootId === this.workerBootId && delivery.activeClaimId === settlement.claimId) {
+          await this.settleObservedDeliveryClaim(delivery, settlement);
+        } else if (settlement) {
+          this.observedDeliverySettlements.delete(delivery.deliveryId);
+        }
+        return;
+      }
+      this.observedDeliverySettlements.delete(delivery.deliveryId);
       const metaRecord = await this.options.workspaceDocument.repo.getDocMeta(getSessionRoomId(delivery.requesterSessionId));
       if (!metaRecord?.meta || isLoroRepoDocDeleted(metaRecord)) return;
       const meta = metaRecord.meta;
@@ -143122,32 +143684,54 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       const sessionDoc = await this.options.workspaceDocument.getOrCreateSessionDoc(delivery.requesterSessionId);
       this.subscribeTarget(delivery.requesterSessionId, sessionDoc);
       const execution = this.options.executionService.getExecutionSnapshot(delivery.requesterSessionId);
-      const historyBeforeDispatch = await sessionDoc.getHistory();
-      const continuationEvidence = this.getContinuationEvidence(historyBeforeDispatch, delivery.systemTurnId);
-      if (continuationEvidence) {
-        this.consumeDelivery(delivery, reason, continuationEvidence);
-        return;
-      }
       const operation = this.withStore((store) => store.get(delivery.requesterSessionId, delivery.operationId));
       if (this.now() >= Date.parse(operation.deadlineAt) + DELIVERY_EXPIRY_GRACE_MS) {
-        this.consumeDelivery(delivery, reason, "expired_stale");
+        await this.finalizeDeliveryWithoutExecution(sessionDoc, operation, delivery, reason, "expired_stale", void 0, false, delivery.executionPhase === "uncertain" ? "uncertain" : "ready");
+        return;
+      }
+      if (delivery.executionPhase === "uncertain") {
+        await this.failUncertainDelivery(sessionDoc, operation, delivery, reason);
         return;
       }
       if (execution.hasActiveTurn) return;
       if (this.options.dispatchWatcher.hasPendingDispatch(delivery.requesterSessionId)) return;
+      if (delivery.attemptCount >= DELIVERY_MAX_ATTEMPTS) {
+        await this.failExhaustedDelivery(sessionDoc, operation, delivery, reason);
+        return;
+      }
       const configuration = await this.resolveFrozenConfiguration(operation, delivery, reason);
       if (configuration === "unknown") {
         this.armConfigurationRetry(delivery.requesterSessionId);
         return;
       }
       if (configuration === "unavailable") {
-        await this.writeCompletionTurn(sessionDoc, operation, delivery, false);
-        this.consumeDelivery(delivery, reason, "configuration_unavailable");
+        await this.finalizeDeliveryWithoutExecution(sessionDoc, operation, delivery, reason, "configuration_unavailable", {
+          code: "CONFIGURATION_UNAVAILABLE",
+          message: "The frozen continuation agent configuration is no longer available."
+        });
         return;
       }
       const frozen = operation.frozenContinuationConfig.inputConfig;
       const requester = await this.resolveRequesterIdentity(operation.requesterUserId);
-      await this.options.executionService.continueSession({
+      const attemptId = randomUUID();
+      let observedSettlement;
+      const settleResidualClaim = () => observedSettlement ? this.settleObservedDeliveryClaim(delivery, {
+        claimId: attemptId,
+        outcome: observedSettlement
+      }) : this.withStore((store) => {
+        let current2 = store.getDelivery(delivery.requesterSessionId, delivery.operationId);
+        if (current2.activeClaimWorkerBootId !== this.workerBootId || current2.activeClaimId !== attemptId) {
+          return current2;
+        }
+        if (current2.executionPhase === "started") {
+          store.markClaimedDeliveryExecutionUncertain(delivery.requesterSessionId, delivery.operationId, this.workerBootId, attemptId);
+        } else {
+          store.releaseDeliveryClaim(delivery.requesterSessionId, delivery.operationId, this.workerBootId, attemptId);
+        }
+        current2 = store.getDelivery(delivery.requesterSessionId, delivery.operationId);
+        return current2;
+      });
+      const continuation = this.options.executionService.continueSession({
         type: "session/chat",
         sessionId: delivery.requesterSessionId,
         machineId: this.options.machineId,
@@ -143183,18 +143767,97 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       }, {
         dispatchSource: "delivery",
         onTurnClaimed: async () => {
-          await this.writeCompletionTurn(sessionDoc, operation, delivery, true);
+          if (!this.started) return false;
+          const claim = this.withStore((store) => store.claimDeliveryExecution(delivery.requesterSessionId, delivery.operationId, {
+            claimId: attemptId,
+            workerBootId: this.workerBootId
+          }));
+          if (claim.status !== "claimed") {
+            this.options.logger.debug(`[orchestration] Delivery ${delivery.deliveryId} claim lost status=${claim.status}`);
+            return false;
+          }
+          try {
+            await this.writeCompletionTurn(sessionDoc, operation, delivery);
+            const prepared = this.withStore((store) => store.prepareClaimedDeliveryExecution(delivery.requesterSessionId, delivery.operationId, this.workerBootId, attemptId));
+            if (!prepared.prepared) {
+              this.withStore((store) => store.releaseDeliveryClaim(delivery.requesterSessionId, delivery.operationId, this.workerBootId, attemptId));
+              this.options.logger.debug(`[orchestration] Delivery ${delivery.deliveryId} execution start lost its claim`);
+              return false;
+            }
+          } catch (error2) {
+            this.withStore((store) => store.releaseDeliveryClaim(delivery.requesterSessionId, delivery.operationId, this.workerBootId, attemptId));
+            throw error2;
+          }
+          return true;
+        },
+        onTurnStarted: async () => this.withStore((store) => store.markClaimedDeliveryExecutionStarted(delivery.requesterSessionId, delivery.operationId, this.workerBootId, attemptId)),
+        onTurnSettled: async (outcome) => {
+          observedSettlement = outcome;
+          const settled = await this.settleObservedDeliveryClaim(delivery, {
+            claimId: attemptId,
+            outcome
+          });
+          if (outcome === "handled" || outcome === "cancelled") {
+            this.options.logger.debug(`[orchestration] Delivery ${delivery.deliveryId} consumed=${String(settled.state === "consumed")}`);
+          }
         }
       });
-      const historyAfterExecution = await sessionDoc.getHistory();
-      const evidenceAfterExecution = this.getContinuationEvidence(historyAfterExecution, delivery.systemTurnId);
-      if (evidenceAfterExecution) {
-        this.consumeDelivery(delivery, reason, evidenceAfterExecution);
+      try {
+        await continuation;
+      } catch (error2) {
+        const afterInterruption = await settleResidualClaim();
+        if (afterInterruption.executionPhase === "uncertain") {
+          await this.failUncertainDelivery(sessionDoc, operation, afterInterruption, reason);
+        }
+        if (afterInterruption.state === "pending" && !afterInterruption.activeClaimId && afterInterruption.attemptCount >= DELIVERY_MAX_ATTEMPTS) {
+          await this.failExhaustedDelivery(sessionDoc, operation, afterInterruption, reason);
+        }
+        throw error2;
+      }
+      const afterExecution = await settleResidualClaim();
+      if (afterExecution.executionPhase === "uncertain") {
+        await this.failUncertainDelivery(sessionDoc, operation, afterExecution, reason);
+        return;
       }
+      if (afterExecution.state === "pending" && !afterExecution.activeClaimId && afterExecution.attemptCount >= DELIVERY_MAX_ATTEMPTS) {
+        await this.failExhaustedDelivery(sessionDoc, operation, afterExecution, reason);
+      }
+    }
+    async failExhaustedDelivery(sessionDoc, operation, delivery, wakeReason) {
+      await this.finalizeDeliveryWithoutExecution(sessionDoc, operation, delivery, wakeReason, "attempts_exhausted", {
+        code: "DELIVERY_ATTEMPTS_EXHAUSTED",
+        message: "The completion continuation did not settle after two delivery attempts."
+      }, true);
+    }
+    async failUncertainDelivery(sessionDoc, operation, delivery, wakeReason) {
+      await this.finalizeDeliveryWithoutExecution(sessionDoc, operation, delivery, wakeReason, "execution_uncertain", {
+        status: "uncertain",
+        code: "DELIVERY_EXECUTION_UNCERTAIN",
+        message: "The completion continuation may have started before execution was interrupted. It was not replayed; review the session output and continue manually if needed."
+      }, false, "uncertain");
     }
-    consumeDelivery(delivery, wakeReason, evidence) {
+    async finalizeDeliveryWithoutExecution(sessionDoc, operation, delivery, wakeReason, evidence, continuationFailure, requireAttemptsExhausted = false, requiredExecutionPhase = "ready") {
+      if (!this.started) return;
       const startedAt = performance$2.now();
-      this.withStore((store) => store.consumeDelivery(delivery.requesterSessionId, delivery.operationId));
+      const claimId = randomUUID();
+      const claim = this.withStore((store) => store.claimDeliveryFinalization(delivery.requesterSessionId, delivery.operationId, {
+        claimId,
+        workerBootId: this.workerBootId,
+        requireAttemptsExhausted,
+        requiredExecutionPhase
+      }));
+      if (claim.status !== "claimed") {
+        this.options.logger.debug(`[orchestration] Delivery ${delivery.deliveryId} finalization skipped status=${claim.status} reason=${evidence} wake=${wakeReason}`);
+        return;
+      }
+      const settled = await this.settleObservedDeliveryClaim(delivery, {
+        claimId,
+        outcome: "finalize",
+        ...continuationFailure ? {
+          pendingHistoryWrite: () => this.writeCompletionTurn(sessionDoc, operation, delivery, continuationFailure)
+        } : {}
+      });
+      if (settled.state !== "consumed") return;
       const timer2 = this.configurationTimers.get(delivery.requesterSessionId);
       if (timer2) clearTimeout(timer2);
       this.configurationTimers.delete(delivery.requesterSessionId);
@@ -143248,50 +143911,83 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       timer2.unref?.();
       this.configurationTimers.set(sessionId, timer2);
     }
-    async writeCompletionTurn(sessionDoc, operation, delivery, configAvailable) {
+    async writeCompletionTurn(sessionDoc, operation, delivery, continuationFailure) {
       if (!operation.completion) {
         throw new Error(`Finished Operation ${operation.operationId} has no completion.`);
       }
-      const progressMessageId = this.findProgressMessageId(await sessionDoc.getHistory(), operation);
-      const item = {
-        type: "operation_completion",
-        deliveryId: delivery.deliveryId,
-        operationId: operation.operationId,
-        operationKind: operation.kind,
-        ...progressMessageId ? {
-          progressMessageId
-        } : {},
-        completion: operation.completion,
-        ...!configAvailable ? {
-          continuation: {
-            status: "not_started",
-            reason: {
-              code: "CONFIGURATION_UNAVAILABLE",
-              message: "The frozen continuation agent configuration is no longer available."
+      const completion = operation.completion;
+      const buildTurn = (progressMessageId) => {
+        const item = {
+          type: "operation_completion",
+          deliveryId: delivery.deliveryId,
+          operationId: operation.operationId,
+          operationKind: operation.kind,
+          ...progressMessageId ? {
+            progressMessageId
+          } : {},
+          completion,
+          ...continuationFailure ? {
+            continuation: {
+              status: continuationFailure.status ?? "not_started",
+              reason: {
+                code: continuationFailure.code,
+                message: continuationFailure.message
+              }
             }
+          } : {}
+        };
+        return {
+          id: delivery.systemTurnId,
+          role: "system",
+          userId: operation.requesterUserId,
+          timestamp: new Date(this.now()).toISOString(),
+          items: [
+            item
+          ],
+          fileDiff: [],
+          finished: true,
+          inputConfig: {
+            ...operation.frozenContinuationConfig.inputConfig,
+            prompt: completionText(operation),
+            chainDepth: operation.initiatorChainDepth + 1
           }
-        } : {}
-      };
-      const turn = {
-        id: delivery.systemTurnId,
-        role: "system",
-        userId: operation.requesterUserId,
-        timestamp: new Date(this.now()).toISOString(),
-        items: [
-          item
-        ],
-        fileDiff: [],
-        finished: true,
-        inputConfig: {
-          ...operation.frozenContinuationConfig.inputConfig,
-          prompt: completionText(operation),
-          chainDepth: operation.initiatorChainDepth + 1
-        }
+        };
       };
-      await sessionDoc.updateHistory((history) => history.some((entry) => entry.id === delivery.systemTurnId) ? history : [
-        ...history,
-        turn
-      ]);
+      await sessionDoc.updateHistory((history) => {
+        const progressMessageId = this.findProgressMessageId(history, operation);
+        const existing = history.find((entry) => entry.id === delivery.systemTurnId);
+        if (!existing) return [
+          ...history,
+          buildTurn(progressMessageId)
+        ];
+        if (existing.role !== "system") return history;
+        return history.map((entry) => entry.id !== delivery.systemTurnId ? entry : {
+          ...entry,
+          items: entry.items?.map((existingItem) => {
+            if (existingItem.type !== "operation_completion" || existingItem.deliveryId !== delivery.deliveryId) {
+              return existingItem;
+            }
+            const linkedItem = progressMessageId ? {
+              ...existingItem,
+              progressMessageId
+            } : existingItem;
+            if (continuationFailure) {
+              return {
+                ...linkedItem,
+                continuation: {
+                  status: continuationFailure.status ?? "not_started",
+                  reason: {
+                    code: continuationFailure.code,
+                    message: continuationFailure.message
+                  }
+                }
+              };
+            }
+            const { continuation: _continuation, ...withoutContinuation } = linkedItem;
+            return withoutContinuation;
+          })
+        });
+      });
     }
     findProgressMessageId(history, operation) {
       if (operation.kind !== "session_create" && operation.kind !== "session_create_many") {
@@ -143312,20 +144008,6 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       ].every((item) => item.status === "succeeded" ? covered.get(getOperationProgressTargetKey(item.target)) === "succeeded" : item.status === "active" && item.inputDurable ? covered.has(getOperationProgressTargetKey(item.target)) : true);
       return complete2 ? progressMessageId : void 0;
     }
-    getContinuationEvidence(history, systemTurnId) {
-      const index = history.findIndex((entry) => entry.id === systemTurnId && entry.role === "system");
-      if (index < 0) return null;
-      const completionWasUnavailable = history[index]?.items?.some((item) => item.type === "operation_completion" && item.continuation?.status === "not_started" && item.continuation.reason.code === "CONFIGURATION_UNAVAILABLE");
-      if (completionWasUnavailable) return "configuration_unavailable";
-      for (const entry of history.slice(index + 1)) {
-        if (entry.role === "assistant") return "assistant_history";
-        if (entry.role === "user") return null;
-        if (entry.role === "system" && entry.items?.some((item) => item.type === "system_notice" && item.name === "chat_failed")) {
-          return "chat_failed";
-        }
-      }
-      return null;
-    }
   }
   const version = "1.33.0";
   var lookup = [];
@@ -222954,7 +223636,7 @@ ${page}${helpTipBottom}${choiceDescription}${ansiEscapes.cursorHide}`;
       data = createReviewBundleSnapshot(bundle);
     }
     const { injectReviewSnapshot } = await import("./chunks/index-VoI6Ds2-.js");
-    const { resolveReviewViewerTemplate } = await import("./chunks/review-viewer-CEr3NCEE.js").then(async (m) => {
+    const { resolveReviewViewerTemplate } = await import("./chunks/review-viewer-DqtXyKjy.js").then(async (m) => {
       await m.__tla;
       return m;
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lody",
-  "version": "0.92.0",
+  "version": "0.92.1",
   "description": "Lody Agent CLI tool for managing remote command execution",
   "type": "module",
   "main": "dist/index.js",