@autopilot-harness/cli 0.2.5 → 0.2.7

package/dist/assets/vendor/runtime.mjs

@@ -500,7 +500,7 @@ function evaluateVerifyReport(options) {
   return { outcome: "pass" };
 }
 function hasNoCodeCompletionEvidence(options) {
-  const { reportPath, currentItemId, projectRoot } = options;
+  const { reportPath, currentItemId, projectRoot, notBefore } = options;
   if (!currentItemId || typeof currentItemId !== "string") return false;
   let root;
   if (projectRoot !== void 0 && projectRoot !== null) {
@@ -528,8 +528,44 @@ function hasNoCodeCompletionEvidence(options) {
   }
   const ok = report.ok;
   if (ok === false) return false;
+  const notBeforeRaw = typeof notBefore === "string" && notBefore.trim() && !notBefore.includes("\0") ? notBefore.trim() : null;
+  if (notBeforeRaw) {
+    const floor = Date.parse(notBeforeRaw);
+    if (Number.isNaN(floor)) return false;
+    const rawAt = report.at;
+    if (rawAt !== void 0 && rawAt !== null) {
+      const atMs = parseEvidenceAtMs(rawAt);
+      if (Number.isNaN(atMs) || atMs < floor) {
+        return false;
+      }
+    }
+  }
   return true;
 }
+function parseEvidenceAtMs(rawAt) {
+  let atMs = NaN;
+  if (typeof rawAt === "number" && Number.isFinite(rawAt)) {
+    atMs = rawAt;
+  } else if (typeof rawAt === "string" && rawAt.trim() && !rawAt.includes("\0")) {
+    const trimmed = rawAt.trim();
+    if (/^[+-]?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(trimmed)) {
+      const n = Number(trimmed);
+      if (Number.isFinite(n)) atMs = n;
+    } else {
+      atMs = Date.parse(trimmed);
+    }
+  }
+  if (!Number.isNaN(atMs) && atMs >= 0) {
+    const whole = Math.trunc(atMs);
+    if (Math.abs(atMs - whole) < 1e-9) {
+      const digits = String(Math.abs(whole)).length;
+      if (digits >= 1 && digits <= 10) {
+        atMs = whole * 1e3;
+      }
+    }
+  }
+  return atMs;
+}
 function defaultVerifyReportPath(projectRoot) {
   const root = normalizeProjectRoot(projectRoot) ?? "";
   return path2.join(root, ".autopilot", "verify-last.json");
@@ -1123,9 +1159,10 @@ var StateStore = class _StateStore {
     ).run(nowIso(), conversationId);
   }
   /**
-   * Column-only redeliver hold (recover claim sleep). Also clears chain_pending so
-   * armChain=false recover cannot leave a phantom E3 arm. Avoids updateReviewChain
-   * read-merge-write clobbering confirm_left / pending under concurrency.
+   * Column-only redeliver hold (recover claim sleep). Does not touch
+   * chain_pending — callers that need disarm (executing / ambient non-resumeFix)
+   * clearChainPending before this. Mid-fix ambient resumeFix keeps
+   * chain_pending for abort wasArmed handoff.
    */
   setPendingRedeliverHold(conversationId, at) {
     if (this.isInvalidConversationId(conversationId)) {
@@ -1137,7 +1174,7 @@ var StateStore = class _StateStore {
     }
     this.db.prepare(
       `UPDATE review_chains SET
-          pending_redeliver_at = ?, chain_pending = 0, updated_at = ?
+          pending_redeliver_at = ?, updated_at = ?
          WHERE conversation_id = ?`
     ).run(stamp, nowIso(), conversationId);
   }
@@ -1336,7 +1373,7 @@ var StateStore = class _StateStore {
    * Column-only: neutralize fix/confirm/pending re-entry without ensure/session.
    * Used when pause-threshold upsert failed but the session is still armed — a
    * later completed stop must not resume the review loop via code_edited/pending
-   * or loopCount>0→E3 (fix_round cleared so bare loopCount cannot re-arm).
+   * or checklist executing fix_round>0→E3 (fix_round cleared here).
    */
   neutralizeReviewChain(conversationId) {
     if (this.isInvalidConversationId(conversationId)) {
@@ -1419,7 +1456,8 @@ var StateStore = class _StateStore {
   }
   /**
    * Column-only pause/disarm when the full upsertSession pause write failed.
-   * Without this, loopCount>0 completed stops can still hit E3 while armed.
+   * Without this, checklist executing completed stops can still hit E3 via
+   * fix_round>0 / chain_pending while the session looks armed.
    */
   pauseSessionForRepeatedErrors(conversationId, errorCount, lastError) {
     if (this.isInvalidConversationId(conversationId)) {
@@ -2436,11 +2474,16 @@ var ReviewEngine = class {
       const transcriptPath = input.transcriptPath?.trim() || void 0;
       const events = transcriptPath ? readTranscriptTail(transcriptPath) : [];
       if (chain.code_edited === 1) {
-        return this.e2Fix(session, chain);
+        const tip = chain.pending_followup?.trim() ?? "";
+        if (!isRecoverOrStuckFollowupMessage(tip)) {
+          const fix = this.e2Fix(session, chain);
+          if (fix) return fix;
+        }
       }
+      const chainLive = this.store.getReviewChain(session.conversation_id) ?? chain;
       const redelivered = this.tryRedeliverPending(
         session.conversation_id,
-        chain,
+        chainLive,
         events,
         transcriptPath
       );
@@ -2450,23 +2493,112 @@ var ReviewEngine = class {
       }
       if (this.pendingBlocksAdvance(
         session.conversation_id,
-        chain,
+        chainLive,
         events,
         transcriptPath
       )) {
         return null;
       }
-      if (chain.confirm_left !== null && chain.confirm_left > 0) {
-        return this.e4Confirm(session, chain);
+      const chainAfterPending = this.store.getReviewChain(session.conversation_id) ?? chainLive;
+      {
+        const liveTip = chainAfterPending.pending_followup?.trim() ?? "";
+        if (isRecoverOrStuckFollowupMessage(liveTip)) {
+          return null;
+        }
+      }
+      if (chainAfterPending.code_edited === 1) {
+        const tip = chainAfterPending.pending_followup?.trim() ?? "";
+        if (!isRecoverOrStuckFollowupMessage(tip)) {
+          const fix = this.e2Fix(session, chainAfterPending);
+          if (fix) return fix;
+          const afterE2 = this.store.getReviewChain(session.conversation_id) ?? chainAfterPending;
+          const afterTip = afterE2.pending_followup?.trim() ?? "";
+          if (isRecoverOrStuckFollowupMessage(afterTip)) {
+            const again = this.tryRedeliverPending(
+              session.conversation_id,
+              afterE2,
+              events,
+              transcriptPath
+            );
+            if (again) return again;
+            return null;
+          }
+        }
+      }
+      if (chainAfterPending.confirm_left !== null && chainAfterPending.confirm_left > 0) {
+        return this.e4Confirm(session, chainAfterPending);
+      }
+      if (chainAfterPending.confirm_left === 0 || chainAfterPending.item_confirm_complete === 1 && chainAfterPending.confirm_left === null) {
+        return this.e5Gate(session, chainAfterPending);
+      }
+      if (chainAfterPending.chain_pending === 0 && chainAfterPending.fix_round > 0 && chainAfterPending.code_edited === 0 && chainAfterPending.item_confirm_complete === 0 && isChecklistExecuting(session)) {
+        const cid2 = session.conversation_id;
+        const rearmed = this.store.exclusiveWrite(() => {
+          if (!this.sessionRunnable(cid2)) {
+            return { commit: false, value: false };
+          }
+          const fresh = this.store.getReviewChain(cid2);
+          if (!fresh || fresh.code_edited === 1 || fresh.confirm_left !== null || fresh.item_confirm_complete === 1 || fresh.chain_pending === 1 || fresh.fix_round <= 0 || isRecoverOrStuckFollowupMessage(
+            fresh.pending_followup?.trim() ?? ""
+          )) {
+            return { commit: false, value: false };
+          }
+          this.store.updateReviewChain(cid2, { code_edited: 1 });
+          return { commit: true, value: true };
+        });
+        if (rearmed) {
+          const live = this.store.getReviewChain(cid2);
+          if (live?.code_edited === 1) {
+            const fix = this.e2Fix(session, live);
+            if (fix) return fix;
+            const afterE2 = this.store.getReviewChain(cid2) ?? live;
+            const afterTip = afterE2.pending_followup?.trim() ?? "";
+            if (isRecoverOrStuckFollowupMessage(afterTip)) {
+              const again = this.tryRedeliverPending(
+                cid2,
+                afterE2,
+                events,
+                transcriptPath
+              );
+              if (again) return again;
+              return null;
+            }
+          }
+        }
       }
-      if (chain.confirm_left === 0 || chain.item_confirm_complete === 1 && chain.confirm_left === null) {
-        return this.e5Gate(session, chain);
+      const chainNow = this.store.getReviewChain(input.conversationId) ?? chain;
+      if (chainNow.code_edited === 1) {
+        const tip = chainNow.pending_followup?.trim() ?? "";
+        if (isRecoverOrStuckFollowupMessage(tip)) {
+          const again = this.tryRedeliverPending(
+            session.conversation_id,
+            chainNow,
+            events,
+            transcriptPath
+          );
+          if (again) return again;
+          return null;
+        }
+        const fix = this.e2Fix(session, chainNow);
+        if (fix) return fix;
+        const afterE2 = this.store.getReviewChain(session.conversation_id) ?? chainNow;
+        const afterTip = afterE2.pending_followup?.trim() ?? "";
+        if (isRecoverOrStuckFollowupMessage(afterTip)) {
+          const again = this.tryRedeliverPending(
+            session.conversation_id,
+            afterE2,
+            events,
+            transcriptPath
+          );
+          if (again) return again;
+          return null;
+        }
       }
-      const inChain = chain.chain_pending === 1 || input.loopCount > 0 && chain.fix_round > 0 && isChecklistExecuting(session);
-      if (chain.confirm_left === null && chain.item_confirm_complete === 0 && inChain) {
-        return this.e3ArmConfirm(session, chain);
+      const inChain = chainNow.chain_pending === 1 || chainNow.fix_round > 0 && isChecklistExecuting(session);
+      if (chainNow.confirm_left === null && chainNow.item_confirm_complete === 0 && inChain) {
+        return this.e3ArmConfirm(session, chainNow);
       }
-      return this.e0NoCodeContinue(session, chain);
+      return this.e0NoCodeContinue(session, chainNow);
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       if (msg.includes("No session for conversation") || msg.includes("Invalid conversation id")) {
@@ -2479,18 +2611,16 @@ var ReviewEngine = class {
     const pending = chain.pending_followup?.trim();
     if (!pending) return false;
     if (events.length > 0 && automationFollowupPresent(events, pending)) {
-      try {
-        const cleared = this.store.clearPendingFollowupIf(
-          conversationId,
-          (m) => m.trim() === pending
-        );
-        if (!cleared) {
+      const cleared = this.clearMatchingPendingAndArmAmbient(
+        conversationId,
+        pending
+      );
+      if (!cleared) {
+        try {
           const live = this.store.getReviewChain(conversationId)?.pending_followup?.trim() ?? "";
-          if (live && !(events.length > 0 && automationFollowupPresent(events, live))) {
-            return true;
-          }
+          if (live) return true;
+        } catch {
         }
-      } catch {
       }
       return false;
     }
@@ -2498,17 +2628,23 @@ var ReviewEngine = class {
     return true;
   }
   tryRedeliverPending(conversationId, chain, events, transcriptPath) {
-    const pending = chain.pending_followup?.trim();
+    let pending = chain.pending_followup?.trim() ?? "";
+    if (!pending) {
+      try {
+        pending = this.store.getReviewChain(conversationId)?.pending_followup?.trim() ?? "";
+      } catch {
+        pending = "";
+      }
+    }
     if (!pending) return null;
     if (!transcriptPath) return null;
     if (events.length > 0 && automationFollowupPresent(events, pending)) {
-      try {
-        const cleared = this.store.clearPendingFollowupIf(
-          conversationId,
-          (m) => m.trim() === pending
-        );
-        if (cleared) return null;
-      } catch {
+      const cleared = this.clearMatchingPendingAndArmAmbient(
+        conversationId,
+        pending
+      );
+      if (cleared) {
+        return null;
       }
     }
     if (events.length > 0 && followupInFlight(events)) {
@@ -2528,10 +2664,16 @@ var ReviewEngine = class {
           return { commit: false, value: null };
         }
         if (events.length > 0 && automationFollowupPresent(events, livePending)) {
-          this.store.clearPendingFollowupIf(
+          const cleared = this.store.clearPendingFollowupIf(
             conversationId,
             (m) => m.trim() === livePending
           );
+          if (cleared) {
+            this.armAmbientChainAfterDeliveredFixTip(
+              conversationId,
+              livePending
+            );
+          }
           return { commit: true, value: null };
         }
         try {
@@ -2546,10 +2688,13 @@ var ReviewEngine = class {
           return { commit: true, value: null };
         }
         if (events.length > 0 && automationFollowupPresent(events, after)) {
-          this.store.clearPendingFollowupIf(
+          const cleared = this.store.clearPendingFollowupIf(
             conversationId,
             (m) => m.trim() === after
           );
+          if (cleared) {
+            this.armAmbientChainAfterDeliveredFixTip(conversationId, after);
+          }
           return { commit: true, value: null };
         }
         return {
@@ -2604,15 +2749,45 @@ var ReviewEngine = class {
    * Clear sticky code_edited so Stop→revert→resend cannot open a phantom fix
    * chain on the next completed stop (disk may already be clean).
    * Leave fix/confirm pending alone (delivery retry still valid if inject raced).
-   * Both clears share one exclusiveWrite so a mid-abort failure cannot leave
+   *
+   * Project-scope ambient/planning: after recover soft-reset cleared
+   * chain_pending, sticky code_edited may be the only handoff marker. Clearing
+   * it without a freeze leaves fix_round residue that cannot E3 (bare fix_round
+   * must not phantom-confirm). Freeze into confirm_left, or re-arm chain_pending
+   * when an undelivered fix tip remains. Checklist executing keeps residue-E2.
+   *
+   * Clears + freeze share one exclusiveWrite so a mid-abort failure cannot leave
    * recover gone while code_edited sticky (or the reverse).
    */
   handleAbortedStop(session) {
     try {
       const cid2 = session.conversation_id;
+      const ambientFreeze = this.config.reviewScope === "project" && !isChecklistExecuting(session);
       this.store.exclusiveWrite(() => {
         this.store.clearPendingFollowupIf(cid2, isRecoverOrStuckFollowupMessage);
+        const chain = this.store.getReviewChain(cid2);
+        const pending = chain?.pending_followup?.trim() ?? "";
+        const fixPending = this.isFixFollowupMessage(pending);
+        const mid = this.isMidConfirmOrE5(chain);
+        const fixRound = chain?.fix_round ?? 0;
+        const wasArmed = chain?.chain_pending === 1;
         this.store.clearCodeEdited(cid2);
+        if (ambientFreeze && !mid && fixRound > 0) {
+          if (fixPending) {
+            this.store.updateReviewChain(cid2, { chain_pending: 1 });
+          } else if (!pending && wasArmed) {
+            const rounds = this.config.confirmRounds;
+            if (rounds > 0) {
+              this.store.updateReviewChain(cid2, {
+                confirm_left: rounds,
+                chain_pending: 0,
+                code_edited: 0
+              });
+            } else {
+              this.store.updateReviewChain(cid2, { chain_pending: 1 });
+            }
+          }
+        }
         return { commit: true, value: void 0 };
       });
     } catch {
@@ -2798,7 +2973,10 @@ var ReviewEngine = class {
           if (!stamp2) {
             return { commit: false, value: { role: "failed" } };
           }
-          this.store.clearChainPending(conversationId);
+          const liveRedeliver = this.store.getReviewChain(conversationId);
+          if (liveRedeliver?.code_edited !== 1) {
+            this.store.clearChainPending(conversationId);
+          }
           this.armRecoverClaimRedeliverHold(conversationId, debounceMs);
           return {
             commit: true,
@@ -2809,13 +2987,15 @@ var ReviewEngine = class {
           this.applySoftResetAmbientChainForErrorRecover(conversationId);
           const live = this.store.getReviewChain(conversationId);
           if (fixTipAtClaim && live && !this.isMidConfirmOrE5(live)) {
-            this.store.updateReviewChain(conversationId, { code_edited: 1 });
+            this.store.updateReviewChain(conversationId, {
+              code_edited: 1,
+              chain_pending: 1
+            });
           }
         } else {
-          const resumeFix = !this.isMidConfirmOrE5(chain) && (this.isFixFollowupMessage(pending) || chain?.code_edited === 1 || fixTipAtClaim);
-          if (resumeFix) {
-            this.store.updateReviewChain(conversationId, { code_edited: 1 });
-          }
+          this.applyExecutingErrorRecoverChainAdjustments(conversationId, {
+            fixTipAtClaim
+          });
         }
         this.store.savePendingFollowup(conversationId, message, {
           armChain: false
@@ -2824,7 +3004,14 @@ var ReviewEngine = class {
         if (!stamp) {
           return { commit: false, value: { role: "failed" } };
         }
-        this.store.clearChainPending(conversationId);
+        if (!ambient) {
+          this.store.clearChainPending(conversationId);
+        } else {
+          const liveAfter = this.store.getReviewChain(conversationId);
+          if (liveAfter?.code_edited !== 1) {
+            this.store.clearChainPending(conversationId);
+          }
+        }
         this.armRecoverClaimRedeliverHold(conversationId, debounceMs);
         return {
           commit: true,
@@ -2999,7 +3186,10 @@ var ReviewEngine = class {
         if (!this.store.casBumpPendingFollowupAt(conversationId, expectedStamp)) {
           return { commit: false, value: null };
         }
-        this.store.clearChainPending(conversationId);
+        const afterBump = this.store.getReviewChain(conversationId);
+        if (afterBump?.code_edited !== 1) {
+          this.store.clearChainPending(conversationId);
+        }
         return {
           commit: true,
           value: {
@@ -3118,29 +3308,39 @@ var ReviewEngine = class {
    */
   emitRecoverAfterFailedClaim(conversationId, action, opts) {
     const ambientSoftReset = opts?.ambientSoftReset === true;
-    try {
-      return this.store.exclusiveWrite(() => {
-        const session = this.store.getSession(conversationId);
-        if (!session || !this.sessionErrorRecoverable(session)) {
-          return { commit: false, value: null };
-        }
-        const pending = this.store.getReviewChain(conversationId)?.pending_followup?.trim() ?? "";
-        if (isRecoverFollowupMessage(pending)) {
-          return { commit: false, value: null };
-        }
-        if (ambientSoftReset) {
-          this.applySoftResetAmbientChainForErrorRecover(conversationId);
-        }
-        this.store.savePendingFollowup(conversationId, action.message, {
-          armChain: false
-        });
-        const live = this.store.getReviewChain(conversationId)?.pending_followup?.trim() ?? "";
-        if (!isRecoverFollowupMessage(live)) {
-          return { commit: false, value: null };
-        }
-        this.store.clearChainPending(conversationId);
-        return { commit: true, value: action };
+    const writeRecover = () => this.store.exclusiveWrite(() => {
+      const session = this.store.getSession(conversationId);
+      if (!session || !this.sessionErrorRecoverable(session)) {
+        return { commit: false, value: null };
+      }
+      const pending = this.store.getReviewChain(conversationId)?.pending_followup?.trim() ?? "";
+      if (isRecoverFollowupMessage(pending)) {
+        return { commit: false, value: null };
+      }
+      if (ambientSoftReset) {
+        this.applySoftResetAmbientChainForErrorRecover(conversationId);
+      } else {
+        this.applyExecutingErrorRecoverChainAdjustments(conversationId);
+      }
+      this.store.savePendingFollowup(conversationId, action.message, {
+        armChain: false
       });
+      const live = this.store.getReviewChain(conversationId)?.pending_followup?.trim() ?? "";
+      if (!isRecoverFollowupMessage(live)) {
+        return { commit: false, value: null };
+      }
+      if (!ambientSoftReset) {
+        this.store.clearChainPending(conversationId);
+      } else {
+        const liveChain = this.store.getReviewChain(conversationId);
+        if (liveChain?.code_edited !== 1) {
+          this.store.clearChainPending(conversationId);
+        }
+      }
+      return { commit: true, value: action };
+    });
+    try {
+      return writeRecover();
     } catch {
       if (!this.sessionStillErrorRecoverable(conversationId)) {
         return null;
@@ -3152,9 +3352,40 @@ var ReviewEngine = class {
         }
       } catch {
       }
+      try {
+        return writeRecover();
+      } catch {
+      }
+      try {
+        return this.store.exclusiveWrite(() => {
+          if (!this.sessionStillErrorRecoverable(conversationId)) {
+            return { commit: false, value: null };
+          }
+          const pending = this.store.getReviewChain(conversationId)?.pending_followup?.trim() ?? "";
+          if (isRecoverFollowupMessage(pending)) {
+            return { commit: false, value: null };
+          }
+          this.store.savePendingFollowup(conversationId, action.message, {
+            armChain: false
+          });
+          const live = this.store.getReviewChain(conversationId)?.pending_followup?.trim() ?? "";
+          if (!isRecoverFollowupMessage(live)) {
+            return { commit: false, value: null };
+          }
+          const liveChain = this.store.getReviewChain(conversationId);
+          if (liveChain?.code_edited !== 1) {
+            this.store.clearChainPending(conversationId);
+          }
+          return { commit: true, value: action };
+        });
+      } catch {
+      }
       this.emit(conversationId, action);
       try {
-        this.store.clearChainPending(conversationId);
+        const liveChain = this.store.getReviewChain(conversationId);
+        if (liveChain?.code_edited !== 1) {
+          this.store.clearChainPending(conversationId);
+        }
       } catch {
       }
       try {
@@ -3197,6 +3428,37 @@ var ReviewEngine = class {
       return "failed";
     }
   }
+  /**
+   * Executing error-recover chain adjust (call under exclusiveWrite, before
+   * savePendingFollowup + clearChainPending). Mirrors ambient readyForE3 /
+   * resumeFix without soft-resetting mid-confirm/E5.
+   *
+   * Ready-for-E3 (delivered fix, chain_pending only, empty pending) arms
+   * confirm_left=confirmRounds so post-recover continues E4 — not another E2
+   * solely from fix_round>0. Mid-fix residue still forces code_edited.
+   */
+  applyExecutingErrorRecoverChainAdjustments(conversationId, opts) {
+    this.store.ensureReviewChain(conversationId);
+    const chain = this.store.getReviewChain(conversationId);
+    if (!chain) return;
+    if (isRecoverFollowupMessage(chain.pending_followup?.trim() ?? "")) {
+      return;
+    }
+    const pending = chain.pending_followup?.trim() ?? "";
+    const readyForE3 = !this.isMidConfirmOrE5(chain) && chain.chain_pending === 1 && chain.code_edited === 0 && pending.length === 0;
+    const rounds = this.config.confirmRounds;
+    if (readyForE3 && rounds > 0) {
+      this.store.updateReviewChain(conversationId, {
+        confirm_left: rounds,
+        code_edited: 0
+      });
+      return;
+    }
+    const resumeFix = !this.isMidConfirmOrE5(chain) && (this.isFixFollowupMessage(pending) || chain.code_edited === 1 || opts?.fixTipAtClaim === true || chain.fix_round > 0);
+    if (resumeFix) {
+      this.store.updateReviewChain(conversationId, { code_edited: 1 });
+    }
+  }
   /**
    * Ambient/planning error recover: drop confirm/pending arming so recover
    * (armChain=false) cannot leave chain_pending=1 → phantom E3.
@@ -3211,7 +3473,8 @@ var ReviewEngine = class {
    * do not regress to another fix. Ready-for-E3 requires empty pending (not
    * merely !fixPending). Force code_edited only for an active fix
    * (code_edited / undelivered fix pending / chain_pending with pending still
-   * set). Bare leftover fix_round is ignored (ambient phantom residue).
+   * set). Mid-fix resumeFix keeps chain_pending=1 so abort can freeze via
+   * wasArmed; bare leftover fix_round stays disarmed (ambient phantom residue).
    */
   applySoftResetAmbientChainForErrorRecover(conversationId) {
     this.store.ensureReviewChain(conversationId);
@@ -3230,7 +3493,10 @@ var ReviewEngine = class {
     this.store.softResetAmbientChainUnlessRecover(conversationId, {
       confirm_left: atE5 || midConfirm ? chain.confirm_left : readyForE3 && rounds > 0 ? rounds : null,
       item_confirm_complete: atE5 ? chain.item_confirm_complete : 0,
-      chain_pending: 0,
+      // Mid-fix resume keeps chain_pending so abort clearing code_edited still
+      // has wasArmed handoff (freeze into confirm). Ready-for-E3 / idle residue
+      // stay 0 — bare fix_round must not phantom-E3 after recover tip clears.
+      chain_pending: resumeFix ? 1 : 0,
       // Preserve an in-flight edit marker (E2 wins over E4); else force only for mid-fix.
       code_edited: resumeFix || chain.code_edited === 1 ? 1 : 0
     });
@@ -3240,6 +3506,51 @@ var ReviewEngine = class {
     const line = firstSubstantiveLine(message) || message.trim();
     return line.startsWith("Review fix") || line.startsWith("\u81EA\u5BA1\u4FEE\u590D");
   }
+  /**
+   * Unlocked callers: clear snapshot needle + ambient E3 arm in one
+   * exclusiveWrite. A crash mid-pair must not leave tip cleared with
+   * chain_pending still 0 (silent ambient stall). Safe under an open writer
+   * only via {@link armAmbientChainAfterDeliveredFixTip} after an inline clear
+   * (clearPendingFollowupIf runs in-txn when writeDepth > 0).
+   */
+  clearMatchingPendingAndArmAmbient(conversationId, pending) {
+    try {
+      return this.store.exclusiveWrite(() => {
+        const cleared = this.store.clearPendingFollowupIf(
+          conversationId,
+          (m) => m.trim() === pending
+        );
+        if (cleared) {
+          this.armAmbientChainAfterDeliveredFixTip(conversationId, pending);
+        }
+        return { commit: true, value: cleared };
+      });
+    } catch {
+      return false;
+    }
+  }
+  /**
+   * After a delivered ambient fix tip is cleared, recover/abort may have left
+   * chain_pending=0. Re-arm so this completed stop can E3 → confirm instead of
+   * silent stall. Never arms bare stale fix_round without a delivered fix tip
+   * (keeps F-ERR-AMBIENT-STALE-FIX-ROUND / F-ABORT-NO-PHANTOM-FIX).
+   * Call under the same writer txn as the clear when possible — throws must
+   * propagate so the clear can roll back. Still arms when code_edited=1 so a
+   * concurrent abort clearing sticky edit keeps wasArmed handoff.
+   */
+  armAmbientChainAfterDeliveredFixTip(conversationId, deliveredPending) {
+    if (!this.isFixFollowupMessage(deliveredPending)) return;
+    if (this.config.reviewScope !== "project") return;
+    const session = this.store.getSession(conversationId);
+    if (!session || isChecklistExecuting(session)) return;
+    const chain = this.store.getReviewChain(conversationId);
+    if (!chain || chain.fix_round <= 0) return;
+    if (this.isMidConfirmOrE5(chain)) return;
+    if (chain.chain_pending === 1) return;
+    const live = chain.pending_followup?.trim() ?? "";
+    if (live) return;
+    this.store.updateReviewChain(conversationId, { chain_pending: 1 });
+  }
   /** Mid-confirm or E5-ready — must not phantom-arm code_edited over E4/E5. */
   isMidConfirmOrE5(chain) {
     if (!chain) return false;
@@ -3287,7 +3598,9 @@ var ReviewEngine = class {
    */
   e0NoCodeContinue(session, chain) {
     if (!isChecklistExecuting(session)) return null;
-    if (chain.code_edited === 1 || chain.confirm_left !== null || chain.item_confirm_complete === 1 || chain.chain_pending === 1) {
+    if (chain.code_edited === 1 || chain.confirm_left !== null || chain.item_confirm_complete === 1 || chain.chain_pending === 1 || // Mid-item review residue (e.g. recover cleared chain_pending): never
+    // soft-advance/done — caller should have taken residue-E2 or E3.
+    chain.fix_round > 0) {
       return null;
     }
     const parsed = this.parseSessionChecklist(session);
@@ -3322,7 +3635,8 @@ var ReviewEngine = class {
       if (!hasNoCodeCompletionEvidence({
         reportPath,
         currentItemId: liveId,
-        projectRoot: trustRoot ?? void 0
+        projectRoot: trustRoot ?? void 0,
+        notBefore: liveChain?.updated_at
       })) {
         return null;
       }
@@ -3378,7 +3692,7 @@ var ReviewEngine = class {
         return { commit: false, value: null };
       }
       const fresh = this.store.getReviewChain(cid2);
-      if (!fresh || fresh.code_edited === 1 || fresh.confirm_left !== null || fresh.item_confirm_complete === 1 || fresh.chain_pending === 1) {
+      if (!fresh || fresh.code_edited === 1 || fresh.confirm_left !== null || fresh.item_confirm_complete === 1 || fresh.chain_pending === 1 || fresh.fix_round > 0 || isRecoverOrStuckFollowupMessage(fresh.pending_followup?.trim() ?? "")) {
         return { commit: false, value: null };
       }
       const refreshed = this.parseSessionChecklist(lockedSession);
@@ -3398,7 +3712,8 @@ var ReviewEngine = class {
         if (!hasNoCodeCompletionEvidence({
           reportPath,
           currentItemId: targets.current.id,
-          projectRoot: trustRoot ?? void 0
+          projectRoot: trustRoot ?? void 0,
+          notBefore: fresh.updated_at
         })) {
           return { commit: false, value: null };
         }
@@ -3489,7 +3804,7 @@ var ReviewEngine = class {
         return { commit: false, value: null };
       }
       const fresh = this.store.getReviewChain(cid2);
-      if (!fresh || fresh.code_edited === 1 || fresh.confirm_left !== null || fresh.item_confirm_complete === 1 || fresh.chain_pending === 1) {
+      if (!fresh || fresh.code_edited === 1 || fresh.confirm_left !== null || fresh.item_confirm_complete === 1 || fresh.chain_pending === 1 || fresh.fix_round > 0 || isRecoverOrStuckFollowupMessage(fresh.pending_followup?.trim() ?? "")) {
         return { commit: false, value: null };
       }
       const refreshed = this.parseSessionChecklist(sess);
@@ -3508,7 +3823,8 @@ var ReviewEngine = class {
       if (hasNoCodeCompletionEvidence({
         reportPath,
         currentItemId: lockedItem.id,
-        projectRoot: trustRoot ?? void 0
+        projectRoot: trustRoot ?? void 0,
+        notBefore: fresh.updated_at
       })) {
         return { commit: false, value: null };
       }
@@ -3568,7 +3884,7 @@ var ReviewEngine = class {
         return { commit: false, value: false };
       }
       const fresh = this.store.getReviewChain(conversationId);
-      if (!fresh || fresh.code_edited === 1 || fresh.confirm_left !== null || fresh.item_confirm_complete === 1 || fresh.chain_pending === 1) {
+      if (!fresh || fresh.code_edited === 1 || fresh.confirm_left !== null || fresh.item_confirm_complete === 1 || fresh.chain_pending === 1 || fresh.fix_round > 0) {
         return { commit: false, value: false };
       }
       this.store.updateReviewChain(conversationId, {
@@ -3615,6 +3931,10 @@ var ReviewEngine = class {
       if (!fresh || fresh.code_edited !== 1) {
         return { commit: false, value: null };
       }
+      const pendingLive = fresh.pending_followup?.trim() ?? "";
+      if (isRecoverOrStuckFollowupMessage(pendingLive)) {
+        return { commit: false, value: null };
+      }
       const fixRound = this.nextSessionRound(fresh);
       const message = this.render("review.fix", { round: fixRound, total: rounds });
       const out = {
@@ -3651,7 +3971,8 @@ var ReviewEngine = class {
         return { commit: false, value: null };
       }
       const fresh = this.store.getReviewChain(cid2);
-      if (!fresh || fresh.code_edited === 1 || fresh.confirm_left !== null || fresh.item_confirm_complete === 1) {
+      const pendingLive = fresh?.pending_followup?.trim() ?? "";
+      if (!fresh || fresh.code_edited === 1 || fresh.confirm_left !== null || fresh.item_confirm_complete === 1 || this.isFixFollowupMessage(pendingLive) || isRecoverOrStuckFollowupMessage(pendingLive)) {
         return { commit: false, value: null };
       }
       const sessionRound = this.nextSessionRound(fresh);
@@ -3701,6 +4022,10 @@ var ReviewEngine = class {
       if (!fresh || fresh.code_edited === 1 || fresh.confirm_left !== expectedLeft) {
         return { commit: false, value: null };
       }
+      const pendingLive = fresh.pending_followup?.trim() ?? "";
+      if (isRecoverOrStuckFollowupMessage(pendingLive)) {
+        return { commit: false, value: null };
+      }
       const sessionRound = this.nextSessionRound(fresh);
       const message = this.render(kind, {
         n,
@@ -3780,6 +4105,10 @@ var ReviewEngine = class {
         if (!atE5) {
           return { commit: false, value: null };
         }
+        const pendingLive = fresh.pending_followup?.trim() ?? "";
+        if (isRecoverOrStuckFollowupMessage(pendingLive)) {
+          return { commit: false, value: null };
+        }
         const sess = this.store.getSession(cid2);
         if (!sess || !isChecklistExecuting(sess)) {
           return { commit: false, value: null };
@@ -3870,6 +4199,10 @@ var ReviewEngine = class {
       if (!atE5) {
         return { commit: false, value: null };
       }
+      const pendingLive = fresh.pending_followup?.trim() ?? "";
+      if (isRecoverOrStuckFollowupMessage(pendingLive)) {
+        return { commit: false, value: null };
+      }
       const lockedSession = this.store.getSession(cid2);
       if (!lockedSession || !sessionReviewRunnable(lockedSession, this.config.reviewScope)) {
         return { commit: false, value: null };

package/dist/init/types.d.ts

@@ -75,7 +75,7 @@ export interface HooksFile {
         [event: string]: HookCommand[] | undefined;
     };
 }
-export declare const PACKAGE_VERSION = "0.2.5";
+export declare const PACKAGE_VERSION = "0.2.7";
 export declare const HOOK_MARKER = "autopilot-harness";
 export declare const AUTOPILOT_EVENTS: readonly ["beforeSubmitPrompt", "afterFileEdit", "stop"];
 //# sourceMappingURL=types.d.ts.map

package/dist/init/types.js

@@ -1,5 +1,5 @@
 /** Shared types for Autopilot init. */
-export const PACKAGE_VERSION = "0.2.5";
+export const PACKAGE_VERSION = "0.2.7";
 export const HOOK_MARKER = "autopilot-harness";
 export const AUTOPILOT_EVENTS = [
     "beforeSubmitPrompt",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autopilot-harness/cli",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Autopilot harness CLI — structured planning, checklist execution, and multi-lens self-review for Cursor and Claude Code (bin: autopilot-harness)",
   "license": "MIT",
   "repository": {
@@ -31,10 +31,10 @@
     "@clack/prompts": "^0.10.0",
     "commander": "^13.1.0",
     "yaml": "^2.7.0",
-    "@autopilot-harness/core": "0.2.5",
-    "@autopilot-harness/port-cursor": "0.2.5",
-    "@autopilot-harness/i18n": "0.2.5",
-    "@autopilot-harness/port-claude-code": "0.2.5"
+    "@autopilot-harness/core": "0.2.7",
+    "@autopilot-harness/port-claude-code": "0.2.7",
+    "@autopilot-harness/i18n": "0.2.7",
+    "@autopilot-harness/port-cursor": "0.2.7"
   },
   "devDependencies": {
     "esbuild": "^0.25.12",