opencode-immune 1.0.20 → 1.0.21

package/dist/plugin.js

@@ -914,9 +914,12 @@ const ALL_CYCLES_COMPLETE_MARKER = "0-ULTRAWORK: ALL_CYCLES_COMPLETE";
 /**
  * experimental.text.complete: scans completed assistant text for signal markers.
  *
- * PRE_COMMIT → executes /commit via client.session.command()
- * CYCLE_COMPLETE → creates a new session and sends bootstrap prompt
- * ALL_CYCLES_COMPLETE → clears ultrawork marker
+ * Handles the full cycle-end sequence:
+ * 1. PRE_COMMIT detected → execute /commit → await result
+ * 2. CYCLE_COMPLETE detected → create new session → send AUTO-CYCLE prompt
+ * Steps are sequential: new session only starts AFTER commit completes (or fails).
+ *
+ * ALL_CYCLES_COMPLETE → clears ultrawork marker, no new session.
  */
 function createTextCompleteHandler(state) {
     return async (input, output) => {
@@ -928,44 +931,49 @@ function createTextCompleteHandler(state) {
         if (text.includes(ALL_CYCLES_COMPLETE_MARKER)) {
             await clearUltraworkMarker(state);
             console.log("[opencode-immune] Multi-Cycle: ALL_CYCLES_COMPLETE detected in text.complete, ultrawork marker cleared.");
+            return;
         }
-        // ── PRE_COMMIT: execute /commit ──
-        if (text.includes(PRE_COMMIT_MARKER) && !state.commitPending && sessionID) {
-            state.commitPending = true;
-            console.log("[opencode-immune] Multi-Cycle: PRE_COMMIT detected in text.complete, executing /commit...");
-            setTimeout(async () => {
+        const hasPRECOMMIT = text.includes(PRE_COMMIT_MARKER);
+        const hasCYCLECOMPLETE = text.includes(CYCLE_COMPLETE_MARKER);
+        if (!hasPRECOMMIT && !hasCYCLECOMPLETE)
+            return;
+        // Run the full sequence in one async flow (no timers):
+        // commit → wait → new session
+        // Use setTimeout(0) only to not block the hook return.
+        setTimeout(async () => {
+            // ── Step 1: PRE_COMMIT → execute /commit and await result ──
+            if (hasPRECOMMIT && !state.commitPending && sessionID) {
+                state.commitPending = true;
+                console.log("[opencode-immune] Multi-Cycle: PRE_COMMIT detected, executing /commit...");
                 try {
-                    await state.input.client.session.command({
+                    const commitResult = await state.input.client.session.command({
                         body: {
                             command: "/commit",
                             arguments: "",
                         },
                         path: { id: sessionID },
                     });
-                    console.log("[opencode-immune] Multi-Cycle: /commit executed successfully.");
+                    console.log("[opencode-immune] Multi-Cycle: /commit completed.", commitResult?.response?.status ?? "");
                 }
                 catch (err) {
-                    console.error("[opencode-immune] Multi-Cycle: /commit failed:", err);
+                    console.error("[opencode-immune] Multi-Cycle: /commit failed (continuing to next cycle anyway):", err);
                 }
                 finally {
                     state.commitPending = false;
                 }
-            }, 2_000);
-        }
-        // ── CYCLE_COMPLETE: create new session ──
-        if (text.includes(CYCLE_COMPLETE_MARKER)) {
-            state.cycleCount++;
-            if (state.cycleCount >= MAX_CYCLES) {
-                console.log(`[opencode-immune] Multi-Cycle: MAX_CYCLES (${MAX_CYCLES}) reached. Not creating new session.`);
-                await clearUltraworkMarker(state);
-                return;
             }
-            const taskMatch = text.match(NEXT_TASK_PATTERN);
-            const nextTask = taskMatch?.[1]?.trim() ?? "Continue processing task backlog";
-            console.log(`[opencode-immune] Multi-Cycle: CYCLE_COMPLETE detected in text.complete (cycle ${state.cycleCount}/${MAX_CYCLES}). ` +
-                `Creating new session for: "${nextTask}"`);
-            // Delay to let commit finish
-            setTimeout(async () => {
+            // ── Step 2: CYCLE_COMPLETE → create new session ──
+            if (hasCYCLECOMPLETE) {
+                state.cycleCount++;
+                if (state.cycleCount >= MAX_CYCLES) {
+                    console.log(`[opencode-immune] Multi-Cycle: MAX_CYCLES (${MAX_CYCLES}) reached. Not creating new session.`);
+                    await clearUltraworkMarker(state);
+                    return;
+                }
+                const taskMatch = text.match(NEXT_TASK_PATTERN);
+                const nextTask = taskMatch?.[1]?.trim() ?? "Continue processing task backlog";
+                console.log(`[opencode-immune] Multi-Cycle: CYCLE_COMPLETE detected (cycle ${state.cycleCount}/${MAX_CYCLES}). ` +
+                    `Creating new session for: "${nextTask}"`);
                 try {
                     const createResult = await state.input.client.session.create({
                         body: {
@@ -997,8 +1005,8 @@ function createTextCompleteHandler(state) {
                 catch (err) {
                     console.error("[opencode-immune] Multi-Cycle: Failed to create new session or send prompt:", err);
                 }
-            }, 8_000);
-        }
+            }
+        }, 0);
     };
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-immune",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "OpenCode plugin: session recovery, auto-retry, multi-cycle automation, context monitoring",
   "exports": {
     "./server": "./dist/plugin.js"