opencode-immune 1.0.77 → 1.0.79

package/dist/plugin/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.77";
+var PLUGIN_VERSION = "1.0.79";
 var PLUGIN_PACKAGE_NAME = "opencode-immune";
 var PLUGIN_DIRNAME = dirname(fileURLToPath(import.meta.url));
 function getServerAuthHeaders() {
@@ -3895,8 +3895,6 @@ var PROVIDER_RETRY_WATCHDOG_MS = 3e4;
 var RETRY_PROMPT_DELIVERY_ATTEMPTS = 3;
 var CHILD_FALLBACK_REQUEST_TTL_MS = 10 * 60 * 1e3;
 var AUTO_CYCLE_LOCK_TTL_MS = 30 * 60 * 1e3;
-var PROJECT_TMP_RELATIVE_PATH = ".opencode/tmp";
-var PROJECT_LOG_RELATIVE_PATH = ".opencode/state/logs";
 var MODEL_NAME_CAPABILITY_SCORE = {
   "claude-opus-4-7": 100,
   "gpt-5.5": 100,
@@ -3916,12 +3914,6 @@ function isManagedRootUltraworkSession(state, sessionID) {
   const record = getManagedSession(state, sessionID);
   return !!record && record.kind === "root";
 }
-function getProjectTmpDir(state) {
-  return join(state.input.directory, PROJECT_TMP_RELATIVE_PATH);
-}
-function getProjectLogDir(state) {
-  return join(state.input.directory, PROJECT_LOG_RELATIVE_PATH);
-}
 async function createManagedUltraworkSession(state, title) {
   const result = await state.client.session.create({
     directory: state.input.directory,
@@ -5798,6 +5790,18 @@ var PRE_COMMIT_MARKER = "0-ULTRAWORK: PRE_COMMIT";
 var CYCLE_COMPLETE_MARKER = "0-ULTRAWORK: CYCLE_COMPLETE";
 var NEXT_TASK_PATTERN = /Next task:\s*(.+)/;
 var ALL_CYCLES_COMPLETE_MARKER = "0-ULTRAWORK: ALL_CYCLES_COMPLETE";
+async function commitCycleChanges(state, reason) {
+  if (state.commitPending) return;
+  state.commitPending = true;
+  pluginLog.info(`[opencode-immune] Multi-Cycle: ${reason}, running git commit...`);
+  try {
+    await runGitCommit(state.input.directory);
+  } catch (err) {
+    pluginLog.error(`[opencode-immune] Multi-Cycle: git commit failed (${reason}):`, err);
+  } finally {
+    state.commitPending = false;
+  }
+}
 async function archiveProgress(directory) {
   const progressPath = join(directory, "memory-bank", "progress.md");
   try {
@@ -5905,62 +5909,55 @@ function createTextCompleteHandler(state) {
       return;
     }
     if (text.includes(PRE_COMMIT_MARKER) && !text.includes(CYCLE_COMPLETE_MARKER)) {
-      if (!state.commitPending) {
-        state.commitPending = true;
-        pluginLog.info("[opencode-immune] Multi-Cycle: PRE_COMMIT detected (standalone), running git commit...");
-        try {
-          await runGitCommit(state.input.directory);
-        } catch (err) {
-          pluginLog.error("[opencode-immune] Multi-Cycle: git commit failed (standalone):", err);
-        } finally {
-          state.commitPending = false;
-        }
-      }
+      await commitCycleChanges(state, "PRE_COMMIT detected (standalone)");
       return;
     }
     if (text.includes(CYCLE_COMPLETE_MARKER)) {
+      if (state.autoCycleInFlight || state.autoCycleSourceSessions.has(sessionID)) return;
+      const lockAcquired2 = await acquireAutoCycleLock(
+        state,
+        "cycle-complete",
+        sessionID
+      );
+      if (!lockAcquired2) return;
+      state.autoCycleSourceSessions.add(sessionID);
+      state.autoCycleInFlight = true;
       try {
-        await archiveProgress(state.input.directory);
-      } catch (err) {
-        pluginLog.warn("[opencode-immune] Multi-Cycle: archive progress failed:", err);
-      }
-      if (!state.commitPending) {
-        state.commitPending = true;
-        pluginLog.info("[opencode-immune] Multi-Cycle: CYCLE_COMPLETE detected, running git commit first...");
         try {
-          await runGitCommit(state.input.directory);
-          pluginLog.info("[opencode-immune] Multi-Cycle: git commit completed before new cycle.");
+          await archiveProgress(state.input.directory);
         } catch (err) {
-          pluginLog.error("[opencode-immune] Multi-Cycle: git commit failed (continuing anyway):", err);
-        } finally {
-          state.commitPending = false;
+          pluginLog.warn("[opencode-immune] Multi-Cycle: archive progress failed:", err);
         }
-      }
-      state.cycleCount++;
-      if (state.cycleCount >= MAX_CYCLES) {
+        await commitCycleChanges(state, "CYCLE_COMPLETE detected");
+        state.cycleCount++;
+        if (state.cycleCount >= MAX_CYCLES) {
+          pluginLog.info(
+            `[opencode-immune] Multi-Cycle: MAX_CYCLES (${MAX_CYCLES}) reached. Not creating new session.`
+          );
+          await clearUltraworkMarker(state);
+          await clearAutoCycleLock(state, "max cycles reached");
+          return;
+        }
+        const taskMatch = text.match(NEXT_TASK_PATTERN);
+        const nextTask = taskMatch?.[1]?.trim() ?? "Continue processing task backlog";
         pluginLog.info(
-          `[opencode-immune] Multi-Cycle: MAX_CYCLES (${MAX_CYCLES}) reached. Not creating new session.`
+          `[opencode-immune] Multi-Cycle: Starting next cycle in a new session (cycle ${state.cycleCount}/${MAX_CYCLES}) for: "${nextTask}"`
         );
-        await clearUltraworkMarker(state);
-        return;
-      }
-      const taskMatch = text.match(NEXT_TASK_PATTERN);
-      const nextTask = taskMatch?.[1]?.trim() ?? "Continue processing task backlog";
-      pluginLog.info(
-        `[opencode-immune] Multi-Cycle: Starting next cycle in a new session (cycle ${state.cycleCount}/${MAX_CYCLES}) for: "${nextTask}"`
-      );
-      try {
         await startAutoCycleInNewSession(
           state,
           {
             sourceSessionID: sessionID,
             nextTask,
             logContext: "Multi-Cycle",
+            clearLockOnFailureReason: "cycle complete bootstrap failed",
             retireSourceSession: true
           }
         );
       } catch (err) {
+        state.autoCycleSourceSessions.delete(sessionID);
         pluginLog.error("[opencode-immune] Multi-Cycle: Failed to send prompt:", err);
+      } finally {
+        state.autoCycleInFlight = false;
       }
       return;
     }
@@ -5982,6 +5979,7 @@ 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 {
+      await commitCycleChanges(state, "fallback AUTO-CYCLE before new session");
       await refreshAutoCycleLock(state, sessionID);
       await startAutoCycleInNewSession(
         state,
@@ -6049,25 +6047,11 @@ function createPermissionAskHandler(state) {
         `[opencode-immune] Permission request recovered AUTO-RESUME session ${sessionID}; tracking as managed ultrawork session.`
       );
     }
-    const permissionType = getPermissionType(input);
-    const patterns = getPermissionPatterns(input);
-    if (isManagedUltraworkSession(state, sessionID) && permissionType === "external_directory" && patterns.some(isExternalTmpPattern)) {
-      output.status = "deny";
-      await writeDiagnosticLog(state, "permission:auto-deny-external-tmp", {
-        sessionID,
-        status: output.status,
-        permission: permissionType,
-        patterns,
-        projectTmpDir: getProjectTmpDir(state),
-        projectLogDir: getProjectLogDir(state)
-      });
-      return;
-    }
     await writeDiagnosticLog(state, "permission:ask", {
       sessionID,
       status: output.status,
-      permission: permissionType,
-      patterns
+      permission: getPermissionType(input),
+      patterns: getPermissionPatterns(input)
     });
   };
 }
@@ -6083,22 +6067,6 @@ function getPermissionPatterns(input) {
   if (Array.isArray(source)) return source.filter((item) => typeof item === "string");
   return typeof source === "string" ? [source] : [];
 }
-function isExternalTmpPattern(pattern) {
-  return pattern === "/tmp" || pattern.startsWith("/tmp/") || pattern === "/tmp/*";
-}
-function createShellEnvHandler(state) {
-  return async (_input, output) => {
-    const projectTmpDir = getProjectTmpDir(state);
-    const projectLogDir = getProjectLogDir(state);
-    await mkdir(projectTmpDir, { recursive: true });
-    await mkdir(projectLogDir, { recursive: true });
-    output.env.TMPDIR = projectTmpDir;
-    output.env.TMP = projectTmpDir;
-    output.env.TEMP = projectTmpDir;
-    output.env.OPENCODE_TMP_DIR = projectTmpDir;
-    output.env.OPENCODE_LOG_DIR = projectLogDir;
-  };
-}
 async function server(input) {
   const state = createState(input);
   checkPluginUpdate(state).catch(() => {
@@ -6238,11 +6206,6 @@ async function server(input) {
       state,
       "permission.ask",
       createPermissionAskHandler(state)
-    ),
-    "shell.env": withErrorBoundary(
-      state,
-      "shell.env",
-      createShellEnvHandler(state)
     )
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-immune",
-  "version": "1.0.77",
+  "version": "1.0.79",
   "type": "module",
   "description": "OpenCode plugin: session recovery, auto-retry, multi-cycle automation, context monitoring",
   "exports": {