opencode-auto-resume 1.0.7 → 1.0.8

package/README.md

@@ -30,6 +30,12 @@ _( [#128](https://github.com/opencode-ai/opencode/pulls/128), [#22](https://gith
 
 **Session discovery** — periodically calls `session.list()` to pick up sessions that were missed by event tracking. Idle sessions are cleaned up after 10 minutes to prevent memory leaks.
 
+**Model preservation** — when resuming with "continue", the plugin extracts agent, model and provider from the last session message (not from `info` field) to preserve the user's UI selection.
+_( [#111](https://github.com/opencode-ai/opencode/issues/111), [#277](https://github.com/opencode-ai/opencode/issues/277) )_
+
+**Subagent stuck detection** — detects when a subagent hasn't received new text for >1 minute (or >3 minutes if a tool call is in progress). If stuck, sends a recovery prompt before triggering abort+resume on the parent.
+_( [#55](https://github.com/opencode-ai/opencode/issues/55), [#60](https://github.com/opencode-ai/opencode/issues/60), [#246](https://github.com/opencode-ai/opencode/issues/246) )_
+
 ## Architecture
 
 ```

package/dist/index.js

@@ -217,12 +217,15 @@ var AutoResumePlugin = async (ctx, options) => {
       const msgs = extractMessages(msgResp);
       for (let i = msgs.length - 1;i >= 0; i--) {
         const msg = msgs[i];
-        const info = msg.info;
-        if (info?.role === "user") {
-          const rawAgent = info.agent;
+        const role = msg.role ?? msg.info?.role;
+        if (role === "user") {
+          const rawAgent = msg.agent;
           if (typeof rawAgent === "string")
             agent2 = rawAgent;
-          const rawModel = info.model;
+          let rawModel = msg.model;
+          if (!rawModel) {
+            rawModel = msg.info?.model;
+          }
           if (rawModel && typeof rawModel.providerID === "string" && typeof rawModel.modelID === "string") {
             model2 = {
               providerID: rawModel.providerID,
@@ -271,10 +274,27 @@ var AutoResumePlugin = async (ctx, options) => {
       return response.messages;
     return [];
   }
+  const SUBAGENT_STUCK_MS = 60000;
+  const SUBAGENT_RECOVERY_PROMPT = "It looks like you may have stalled or timed out. Please retry the last operation or continue with the task.";
+  async function recoverSubagent(subagentSid) {
+    try {
+      await ctx.client.session.prompt({
+        path: { id: subagentSid },
+        body: { parts: [{ type: "text", text: SUBAGENT_RECOVERY_PROMPT }] }
+      });
+      await log("info", `Sent recovery prompt to subagent ${short(subagentSid)}`);
+      return true;
+    } catch (err) {
+      const errMsg = err instanceof Error ? err.message : String(err);
+      await log("warn", `Failed to recover subagent ${short(subagentSid)}: ${errMsg}`);
+      return false;
+    }
+  }
   async function checkSubagentStatus(parentSid) {
     try {
       const response = await ctx.client.session.list();
       const allSessions = extractMessages(response);
+      const now = Date.now();
       let hasBusySubagent = false;
       for (const s of allSessions) {
         const sId = s.id;
@@ -291,16 +311,23 @@ var AutoResumePlugin = async (ctx, options) => {
             await log("debug", `Subagent ${short(sId)} appears crashed`);
             return "crashed";
           }
+          const msgTime = lastMsg?.time?.created ?? lastMsg?.time;
+          const hasToolCall = lastMsg?.toolCall !== undefined || lastMsg?.tool_calls !== undefined || lastMsg?.parts?.some((p) => p.type === "tool-call") !== undefined;
+          const isStuck = hasToolCall ? now - msgTime > SUBAGENT_STUCK_MS * 3 : now - msgTime > SUBAGENT_STUCK_MS;
+          if (isStuck) {
+            await log("debug", `Subagent ${short(sId)} stuck - no new text in >${hasToolCall ? 3 : 1}min`);
+            return { status: "crashed", stuckSid: sId };
+          }
         }
       }
       if (!hasBusySubagent) {
-        return "idle";
+        return { status: "idle" };
       }
-      return "busy";
+      return { status: "busy" };
     } catch (err) {
       const errMsg = err instanceof Error ? err.message : String(err);
       await log("debug", `checkSubagentStatus failed: ${errMsg}`);
-      return "unknown";
+      return { status: "unknown" };
     }
   }
   function resetSessionFlags(w) {
@@ -511,10 +538,15 @@ var AutoResumePlugin = async (ctx, options) => {
           if (orphanIdle >= subagentWaitMs + gracePeriodMs) {
             if (w.resumeAttempts < maxRetries) {
               const subStatus = await checkSubagentStatus(sid);
-              if (subStatus === "crashed") {
-                await log("info", `Subagent crashed, triggering abort+resume on ${short(sid)}`);
-                tryAbortAndResume(sid, w);
-              } else if (subStatus === "idle") {
+              if (subStatus.status === "crashed" && subStatus.stuckSid) {
+                const recovered = await recoverSubagent(subStatus.stuckSid);
+                if (recovered) {
+                  await log("info", `Sent recovery prompt to stuck subagent ${short(subStatus.stuckSid)}, waiting...`);
+                } else {
+                  await log("info", `Subagent crashed, triggering abort+resume on ${short(sid)}`);
+                  tryAbortAndResume(sid, w);
+                }
+              } else if (subStatus.status === "idle") {
                 await log("info", `All subagents idle, parent ${short(sid)} stuck. Triggering abort+resume.`);
                 tryAbortAndResume(sid, w);
               } else {
@@ -531,6 +563,23 @@ var AutoResumePlugin = async (ctx, options) => {
         }
         if (numBusy > 1)
           continue;
+        if (w.lastActivityAt > 0 && now - w.lastActivityAt > subagentWaitMs) {
+          const subStatus = await checkSubagentStatus(sid);
+          if (subStatus.status === "idle" || subStatus.status === "unknown") {
+            await log("info", `Parent ${short(sid)} stuck with no active subagents. Triggering abort+resume.`);
+            tryAbortAndResume(sid, w);
+            continue;
+          } else if (subStatus.status === "crashed" && subStatus.stuckSid) {
+            const recovered = await recoverSubagent(subStatus.stuckSid);
+            if (recovered) {
+              await log("info", `Sent recovery prompt to stuck subagent ${short(subStatus.stuckSid)}, waiting...`);
+            } else {
+              await log("info", `Parent ${short(sid)} subagent recovery failed. Triggering abort+resume.`);
+              tryAbortAndResume(sid, w);
+            }
+            continue;
+          }
+        }
         const idle = now - w.lastActivityAt;
         if (idle >= chunkTimeoutMs + gracePeriodMs) {
           if (w.resumeAttempts < maxRetries) {

package/package.json

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