opencode-immune 1.0.14 → 1.0.16

package/dist/plugin.js

@@ -30,6 +30,10 @@ const RATE_LIMIT_FALLBACK_MODEL = {
     providerID: "externcash",
     modelID: "gpt-5.4",
 };
+const CHILD_SESSION_FALLBACK_MODEL = {
+    providerID: "externcash",
+    modelID: "gpt-5.4",
+};
 function isManagedUltraworkSession(state, sessionID) {
     return !!sessionID && state.managedUltraworkSessions.has(sessionID);
 }
@@ -173,8 +177,36 @@ function isRetryableApiError(error) {
     if (!error || typeof error !== "object")
         return false;
     const maybeError = error;
-    return (maybeError.name === "APIError" &&
-        maybeError.data?.isRetryable === true);
+    // Structured retryable flag
+    if (maybeError.name === "APIError" &&
+        maybeError.data?.isRetryable === true) {
+        return true;
+    }
+    // Text-based detection for model access errors (not marked as retryable
+    // by the API but retryable with a fallback model)
+    const message = `${maybeError.message ?? ""} ${maybeError.data?.message ?? ""}`.toLowerCase();
+    if (message.includes("не разрешен") ||
+        message.includes("not allowed") ||
+        message.includes("model not available") ||
+        message.includes("model_not_found") ||
+        message.includes("access denied")) {
+        return true;
+    }
+    return false;
+}
+function isModelAccessError(error) {
+    if (!error || typeof error !== "object")
+        return false;
+    const maybeError = error;
+    const message = `${maybeError.message ?? ""} ${maybeError.data?.message ?? ""}`.toLowerCase();
+    const type = `${maybeError.data?.type ?? ""}`.toLowerCase();
+    return (message.includes("не разрешен") ||
+        message.includes("not allowed") ||
+        message.includes("model not available") ||
+        message.includes("model_not_found") ||
+        message.includes("access denied") ||
+        type.includes("model_not_found") ||
+        type.includes("invalid_model"));
 }
 function isRateLimitApiError(error) {
     if (!error || typeof error !== "object")
@@ -263,7 +295,7 @@ async function sendManagedSessionRetryPrompt(state, sessionID, reason, options =
     return true;
 }
 function scheduleManagedSessionRetry(state, sessionID, options) {
-    if (!isManagedRootUltraworkSession(state, sessionID)) {
+    if (!isManagedUltraworkSession(state, sessionID)) {
         return false;
     }
     if (state.sessionRetryTimers.has(sessionID)) {
@@ -275,7 +307,7 @@ function scheduleManagedSessionRetry(state, sessionID, options) {
         `Waiting ${options.delayMs / 1000}s before retry...`);
     const timer = setTimeout(async () => {
         state.sessionRetryTimers.delete(sessionID);
-        if (!isManagedRootUltraworkSession(state, sessionID)) {
+        if (!isManagedUltraworkSession(state, sessionID)) {
             return;
         }
         try {
@@ -497,6 +529,11 @@ function createSessionRecoveryEvent(state) {
                 if (recovery.phase !== "ARCHIVE: DONE") {
                     // Register this root session as managed so retry/recovery works
                     await addManagedUltraworkSession(state, sessionID);
+                    // Skip sending AUTO-RESUME if already sent from plugin init
+                    if (state.autoResumeAttempted) {
+                        console.log(`[opencode-immune] Auto-resume already sent from plugin init, skipping duplicate for session ${sessionID}.`);
+                        return;
+                    }
                     setTimeout(async () => {
                         try {
                             await state.input.client.session.promptAsync({
@@ -791,10 +828,13 @@ function createEventHandler(state) {
         const eventType = event.type ?? "unknown";
         const info = event.properties?.info;
         const sessionID = event.properties?.sessionID ?? info?.id;
-        // ── Auto-retry on retryable API error for managed root ultrawork sessions ──
+        // ── Auto-retry on retryable API error for managed ultrawork sessions ──
         if (eventType === "session.error" && sessionID) {
             const error = event.properties?.error;
-            if (!isManagedRootUltraworkSession(state, sessionID)) {
+            const managedSession = getManagedSession(state, sessionID);
+            const isRoot = managedSession?.kind === "root";
+            const isChild = managedSession?.kind === "child";
+            if (!managedSession) {
                 return;
             }
             if (!isRetryableApiError(error)) {
@@ -803,22 +843,29 @@ function createEventHandler(state) {
                 return;
             }
             if (state.sessionRetryTimers.has(sessionID)) {
-                console.log(`[opencode-immune] Retry already pending for session ${sessionID}, skipping duplicate.`);
+                console.log(`[opencode-immune] Retry already pending for ${isChild ? "child" : "root"} session ${sessionID}, skipping duplicate.`);
                 return;
             }
             const count = state.sessionErrorRetryCount.get(sessionID) ?? 0;
             if (count < MAX_RETRIES) {
                 const delay = Math.min(BASE_DELAY_MS * Math.pow(2, count), MAX_DELAY_MS);
                 state.sessionErrorRetryCount.set(sessionID, count + 1);
-                if (isRateLimitApiError(error)) {
+                // Pin fallback model: for child sessions always, for root on rate-limit
+                if (isChild) {
+                    await setSessionFallbackModel(state, sessionID, CHILD_SESSION_FALLBACK_MODEL);
+                    const errorType = isModelAccessError(error) ? "model access error" : isRateLimitApiError(error) ? "rate limit" : "retryable error";
+                    console.log(`[opencode-immune] Child session ${sessionID}: ${errorType} detected. ` +
+                        `Retry will use fallback model ${CHILD_SESSION_FALLBACK_MODEL.providerID}/${CHILD_SESSION_FALLBACK_MODEL.modelID}.`);
+                }
+                else if (isRoot && isRateLimitApiError(error)) {
                     await setSessionFallbackModel(state, sessionID, RATE_LIMIT_FALLBACK_MODEL);
-                    console.log(`[opencode-immune] Rate limit detected for session ${sessionID}. ` +
+                    console.log(`[opencode-immune] Rate limit detected for root session ${sessionID}. ` +
                         `Retry will use fallback model ${RATE_LIMIT_FALLBACK_MODEL.providerID}/${RATE_LIMIT_FALLBACK_MODEL.modelID}.`);
                 }
                 const scheduled = scheduleManagedSessionRetry(state, sessionID, {
                     delayMs: delay,
-                    reason: "session.error",
-                    attemptLabel: `attempt ${count + 1}/${MAX_RETRIES}`,
+                    reason: isChild ? "child session.error" : "session.error",
+                    attemptLabel: `${isChild ? "child " : ""}attempt ${count + 1}/${MAX_RETRIES}`,
                     countAgainstBudget: true,
                 });
                 if (!scheduled) {
@@ -826,7 +873,7 @@ function createEventHandler(state) {
                 }
             }
             else {
-                console.log(`[opencode-immune] Max retries (${MAX_RETRIES}) reached for session ${sessionID}. Not retrying.`);
+                console.log(`[opencode-immune] Max retries (${MAX_RETRIES}) reached for ${isChild ? "child" : "root"} session ${sessionID}. Not retrying.`);
             }
         }
         // Reset retry counter on successful activity

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-immune",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "OpenCode plugin: session recovery, auto-retry, multi-cycle automation, context monitoring",
   "exports": {
     "./server": "./dist/plugin.js"
@@ -14,7 +14,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@opencode-ai/plugin": "1.4.1"
+    "@opencode-ai/plugin": "1.4.2"
   },
   "devDependencies": {
     "@types/node": "^25.5.2",