opencode-auto-resume 1.0.5 → 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,
@@ -210,12 +211,45 @@ var AutoResumePlugin = async (ctx, options) => {
     }
     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 }] }
+        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;
     }
@@ -229,6 +263,33 @@ var AutoResumePlugin = async (ctx, options) => {
       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;
@@ -275,19 +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 sendContinuePrompt(sid, TOOL_TEXT_RECOVERY_PROMPT, w);
+                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);
@@ -412,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) {
@@ -426,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;

package/package.json

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