opencode-auto-resume 1.2.0 → 1.2.2

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
 
@@ -453,7 +445,7 @@ On v2 a clean load writes nothing at startup: warnings and recovery lines go to
 | Tool-text not detected | Check server logs — requires SDK message fetching (v1). On v2 the history comes from the client message surface or loopback HTTP — check the server process output instead |
 | Long-running tool killed | Should not happen — active-tool guard prevents it. Report a bug. |
 | No plugin activity in the log | The entry is not in a location opencode scans, or not listed in `plugins`; fix the config and restart opencode. |
-| Log says `ctx.app.version is missing` (or `ctx.serverUrl is missing` on v1) | The build was loaded on the wrong server generation. Update the npm package (the universal entry auto-selects the branch) or match the build file to the server. |
+| Log says `ctx.app.version is missing` (or `ctx.serverUrl is missing` on v1) | The build was loaded on the wrong server generation. The plugin disables itself with this diagnostic instead of crashing. Update the npm package (the universal entry auto-selects the branch by context shape) or match the build file to the server. |
 | Never recovers a parent waiting on a subagent | Intentional: parent sessions blocked on a running subagent are left alone. |
 | Never recovers while a permission dialog is open | Intentional: recovery is held until the permission is answered. |
 | Recovers but you don't see a notice (v2) | Your model/provider may reject `session.synthetic()`; the plugin falls back to `session.prompt()` (no TUI banner). |

package/dist/index.js

@@ -12389,6 +12389,12 @@ var TASK_COMPLETE_REPEAT_ERROR = "task_complete already acknowledged twice with
 var CTX_WRAPUP_TRIGGER = "ctx-wrapup";
 var UNKNOWN_TOOL_THRESHOLD = 2;
 var TOOL_IDS_CACHE_MS = 5 * 60000;
+var OWN_PROMPT_SHAPES = [
+  /^continue\s*\u2014\s*stalled\s*\(/,
+  /^continue\s*\nOnly continue work already in progress\./,
+  /^continue\s*\nIf work was already in progress,/,
+  /^You tried to use the tool "/
+];
 var TOOL_TEXT_PATTERNS = [
   /<function\s*=/i,
   /<function>/i,
@@ -12677,6 +12683,10 @@ Please continue working on ${thisWord} ${taskWord}.`;
 var AutoResumePlugin = async (ctx, options) => {
   if (!ctx.serverUrl) {
     console.warn("[auto-resume] this looks like the opencode v1 build running on the wrong server: ctx.serverUrl is missing. The v1 bundle requires opencode v1 \u2014 update the plugin package (the npm build auto-selects per server) or load the build matching your server; see the README on npm (opencode-auto-resume).");
+    return {
+      event: async () => {},
+      config: async () => {}
+    };
   }
   const chunkTimeoutMs = options?.chunkTimeoutMs ?? DEFAULT_CHUNK_TIMEOUT_MS;
   const checkIntervalMs = options?.checkIntervalMs ?? DEFAULT_CHECK_INTERVAL_MS;
@@ -13201,7 +13211,11 @@ var AutoResumePlugin = async (ctx, options) => {
       if (available.length === 0)
         return false;
       const messages = await getSessionMessages(sid);
+      const lastUserAt = lastUserMessageTimeOf(messages);
       for (const msg of messages) {
+        if (lastUserAt !== undefined && messageTimeOf(msg) !== undefined && messageTimeOf(msg) <= lastUserAt) {
+          continue;
+        }
         const parts = msg.parts;
         if (!parts)
           continue;
@@ -13245,6 +13259,39 @@ var AutoResumePlugin = async (ctx, options) => {
       return;
     return msg.role ?? msg.info?.role;
   }
+  function messageTimeOf(msg) {
+    if (!msg)
+      return;
+    const direct = msg.time;
+    const viaInfo = msg.info?.time;
+    const raw = typeof direct === "number" ? direct : direct?.created ?? (typeof viaInfo === "number" ? viaInfo : viaInfo?.created);
+    return typeof raw === "number" && raw > 0 ? raw : undefined;
+  }
+  function lastUserMessageTimeOf(messages) {
+    for (let i = messages.length - 1;i >= 0; i--) {
+      const msg = messages[i];
+      if (roleOf(msg) !== "user")
+        continue;
+      const t = messageTimeOf(msg);
+      if (t !== undefined)
+        return t;
+    }
+    return;
+  }
+  function looksLikeOwnPrompt(props) {
+    if (!props)
+      return false;
+    const parts = props.parts ?? props.info?.parts;
+    let text;
+    if (Array.isArray(parts)) {
+      text = parts.filter((p) => p?.type === "text").map((p) => p.text).join(`
+`);
+    }
+    text = text ?? props.text ?? props.info?.text;
+    if (!text)
+      return false;
+    return OWN_PROMPT_SHAPES.some((re) => re.test(text));
+  }
   async function lastAssistantEndsWithCelebration(sid) {
     try {
       const msgs = await getSessionMessages(sid);
@@ -14600,13 +14647,15 @@ var AutoResumePlugin = async (ctx, options) => {
         const info = props?.info;
         const role = info?.role ?? props?.role;
         if (role === "user") {
+          if (looksLikeOwnPrompt(props)) {
+            break;
+          }
           const w = sessions.get(sid);
           if (w) {
             w.doneClaimNoTodosAttempts = 0;
             w.lastUserMessageAt = Date.now();
             w.unknownToolErrors.clear();
             w.unknownToolSuggestionSent = false;
-            w.checkedToolPartIDs.clear();
           }
           break;
         }
@@ -14862,7 +14911,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";
@@ -14968,7 +15017,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",
@@ -15006,7 +15054,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;
@@ -15340,9 +15389,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);
 }
@@ -15479,15 +15525,16 @@ function messageTextOf(m) {
     return mm.info.content;
   return;
 }
-var OWN_PROMPT_SHAPES = [
+var OWN_PROMPT_SHAPES2 = [
   /^continue\s*\u2014\s*stalled\s*\(/,
   /^continue\s*\nOnly continue work already in progress\./,
-  /^continue\s*\nIf work was already in progress,/
+  /^continue\s*\nIf work was already in progress,/,
+  /^You tried to use the tool "/
 ];
 function looksLikeOwnPrompt(text) {
   if (typeof text !== "string" || text.length === 0)
     return false;
-  return OWN_PROMPT_SHAPES.some((re) => re.test(text));
+  return OWN_PROMPT_SHAPES2.some((re) => re.test(text));
 }
 function isTaskToolCall(ev) {
   const tool = ev.data?.tool ?? ev.data?.toolName;
@@ -15532,6 +15579,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;
@@ -15577,12 +15625,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",
@@ -15636,6 +15685,7 @@ var v2_default = define({
     }
     if (typeof ctx.app?.version !== "string") {
       log("warn", "this looks like the opencode v1 build running on the wrong server: ctx.app.version is missing. The v2 bundle requires opencode v2 \u2014 update the plugin package (the npm build auto-selects per server) or load the build matching your server; see the README on npm (opencode-auto-resume).");
+      return () => {};
     }
     const gatedInUse = Object.keys(opts).filter((key) => FEATURE_GATED_OPTIONS.includes(key));
     const dbg = (...args) => {
@@ -15710,7 +15760,6 @@ var v2_default = define({
           providerRetryAt: 0,
           quotaNoticedAt: 0,
           gaveUp: false,
-          lastQuotaNoticeAt: 0,
           paused: false,
           lastGenuineUserAt: 0,
           consecFailureRecovers: 0,
@@ -15744,6 +15793,8 @@ var v2_default = define({
           intentNudgeAttempts: 0,
           completionSignaled: false,
           completionSignaledAt: 0,
+          completionHard: false,
+          latchReopened: false,
           emptyIdleNudged: false,
           todos: [],
           todosFetchedAt: 0,
@@ -15801,14 +15852,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/)) {
@@ -15816,12 +15861,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) {
@@ -15841,7 +15883,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)}`);
       }
@@ -15888,6 +15929,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;
@@ -15955,6 +16012,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`);
@@ -15967,9 +16054,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;
@@ -15987,9 +16073,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}).`);
@@ -16469,13 +16554,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("; ");
@@ -16556,7 +16640,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}`);
       }
@@ -17043,6 +17127,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) {
@@ -17223,7 +17308,10 @@ ${suffix}`).slice(0, 2000);
         const available = await getAvailableToolIds();
         if (available.length === 0)
           return false;
+        const lastUserAt = lastUserMessageAt(messages);
         for (const msg of messages) {
+          if (lastUserAt !== undefined && msgAt(msg) <= lastUserAt)
+            continue;
           const content = msg?.content;
           if (!Array.isArray(content))
             continue;
@@ -17325,6 +17413,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)
@@ -17376,6 +17465,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`);
@@ -17414,6 +17504,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 {
@@ -17452,6 +17544,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`);
@@ -17484,6 +17577,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`);
@@ -17830,7 +17925,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`);
                 }
@@ -17850,33 +17948,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`);
                   }
                 }
@@ -17900,7 +17973,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;
@@ -17997,34 +18073,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`);
         }
       }
@@ -18361,11 +18412,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;
@@ -18868,10 +18929,22 @@ ${reminder}`;
 });
 
 // src/dispatch.ts
+var noopDispose = () => {};
 var dispatcher = {
   id: "auto-resume.v2",
   server: AutoResumePlugin,
-  setup: v2_default.setup
+  setup: async (ctx) => {
+    if (ctx?.app?.version)
+      return v2_default.setup(ctx);
+    if (typeof ctx?.event?.subscribe === "function") {
+      return v2_default.setup(ctx);
+    }
+    if (ctx?.serverUrl || ctx?.client?.session) {
+      return AutoResumePlugin(ctx, ctx.options);
+    }
+    console.warn("[auto-resume] unrecognised host context \u2014 no ctx.app.version (opencode v2), no ctx.event.subscribe (v2 loader), no ctx.serverUrl/client (opencode v1). Plugin disabled; see the README on npm (opencode-auto-resume).");
+    return noopDispose;
+  }
 };
 var dispatch_default = dispatcher;
 export {

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);
 }
@@ -620,7 +617,8 @@ function messageTextOf(m) {
 var OWN_PROMPT_SHAPES = [
   /^continue\s*\u2014\s*stalled\s*\(/,
   /^continue\s*\nOnly continue work already in progress\./,
-  /^continue\s*\nIf work was already in progress,/
+  /^continue\s*\nIf work was already in progress,/,
+  /^You tried to use the tool "/
 ];
 function looksLikeOwnPrompt(text) {
   if (typeof text !== "string" || text.length === 0)
@@ -670,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;
@@ -715,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",
@@ -774,6 +774,7 @@ var v2_default = define({
     }
     if (typeof ctx.app?.version !== "string") {
       log("warn", "this looks like the opencode v1 build running on the wrong server: ctx.app.version is missing. The v2 bundle requires opencode v2 \u2014 update the plugin package (the npm build auto-selects per server) or load the build matching your server; see the README on npm (opencode-auto-resume).");
+      return () => {};
     }
     const gatedInUse = Object.keys(opts).filter((key) => FEATURE_GATED_OPTIONS.includes(key));
     const dbg = (...args) => {
@@ -848,7 +849,6 @@ var v2_default = define({
           providerRetryAt: 0,
           quotaNoticedAt: 0,
           gaveUp: false,
-          lastQuotaNoticeAt: 0,
           paused: false,
           lastGenuineUserAt: 0,
           consecFailureRecovers: 0,
@@ -882,6 +882,8 @@ var v2_default = define({
           intentNudgeAttempts: 0,
           completionSignaled: false,
           completionSignaledAt: 0,
+          completionHard: false,
+          latchReopened: false,
           emptyIdleNudged: false,
           todos: [],
           todosFetchedAt: 0,
@@ -939,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/)) {
@@ -954,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) {
@@ -979,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)}`);
       }
@@ -1026,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;
@@ -1093,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`);
@@ -1105,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;
@@ -1125,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}).`);
@@ -1607,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("; ");
@@ -1694,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}`);
       }
@@ -2181,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) {
@@ -2361,7 +2397,10 @@ ${suffix}`).slice(0, 2000);
         const available = await getAvailableToolIds();
         if (available.length === 0)
           return false;
+        const lastUserAt = lastUserMessageAt(messages);
         for (const msg of messages) {
+          if (lastUserAt !== undefined && msgAt(msg) <= lastUserAt)
+            continue;
           const content = msg?.content;
           if (!Array.isArray(content))
             continue;
@@ -2463,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)
@@ -2514,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`);
@@ -2552,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 {
@@ -2590,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`);
@@ -2622,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`);
@@ -2968,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`);
                 }
@@ -2988,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`);
                   }
                 }
@@ -3038,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;
@@ -3135,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`);
         }
       }
@@ -3499,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.0",
+  "version": "1.2.2",
   "description": "OpenCode plugin that automatically resumes stalled LLM sessions when thinking/streaming freezes mid-generation.",
   "keywords": [
     "opencode",