opencode-immune 1.0.18 → 1.0.19

package/dist/plugin.js

@@ -467,12 +467,12 @@ function createTodoEnforcerChatMessage(state) {
             await addManagedUltraworkSession(state, sessionID);
             await writeUltraworkMarker(state);
         }
-        else if (sessionID && agent && record?.kind === "root") {
-            await removeManagedUltraworkSession(state, sessionID, `session taken over by agent \"${agent}\"`);
-        }
         else if (sessionID && agent && record?.kind === "child") {
             await updateManagedSessionAgent(state, sessionID, agent);
         }
+        // NOTE: Do NOT remove managed root sessions when agent changes.
+        // 0-ultrawork delegates to subagents (1-van, 7-backlog, etc.) which
+        // may appear as agent in chat.message but the session is still managed.
         // On user message, check previous assistant turn's counters
         // then reset for next turn
         if (state.toolCallCount > 3 && !state.todoWriteUsed) {
@@ -791,12 +791,11 @@ function createFallbackModels(state) {
                 }
             }
         }
-        else if (getManagedSession(state, input.sessionID)?.kind === "root") {
-            await removeManagedUltraworkSession(state, input.sessionID, `session switched to agent \"${input.agent}\"`);
-        }
         else if (getManagedSession(state, input.sessionID)?.kind === "child") {
             await updateManagedSessionAgent(state, input.sessionID, input.agent);
         }
+        // NOTE: Do NOT remove managed root sessions when agent changes in chat.params.
+        // Subagent calls from 0-ultrawork (1-van, 7-backlog, etc.) use the same session.
         // Log model and agent for observability
         const modelId = input.model && "id" in input.model
             ? input.model.id
@@ -936,28 +935,8 @@ function createMultiCycleHandler(state) {
             await clearUltraworkMarker(state);
             console.log("[opencode-immune] Multi-Cycle: ALL_CYCLES_COMPLETE detected, ultrawork marker cleared.");
         }
-        if (!isManagedRootUltraworkSession(state, sessionID))
-            return;
-        const managedSession = getManagedSession(state, sessionID);
-        if (sessionID &&
-            messageRole === "assistant" &&
-            RATE_LIMIT_MESSAGE_PATTERN.test(messageContent)) {
-            if (managedSession && !managedSession.fallbackModel) {
-                await setSessionFallbackModel(state, sessionID, RATE_LIMIT_FALLBACK_MODEL);
-                console.log(`[opencode-immune] Rate limit message detected in chat output for session ${sessionID}. ` +
-                    `Fallback model pinned to ${RATE_LIMIT_FALLBACK_MODEL.providerID}/${RATE_LIMIT_FALLBACK_MODEL.modelID}.`);
-            }
-            if (managedSession) {
-                scheduleManagedSessionRetry(state, sessionID, {
-                    delayMs: 1_000,
-                    reason: "rate-limit message fallback",
-                    countAgainstBudget: false,
-                    abortBeforePrompt: true,
-                });
-            }
-        }
-        // ── PRE_COMMIT: execute /commit ──
-        if (messageContent.includes(PRE_COMMIT_MARKER) && !state.commitPending) {
+        // ── PRE_COMMIT: execute /commit (checked before managed session guard) ──
+        if (messageContent.includes(PRE_COMMIT_MARKER) && !state.commitPending && sessionID) {
             state.commitPending = true;
             console.log("[opencode-immune] Multi-Cycle: PRE_COMMIT detected, executing /commit...");
             // Small delay to let the message finish rendering
@@ -980,7 +959,7 @@ function createMultiCycleHandler(state) {
                 }
             }, 2_000);
         }
-        // ── CYCLE_COMPLETE: create new session ──
+        // ── CYCLE_COMPLETE: create new session (checked before managed session guard) ──
         if (messageContent.includes(CYCLE_COMPLETE_MARKER)) {
             state.cycleCount++;
             if (state.cycleCount >= MAX_CYCLES) {
@@ -1031,6 +1010,27 @@ function createMultiCycleHandler(state) {
                 }
             }, 8_000); // 8s delay: let /commit finish first
         }
+        if (!isManagedRootUltraworkSession(state, sessionID))
+            return;
+        const managedSession = getManagedSession(state, sessionID);
+        // Rate-limit message detection (only for managed root sessions)
+        if (sessionID &&
+            messageRole === "assistant" &&
+            RATE_LIMIT_MESSAGE_PATTERN.test(messageContent)) {
+            if (managedSession && !managedSession.fallbackModel) {
+                await setSessionFallbackModel(state, sessionID, RATE_LIMIT_FALLBACK_MODEL);
+                console.log(`[opencode-immune] Rate limit message detected in chat output for session ${sessionID}. ` +
+                    `Fallback model pinned to ${RATE_LIMIT_FALLBACK_MODEL.providerID}/${RATE_LIMIT_FALLBACK_MODEL.modelID}.`);
+            }
+            if (managedSession) {
+                scheduleManagedSessionRetry(state, sessionID, {
+                    delayMs: 1_000,
+                    reason: "rate-limit message fallback",
+                    countAgainstBudget: false,
+                    abortBeforePrompt: true,
+                });
+            }
+        }
     };
 }
 // ═══════════════════════════════════════════════════════════════════════════════

package/package.json

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