opencode-auto-resume 1.2.2 → 1.2.4

package/README.md

@@ -238,6 +238,10 @@ _Motivated by:_
 - [#33050](https://github.com/anomalyco/opencode/issues/33050) — orphaned sessions continue looping after abort, causing sustained high CPU
 - [#32335](https://github.com/anomalyco/opencode/issues/32335) — opencode run processes don't exit after completing scheduled work, causing memory leak
 
+#### Subagent dead response
+
+A child that finishes idle with a provider error, or with an empty finish (no text, no tool call), leaves its parent waiting on a result that will never arrive. The plugin detects the dead child on its own idle event and sends one targeted recovery prompt to that child, then hands back to the parent-side orphan watch. This applies to both builds: v1 reads the child's message history through the SDK; v2 reads the graph messages on the child session. Handling is suppressed when the child was cancelled by the user, already signalled completion, gave up, is waiting on a permission, is compacting, is mid-recovery, or when the plugin itself aborted it. Only the current turn counts — an error or empty finish before a newer user message is history, not a dead child. One prompt per episode; a genuine new user message re-arms it. Log line: `subagent error <reason> — sending one recovery prompt` or `subagent empty finish=<reason> — sending one recovery prompt` (v1 prefixes the short id with ` - `).
+
 #### 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 to the subagent before triggering abort+resume on the parent. This avoids killing a parent that merely has a slow child.
@@ -404,7 +408,7 @@ All recovery paths fall into three families. Which family fires determines what
 
 Fire only after OpenCode reports the session **idle** — the runner has exited. The prompt starts a new run.
 
-Paths: todo nudges, tool-call-as-text recovery, thinking-tool recovery, action-intent nudge, ready-to-continue, done-claim verification, streaming-failure recovery, silent dead-stream recovery, context-saturation routing (magic-context-gated; parent sessions use `session.command`, subagents use opt-in native `session.summarize`).
+Paths: todo nudges, tool-call-as-text recovery, thinking-tool recovery, action-intent nudge, ready-to-continue, done-claim verification, streaming-failure recovery, silent dead-stream recovery, subagent dead-response recovery, context-saturation routing (magic-context-gated; parent sessions use `session.command`, subagents use opt-in native `session.summarize`).
 
 ### 2. Busy-silence continue (stream stall)
 
@@ -424,7 +428,6 @@ Aborts the active run, then continues. The only family that can unblock a live r
 
 Paths: orphan parent, subagent stuck (parent side), hallucination loop, streaming-failure escalation. All aborts pass the active-tool guards first, and plugin-initiated aborts are marked so they are not mistaken for user ESC (`session.error` → `MessageAbortedError` race).
 
-<<<<<<< HEAD
 ## Architecture
 
 
@@ -434,6 +437,8 @@ To verify the plugin is loaded, run `/status` inside OpenCode — it lists all l
 
 On v2 a clean load writes nothing at startup: warnings and recovery lines go to the server process output, not a file, and there is no ready banner. To confirm the config reached the plugin, trigger any recovery — every action is logged to the process output.
 
+On v1 every startup line carries the loaded build version (`opencode-auto-resume ready (vX.Y.Z)`, `opencode-auto-resume config OK (vX.Y.Z)`), and diagnostics are prefixed `[auto-resume vX.Y.Z]`. opencode 1.19.5 and later run two plugin loaders: the v1 `server()` loader and the v2 config-plugin `setup()` loader. The setup context has service domains only — no event stream and no client — so the plugin cannot recover sessions from it. The dispatcher detects that shape, logs `opencode v2 config-plugin API detected ... this setup() call is inert`, and leaves the v1 copy loaded through `server()` active. The `ready (vX.Y.Z)` line is the proof the active copy is running.
+
 | Problem | Solution |
 |---|---|
 | Resumes after ESC | Increase `gracePeriodMs` to `5000` |
@@ -446,6 +451,7 @@ On v2 a clean load writes nothing at startup: warnings and recovery lines go to
 | 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. 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. |
+| Log says `opencode v2 config-plugin API detected` or `this setup() call is inert` | Expected on opencode 1.19.5+. Its second loader calls `setup()` with a service-only context; the v1 `server()` copy still handles recovery. Confirm the `opencode-auto-resume ready (vX.Y.Z)` startup line. If you instead see `unrecognised host context`, the host shape is unsupported. |
 | 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

@@ -12343,7 +12343,56 @@ function tool(input) {
   return input;
 }
 tool.schema = exports_external;
+// package.json
+var package_default = {
+  name: "opencode-auto-resume",
+  version: "1.2.4",
+  description: "OpenCode plugin that automatically resumes stalled LLM sessions when thinking/streaming freezes mid-generation.",
+  keywords: [
+    "opencode",
+    "plugin",
+    "auto-resume",
+    "stall-detection",
+    "llm"
+  ],
+  homepage: "https://github.com/Mte90/opencode-auto-resume#readme",
+  bugs: {
+    url: "https://github.com/Mte90/opencode-auto-resume/issues"
+  },
+  repository: {
+    type: "git",
+    url: "git+https://github.com/Mte90/opencode-auto-resume.git"
+  },
+  license: "GPL-3.0-or-later",
+  author: 'Daniele "mte90" Scasciafratte',
+  type: "module",
+  main: "dist/index.js",
+  scripts: {
+    build: "bun run build:v1 && bun run build:v2",
+    "build:v1": "bun build src/dispatch.ts --outfile dist/index.js --target bun",
+    "build:v2": "bun build src/v2/index.ts --outfile dist/v2/index.js --target bun",
+    dev: "bun build src/dispatch.ts --outfile dist/index.js --target bun --watch",
+    test: "bun run build && bun test",
+    prepublishOnly: "bun run build"
+  },
+  files: [
+    "dist/index.js",
+    "dist/v2/index.js",
+    "README.md",
+    "LICENSE"
+  ],
+  dependencies: {
+    "@opencode-ai/plugin": "latest"
+  },
+  devDependencies: {
+    "@opencode-ai/sdk": "latest",
+    "@types/bun": "latest",
+    typescript: "latest"
+  }
+};
+
 // src/index.ts
+var PLUGIN_VERSION = package_default.version;
 var DEFAULT_CHUNK_TIMEOUT_MS = 180000;
 var DEFAULT_CHECK_INTERVAL_MS = 5000;
 var DEFAULT_DISCOVERY_DELAY_MS = 5000;
@@ -12682,7 +12731,7 @@ 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).");
+    console.warn(`[auto-resume v${PLUGIN_VERSION}] 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 () => {}
@@ -12837,6 +12886,7 @@ var AutoResumePlugin = async (ctx, options) => {
         contextWrapupAttempts: 0,
         toolLoopAttempts: 0,
         isSubagent: false,
+        subagentRecoveryTried: false,
         completionSignaled: false,
         todoNudgeAttempts: 0,
         taskCompleteOverrides: 0,
@@ -12849,6 +12899,7 @@ var AutoResumePlugin = async (ctx, options) => {
         pendingRecoveryReason: null,
         pendingRecoveryAt: 0,
         recoveryAttempts: 0,
+        recoveryContinueInFlight: false,
         watchdogRetryGuard: false,
         unknownToolErrors: new Map,
         unknownToolSuggestionSent: false,
@@ -13092,6 +13143,7 @@ var AutoResumePlugin = async (ctx, options) => {
             const retryBackoffMs = backoffMs(w.recoveryAttempts, baseBackoffMs, maxBackoffMs);
             await log("info", `Retrying recovery on ${short(sid)}: attempt=${w.recoveryAttempts}, backoffMs=${retryBackoffMs}`);
             dbg(`Retrying recovery on ${short(sid)}: recoveryAttempts=${w.recoveryAttempts}, backoffMs=${retryBackoffMs}, pendingRecoveryReason=${w.pendingRecoveryReason}`);
+            w.recoveryContinueInFlight = true;
             try {
               await sendContinuePrompt(sid, continuePrompt, w);
             } catch (err) {
@@ -13259,6 +13311,40 @@ var AutoResumePlugin = async (ctx, options) => {
       return;
     return msg.role ?? msg.info?.role;
   }
+  function getSubagentResponseFailure(messages) {
+    let lastUser = -1;
+    for (let i = messages.length - 1;i >= 0; i--) {
+      if (roleOf(messages[i]) === "user") {
+        lastUser = i;
+        break;
+      }
+    }
+    const turn = lastUser >= 0 ? messages.slice(lastUser + 1) : messages;
+    const error = getLastAssistantError(turn);
+    if (error) {
+      const detail = [error.name, error.message].filter(Boolean).join(": ") || "error";
+      return { kind: "error", detail };
+    }
+    for (let i = turn.length - 1;i >= 0; i--) {
+      const msg = turn[i];
+      if (roleOf(msg) !== "assistant")
+        continue;
+      const info = msg.info;
+      const finish = msg.finish ?? info?.finish ?? info?.finishReason;
+      if (!finish)
+        return null;
+      const parts = msg.parts ?? [];
+      const hasText = parts.some((p) => p.type === "text" && typeof p.text === "string" && p.text.length > 0);
+      const hasToolCall = parts.some((p) => {
+        const type = typeof p.type === "string" ? p.type : "";
+        return type.startsWith("tool");
+      }) || msg.toolCall !== undefined || (msg.tool_calls?.length ?? 0) > 0;
+      if (hasText || hasToolCall)
+        return null;
+      return { kind: "empty", detail: finish };
+    }
+    return null;
+  }
   function messageTimeOf(msg) {
     if (!msg)
       return;
@@ -13558,15 +13644,15 @@ var AutoResumePlugin = async (ctx, options) => {
     w.pendingRecovery = false;
     w.pendingRecoveryReason = null;
     w.pendingRecoveryAt = 0;
+    w.subagentRecoveryTried = false;
     w.recoveryAttempts = 0;
+    w.recoveryContinueInFlight = false;
     w.watchdogRetryGuard = false;
   }
   function resetBusyFlags(w) {
-    w.resumeAttempts = 0;
     w.lastRetryAt = 0;
     w.pendingTools = 0;
     w.pendingCommands = 0;
-    w.gaveUp = false;
     w.orphanWatchStartAt = null;
     w.aborting = false;
     w.toolTextRecovered = false;
@@ -13581,7 +13667,7 @@ var AutoResumePlugin = async (ctx, options) => {
     w.pendingRecovery = false;
     w.pendingRecoveryReason = null;
     w.pendingRecoveryAt = 0;
-    w.recoveryAttempts = 0;
+    w.recoveryContinueInFlight = false;
     w.watchdogRetryGuard = false;
     if (w.toolTextTimer) {
       clearTimeout(w.toolTextTimer);
@@ -13974,6 +14060,7 @@ var AutoResumePlugin = async (ctx, options) => {
       return false;
     if (w.oocLocked)
       return false;
+    w.aborting = true;
     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;
@@ -13999,6 +14086,7 @@ var AutoResumePlugin = async (ctx, options) => {
       return false;
     }
     try {
+      w.recoveryContinueInFlight = false;
       await sendContinuePrompt(sid, continuePrompt, w);
       await log("info", `${short(sid)} - abort+continue done`);
       w.orphanWatchStartAt = null;
@@ -14234,6 +14322,7 @@ var AutoResumePlugin = async (ctx, options) => {
             dbg(`Recovery timing on ${short(sid)}: detectionToAttemptMs=${Date.now() - w.pendingRecoveryAt}`);
             w.recoveryAttempts++;
             dbg(`State transition on ${short(sid)}: recoveryAttempts=${w.recoveryAttempts - 1} -> ${w.recoveryAttempts}`);
+            w.recoveryContinueInFlight = true;
             try {
               await sendContinuePrompt(sid, continuePrompt, w);
             } catch (err) {
@@ -14328,6 +14417,11 @@ var AutoResumePlugin = async (ctx, options) => {
           if (w.pendingRecovery) {
             dbg(`Pending recovery cleared on ${short(sid)}: reason=session-busy`);
           }
+          if (w.recoveryContinueInFlight) {
+            w.recoveryAttempts = 0;
+            w.recoveryContinueInFlight = false;
+            dbg(`Recovery succeeded on ${short(sid)}: recoveryAttempts reset to 0`);
+          }
           if (w.continuing) {
             dbg(`busy on ${short(sid)} via recovery prompt - preserving resumeAttempts=${w.resumeAttempts} gaveUp=${w.gaveUp}`);
           } else {
@@ -14388,6 +14482,21 @@ var AutoResumePlugin = async (ctx, options) => {
               dbg(`session.idle sid=${short(sid)}: context-saturation check error: ${errMsg}`);
             }
           }
+          if (w.isSubagent && !w.subagentRecoveryTried && !w.userCancelled && !w.completionSignaled && !w.aborting && !w.gaveUp && !w.pendingRecovery && !w.continuing) {
+            try {
+              const subMessages = await getSessionMessages(sid);
+              const failure = getSubagentResponseFailure(subMessages);
+              if (failure && !hasPendingUserInput(subMessages) && !userRecentlyActive(w)) {
+                w.subagentRecoveryTried = true;
+                const reason = failure.kind === "error" ? `error ${failure.detail}` : `empty finish=${failure.detail}`;
+                await log("info", `${short(sid)} - subagent ${reason} \u2014 sending one recovery prompt`);
+                await recoverSubagent(sid);
+              }
+            } catch (e) {
+              const errMsg = e instanceof Error ? e.message : String(e);
+              dbg(`session.idle sid=${short(sid)}: subagent dead-response check error: ${errMsg}`);
+            }
+          }
           if (!w.isSubagent) {
             let awaitingUserInput = false;
             try {
@@ -14654,6 +14763,7 @@ var AutoResumePlugin = async (ctx, options) => {
           if (w) {
             w.doneClaimNoTodosAttempts = 0;
             w.lastUserMessageAt = Date.now();
+            w.subagentRecoveryTried = false;
             w.unknownToolErrors.clear();
             w.unknownToolSuggestionSent = false;
           }
@@ -14820,7 +14930,7 @@ ${reminder}`;
     event: async ({ event }) => {
       if (!initialised) {
         initialised = true;
-        log("info", `opencode-auto-resume ready. timeout=${chunkTimeoutMs}ms, orphan=${subagentWaitMs}ms, loop=${loopMaxContinues}x/${loopWindowMs / 1000}s`);
+        log("info", `opencode-auto-resume ready (v${PLUGIN_VERSION}). timeout=${chunkTimeoutMs}ms, orphan=${subagentWaitMs}ms, loop=${loopMaxContinues}x/${loopWindowMs / 1000}s`);
       }
       handleEvent(event).catch((e) => {
         const msg = e instanceof Error ? e.message : String(e);
@@ -14829,7 +14939,7 @@ ${reminder}`;
       });
     },
     config: async () => {
-      log("info", `opencode-auto-resume config OK`);
+      log("info", `opencode-auto-resume config OK (v${PLUGIN_VERSION})`);
     },
     tool: {
       task_complete: taskCompleteTool
@@ -14916,6 +15026,7 @@ import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { readFile } from "fs/promises";
 var define = (plugin) => plugin;
+var PLUGIN_VERSION2 = package_default.version;
 async function configMentionsTaskComplete(cfgPath) {
   try {
     const raw = await readFile(cfgPath, "utf8");
@@ -15684,7 +15795,7 @@ var v2_default = define({
       log("warn", `ignoring unrecognised option(s): ${unknownOptions.join(", ")} \u2014 ` + `this v2 build does not read them. See the README on npm (opencode-auto-resume).`);
     }
     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).");
+      log("warn", `v${PLUGIN_VERSION2} \u2014 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));
@@ -15737,6 +15848,7 @@ var v2_default = define({
       let w = sessions.get(sid);
       if (w) {
         w.emptyIdleNudged ??= false;
+        w.subagentRecoveryTried ??= false;
         w.workRetries ??= 0;
         w.recoverGeneration ??= 0;
         w.lifetimeContinues ??= 0;
@@ -15796,6 +15908,7 @@ var v2_default = define({
           completionHard: false,
           latchReopened: false,
           emptyIdleNudged: false,
+          subagentRecoveryTried: false,
           todos: [],
           todosFetchedAt: 0,
           taskCompleteSignals: 0,
@@ -16911,6 +17024,48 @@ ${suffix}`).slice(0, 2000);
       }
       return null;
     }
+    function lastAssistantError(messages) {
+      for (let i = messages.length - 1;i >= 0; i--) {
+        const msg = messages[i];
+        if (msgRole(msg) !== "assistant")
+          continue;
+        const err = msg.error ?? msg.info?.error;
+        if (err === undefined || err === null)
+          return null;
+        if (typeof err === "object") {
+          const e = err;
+          return String(e.type ?? e.data?.message ?? e.message ?? "error");
+        }
+        return String(err);
+      }
+      return null;
+    }
+    async function recoverSubagentResponse(sid, w, messages) {
+      if (w.subagentRecoveryTried)
+        return false;
+      if (!await isSubAgentSession(sid))
+        return false;
+      let lastUser = -1;
+      for (let i = messages.length - 1;i >= 0; i--) {
+        if (msgRole(messages[i]) === "user") {
+          lastUser = i;
+          break;
+        }
+      }
+      const turn = lastUser >= 0 ? messages.slice(lastUser + 1) : messages;
+      const error = lastAssistantError(turn);
+      const dead = lastSilentDeadStream(turn);
+      if (!error && !dead)
+        return false;
+      if (w.userCancelled || w.gaveUp || w.completionSignaled || w.permissionPending || w.compacting || w.recovering || selfAbortActive(w)) {
+        return false;
+      }
+      w.subagentRecoveryTried = true;
+      const reason = error ? `error ${error}` : `empty finish=${dead?.finish ?? "unknown"}`;
+      log("info", `${short(sid)} subagent ${reason} \u2014 sending one recovery prompt`);
+      await recoverStuckSubagent(sid);
+      return true;
+    }
     async function recoverSilentDeadStream(sid, messages) {
       const dead = lastSilentDeadStream(messages);
       if (!dead)
@@ -17143,6 +17298,7 @@ ${suffix}`).slice(0, 2000);
       }
       w.gaveUp = false;
       w.emptyIdleNudged = false;
+      w.subagentRecoveryTried = false;
     }
     let cachedToolIds = null;
     let cachedToolIdsAt = 0;
@@ -17479,6 +17635,8 @@ ${reminder}`;
       const w = ensureWatch(sid);
       const messages = await loadMessages(sid);
       noteInboundUserMessage(sid, w, messages);
+      if (await recoverSubagentResponse(sid, w, messages))
+        return;
       if (await recoverSilentDeadStream(sid, messages))
         return;
       if (await checkForStuckToolCalls(sid, w))
@@ -18929,7 +19087,9 @@ ${reminder}`;
 });
 
 // src/dispatch.ts
+var PLUGIN_VERSION3 = package_default.version;
 var noopDispose = () => {};
+var isV2ServiceContext = (ctx) => typeof ctx?.plugin?.add === "function" && typeof ctx?.agent?.transform === "function" && typeof ctx?.skill?.transform === "function";
 var dispatcher = {
   id: "auto-resume.v2",
   server: AutoResumePlugin,
@@ -18942,7 +19102,11 @@ var dispatcher = {
     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).");
+    if (isV2ServiceContext(ctx)) {
+      console.log(`[auto-resume v${PLUGIN_VERSION3}] opencode v2 config-plugin API detected; auto-resume runs through the v1 server() loader on hosts that provide it \u2014 this setup() call is inert.`);
+      return noopDispose;
+    }
+    console.warn(`[auto-resume v${PLUGIN_VERSION3}] 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;
   }
 };

package/dist/v2/index.js

@@ -4,7 +4,57 @@ import { readFileSync, mkdirSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { readFile } from "fs/promises";
+// package.json
+var package_default = {
+  name: "opencode-auto-resume",
+  version: "1.2.4",
+  description: "OpenCode plugin that automatically resumes stalled LLM sessions when thinking/streaming freezes mid-generation.",
+  keywords: [
+    "opencode",
+    "plugin",
+    "auto-resume",
+    "stall-detection",
+    "llm"
+  ],
+  homepage: "https://github.com/Mte90/opencode-auto-resume#readme",
+  bugs: {
+    url: "https://github.com/Mte90/opencode-auto-resume/issues"
+  },
+  repository: {
+    type: "git",
+    url: "git+https://github.com/Mte90/opencode-auto-resume.git"
+  },
+  license: "GPL-3.0-or-later",
+  author: 'Daniele "mte90" Scasciafratte',
+  type: "module",
+  main: "dist/index.js",
+  scripts: {
+    build: "bun run build:v1 && bun run build:v2",
+    "build:v1": "bun build src/dispatch.ts --outfile dist/index.js --target bun",
+    "build:v2": "bun build src/v2/index.ts --outfile dist/v2/index.js --target bun",
+    dev: "bun build src/dispatch.ts --outfile dist/index.js --target bun --watch",
+    test: "bun run build && bun test",
+    prepublishOnly: "bun run build"
+  },
+  files: [
+    "dist/index.js",
+    "dist/v2/index.js",
+    "README.md",
+    "LICENSE"
+  ],
+  dependencies: {
+    "@opencode-ai/plugin": "latest"
+  },
+  devDependencies: {
+    "@opencode-ai/sdk": "latest",
+    "@types/bun": "latest",
+    typescript: "latest"
+  }
+};
+
+// src/v2/index.ts
 var define = (plugin) => plugin;
+var PLUGIN_VERSION = package_default.version;
 async function configMentionsTaskComplete(cfgPath) {
   try {
     const raw = await readFile(cfgPath, "utf8");
@@ -773,7 +823,7 @@ var v2_default = define({
       log("warn", `ignoring unrecognised option(s): ${unknownOptions.join(", ")} \u2014 ` + `this v2 build does not read them. See the README on npm (opencode-auto-resume).`);
     }
     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).");
+      log("warn", `v${PLUGIN_VERSION} \u2014 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));
@@ -826,6 +876,7 @@ var v2_default = define({
       let w = sessions.get(sid);
       if (w) {
         w.emptyIdleNudged ??= false;
+        w.subagentRecoveryTried ??= false;
         w.workRetries ??= 0;
         w.recoverGeneration ??= 0;
         w.lifetimeContinues ??= 0;
@@ -885,6 +936,7 @@ var v2_default = define({
           completionHard: false,
           latchReopened: false,
           emptyIdleNudged: false,
+          subagentRecoveryTried: false,
           todos: [],
           todosFetchedAt: 0,
           taskCompleteSignals: 0,
@@ -2000,6 +2052,48 @@ ${suffix}`).slice(0, 2000);
       }
       return null;
     }
+    function lastAssistantError(messages) {
+      for (let i = messages.length - 1;i >= 0; i--) {
+        const msg = messages[i];
+        if (msgRole(msg) !== "assistant")
+          continue;
+        const err = msg.error ?? msg.info?.error;
+        if (err === undefined || err === null)
+          return null;
+        if (typeof err === "object") {
+          const e = err;
+          return String(e.type ?? e.data?.message ?? e.message ?? "error");
+        }
+        return String(err);
+      }
+      return null;
+    }
+    async function recoverSubagentResponse(sid, w, messages) {
+      if (w.subagentRecoveryTried)
+        return false;
+      if (!await isSubAgentSession(sid))
+        return false;
+      let lastUser = -1;
+      for (let i = messages.length - 1;i >= 0; i--) {
+        if (msgRole(messages[i]) === "user") {
+          lastUser = i;
+          break;
+        }
+      }
+      const turn = lastUser >= 0 ? messages.slice(lastUser + 1) : messages;
+      const error = lastAssistantError(turn);
+      const dead = lastSilentDeadStream(turn);
+      if (!error && !dead)
+        return false;
+      if (w.userCancelled || w.gaveUp || w.completionSignaled || w.permissionPending || w.compacting || w.recovering || selfAbortActive(w)) {
+        return false;
+      }
+      w.subagentRecoveryTried = true;
+      const reason = error ? `error ${error}` : `empty finish=${dead?.finish ?? "unknown"}`;
+      log("info", `${short(sid)} subagent ${reason} \u2014 sending one recovery prompt`);
+      await recoverStuckSubagent(sid);
+      return true;
+    }
     async function recoverSilentDeadStream(sid, messages) {
       const dead = lastSilentDeadStream(messages);
       if (!dead)
@@ -2232,6 +2326,7 @@ ${suffix}`).slice(0, 2000);
       }
       w.gaveUp = false;
       w.emptyIdleNudged = false;
+      w.subagentRecoveryTried = false;
     }
     let cachedToolIds = null;
     let cachedToolIdsAt = 0;
@@ -2568,6 +2663,8 @@ ${reminder}`;
       const w = ensureWatch(sid);
       const messages = await loadMessages(sid);
       noteInboundUserMessage(sid, w, messages);
+      if (await recoverSubagentResponse(sid, w, messages))
+        return;
       if (await recoverSilentDeadStream(sid, messages))
         return;
       if (await checkForStuckToolCalls(sid, w))

package/package.json

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