opencode-auto-resume 1.0.3 → 1.0.5

package/dist/index.js

@@ -119,7 +119,8 @@ var AutoResumePlugin = async (ctx, options) => {
         toolTextRecovered: false,
         toolTextAttempts: 0,
         continueTimestamps: [],
-        idleSince: null
+        idleSince: null,
+        continuing: false
       };
       sessions.set(sid, w);
     }
@@ -202,7 +203,53 @@ 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 {
+      await ctx.client.session.prompt({
+        path: { id: sid },
+        body: { parts: [{ type: "text", text }] }
+      });
+      recordContinue(sid);
+      w.lastRetryAt = Date.now();
+    } 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 [];
+  }
+  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;
     if (w.userCancelled || w.toolTextRecovered)
       return;
     if (w.toolTextAttempts > 0) {
@@ -218,15 +265,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;
@@ -248,12 +287,7 @@ var AutoResumePlugin = async (ctx, options) => {
               await tryAbortAndResume(sid, w);
             } else {
               try {
-                await ctx.client.session.prompt({
-                  path: { id: sid },
-                  body: { agent: w.agent, parts: [{ type: "text", text: TOOL_TEXT_RECOVERY_PROMPT }] }
-                });
-                recordContinue(sid);
-                w.lastRetryAt = Date.now();
+                await sendContinuePrompt(sid, TOOL_TEXT_RECOVERY_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);
@@ -271,12 +305,7 @@ var AutoResumePlugin = async (ctx, options) => {
               await tryAbortAndResume(sid, w);
             } else {
               try {
-                await ctx.client.session.prompt({
-                  path: { id: sid },
-                  body: { agent: w.agent, 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);
@@ -293,6 +322,8 @@ var AutoResumePlugin = async (ctx, options) => {
     }
   }
   async function tryAbortAndResume(sid, w) {
+    if (typeof sid !== "string" || !sid)
+      return false;
     if (w.aborting)
       return false;
     w.aborting = true;
@@ -311,13 +342,8 @@ var AutoResumePlugin = async (ctx, options) => {
     if (w.status === "busy")
       w.status = "idle";
     try {
-      await ctx.client.session.prompt({
-        path: { id: sid },
-        body: { agent: w.agent, 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;
@@ -330,6 +356,10 @@ var AutoResumePlugin = async (ctx, options) => {
     }
   }
   async function tryResume(sid, w, reason) {
+    if (typeof sid !== "string" || !sid) {
+      await log("warn", `tryResume called with invalid sid: ${sid}`);
+      return false;
+    }
     const now = Date.now();
     const elapsedSinceRetry = now - w.lastRetryAt;
     const requiredBackoff = backoffMs(w.resumeAttempts);
@@ -343,13 +373,8 @@ var AutoResumePlugin = async (ctx, options) => {
     const idleSec = Math.round((now - w.lastActivityAt) / 1000);
     await log("info", `${reason} on ${short(sid)} (${idleSec}s, retry ${w.resumeAttempts}/${maxRetries})`);
     try {
-      await ctx.client.session.prompt({
-        path: { id: sid },
-        body: { agent: w.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);
@@ -358,42 +383,10 @@ var AutoResumePlugin = async (ctx, options) => {
       return false;
     }
   }
-  async function getSessionAgent(sid) {
-    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) {
@@ -407,14 +400,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()`);
           }
         }
       }
@@ -490,21 +476,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();
@@ -544,10 +520,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);
@@ -565,9 +538,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)");
@@ -581,13 +552,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.3",
+  "version": "1.0.5",
   "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"