opencode-auto-resume 1.1.18 → 1.1.19

package/README.md

@@ -415,6 +415,8 @@ With options:
 | `thinkingToolRecoveryPrompt` | `THINKING_TOOL_RECOVERY_PROMPT` | Override the thinking-tool recovery prompt |
 | `doneWithoutWorkPrompt` | `DONE_WITHOUT_WORK_PROMPT` | Override the done-claim-with-open-todos prompt |
 | `doneWithoutDetailsPrompt` | `DONE_WITHOUT_DETAILS_PROMPT` | Override the done-claim-with-no-todos report prompt |
+| `doneClaimPatterns` | `DONE_CLAIM_PATTERNS` | Array of regex strings overriding the default done-claim detection patterns (case-insensitive, multiline). Invalid regexes are skipped. Empty array falls back to defaults. |
+| `readyToContinuePatterns` | `READY_TO_CONTINUE_PATTERNS` | Array of regex strings overriding the default ready-to-continue detection patterns (case-insensitive). Invalid regexes are skipped. Empty array falls back to defaults. |
 | `silentDeadStreamMinTokens` | `200` | Min output tokens to treat a textless `finish:"unknown"` message as a dead stream |
 | `busyStallStrategy` | `"continue"` | Busy-stall response: `"continue"`, `"abort"` (abort-first), or `"off"` (disabled) |
 | `contextSaturationThreshold` | `0.85` | Ratio of used/usable context that routes a saturated parent to magic-context `ctx-wrapup` (only when magic-context is installed) |

package/dist/index.js

@@ -12428,7 +12428,7 @@ function containsToolCallAsText(text) {
   }
   return false;
 }
-function containsReadyToContinuePattern(text) {
+function containsReadyToContinuePattern(text, patterns = READY_TO_CONTINUE_PATTERNS) {
   const lines = text.split(`
 `);
   const lastLine = lines[lines.length - 1]?.trim();
@@ -12436,7 +12436,7 @@ function containsReadyToContinuePattern(text) {
     return false;
   const lastLines = lines.slice(-3).join(`
 `);
-  return READY_TO_CONTINUE_PATTERNS.some((pat) => pat.test(lastLines));
+  return patterns.some((pat) => pat.test(lastLines));
 }
 var DONE_CLAIM_PATTERNS = [
   /^task\s+done[.!]*$/im,
@@ -12456,12 +12456,12 @@ var DONE_CLAIM_PATTERNS = [
 ];
 var DONE_WITHOUT_WORK_PROMPT = "I need you to verify more carefully that you have actually completed all the required tasks. " + "Your response indicated you're done, but no work was detected. Please check your todo list " + "and complete any remaining work.";
 var DONE_WITHOUT_DETAILS_PROMPT = "Your last response claimed the task is complete but contained no work description. This is not acceptable. " + "You MUST respond now with a full, detailed report of everything you did: " + "for each file you modified, state the full path and the exact changes; " + "list every command you ran to verify and its result; state the final outcome. " + "Do NOT reply with 'done', 'task completed', or any short acknowledgment \u2014 " + "your ONLY acceptable response right now is this detailed report. Write it now.";
-function containsDoneClaimPattern(text) {
+function containsDoneClaimPattern(text, patterns = DONE_CLAIM_PATTERNS) {
   const lines = text.split(`
 `);
   const lastLines = lines.slice(-5).join(`
 `);
-  return DONE_CLAIM_PATTERNS.some((pat) => pat.test(lastLines));
+  return patterns.some((pat) => pat.test(lastLines));
 }
 function containsWorkDescription(text) {
   if (/`[^`\n]*\.[a-zA-Z0-9]{1,8}[^`\n]*`/.test(text))
@@ -12675,6 +12675,30 @@ var AutoResumePlugin = async (ctx, options) => {
   const contextSaturationThreshold = options?.contextSaturationThreshold ?? 0.85;
   const subagentNativeCompactionEnabled = options?.subagentNativeCompactionEnabled ?? false;
   const activeUserWindowMs = options?.activeUserWindowMs ?? DEFAULT_ACTIVE_USER_WINDOW_MS;
+  const doneClaimPatterns = (() => {
+    const raw = options?.doneClaimPatterns;
+    if (!Array.isArray(raw) || raw.length === 0)
+      return DONE_CLAIM_PATTERNS;
+    return raw.map((s) => {
+      try {
+        return new RegExp(s, "im");
+      } catch {
+        return null;
+      }
+    }).filter((r) => r !== null);
+  })();
+  const readyToContinuePatterns = (() => {
+    const raw = options?.readyToContinuePatterns;
+    if (!Array.isArray(raw) || raw.length === 0)
+      return READY_TO_CONTINUE_PATTERNS;
+    return raw.map((s) => {
+      try {
+        return new RegExp(s, "i");
+      } catch {
+        return null;
+      }
+    }).filter((r) => r !== null);
+  })();
   const dbg = (...args) => {
     if (debug)
       console.log("[debug]", ...args);
@@ -12749,6 +12773,7 @@ var AutoResumePlugin = async (ctx, options) => {
         orphanWatchStartAt: null,
         aborting: false,
         pluginAbortInFlight: false,
+        pluginAbortAt: 0,
         toolTextRecovered: false,
         toolTextAttempts: 0,
         continueTimestamps: [],
@@ -12917,6 +12942,10 @@ var AutoResumePlugin = async (ctx, options) => {
     }
     if (w.userCancelled || w.completionSignaled)
       return;
+    if (w.gaveUp) {
+      await log("debug", `${short(sid)} - gaveUp latched, refusing further continue prompts`);
+      return;
+    }
     if (!w.continuing)
       dbg(`State transition on ${short(sid)}: continuing=false -> true`);
     w.continuing = true;
@@ -13018,7 +13047,6 @@ var AutoResumePlugin = async (ctx, options) => {
             } catch (err) {
               const errMsg = err instanceof Error ? err.message : String(err);
               await log("warn", `${short(sid)} - recovery retry failed: ${errMsg}`);
-              w.recoveryAttempts = 0;
             }
             w.watchdogRetryGuard = false;
           } else {
@@ -13030,8 +13058,11 @@ var AutoResumePlugin = async (ctx, options) => {
             dbg(`Watchdog check on ${short(sid)}: status=${w.status}, recoveryAttempts=${w.recoveryAttempts}, maxRetries=${maxRecoveryRetries}, watchdogLatencyMs=${Date.now() - w.lastRetryAt} -> ABORT_RESUME`);
             const resumed = await tryAbortAndResume(sid, w);
             if (!resumed && !w.aborting) {
-              await log("warn", `Recovery exhausted on ${short(sid)}: attempts=${w.recoveryAttempts}, lastError=abort+resume failed`);
-              dbg(`Watchdog check on ${short(sid)}: status=${w.status} -> GAVE_UP`);
+              w.gaveUp = true;
+              w.pendingRecovery = false;
+              w.pendingRecoveryReason = null;
+              await log("warn", `Recovery exhausted on ${short(sid)}: attempts=${w.recoveryAttempts}, lastError=abort+resume failed \u2014 GAVE UP (re-arms on next user message)`);
+              dbg(`Watchdog check on ${short(sid)}: status=${w.status} -> GAVE_UP (latched)`);
               if (w.pendingRecoveryAt > 0) {
                 dbg(`Total recovery cycle on ${short(sid)} (failed): totalCycleMs=${Date.now() - w.pendingRecoveryAt}`);
               }
@@ -13660,7 +13691,7 @@ var AutoResumePlugin = async (ctx, options) => {
               bestCandidate = candidate;
             }
           }
-          if (containsReadyToContinuePattern(text)) {
+          if (containsReadyToContinuePattern(text, readyToContinuePatterns)) {
             const todos = w.todos || [];
             const hasOpenTodos = todos.some(isOpenTodo);
             if (!hasOpenTodos && todos.length > 0) {
@@ -13680,16 +13711,42 @@ var AutoResumePlugin = async (ctx, options) => {
               await log("info", `${short(sid)} - skipping continue, todos appear completed (attempt ${w.todoCheckAttempts}/2)`);
               continue;
             }
-            const candidate = {
-              prompt: containsDoneClaimPattern(text) ? doneWithoutWorkPrompt : continuePrompt,
-              source: containsDoneClaimPattern(text) ? "done-claim" : "ready-to-continue",
-              priority: 1
-            };
-            if (!bestCandidate || candidate.priority < bestCandidate.priority) {
-              bestCandidate = candidate;
+            if (containsDoneClaimPattern(text, doneClaimPatterns)) {
+              const todos = w.todos || [];
+              const hasOpenTodos = todos.some(isOpenTodo);
+              if (hasOpenTodos) {
+                const candidate = {
+                  prompt: doneWithoutWorkPrompt,
+                  source: "done-claim",
+                  priority: 1
+                };
+                if (!bestCandidate || candidate.priority < bestCandidate.priority) {
+                  bestCandidate = candidate;
+                }
+              } else if (!containsWorkDescription(allAssistantText)) {
+                if (w.doneClaimNoTodosAttempts < maxRetries) {
+                  const candidate = {
+                    prompt: doneWithoutDetailsPrompt,
+                    source: "done-claim-no-todos",
+                    priority: 1
+                  };
+                  if (!bestCandidate || candidate.priority < bestCandidate.priority) {
+                    bestCandidate = candidate;
+                  }
+                }
+              }
+            } else {
+              const candidate = {
+                prompt: continuePrompt,
+                source: "ready-to-continue",
+                priority: 1
+              };
+              if (!bestCandidate || candidate.priority < bestCandidate.priority) {
+                bestCandidate = candidate;
+              }
             }
           }
-          if (!bestCandidate && containsDoneClaimPattern(text)) {
+          if (!bestCandidate && containsDoneClaimPattern(text, doneClaimPatterns)) {
             const todos = w.todos || [];
             const hasOpenTodos = todos.some(isOpenTodo);
             if (hasOpenTodos) {
@@ -13774,6 +13831,7 @@ var AutoResumePlugin = async (ctx, options) => {
           await log("info", `${short(sid)} - max open-todos nudges (${maxRetries}) reached, waiting for activity`);
           return;
         }
+        w.todoNudgeAttempts++;
       } else if (isDoneClaimNoTodos) {
         w.doneClaimNoTodosAttempts++;
       } else {
@@ -13829,6 +13887,7 @@ var AutoResumePlugin = async (ctx, options) => {
     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;
+    w.pluginAbortAt = Date.now();
     try {
       await ctx.client.session.abort({ path: { id: sid } });
       await log("info", `${short(sid)} - abort OK`);
@@ -13838,6 +13897,7 @@ var AutoResumePlugin = async (ctx, options) => {
       await log("warn", `${short(sid)} - abort failed: ${errMsg}`);
       w.aborting = false;
       w.pluginAbortInFlight = false;
+      w.pluginAbortAt = 0;
       return false;
     }
     await new Promise((resolve) => setTimeout(resolve, ABORT_CONTINUE_DELAY_MS));
@@ -13862,6 +13922,7 @@ var AutoResumePlugin = async (ctx, options) => {
       return false;
     } finally {
       w.pluginAbortInFlight = false;
+      w.pluginAbortAt = 0;
     }
   }
   async function tryResume(sid, w, reason, prompt) {
@@ -14526,10 +14587,16 @@ var AutoResumePlugin = async (ctx, options) => {
         const isMessageAborted = errorName === "MessageAbortedError";
         if (isMessageAborted) {
           for (const [wSid, w] of sessions) {
-            if (!w.pluginAbortInFlight) {
+            const PLUGIN_ABORT_GRACE_MS = 1000;
+            const isOwnAbort = w.pluginAbortInFlight && Date.now() - (w.pluginAbortAt || 0) < PLUGIN_ABORT_GRACE_MS;
+            if (!isOwnAbort) {
               w.userCancelled = true;
               w.status = "idle";
               resetIdleFlags(w);
+              if (w.toolTextTimer) {
+                clearTimeout(w.toolTextTimer);
+                w.toolTextTimer = null;
+              }
             }
           }
           log("info", "User abort (ESC)");

package/package.json

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