opencode-auto-resume 1.2.0 → 1.2.1

package/README.md

@@ -453,7 +453,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;
         }
@@ -15479,15 +15528,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;
@@ -15636,6 +15686,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) => {
@@ -17223,7 +17274,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;
@@ -18868,10 +18922,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

@@ -620,7 +620,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)
@@ -774,6 +775,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) => {
@@ -2361,7 +2363,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;

package/package.json

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