opencode-auto-resume 1.2.1 → 1.2.3

package/README.md

@@ -424,17 +424,9 @@ Aborts the active run, then continues. The only family that can unblock a live r
 
 Paths: orphan parent, subagent stuck (parent side), hallucination loop, streaming-failure escalation. All aborts pass the active-tool guards first, and plugin-initiated aborts are marked so they are not mistaken for user ESC (`session.error` → `MessageAbortedError` race).
 
-## Complementary plugins (for v2)
+<<<<<<< HEAD
+## Architecture
 
-Auto-resume works on its own, but two companion plugins make it sharper. Both are optional — auto-resume detects their presence and degrades gracefully when they are absent.
-
-| Plugin | Required? | If absent |
-|---|---|---|
-| opencode-todolist | No | No task-aware nudges; other paths unaffected |
-| opencode-task-complete | No | Built-in fallback `task_complete` tool; text/emoji completion |
-
-- [opencode-todolist](https://github.com/aiev/opencode-todolist) — Restores `todowrite` / `todoread` in opencode v2
-- [opencode-task-complete](https://github.com/famewolf/opencode-task-complete) — Provides the `task_complete` tool for explicit completion signalling
 
 ## Verification & troubleshooting
 

package/dist/index.js

@@ -12849,6 +12849,7 @@ var AutoResumePlugin = async (ctx, options) => {
         pendingRecoveryReason: null,
         pendingRecoveryAt: 0,
         recoveryAttempts: 0,
+        recoveryContinueInFlight: false,
         watchdogRetryGuard: false,
         unknownToolErrors: new Map,
         unknownToolSuggestionSent: false,
@@ -13092,6 +13093,7 @@ var AutoResumePlugin = async (ctx, options) => {
             const retryBackoffMs = backoffMs(w.recoveryAttempts, baseBackoffMs, maxBackoffMs);
             await log("info", `Retrying recovery on ${short(sid)}: attempt=${w.recoveryAttempts}, backoffMs=${retryBackoffMs}`);
             dbg(`Retrying recovery on ${short(sid)}: recoveryAttempts=${w.recoveryAttempts}, backoffMs=${retryBackoffMs}, pendingRecoveryReason=${w.pendingRecoveryReason}`);
+            w.recoveryContinueInFlight = true;
             try {
               await sendContinuePrompt(sid, continuePrompt, w);
             } catch (err) {
@@ -13559,14 +13561,13 @@ var AutoResumePlugin = async (ctx, options) => {
     w.pendingRecoveryReason = null;
     w.pendingRecoveryAt = 0;
     w.recoveryAttempts = 0;
+    w.recoveryContinueInFlight = false;
     w.watchdogRetryGuard = false;
   }
   function resetBusyFlags(w) {
-    w.resumeAttempts = 0;
     w.lastRetryAt = 0;
     w.pendingTools = 0;
     w.pendingCommands = 0;
-    w.gaveUp = false;
     w.orphanWatchStartAt = null;
     w.aborting = false;
     w.toolTextRecovered = false;
@@ -13581,7 +13582,7 @@ var AutoResumePlugin = async (ctx, options) => {
     w.pendingRecovery = false;
     w.pendingRecoveryReason = null;
     w.pendingRecoveryAt = 0;
-    w.recoveryAttempts = 0;
+    w.recoveryContinueInFlight = false;
     w.watchdogRetryGuard = false;
     if (w.toolTextTimer) {
       clearTimeout(w.toolTextTimer);
@@ -13974,6 +13975,7 @@ var AutoResumePlugin = async (ctx, options) => {
       return false;
     if (w.oocLocked)
       return false;
+    w.aborting = true;
     const idleSec = Math.round((Date.now() - (w.orphanWatchStartAt ?? w.lastActivityAt)) / 1000);
     await log("info", `Abort+Resume on ${short(sid)} (${idleSec}s idle). Aborting...`);
     w.pluginAbortInFlight = true;
@@ -13999,6 +14001,7 @@ var AutoResumePlugin = async (ctx, options) => {
       return false;
     }
     try {
+      w.recoveryContinueInFlight = false;
       await sendContinuePrompt(sid, continuePrompt, w);
       await log("info", `${short(sid)} - abort+continue done`);
       w.orphanWatchStartAt = null;
@@ -14234,6 +14237,7 @@ var AutoResumePlugin = async (ctx, options) => {
             dbg(`Recovery timing on ${short(sid)}: detectionToAttemptMs=${Date.now() - w.pendingRecoveryAt}`);
             w.recoveryAttempts++;
             dbg(`State transition on ${short(sid)}: recoveryAttempts=${w.recoveryAttempts - 1} -> ${w.recoveryAttempts}`);
+            w.recoveryContinueInFlight = true;
             try {
               await sendContinuePrompt(sid, continuePrompt, w);
             } catch (err) {
@@ -14328,6 +14332,11 @@ var AutoResumePlugin = async (ctx, options) => {
           if (w.pendingRecovery) {
             dbg(`Pending recovery cleared on ${short(sid)}: reason=session-busy`);
           }
+          if (w.recoveryContinueInFlight) {
+            w.recoveryAttempts = 0;
+            w.recoveryContinueInFlight = false;
+            dbg(`Recovery succeeded on ${short(sid)}: recoveryAttempts reset to 0`);
+          }
           if (w.continuing) {
             dbg(`busy on ${short(sid)} via recovery prompt - preserving resumeAttempts=${w.resumeAttempts} gaveUp=${w.gaveUp}`);
           } else {
@@ -14911,7 +14920,7 @@ ${reminder}`;
 };
 
 // src/v2/index.ts
-import { readFileSync, mkdirSync, statSync, writeFileSync } from "fs";
+import { readFileSync, mkdirSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { readFile } from "fs/promises";
@@ -15017,7 +15026,6 @@ var DONE_CLAIM_PATTERN_SOURCES = [
   "\\b(?:all|everything)\\s+(?:[\\w-]+\\s+)?(?:is\\s+)?(?:complete|done|finished)",
   "\\bnothing\\s+(?:else\\s+)?(?:left|remaining|to do)"
 ];
-var DEFAULT_DONE_CLAIM_PATTERNS = [...DONE_CLAIM_PATTERN_SOURCES];
 var DEFAULT_READY_TO_CONTINUE_PATTERNS = [
   "ready to continue with task",
   "continuing with task",
@@ -15055,7 +15063,8 @@ var DEFAULT_INJECT_INTERVAL_MS = 15000;
 var OWN_PROMPT_TIME_MS = 30000;
 var MAX_IDLE_SESSIONS2 = 50;
 var IDLE_CLEANUP_MS2 = 10 * 60000;
-var COMPACTION_STALE_TTL_MS = 30 * 60000;
+var COMPACTION_STALE_TTL_MS = 5 * 60000;
+var COMPLETION_LATCH_TTL_MS = 5 * 60000;
 var PERMISSION_STALE_TTL_MS = 30 * 60000;
 var NEVER_INTERRUPT_STALE_TTL_MS = 30 * 60000;
 var TEXT_BUFFER_TRIM_LEN = 20000;
@@ -15389,9 +15398,6 @@ function isUserHandoff(text) {
   ];
   return patterns.some((p) => p.test(last));
 }
-function backoffMs2(attempt, base, max) {
-  return Math.min(base * Math.pow(2, attempt - 1), max);
-}
 function isSilenceReason(reason) {
   return /^no activity for \d+s/i.test(reason);
 }
@@ -15582,6 +15588,7 @@ var v2_default = define({
     const checkIntervalMs = opts.checkIntervalMs ?? DEFAULT_CHECK_INTERVAL_MS2;
     const gracePeriodMs = opts.gracePeriodMs ?? DEFAULT_GRACE_PERIOD_MS2;
     const stuckToolAgeMs = opts.stuckToolAgeMs ?? DEFAULT_STUCK_TOOL_AGE_MS;
+    const completionLatchTtlMs = opts.completionLatchTtlMs ?? COMPLETION_LATCH_TTL_MS;
     const neverInterruptTools = (opts.neverInterruptTools ?? ["compress"]).map((n) => String(n).toLowerCase());
     const maxRetries = opts.maxRetries ?? opts.maxRecoveryRetries ?? DEFAULT_MAX_RETRIES2;
     const baseBackoff = opts.baseBackoffMs ?? DEFAULT_BASE_BACKOFF_MS2;
@@ -15627,12 +15634,13 @@ var v2_default = define({
       }
       return out;
     }
-    const doneClaimPatterns = compilePatterns(opts.doneClaimPatterns, DEFAULT_DONE_CLAIM_PATTERNS, "im");
+    const doneClaimPatterns = compilePatterns(opts.doneClaimPatterns, DONE_CLAIM_PATTERN_SOURCES, "im");
     const readyToContinuePatterns = compilePatterns(opts.readyToContinuePatterns, DEFAULT_READY_TO_CONTINUE_PATTERNS, "i");
     const streamingFailureMessageRegexes = compilePatterns(streamingFailureMessagePatterns, DEFAULT_STREAMING_FAILURE_MESSAGE_PATTERNS2, "i");
     const FEATURE_GATED_OPTIONS = [];
     const RECOGNISED_OPTIONS = new Set([
       "chunkTimeoutMs",
+      "completionLatchTtlMs",
       "checkIntervalMs",
       "gracePeriodMs",
       "maxRetries",
@@ -15761,7 +15769,6 @@ var v2_default = define({
           providerRetryAt: 0,
           quotaNoticedAt: 0,
           gaveUp: false,
-          lastQuotaNoticeAt: 0,
           paused: false,
           lastGenuineUserAt: 0,
           consecFailureRecovers: 0,
@@ -15795,6 +15802,8 @@ var v2_default = define({
           intentNudgeAttempts: 0,
           completionSignaled: false,
           completionSignaledAt: 0,
+          completionHard: false,
+          latchReopened: false,
           emptyIdleNudged: false,
           todos: [],
           todosFetchedAt: 0,
@@ -15852,14 +15861,8 @@ var v2_default = define({
       const lifetimeMaxContinues = opts.lifetimeMaxContinues ?? base.lifetimeMaxContinues;
       return { ...base, chunkTimeoutMs, gracePeriodMs, maxRetries, lifetimeMaxContinues };
     }
-    let pausedCacheMtime = 0;
-    let pausedCacheSet = new Set;
     function readPausedSet() {
       try {
-        const st = statSync(PAUSED_MARKER_FILE);
-        if (st.mtimeMs === pausedCacheMtime)
-          return pausedCacheSet;
-        pausedCacheMtime = st.mtimeMs;
         const raw = readFileSync(PAUSED_MARKER_FILE, "utf8");
         const s = new Set;
         for (const line of raw.split(/\r?\n/)) {
@@ -15867,12 +15870,9 @@ var v2_default = define({
           if (t)
             s.add(t);
         }
-        pausedCacheSet = s;
         return s;
       } catch {
-        pausedCacheMtime = 0;
-        pausedCacheSet = new Set;
-        return pausedCacheSet;
+        return new Set;
       }
     }
     function isPaused(sid) {
@@ -15892,7 +15892,6 @@ var v2_default = define({
         writeFileSync(PAUSED_MARKER_FILE, [...s].join(`
 `) + (s.size ? `
 ` : ""), "utf8");
-        pausedCacheMtime = 0;
       } catch (e) {
         dbg(`${short(sid)} pause write failed: ${e instanceof Error ? e.message : String(e)}`);
       }
@@ -15939,6 +15938,22 @@ var v2_default = define({
       }
       clearStalePermissionFlag(sid, w);
     }
+    function softLatchExpired(sid, w, now) {
+      if (!w.completionSignaled)
+        return false;
+      if (w.completionHard || w.latchReopened)
+        return false;
+      if (!w.completionSignaledAt)
+        return false;
+      if (now - w.completionSignaledAt < completionLatchTtlMs)
+        return false;
+      w.latchReopened = true;
+      w.completionSignaled = false;
+      w.completionSignaledAt = 0;
+      w.pendingRecoveryArmed = true;
+      log("warn", `${short(sid)} soft completion latch older than ${Math.round(completionLatchTtlMs / 1000)}s with no user message \u2014 re-opening once for a self-check`);
+      return true;
+    }
     function clearStalePermissionFlag(sid, w) {
       if (!w.permissionPending)
         return;
@@ -16006,6 +16021,36 @@ var v2_default = define({
       const cooldownMin = Math.max(1, Math.round(ladder[rung] / 60000));
       recover(sid, `rate-limit cooldown served (rung ${rung + 1}/${ladder.length}, ${cooldownMin}m)`);
     }
+    function quotaGuard(sid, w, messages) {
+      try {
+        const last = messages.length ? messages[messages.length - 1] : null;
+        let qtype = "";
+        let qmsg = "";
+        if (last && msgRole(last) === "assistant") {
+          const qe = last.error ?? last.info?.error;
+          if (typeof qe === "string")
+            qmsg = qe;
+          else if (qe && typeof qe === "object") {
+            qtype = String(qe.name ?? qe.type ?? "");
+            qmsg = String(qe.message ?? "");
+          }
+          const qtxt = lastAssistantTextFrom(messages);
+          if (qtxt)
+            qmsg = qmsg ? `${qmsg} ${qtxt}` : qtxt;
+        }
+        if (isRateLimitError(qtype, qmsg)) {
+          handleRateLimitFailure(sid, w, qtype, qmsg);
+          return true;
+        }
+      } catch (e) {
+        dbg(`${short(sid)} quota guard failed: ${e instanceof Error ? e.message : String(e)}`);
+      }
+      if (w.awaitingQuotaRetry || w.rateLimitedAt > 0) {
+        dbg(`${short(sid)} quota-armed \u2014 skipping stall recover`);
+        return true;
+      }
+      return false;
+    }
     function handleRateLimitFailure(sid, w, errType, errMsg) {
       if (isPaused(sid)) {
         dbg(`${short(sid)} paused \u2014 not arming quota ladder`);
@@ -16018,9 +16063,8 @@ var v2_default = define({
       if (n >= ladder.length) {
         w.awaitingQuotaRetry = false;
         log("warn", `${short(sid)} ${tag} budget exhausted (${ladder.length} attempts) \u2014 standing down until user turn`);
-        if (!w.quotaNoticedAt && Date.now() - w.lastQuotaNoticeAt > 100) {
+        if (!w.quotaNoticedAt) {
           w.quotaNoticedAt = Date.now();
-          w.lastQuotaNoticeAt = Date.now();
           sendQuotaNotice(sid, `Rate limited \u2014 standing down until you return (budget exhausted after ${ladder.length} attempts).`);
         }
         return;
@@ -16038,9 +16082,8 @@ var v2_default = define({
       w.awaitingQuotaRetry = true;
       const waitMs = Math.max(0, ladder[n] - (now - w.rateLimitedAt));
       log("warn", `${short(sid)} rate limited (${errType || "error"}) \u2014 standing down, next attempt in ${Math.ceil(waitMs / 1000)}s (${n + 1}/${ladder.length})`);
-      if (!w.quotaNoticedAt && Date.now() - w.lastQuotaNoticeAt > 100) {
+      if (!w.quotaNoticedAt) {
         w.quotaNoticedAt = Date.now();
-        w.lastQuotaNoticeAt = Date.now();
         const mins = Math.max(1, Math.round(waitMs / 60000));
         const when = mins >= 60 ? `~${Math.floor(mins / 60)}h ${mins % 60}m` : `~${mins}m`;
         sendQuotaNotice(sid, `Rate limited, retrying in ${when} (attempt ${n + 1}/${ladder.length}).`);
@@ -16520,13 +16563,12 @@ ${lines.join(`
       });
       const elapsed = w.lastActivityAt ? Math.round((Date.now() - w.lastActivityAt) / 1000) : 0;
       const hms = (n) => n < 60 ? `${n}s` : n < 3600 ? `${Math.floor(n / 60)}m ${n % 60}s` : `${Math.floor(n / 3600)}h ${Math.floor(n % 3600 / 60)}m`;
-      const isRateLimitReason = /rate-limit/i.test(reason);
       const isSilence = isSilenceReason(reason);
       const shown = providerFault ? attempt : attempt;
       const retries = prospectiveRetries ?? w.workRetries;
       const head = [
+        /rate-limit/i.test(reason) ? null : `attempt ${Math.min(shown, maxRetries)}/${maxRetries} (retry #${retries})`,
         isSilence ? null : reason,
-        isRateLimitReason ? null : `attempt ${Math.min(shown, maxRetries)}/${maxRetries} (retry #${retries})`,
         isSilence ? `idle ${hms(elapsed)}` : null,
         now
       ].filter((x) => typeof x === "string" && x.length > 0).join("; ");
@@ -16607,7 +16649,7 @@ ${suffix}`).slice(0, 2000);
       }
       w.recovering = true;
       const attempt = providerFault ? Math.max(1, w.resumeAttempts) : w.resumeAttempts + 1;
-      const delay = backoffMs2(attempt, baseBackoff, maxBackoff);
+      const delay = Math.min(baseBackoff * 2 ** (attempt - 1), maxBackoff);
       if (providerFault) {
         log("info", `${short(sid)} provider-fault stall (${reason}) \u2014 retry scheduled ${Math.round((Date.now() - w.providerRetryAt) / 1000)}s ago, holding the ladder at ${attempt}/${profileMaxRetries}`);
       }
@@ -17094,6 +17136,7 @@ ${suffix}`).slice(0, 2000);
       if (w.completionSignaled) {
         w.completionSignaled = false;
         w.completionSignaledAt = 0;
+        w.latchReopened = false;
         dbg(`${short(sid)} genuine new user message \u2014 re-opening latched completion`);
       }
       if (w.resumeAttempts > 0) {
@@ -17379,6 +17422,7 @@ ${reminder}`;
               }
               w.completionSignaled = true;
               w.completionSignaledAt = Date.now();
+              w.completionHard = true;
               log("info", `${short(sid)} task_complete called, ${await isSubAgentSession(sid) ? "subagent" : "agent"} done`);
               w.taskCompleteSignals++;
               if (w.taskCompleteSignals === 2)
@@ -17430,6 +17474,7 @@ ${reminder}`;
           }
           w.completionSignaled = true;
           w.completionSignaledAt = Date.now();
+          w.completionHard = true;
           w.taskCompleteSignals = 0;
           w.taskCompleteOverrides = 0;
           log("info", `${short(sid)} task_complete called, ${await isSubAgentSession(sid) ? "subagent" : "agent"} done`);
@@ -17468,6 +17513,8 @@ ${reminder}`;
             if (open.length === 0 && !w.completionSignaled) {
               w.completionSignaled = true;
               w.completionSignaledAt = Date.now();
+              w.completionHard = /\btask\s+complete(d)?\b[.!]*$/i.test(stripBoundaryMarkers(tailText).split(`
+`).map((l) => l.trim()).filter((l) => l.length > 0).pop() ?? "");
               log("info", `${short(sid)} turn ends with a completion claim inside the activity window \u2014 latching completion, standing down`);
             }
           } else {
@@ -17506,6 +17553,7 @@ ${reminder}`;
         if (!w.completionSignaled) {
           w.completionSignaled = true;
           w.completionSignaledAt = Date.now();
+          w.completionHard = false;
           log("info", `${short(sid)} turn ends with a celebration and no open todos \u2014 latching completion, not nudging`);
         } else {
           dbg(`${short(sid)} completion already latched \u2014 skipping`);
@@ -17538,6 +17586,8 @@ ${reminder}`;
         if (!w.completionSignaled) {
           w.completionSignaled = true;
           w.completionSignaledAt = Date.now();
+          w.completionHard = /\btask\s+complete(d)?\b[.!]*$/i.test(stripBoundaryMarkers(text).split(`
+`).map((l) => l.trim()).filter((l) => l.length > 0).pop() ?? "");
           log("info", `${short(sid)} turn ends with an explicit stop and no open todos \u2014 latching completion, not nudging`);
         } else {
           dbg(`${short(sid)} completion already latched \u2014 skipping`);
@@ -17884,7 +17934,10 @@ ${reminder}`;
                 if (w.lastGenuineUserAt > w.completionSignaledAt) {
                   w.completionSignaled = false;
                   w.completionSignaledAt = 0;
+                  w.latchReopened = false;
                   dbg(`${short(sid)} genuine new user message after latched completion \u2014 re-opening stall detection`);
+                } else if (softLatchExpired(sid, w, now)) {
+                  dbg(`${short(sid)} soft completion latch expired \u2014 re-opening for one self-check`);
                 } else {
                   dbg(`${short(sid)} completion latched \u2014 skipping stall detection`);
                 }
@@ -17904,33 +17957,8 @@ ${reminder}`;
                   const baseInterval = (profileChunkTimeoutMs + profileGracePeriodMs) * fuseMult;
                   const jitter = baseInterval > 60000 ? Math.floor(Math.random() * STALL_JITTER_MS * 2) - STALL_JITTER_MS : 0;
                   if (silence >= baseInterval + jitter) {
-                    try {
-                      const _qlast2 = history.length ? history[history.length - 1] : null;
-                      let _qtype2 = "";
-                      let _qmsg2 = "";
-                      if (_qlast2 && msgRole(_qlast2) === "assistant") {
-                        const _qe2 = _qlast2.error ?? _qlast2.info?.error;
-                        if (typeof _qe2 === "string")
-                          _qmsg2 = _qe2;
-                        else if (_qe2 && typeof _qe2 === "object") {
-                          _qtype2 = String(_qe2.name ?? _qe2.type ?? "");
-                          _qmsg2 = String(_qe2.message ?? "");
-                        }
-                        const _qtxt2 = lastAssistantTextFrom(history);
-                        if (_qtxt2)
-                          _qmsg2 = _qmsg2 ? `${_qmsg2} ${_qtxt2}` : _qtxt2;
-                      }
-                      if (isRateLimitError(_qtype2, _qmsg2)) {
-                        handleRateLimitFailure(sid, w, _qtype2, _qmsg2);
-                        continue;
-                      }
-                    } catch (e) {
-                      dbg(`${short(sid)} quota guard (idle) failed: ${e instanceof Error ? e.message : String(e)}`);
-                    }
-                    if (w.awaitingQuotaRetry || w.rateLimitedAt > 0) {
-                      dbg(`${short(sid)} quota-armed \u2014 skipping stall recover`);
+                    if (quotaGuard(sid, w, history))
                       continue;
-                    }
                     await recover(sid, `no activity for ${Math.ceil(silence / 1000)}s`);
                   }
                 }
@@ -17954,7 +17982,10 @@ ${reminder}`;
           if (w.lastGenuineUserAt > w.completionSignaledAt) {
             w.completionSignaled = false;
             w.completionSignaledAt = 0;
+            w.latchReopened = false;
             dbg(`${short(sid)} genuine new user message after latched completion \u2014 re-opening stall detection`);
+          } else if (softLatchExpired(sid, w, now)) {
+            dbg(`${short(sid)} soft completion latch expired \u2014 re-opening for one self-check`);
           } else {
             dbg(`${short(sid)} completion latched \u2014 skipping stall detection`);
             continue;
@@ -18051,34 +18082,9 @@ ${reminder}`;
           log("info", `${short(sid)} stall (busyStallStrategy=abort): aborting before continue`);
           await tryAbortAndResume(sid, w, true);
         } else {
-          try {
-            const _qm = await loadMessages(sid);
-            const _qlast = _qm.length ? _qm[_qm.length - 1] : null;
-            let _qtype = "";
-            let _qmsg = "";
-            if (_qlast && msgRole(_qlast) === "assistant") {
-              const _qe = _qlast.error ?? _qlast.info?.error;
-              if (typeof _qe === "string")
-                _qmsg = _qe;
-              else if (_qe && typeof _qe === "object") {
-                _qtype = String(_qe.name ?? _qe.type ?? "");
-                _qmsg = String(_qe.message ?? "");
-              }
-              const _qtxt = lastAssistantTextFrom(_qm);
-              if (_qtxt)
-                _qmsg = _qmsg ? `${_qmsg} ${_qtxt}` : _qtxt;
-            }
-            if (isRateLimitError(_qtype, _qmsg)) {
-              handleRateLimitFailure(sid, w, _qtype, _qmsg);
-              continue;
-            }
-          } catch (e) {
-            dbg(`${short(sid)} quota guard failed: ${e instanceof Error ? e.message : String(e)}`);
-          }
-          if (w.awaitingQuotaRetry || w.rateLimitedAt > 0) {
-            dbg(`${short(sid)} quota-armed \u2014 skipping stall recover`);
+          const _qm = await loadMessages(sid);
+          if (quotaGuard(sid, w, _qm))
             continue;
-          }
           await recover(sid, `no activity for ${Math.ceil(silence / 1000)}s`);
         }
       }
@@ -18415,11 +18421,21 @@ ${reminder}`;
               let ownRung = !providerRetryFresh && selfInjectFresh;
               if (ownRung) {
                 try {
-                  for (const m of await loadMessages(sid)) {
-                    if (msgRole(m) === "user" && msgAt(m) > w.lastInjectAt) {
-                      ownRung = false;
-                      break;
-                    }
+                  const hist = await loadMessages(sid);
+                  for (const m of hist) {
+                    if (msgRole(m) !== "user")
+                      continue;
+                    if (msgAt(m) <= w.lastInjectAt)
+                      continue;
+                    const text = messageTextOf(m);
+                    const ownByText = typeof text === "string" && text.length > 0 && w.ownPromptTexts.includes(text);
+                    const ownByShape = looksLikeOwnPrompt(text);
+                    const ownByTime = msgAt(m) >= w.lastInjectAt && msgAt(m) - w.lastInjectAt < OWN_PROMPT_TIME_MS;
+                    const ownByTimeOnly = ownByTime && !(typeof text === "string" && text.length > 0);
+                    if (ownByText || ownByShape || ownByTimeOnly)
+                      continue;
+                    ownRung = false;
+                    break;
                   }
                 } catch {
                   ownRung = false;

package/dist/v2/index.js

@@ -1,6 +1,6 @@
 // @bun
 // src/v2/index.ts
-import { readFileSync, mkdirSync, statSync, writeFileSync } from "fs";
+import { readFileSync, mkdirSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { readFile } from "fs/promises";
@@ -106,7 +106,6 @@ var DONE_CLAIM_PATTERN_SOURCES = [
   "\\b(?:all|everything)\\s+(?:[\\w-]+\\s+)?(?:is\\s+)?(?:complete|done|finished)",
   "\\bnothing\\s+(?:else\\s+)?(?:left|remaining|to do)"
 ];
-var DEFAULT_DONE_CLAIM_PATTERNS = [...DONE_CLAIM_PATTERN_SOURCES];
 var DEFAULT_READY_TO_CONTINUE_PATTERNS = [
   "ready to continue with task",
   "continuing with task",
@@ -144,7 +143,8 @@ var DEFAULT_INJECT_INTERVAL_MS = 15000;
 var OWN_PROMPT_TIME_MS = 30000;
 var MAX_IDLE_SESSIONS = 50;
 var IDLE_CLEANUP_MS = 10 * 60000;
-var COMPACTION_STALE_TTL_MS = 30 * 60000;
+var COMPACTION_STALE_TTL_MS = 5 * 60000;
+var COMPLETION_LATCH_TTL_MS = 5 * 60000;
 var PERMISSION_STALE_TTL_MS = 30 * 60000;
 var NEVER_INTERRUPT_STALE_TTL_MS = 30 * 60000;
 var TEXT_BUFFER_TRIM_LEN = 20000;
@@ -478,9 +478,6 @@ function isUserHandoff(text) {
   ];
   return patterns.some((p) => p.test(last));
 }
-function backoffMs(attempt, base, max) {
-  return Math.min(base * Math.pow(2, attempt - 1), max);
-}
 function isSilenceReason(reason) {
   return /^no activity for \d+s/i.test(reason);
 }
@@ -671,6 +668,7 @@ var v2_default = define({
     const checkIntervalMs = opts.checkIntervalMs ?? DEFAULT_CHECK_INTERVAL_MS;
     const gracePeriodMs = opts.gracePeriodMs ?? DEFAULT_GRACE_PERIOD_MS;
     const stuckToolAgeMs = opts.stuckToolAgeMs ?? DEFAULT_STUCK_TOOL_AGE_MS;
+    const completionLatchTtlMs = opts.completionLatchTtlMs ?? COMPLETION_LATCH_TTL_MS;
     const neverInterruptTools = (opts.neverInterruptTools ?? ["compress"]).map((n) => String(n).toLowerCase());
     const maxRetries = opts.maxRetries ?? opts.maxRecoveryRetries ?? DEFAULT_MAX_RETRIES;
     const baseBackoff = opts.baseBackoffMs ?? DEFAULT_BASE_BACKOFF_MS;
@@ -716,12 +714,13 @@ var v2_default = define({
       }
       return out;
     }
-    const doneClaimPatterns = compilePatterns(opts.doneClaimPatterns, DEFAULT_DONE_CLAIM_PATTERNS, "im");
+    const doneClaimPatterns = compilePatterns(opts.doneClaimPatterns, DONE_CLAIM_PATTERN_SOURCES, "im");
     const readyToContinuePatterns = compilePatterns(opts.readyToContinuePatterns, DEFAULT_READY_TO_CONTINUE_PATTERNS, "i");
     const streamingFailureMessageRegexes = compilePatterns(streamingFailureMessagePatterns, DEFAULT_STREAMING_FAILURE_MESSAGE_PATTERNS, "i");
     const FEATURE_GATED_OPTIONS = [];
     const RECOGNISED_OPTIONS = new Set([
       "chunkTimeoutMs",
+      "completionLatchTtlMs",
       "checkIntervalMs",
       "gracePeriodMs",
       "maxRetries",
@@ -850,7 +849,6 @@ var v2_default = define({
           providerRetryAt: 0,
           quotaNoticedAt: 0,
           gaveUp: false,
-          lastQuotaNoticeAt: 0,
           paused: false,
           lastGenuineUserAt: 0,
           consecFailureRecovers: 0,
@@ -884,6 +882,8 @@ var v2_default = define({
           intentNudgeAttempts: 0,
           completionSignaled: false,
           completionSignaledAt: 0,
+          completionHard: false,
+          latchReopened: false,
           emptyIdleNudged: false,
           todos: [],
           todosFetchedAt: 0,
@@ -941,14 +941,8 @@ var v2_default = define({
       const lifetimeMaxContinues = opts.lifetimeMaxContinues ?? base.lifetimeMaxContinues;
       return { ...base, chunkTimeoutMs, gracePeriodMs, maxRetries, lifetimeMaxContinues };
     }
-    let pausedCacheMtime = 0;
-    let pausedCacheSet = new Set;
     function readPausedSet() {
       try {
-        const st = statSync(PAUSED_MARKER_FILE);
-        if (st.mtimeMs === pausedCacheMtime)
-          return pausedCacheSet;
-        pausedCacheMtime = st.mtimeMs;
         const raw = readFileSync(PAUSED_MARKER_FILE, "utf8");
         const s = new Set;
         for (const line of raw.split(/\r?\n/)) {
@@ -956,12 +950,9 @@ var v2_default = define({
           if (t)
             s.add(t);
         }
-        pausedCacheSet = s;
         return s;
       } catch {
-        pausedCacheMtime = 0;
-        pausedCacheSet = new Set;
-        return pausedCacheSet;
+        return new Set;
       }
     }
     function isPaused(sid) {
@@ -981,7 +972,6 @@ var v2_default = define({
         writeFileSync(PAUSED_MARKER_FILE, [...s].join(`
 `) + (s.size ? `
 ` : ""), "utf8");
-        pausedCacheMtime = 0;
       } catch (e) {
         dbg(`${short(sid)} pause write failed: ${e instanceof Error ? e.message : String(e)}`);
       }
@@ -1028,6 +1018,22 @@ var v2_default = define({
       }
       clearStalePermissionFlag(sid, w);
     }
+    function softLatchExpired(sid, w, now) {
+      if (!w.completionSignaled)
+        return false;
+      if (w.completionHard || w.latchReopened)
+        return false;
+      if (!w.completionSignaledAt)
+        return false;
+      if (now - w.completionSignaledAt < completionLatchTtlMs)
+        return false;
+      w.latchReopened = true;
+      w.completionSignaled = false;
+      w.completionSignaledAt = 0;
+      w.pendingRecoveryArmed = true;
+      log("warn", `${short(sid)} soft completion latch older than ${Math.round(completionLatchTtlMs / 1000)}s with no user message \u2014 re-opening once for a self-check`);
+      return true;
+    }
     function clearStalePermissionFlag(sid, w) {
       if (!w.permissionPending)
         return;
@@ -1095,6 +1101,36 @@ var v2_default = define({
       const cooldownMin = Math.max(1, Math.round(ladder[rung] / 60000));
       recover(sid, `rate-limit cooldown served (rung ${rung + 1}/${ladder.length}, ${cooldownMin}m)`);
     }
+    function quotaGuard(sid, w, messages) {
+      try {
+        const last = messages.length ? messages[messages.length - 1] : null;
+        let qtype = "";
+        let qmsg = "";
+        if (last && msgRole(last) === "assistant") {
+          const qe = last.error ?? last.info?.error;
+          if (typeof qe === "string")
+            qmsg = qe;
+          else if (qe && typeof qe === "object") {
+            qtype = String(qe.name ?? qe.type ?? "");
+            qmsg = String(qe.message ?? "");
+          }
+          const qtxt = lastAssistantTextFrom(messages);
+          if (qtxt)
+            qmsg = qmsg ? `${qmsg} ${qtxt}` : qtxt;
+        }
+        if (isRateLimitError(qtype, qmsg)) {
+          handleRateLimitFailure(sid, w, qtype, qmsg);
+          return true;
+        }
+      } catch (e) {
+        dbg(`${short(sid)} quota guard failed: ${e instanceof Error ? e.message : String(e)}`);
+      }
+      if (w.awaitingQuotaRetry || w.rateLimitedAt > 0) {
+        dbg(`${short(sid)} quota-armed \u2014 skipping stall recover`);
+        return true;
+      }
+      return false;
+    }
     function handleRateLimitFailure(sid, w, errType, errMsg) {
       if (isPaused(sid)) {
         dbg(`${short(sid)} paused \u2014 not arming quota ladder`);
@@ -1107,9 +1143,8 @@ var v2_default = define({
       if (n >= ladder.length) {
         w.awaitingQuotaRetry = false;
         log("warn", `${short(sid)} ${tag} budget exhausted (${ladder.length} attempts) \u2014 standing down until user turn`);
-        if (!w.quotaNoticedAt && Date.now() - w.lastQuotaNoticeAt > 100) {
+        if (!w.quotaNoticedAt) {
           w.quotaNoticedAt = Date.now();
-          w.lastQuotaNoticeAt = Date.now();
           sendQuotaNotice(sid, `Rate limited \u2014 standing down until you return (budget exhausted after ${ladder.length} attempts).`);
         }
         return;
@@ -1127,9 +1162,8 @@ var v2_default = define({
       w.awaitingQuotaRetry = true;
       const waitMs = Math.max(0, ladder[n] - (now - w.rateLimitedAt));
       log("warn", `${short(sid)} rate limited (${errType || "error"}) \u2014 standing down, next attempt in ${Math.ceil(waitMs / 1000)}s (${n + 1}/${ladder.length})`);
-      if (!w.quotaNoticedAt && Date.now() - w.lastQuotaNoticeAt > 100) {
+      if (!w.quotaNoticedAt) {
         w.quotaNoticedAt = Date.now();
-        w.lastQuotaNoticeAt = Date.now();
         const mins = Math.max(1, Math.round(waitMs / 60000));
         const when = mins >= 60 ? `~${Math.floor(mins / 60)}h ${mins % 60}m` : `~${mins}m`;
         sendQuotaNotice(sid, `Rate limited, retrying in ${when} (attempt ${n + 1}/${ladder.length}).`);
@@ -1609,13 +1643,12 @@ ${lines.join(`
       });
       const elapsed = w.lastActivityAt ? Math.round((Date.now() - w.lastActivityAt) / 1000) : 0;
       const hms = (n) => n < 60 ? `${n}s` : n < 3600 ? `${Math.floor(n / 60)}m ${n % 60}s` : `${Math.floor(n / 3600)}h ${Math.floor(n % 3600 / 60)}m`;
-      const isRateLimitReason = /rate-limit/i.test(reason);
       const isSilence = isSilenceReason(reason);
       const shown = providerFault ? attempt : attempt;
       const retries = prospectiveRetries ?? w.workRetries;
       const head = [
+        /rate-limit/i.test(reason) ? null : `attempt ${Math.min(shown, maxRetries)}/${maxRetries} (retry #${retries})`,
         isSilence ? null : reason,
-        isRateLimitReason ? null : `attempt ${Math.min(shown, maxRetries)}/${maxRetries} (retry #${retries})`,
         isSilence ? `idle ${hms(elapsed)}` : null,
         now
       ].filter((x) => typeof x === "string" && x.length > 0).join("; ");
@@ -1696,7 +1729,7 @@ ${suffix}`).slice(0, 2000);
       }
       w.recovering = true;
       const attempt = providerFault ? Math.max(1, w.resumeAttempts) : w.resumeAttempts + 1;
-      const delay = backoffMs(attempt, baseBackoff, maxBackoff);
+      const delay = Math.min(baseBackoff * 2 ** (attempt - 1), maxBackoff);
       if (providerFault) {
         log("info", `${short(sid)} provider-fault stall (${reason}) \u2014 retry scheduled ${Math.round((Date.now() - w.providerRetryAt) / 1000)}s ago, holding the ladder at ${attempt}/${profileMaxRetries}`);
       }
@@ -2183,6 +2216,7 @@ ${suffix}`).slice(0, 2000);
       if (w.completionSignaled) {
         w.completionSignaled = false;
         w.completionSignaledAt = 0;
+        w.latchReopened = false;
         dbg(`${short(sid)} genuine new user message \u2014 re-opening latched completion`);
       }
       if (w.resumeAttempts > 0) {
@@ -2468,6 +2502,7 @@ ${reminder}`;
               }
               w.completionSignaled = true;
               w.completionSignaledAt = Date.now();
+              w.completionHard = true;
               log("info", `${short(sid)} task_complete called, ${await isSubAgentSession(sid) ? "subagent" : "agent"} done`);
               w.taskCompleteSignals++;
               if (w.taskCompleteSignals === 2)
@@ -2519,6 +2554,7 @@ ${reminder}`;
           }
           w.completionSignaled = true;
           w.completionSignaledAt = Date.now();
+          w.completionHard = true;
           w.taskCompleteSignals = 0;
           w.taskCompleteOverrides = 0;
           log("info", `${short(sid)} task_complete called, ${await isSubAgentSession(sid) ? "subagent" : "agent"} done`);
@@ -2557,6 +2593,8 @@ ${reminder}`;
             if (open.length === 0 && !w.completionSignaled) {
               w.completionSignaled = true;
               w.completionSignaledAt = Date.now();
+              w.completionHard = /\btask\s+complete(d)?\b[.!]*$/i.test(stripBoundaryMarkers(tailText).split(`
+`).map((l) => l.trim()).filter((l) => l.length > 0).pop() ?? "");
               log("info", `${short(sid)} turn ends with a completion claim inside the activity window \u2014 latching completion, standing down`);
             }
           } else {
@@ -2595,6 +2633,7 @@ ${reminder}`;
         if (!w.completionSignaled) {
           w.completionSignaled = true;
           w.completionSignaledAt = Date.now();
+          w.completionHard = false;
           log("info", `${short(sid)} turn ends with a celebration and no open todos \u2014 latching completion, not nudging`);
         } else {
           dbg(`${short(sid)} completion already latched \u2014 skipping`);
@@ -2627,6 +2666,8 @@ ${reminder}`;
         if (!w.completionSignaled) {
           w.completionSignaled = true;
           w.completionSignaledAt = Date.now();
+          w.completionHard = /\btask\s+complete(d)?\b[.!]*$/i.test(stripBoundaryMarkers(text).split(`
+`).map((l) => l.trim()).filter((l) => l.length > 0).pop() ?? "");
           log("info", `${short(sid)} turn ends with an explicit stop and no open todos \u2014 latching completion, not nudging`);
         } else {
           dbg(`${short(sid)} completion already latched \u2014 skipping`);
@@ -2973,7 +3014,10 @@ ${reminder}`;
                 if (w.lastGenuineUserAt > w.completionSignaledAt) {
                   w.completionSignaled = false;
                   w.completionSignaledAt = 0;
+                  w.latchReopened = false;
                   dbg(`${short(sid)} genuine new user message after latched completion \u2014 re-opening stall detection`);
+                } else if (softLatchExpired(sid, w, now)) {
+                  dbg(`${short(sid)} soft completion latch expired \u2014 re-opening for one self-check`);
                 } else {
                   dbg(`${short(sid)} completion latched \u2014 skipping stall detection`);
                 }
@@ -2993,33 +3037,8 @@ ${reminder}`;
                   const baseInterval = (profileChunkTimeoutMs + profileGracePeriodMs) * fuseMult;
                   const jitter = baseInterval > 60000 ? Math.floor(Math.random() * STALL_JITTER_MS * 2) - STALL_JITTER_MS : 0;
                   if (silence >= baseInterval + jitter) {
-                    try {
-                      const _qlast2 = history.length ? history[history.length - 1] : null;
-                      let _qtype2 = "";
-                      let _qmsg2 = "";
-                      if (_qlast2 && msgRole(_qlast2) === "assistant") {
-                        const _qe2 = _qlast2.error ?? _qlast2.info?.error;
-                        if (typeof _qe2 === "string")
-                          _qmsg2 = _qe2;
-                        else if (_qe2 && typeof _qe2 === "object") {
-                          _qtype2 = String(_qe2.name ?? _qe2.type ?? "");
-                          _qmsg2 = String(_qe2.message ?? "");
-                        }
-                        const _qtxt2 = lastAssistantTextFrom(history);
-                        if (_qtxt2)
-                          _qmsg2 = _qmsg2 ? `${_qmsg2} ${_qtxt2}` : _qtxt2;
-                      }
-                      if (isRateLimitError(_qtype2, _qmsg2)) {
-                        handleRateLimitFailure(sid, w, _qtype2, _qmsg2);
-                        continue;
-                      }
-                    } catch (e) {
-                      dbg(`${short(sid)} quota guard (idle) failed: ${e instanceof Error ? e.message : String(e)}`);
-                    }
-                    if (w.awaitingQuotaRetry || w.rateLimitedAt > 0) {
-                      dbg(`${short(sid)} quota-armed \u2014 skipping stall recover`);
+                    if (quotaGuard(sid, w, history))
                       continue;
-                    }
                     await recover(sid, `no activity for ${Math.ceil(silence / 1000)}s`);
                   }
                 }
@@ -3043,7 +3062,10 @@ ${reminder}`;
           if (w.lastGenuineUserAt > w.completionSignaledAt) {
             w.completionSignaled = false;
             w.completionSignaledAt = 0;
+            w.latchReopened = false;
             dbg(`${short(sid)} genuine new user message after latched completion \u2014 re-opening stall detection`);
+          } else if (softLatchExpired(sid, w, now)) {
+            dbg(`${short(sid)} soft completion latch expired \u2014 re-opening for one self-check`);
           } else {
             dbg(`${short(sid)} completion latched \u2014 skipping stall detection`);
             continue;
@@ -3140,34 +3162,9 @@ ${reminder}`;
           log("info", `${short(sid)} stall (busyStallStrategy=abort): aborting before continue`);
           await tryAbortAndResume(sid, w, true);
         } else {
-          try {
-            const _qm = await loadMessages(sid);
-            const _qlast = _qm.length ? _qm[_qm.length - 1] : null;
-            let _qtype = "";
-            let _qmsg = "";
-            if (_qlast && msgRole(_qlast) === "assistant") {
-              const _qe = _qlast.error ?? _qlast.info?.error;
-              if (typeof _qe === "string")
-                _qmsg = _qe;
-              else if (_qe && typeof _qe === "object") {
-                _qtype = String(_qe.name ?? _qe.type ?? "");
-                _qmsg = String(_qe.message ?? "");
-              }
-              const _qtxt = lastAssistantTextFrom(_qm);
-              if (_qtxt)
-                _qmsg = _qmsg ? `${_qmsg} ${_qtxt}` : _qtxt;
-            }
-            if (isRateLimitError(_qtype, _qmsg)) {
-              handleRateLimitFailure(sid, w, _qtype, _qmsg);
-              continue;
-            }
-          } catch (e) {
-            dbg(`${short(sid)} quota guard failed: ${e instanceof Error ? e.message : String(e)}`);
-          }
-          if (w.awaitingQuotaRetry || w.rateLimitedAt > 0) {
-            dbg(`${short(sid)} quota-armed \u2014 skipping stall recover`);
+          const _qm = await loadMessages(sid);
+          if (quotaGuard(sid, w, _qm))
             continue;
-          }
           await recover(sid, `no activity for ${Math.ceil(silence / 1000)}s`);
         }
       }
@@ -3504,11 +3501,21 @@ ${reminder}`;
               let ownRung = !providerRetryFresh && selfInjectFresh;
               if (ownRung) {
                 try {
-                  for (const m of await loadMessages(sid)) {
-                    if (msgRole(m) === "user" && msgAt(m) > w.lastInjectAt) {
-                      ownRung = false;
-                      break;
-                    }
+                  const hist = await loadMessages(sid);
+                  for (const m of hist) {
+                    if (msgRole(m) !== "user")
+                      continue;
+                    if (msgAt(m) <= w.lastInjectAt)
+                      continue;
+                    const text = messageTextOf(m);
+                    const ownByText = typeof text === "string" && text.length > 0 && w.ownPromptTexts.includes(text);
+                    const ownByShape = looksLikeOwnPrompt(text);
+                    const ownByTime = msgAt(m) >= w.lastInjectAt && msgAt(m) - w.lastInjectAt < OWN_PROMPT_TIME_MS;
+                    const ownByTimeOnly = ownByTime && !(typeof text === "string" && text.length > 0);
+                    if (ownByText || ownByShape || ownByTimeOnly)
+                      continue;
+                    ownRung = false;
+                    break;
                   }
                 } catch {
                   ownRung = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-auto-resume",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "OpenCode plugin that automatically resumes stalled LLM sessions when thinking/streaming freezes mid-generation.",
   "keywords": [
     "opencode",