opencode-auto-resume 1.0.4 → 1.0.6

package/README.md

@@ -7,6 +7,8 @@
 LLM sessions fail in predictable ways. This plugin monitors all sessions and automatically recovers without user intervention.
 
 **Stall recovery** — the stream goes silent but the session stays "busy". The UI shows a blinking cursor with no progress. If no events arrive for 48 seconds, the plugin sends `"continue"` with exponential backoff. After 3 failed attempts it gives up.
+
+The plugin extracts the **agent, model, and provider** from the last session message, so it resumes with the exact same configuration the user was using (build, sisyphus, prometheus, etc.).
 _( [#55](https://github.com/opencode-ai/opencode/issues/55), [#199](https://github.com/opencode-ai/opencode/issues/199), [#283](https://github.com/opencode-ai/opencode/issues/283) )_
 
 **Tool calls as raw text** — the model prints tool invocations as raw XML (`<function=edit>...`) instead of executing them. The session goes idle normally but the tool was never run. On idle, the plugin fetches the last messages and scans for XML tool-call patterns (including truncated and alternative formats). If found, it sends a specific recovery prompt.

package/dist/index.js

@@ -15,6 +15,7 @@ var MAX_IDLE_SESSIONS = 50;
 var IDLE_CLEANUP_MS = 10 * 60000;
 var SESSION_DISCOVERY_INTERVAL_MS = 60000;
 var TOOL_TEXT_RECOVERY_PROMPT = "Your last message contained a raw tool call printed as text instead of being executed. " + "Please use the proper tool calling mechanism to execute it.";
+var THINKING_TOOL_RECOVERY_PROMPT = "I noticed you have a tool call generated in your thinking/reasoning. " + "Please execute it using the proper tool calling mechanism instead of keeping it in reasoning.";
 var TOOL_TEXT_PATTERNS = [
   /<function\s*=/i,
   /<function>/i,
@@ -119,7 +120,8 @@ var AutoResumePlugin = async (ctx, options) => {
         toolTextRecovered: false,
         toolTextAttempts: 0,
         continueTimestamps: [],
-        idleSince: null
+        idleSince: null,
+        continuing: false
       };
       sessions.set(sid, w);
     }
@@ -202,6 +204,110 @@ var AutoResumePlugin = async (ctx, options) => {
       log("debug", `Cleaned up ${toDelete.length} idle session(s). Map size: ${sessions.size}`);
     }
   }
+  async function sendContinuePrompt(sid, text, w) {
+    if (w.continuing) {
+      await log("debug", `${short(sid)} - continue already in progress, skipping`);
+      return;
+    }
+    w.continuing = true;
+    try {
+      let agent;
+      let modelID;
+      let providerID;
+      const msgResp = await ctx.client.session.messages({ path: { id: sid } });
+      const msgs = extractMessages(msgResp);
+      const lastMsg = msgs[msgs.length - 1];
+      if (lastMsg) {
+        const info = lastMsg.info;
+        agent = info?.agent;
+        if (lastMsg.role === "assistant") {
+          modelID = lastMsg.modelID;
+          providerID = lastMsg.providerID;
+        }
+      }
+      await ctx.client.session.prompt({
+        path: { id: sid },
+        body: { parts: [{ type: "text", text }] },
+        agent,
+        modelID,
+        providerID
+      });
+      await log("debug", `${short(sid)} - prompt sent with agent: ${agent}, model: ${modelID}`);
+      recordContinue(sid);
+      w.lastRetryAt = Date.now();
+    } catch (err) {
+      const errMsg = err instanceof Error ? err.message : String(err);
+      await log("warn", `${short(sid)} - prompt failed: ${errMsg}`);
+      try {
+        await ctx.client.session.prompt({
+          path: { id: sid },
+          body: { parts: [{ type: "text", text }] }
+        });
+        recordContinue(sid);
+        w.lastRetryAt = Date.now();
+      } catch (retryErr) {
+        const retryMsg = retryErr instanceof Error ? retryErr.message : String(retryErr);
+        await log("error", `${short(sid)} - prompt retry also failed: ${retryMsg}`);
+        throw retryErr;
+      }
+    } finally {
+      w.continuing = false;
+    }
+  }
+  function extractMessages(response) {
+    if (Array.isArray(response))
+      return response;
+    if (Array.isArray(response.data))
+      return response.data;
+    if (Array.isArray(response.messages))
+      return response.messages;
+    return [];
+  }
+  async function checkSubagentCrashed(parentSid) {
+    try {
+      const response = await ctx.client.session.list();
+      const sessions2 = extractMessages(response);
+      for (const s of sessions2) {
+        const sId = s.id;
+        if (!sId || sId === parentSid)
+          continue;
+        const status = s.status;
+        if (status === "busy") {
+          const msgResponse = await ctx.client.session.messages({ path: { id: sId } });
+          const messages = extractMessages(msgResponse);
+          const lastMsg = messages[messages.length - 1];
+          if (lastMsg && lastMsg.role === "assistant" && "error" in lastMsg) {
+            const error = lastMsg.error;
+            const errorName = error?.name;
+            await log("debug", `Subagent ${short(sId)} appears crashed: ${errorName}`);
+            return true;
+          }
+        }
+      }
+    } catch (err) {
+      const errMsg = err instanceof Error ? err.message : String(err);
+      await log("debug", `checkSubagentCrashed failed: ${errMsg}`);
+    }
+    return false;
+  }
+  function resetSessionFlags(w) {
+    w.userCancelled = false;
+    w.resumeAttempts = 0;
+    w.gaveUp = false;
+    w.orphanWatchStartAt = null;
+    w.aborting = false;
+    w.toolTextRecovered = false;
+    w.toolTextAttempts = 0;
+    w.continueTimestamps = [];
+    w.idleSince = null;
+    w.continuing = false;
+  }
+  function resetIdleFlags(w) {
+    w.userCancelled = false;
+    w.aborting = false;
+    w.orphanWatchStartAt = null;
+    w.idleSince = Date.now();
+  }
   async function checkForToolCallAsText(sid, w) {
     if (typeof sid !== "string" || !sid)
       return;
@@ -220,15 +326,7 @@ var AutoResumePlugin = async (ctx, options) => {
       const response = await ctx.client.session.messages({
         path: { id: sid }
       });
-      const data = response;
-      let messages = [];
-      if (Array.isArray(data)) {
-        messages = data;
-      } else if (Array.isArray(data.data)) {
-        messages = data.data;
-      } else if (Array.isArray(data.messages)) {
-        messages = data.messages;
-      }
+      const messages = extractMessages(response);
       const recent = messages.slice(-3);
       for (const msg of recent) {
         const role = msg.role;
@@ -238,24 +336,29 @@ var AutoResumePlugin = async (ctx, options) => {
         if (!parts)
           continue;
         for (const part of parts) {
-          if (part.type !== "text")
+          const partType = part.type;
+          let text = "";
+          let isReasoning = false;
+          if (partType === "text") {
+            text = part.text ?? "";
+          } else if (partType === "reasoning") {
+            text = part.text ?? "";
+            isReasoning = true;
+          } else {
             continue;
-          const text = part.text ?? "";
+          }
           if (containsToolCallAsText(text)) {
             w.toolTextRecovered = true;
             w.toolTextAttempts++;
-            await log("info", `Tool-call-as-text detected on ${short(sid)}! ` + `Attempt ${w.toolTextAttempts}/${maxRetries}. Sending recovery prompt...`);
+            const prompt = isReasoning ? THINKING_TOOL_RECOVERY_PROMPT : TOOL_TEXT_RECOVERY_PROMPT;
+            const source = isReasoning ? "reasoning" : "text";
+            await log("info", `Tool-call-as-text in ${source} detected on ${short(sid)}! ` + `Attempt ${w.toolTextAttempts}/${maxRetries}. Sending recovery prompt...`);
             if (isHallucinationLoop(sid)) {
               await log("warn", `Hallucination loop detected on ${short(sid)} \u2014 aborting instead`);
               await tryAbortAndResume(sid, w);
             } else {
               try {
-                await ctx.client.session.prompt({
-                  path: { id: sid },
-                  body: { agent: typeof w.agent === "string" ? w.agent : undefined, parts: [{ type: "text", text: TOOL_TEXT_RECOVERY_PROMPT }] }
-                });
-                recordContinue(sid);
-                w.lastRetryAt = Date.now();
+                await sendContinuePrompt(sid, prompt, w);
                 await log("info", `${short(sid)} - tool-call-as-text recovery sent (attempt ${w.toolTextAttempts})`);
               } catch (err) {
                 const errMsg = err instanceof Error ? err.message : String(err);
@@ -273,12 +376,7 @@ var AutoResumePlugin = async (ctx, options) => {
               await tryAbortAndResume(sid, w);
             } else {
               try {
-                await ctx.client.session.prompt({
-                  path: { id: sid },
-                  body: { agent: typeof w.agent === "string" ? w.agent : undefined, parts: [{ type: "text", text: "continue" }] }
-                });
-                recordContinue(sid);
-                w.lastRetryAt = Date.now();
+                await sendContinuePrompt(sid, "continue", w);
                 await log("info", `${short(sid)} - ready-to-continue recovery sent (attempt ${w.toolTextAttempts})`);
               } catch (err) {
                 const errMsg = err instanceof Error ? err.message : String(err);
@@ -315,13 +413,8 @@ var AutoResumePlugin = async (ctx, options) => {
     if (w.status === "busy")
       w.status = "idle";
     try {
-      await ctx.client.session.prompt({
-        path: { id: sid },
-        body: { agent: typeof w.agent === "string" ? w.agent : undefined, parts: [{ type: "text", text: "continue" }] }
-      });
-      recordContinue(sid);
+      await sendContinuePrompt(sid, "continue", w);
       await log("info", `${short(sid)} - abort+continue done`);
-      w.lastRetryAt = Date.now();
       w.orphanWatchStartAt = null;
       w.resumeAttempts++;
       w.aborting = false;
@@ -350,15 +443,9 @@ var AutoResumePlugin = async (ctx, options) => {
     w.resumeAttempts++;
     const idleSec = Math.round((now - w.lastActivityAt) / 1000);
     await log("info", `${reason} on ${short(sid)} (${idleSec}s, retry ${w.resumeAttempts}/${maxRetries})`);
-    const agent = typeof w.agent === "string" ? w.agent : undefined;
     try {
-      await ctx.client.session.prompt({
-        path: { id: sid },
-        body: { agent, model: true, parts: [{ type: "text", text: "continue" }] }
-      });
-      recordContinue(sid);
+      await sendContinuePrompt(sid, "continue", w);
       await log("info", `${short(sid)} - retry sent`);
-      w.lastRetryAt = now;
       return true;
     } catch (err) {
       const errMsg = err instanceof Error ? err.message : String(err);
@@ -367,44 +454,10 @@ var AutoResumePlugin = async (ctx, options) => {
       return false;
     }
   }
-  async function getSessionAgent(sid) {
-    if (typeof sid !== "string" || !sid)
-      return;
-    try {
-      const response = await ctx.client.session.messages({
-        path: { id: sid }
-      });
-      const data = response;
-      let messages = [];
-      if (Array.isArray(data)) {
-        messages = data;
-      } else if (Array.isArray(data.data)) {
-        messages = data.data;
-      } else if (Array.isArray(data.messages)) {
-        messages = data.messages;
-      }
-      for (let i = messages.length - 1;i >= 0; i--) {
-        const msg = messages[i];
-        const role = msg.role;
-        if (role === "assistant") {
-          const agent = msg.agent;
-          if (agent)
-            return agent;
-        }
-      }
-    } catch {}
-    return;
-  }
   async function discoverSessions() {
     try {
       const response = await ctx.client.session.list();
-      const data = response;
-      let list = [];
-      if (Array.isArray(data)) {
-        list = data;
-      } else if (Array.isArray(data.data)) {
-        list = data.data;
-      }
+      const list = extractMessages(response);
       for (const s of list) {
         const sid = s.id;
         if (sid) {
@@ -418,14 +471,7 @@ var AutoResumePlugin = async (ctx, options) => {
               w.idleSince = Date.now();
           }
           if (isNew) {
-            const agent = await getSessionAgent(sid);
-            if (agent) {
-              const w = sessions.get(sid);
-              w.agent = agent;
-              log("debug", `Discovered session ${short(sid)} with agent: ${agent}`);
-            } else {
-              log("debug", `Discovered session ${short(sid)} via list()`);
-            }
+            log("debug", `Discovered session ${short(sid)} via list()`);
           }
         }
       }
@@ -437,7 +483,7 @@ var AutoResumePlugin = async (ctx, options) => {
   function startTimer() {
     if (timer)
       return;
-    timer = setInterval(() => {
+    timer = setInterval(async () => {
       const now = Date.now();
       const numBusy = busyCount();
       for (const [sid, w] of sessions) {
@@ -451,7 +497,13 @@ var AutoResumePlugin = async (ctx, options) => {
           const orphanIdle = now - w.orphanWatchStartAt;
           if (orphanIdle >= subagentWaitMs + gracePeriodMs) {
             if (w.resumeAttempts < maxRetries) {
-              tryAbortAndResume(sid, w);
+              const crashed = await checkSubagentCrashed(sid);
+              if (crashed) {
+                await log("info", `Subagent crashed, triggering abort+resume on ${short(sid)}`);
+                tryAbortAndResume(sid, w);
+              } else {
+                await log("debug", `Subagent still running, waiting...`);
+              }
             } else if (!w.gaveUp) {
               w.gaveUp = true;
               w.orphanWatchStartAt = null;
@@ -501,21 +553,11 @@ var AutoResumePlugin = async (ctx, options) => {
         w.status = statusType;
         if (statusType === "busy") {
           w.lastActivityAt = Date.now();
-          w.userCancelled = false;
-          w.resumeAttempts = 0;
-          w.gaveUp = false;
-          w.orphanWatchStartAt = null;
-          w.aborting = false;
-          w.toolTextRecovered = false;
-          w.toolTextAttempts = 0;
-          w.continueTimestamps = [];
-          w.idleSince = null;
+          resetSessionFlags(w);
           log("debug", `${short(sid)} -> busy (${busyCount()})`);
         } else if (statusType === "idle") {
           w.status = "idle";
-          w.userCancelled = false;
-          w.aborting = false;
-          w.idleSince = Date.now();
+          resetIdleFlags(w);
           const currentBusy = busyCount();
           if (prevBusyCount > 1 && currentBusy === 1) {
             const lone = getLoneBusySession();
@@ -555,10 +597,7 @@ var AutoResumePlugin = async (ctx, options) => {
         const w = sessions.get(sid);
         if (w) {
           w.status = "idle";
-          w.userCancelled = false;
-          w.orphanWatchStartAt = null;
-          w.aborting = false;
-          w.idleSince = Date.now();
+          resetIdleFlags(w);
           if (!w.toolTextRecovered && w.toolTextAttempts < maxRetries) {
             setTimeout(() => {
               checkForToolCallAsText(sid, w);
@@ -576,9 +615,7 @@ var AutoResumePlugin = async (ctx, options) => {
             if (w.status === "busy") {
               w.userCancelled = true;
               w.status = "idle";
-              w.orphanWatchStartAt = null;
-              w.aborting = false;
-              w.idleSince = Date.now();
+              resetIdleFlags(w);
             }
           }
           log("info", "User abort (ESC)");
@@ -592,13 +629,7 @@ var AutoResumePlugin = async (ctx, options) => {
       }
       case "command.executed": {
         for (const [, w] of sessions) {
-          w.userCancelled = false;
-          w.resumeAttempts = 0;
-          w.gaveUp = false;
-          w.orphanWatchStartAt = null;
-          w.aborting = false;
-          w.toolTextRecovered = false;
-          w.toolTextAttempts = 0;
+          resetSessionFlags(w);
         }
         break;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-auto-resume",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "OpenCode plugin that automatically resumes stalled LLM sessions when thinking/streaming freezes mid-generation.",
   "keywords": [
     "opencode",
@@ -21,12 +21,12 @@
   "author": "Daniele \"mte90\" Scasciafratte",
   "type": "module",
   "main": "dist/index.js",
-  "scripts": {
+"scripts": {
     "build": "bun build src/index.ts --outdir dist --target bun",
     "dev": "bun build src/index.ts --outdir dist --target bun --watch",
+    "test": "bun test",
     "prepublishOnly": "bun run build"
-  },
-  "files": [
+},  "files": [
     "dist/index.js",
     "README.md",
     "LICENSE"