opencode-immune 1.0.68 → 1.0.70

package/dist/plugin/{server/index.js → server.js}

@@ -3777,7 +3777,7 @@ import { fileURLToPath } from "url";
 import { createHash } from "crypto";
 import { tmpdir } from "os";
 import { execFile } from "child_process";
-var PLUGIN_VERSION = "1.0.68";
+var PLUGIN_VERSION = "1.0.70";
 var PLUGIN_PACKAGE_NAME = "opencode-immune";
 var PLUGIN_DIRNAME = dirname(fileURLToPath(import.meta.url));
 function getServerAuthHeaders() {
@@ -4748,6 +4748,7 @@ async function hasPendingBacklogTasks(directory) {
 async function acquireAutoCycleLock(state, source, sourceSessionID) {
   try {
     const now = Date.now();
+    let shouldReplaceStaleLock = false;
     try {
       const raw = await readFile(state.autoCycleLockPath, "utf-8");
       const existing = JSON.parse(raw);
@@ -4758,8 +4759,16 @@ async function acquireAutoCycleLock(state, source, sourceSessionID) {
         );
         return false;
       }
+      shouldReplaceStaleLock = true;
     } catch {
     }
+    if (shouldReplaceStaleLock) {
+      try {
+        await unlink(state.autoCycleLockPath);
+        pluginLog.info(`[opencode-immune] Auto-cycle stale lock replaced for ${source}.`);
+      } catch {
+      }
+    }
     await mkdir(dirname(state.autoCycleLockPath), { recursive: true });
     const payload = JSON.stringify(
       {
@@ -5155,6 +5164,40 @@ function createSessionRecoveryEvent(state) {
       } else {
         state.recoveryContext = null;
         pluginLog.info("[opencode-immune] No active task found.");
+        const hasPendingTasks = await hasPendingBacklogTasks(state.input.directory);
+        if (!hasPendingTasks || state.autoResumeAttempted || state.autoResumeInFlight) {
+          return;
+        }
+        const lockAcquired = await acquireAutoCycleLock(
+          state,
+          "root-session-auto-cycle",
+          sessionID
+        );
+        if (!lockAcquired) return;
+        await addManagedUltraworkSession(state, sessionID);
+        await refreshAutoCycleLock(state, sessionID);
+        state.autoResumeInFlight = true;
+        setTimeout(async () => {
+          try {
+            await promptManagedSession(
+              state,
+              sessionID,
+              `[AUTO-CYCLE] Continue processing task backlog. Read memory-bank/tasks.md and memory-bank/backlog.md, pick the next pending task, and run the full pipeline.`
+            );
+            state.autoResumeAttempted = true;
+            pluginLog.info(
+              `[opencode-immune] Auto-cycle prompt sent to root ultrawork session ${sessionID}`
+            );
+          } catch (err) {
+            await clearAutoCycleLock(state, "root session auto-cycle failed");
+            pluginLog.error(
+              `[opencode-immune] Auto-cycle prompt failed for root session ${sessionID}:`,
+              err
+            );
+          } finally {
+            state.autoResumeInFlight = false;
+          }
+        }, 3e3);
       }
     }
   };
@@ -5655,26 +5698,17 @@ function createTextCompleteHandler(state) {
       const taskMatch = text.match(NEXT_TASK_PATTERN);
       const nextTask = taskMatch?.[1]?.trim() ?? "Continue processing task backlog";
       pluginLog.info(
-        `[opencode-immune] Multi-Cycle: Creating new session (cycle ${state.cycleCount}/${MAX_CYCLES}) for: "${nextTask}"`
+        `[opencode-immune] Multi-Cycle: Starting next cycle in current session (cycle ${state.cycleCount}/${MAX_CYCLES}) for: "${nextTask}"`
       );
       try {
-        const newSessionID = await createManagedUltraworkSession(
-          state,
-          `Ultrawork Cycle ${state.cycleCount + 1}`
-        );
-        if (!newSessionID) {
-          pluginLog.error("[opencode-immune] Multi-Cycle: Failed to create new session \u2014 no ID returned.");
-          return;
-        }
-        pluginLog.info(`[opencode-immune] Multi-Cycle: New session created: ${newSessionID}`);
         await promptManagedSession(
           state,
-          newSessionID,
+          sessionID,
           `[AUTO-CYCLE] Continue processing task backlog. Read memory-bank/tasks.md and memory-bank/backlog.md, pick the next pending task, and run the full pipeline.`
         );
-        pluginLog.info(`[opencode-immune] Multi-Cycle: Bootstrap prompt sent to ${newSessionID}`);
+        pluginLog.info(`[opencode-immune] Multi-Cycle: Bootstrap prompt sent to ${sessionID}`);
       } catch (err) {
-        pluginLog.error("[opencode-immune] Multi-Cycle: Failed to create session or send prompt:", err);
+        pluginLog.error("[opencode-immune] Multi-Cycle: Failed to send prompt:", err);
       }
       return;
     }
@@ -5696,27 +5730,17 @@ function createTextCompleteHandler(state) {
       `[opencode-immune] Multi-Cycle fallback: no CYCLE_COMPLETE marker detected for ${sessionID}, but tasks.md has no active task and backlog has pending items. Starting AUTO-CYCLE.`
     );
     try {
-      const newSessionID = await createManagedUltraworkSession(
-        state,
-        `AUTO-CYCLE: next backlog task`
-      );
-      if (!newSessionID) {
-        await clearAutoCycleLock(state, "fallback create returned no session ID");
-        pluginLog.error("[opencode-immune] Multi-Cycle fallback: Failed to create new session \u2014 no ID returned.");
-        return;
-      }
-      await refreshAutoCycleLock(state, newSessionID);
-      pluginLog.info(`[opencode-immune] Multi-Cycle fallback: New session created: ${newSessionID}`);
+      await refreshAutoCycleLock(state, sessionID);
       await promptManagedSession(
         state,
-        newSessionID,
+        sessionID,
         `[AUTO-CYCLE] Continue processing task backlog. Read memory-bank/tasks.md and memory-bank/backlog.md, pick the next pending task, and run the full pipeline.`
       );
-      pluginLog.info(`[opencode-immune] Multi-Cycle fallback: Bootstrap prompt sent to ${newSessionID}`);
+      pluginLog.info(`[opencode-immune] Multi-Cycle fallback: Bootstrap prompt sent to ${sessionID}`);
     } catch (err) {
       state.autoCycleSourceSessions.delete(sessionID);
       await clearAutoCycleLock(state, "fallback bootstrap failed");
-      pluginLog.error("[opencode-immune] Multi-Cycle fallback: Failed to create session or send prompt:", err);
+      pluginLog.error("[opencode-immune] Multi-Cycle fallback: Failed to send prompt:", err);
     } finally {
       state.autoCycleInFlight = false;
     }
@@ -5834,51 +5858,9 @@ async function server(input) {
       try {
         const hasPendingTasks = await hasPendingBacklogTasks(state.input.directory);
         if (hasPendingTasks) {
-          const lockAcquired = await acquireAutoCycleLock(
-            state,
-            "plugin-init-auto-cycle"
-          );
-          if (!lockAcquired) return;
           pluginLog.info(
-            `[opencode-immune] Plugin init: no active task but backlog has pending items. Will create new session to start next cycle.`
+            `[opencode-immune] Plugin init: no active task but backlog has pending items. Waiting for root session before starting AUTO-CYCLE.`
           );
-          state.autoResumeInFlight = true;
-          setTimeout(async () => {
-            try {
-              const newSessionID = await createManagedUltraworkSession(
-                state,
-                `AUTO-CYCLE: next backlog task`
-              );
-              if (!newSessionID) {
-                await clearAutoCycleLock(state, "init auto-cycle create returned no session ID");
-                pluginLog.error(
-                  "[opencode-immune] Auto-cycle: Failed to create session \u2014 no session ID returned."
-                );
-                return;
-              }
-              await refreshAutoCycleLock(state, newSessionID);
-              pluginLog.info(
-                `[opencode-immune] Auto-cycle: New session created: ${newSessionID}`
-              );
-              await promptManagedSession(
-                state,
-                newSessionID,
-                `[AUTO-CYCLE] Continue processing task backlog. Read memory-bank/tasks.md and memory-bank/backlog.md, pick the next pending task, and run the full pipeline.`
-              );
-              state.autoResumeAttempted = true;
-              pluginLog.info(
-                `[opencode-immune] Auto-cycle prompt sent to new session ${newSessionID}`
-              );
-            } catch (err) {
-              await clearAutoCycleLock(state, "init auto-cycle bootstrap failed");
-              pluginLog.error(
-                "[opencode-immune] Auto-cycle: Failed to create session or send prompt:",
-                err
-              );
-            } finally {
-              state.autoResumeInFlight = false;
-            }
-          }, 5e3);
         } else {
           await clearUltraworkMarker(state);
           await clearAutoCycleLock(state, "no pending backlog tasks");

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "opencode-immune",
-  "version": "1.0.68",
+  "version": "1.0.70",
   "type": "module",
   "description": "OpenCode plugin: session recovery, auto-retry, multi-cycle automation, context monitoring",
   "exports": {
-    ".": "./dist/plugin/server/index.js",
-    "./server": "./dist/plugin/server/index.js"
+    ".": "./dist/plugin/server.js",
+    "./server": "./dist/plugin/server.js"
   },
-  "main": "./dist/plugin/server/index.js",
+  "main": "./dist/plugin/server.js",
   "files": [
-    "dist/plugin/server/index.js"
+    "dist/plugin/server.js"
   ],
   "scripts": {
-    "build": "esbuild plugin.ts --bundle --platform=node --format=esm --target=node22 --outfile=dist/plugin/server/index.js",
+    "build": "esbuild plugin.ts --bundle --platform=node --format=esm --target=node22 --outfile=dist/plugin/server.js",
     "dev": "node ./node_modules/typescript/bin/tsc --project tsconfig.json --watch",
     "prepublishOnly": "npm run build"
   },