opencode-immune 1.0.34 → 1.0.36

package/dist/plugin.js

@@ -263,6 +263,15 @@ function isRetryableApiError(error) {
     const message = `${maybeError.message ?? ""} ${maybeError.data?.message ?? ""}`.toLowerCase();
     if (message.includes("не разрешен") ||
         message.includes("not allowed") ||
+        message.includes("expected") ||
+        message.includes("to be a string") ||
+        message.includes("invalid_type") ||
+        message.includes("validation") ||
+        message.includes("schema") ||
+        message.includes("zod") ||
+        message.includes("parse error") ||
+        message.includes("invalid id") ||
+        message.includes("expected id") ||
         message.includes("model not available") ||
         message.includes("model_not_found") ||
         message.includes("access denied") ||
@@ -1207,9 +1216,33 @@ function createEventHandler(state) {
         const eventType = event.type ?? "unknown";
         const info = event.properties?.info;
         const sessionID = event.properties?.sessionID ?? info?.id;
+        const error = event.properties?.error;
+        // Fallback: some SDK/schema errors can arrive without a valid sessionID
+        // (for example: "Expected 'id' to be a string."). If there is exactly one
+        // active managed root session, retry it as a best-effort recovery path.
+        if (eventType === "session.error" && !sessionID && isRetryableApiError(error)) {
+            const rootCandidates = Array.from(state.managedUltraworkSessions.entries())
+                .filter(([, record]) => record.kind === "root")
+                .map(([id]) => id);
+            if (rootCandidates.length === 1) {
+                const fallbackSessionID = rootCandidates[0];
+                const count = state.sessionErrorRetryCount.get(fallbackSessionID) ?? 0;
+                if (count < MAX_RETRIES && !state.sessionRetryTimers.has(fallbackSessionID)) {
+                    const delay = Math.min(BASE_DELAY_MS * Math.pow(2, count), MAX_DELAY_MS);
+                    state.sessionErrorRetryCount.set(fallbackSessionID, count + 1);
+                    console.warn(`[opencode-immune] session.error without sessionID matched retryable error. ` +
+                        `Retrying sole managed root session ${fallbackSessionID}.`);
+                    scheduleManagedSessionRetry(state, fallbackSessionID, {
+                        delayMs: delay,
+                        reason: "session.error without sessionID",
+                        attemptLabel: `fallback attempt ${count + 1}/${MAX_RETRIES}`,
+                        countAgainstBudget: true,
+                    });
+                }
+            }
+        }
         // ── Auto-retry on retryable API error for managed ultrawork sessions ──
         if (eventType === "session.error" && sessionID) {
-            const error = event.properties?.error;
             const managedSession = getManagedSession(state, sessionID);
             const isRoot = managedSession?.kind === "root";
             const isChild = managedSession?.kind === "child";
@@ -1323,10 +1356,41 @@ async function archiveProgress(directory) {
         }
     }
 }
+/**
+ * Build a descriptive commit message from tasks.md context + diff stat.
+ * Format: "feat(ultrawork): <task-name-short> [L<level>]"
+ * Body: diff stat + phase info
+ */
+async function buildCommitMessage(directory, diffStat) {
+    try {
+        const ctx = await parseTasksFile(directory);
+        if (ctx) {
+            // Truncate task name to ~45 chars for subject line
+            let taskShort = ctx.task;
+            if (taskShort.length > 45) {
+                taskShort = taskShort.slice(0, 42) + "...";
+            }
+            const subject = `feat(ultrawork): ${taskShort}`;
+            const parts = [];
+            parts.push(`- Level: ${ctx.level}`);
+            if (ctx.intent)
+                parts.push(`- Intent: ${ctx.intent}`);
+            if (ctx.category)
+                parts.push(`- Category: ${ctx.category}`);
+            parts.push(`- Phase: ${ctx.phase}`);
+            if (diffStat)
+                parts.push("", diffStat);
+            return `${subject}\n\n${parts.join("\n")}`;
+        }
+    }
+    catch { /* fallback below */ }
+    // Fallback: no tasks.md or parse failed
+    const body = diffStat ? `\n\n${diffStat}` : "";
+    return `chore(ultrawork): cycle auto-commit${body}`;
+}
 /**
  * Helper: run git add + diff-stat + commit with descriptive message.
- * Builds commit body from `git diff --cached --stat` so the commit
- * is not an opaque "auto-commit" but shows what changed.
+ * Reads tasks.md to build a meaningful commit subject from task context.
  * Returns true if commit succeeded (or nothing to commit), false on error.
  */
 function runGitCommit(directory) {
@@ -1339,10 +1403,9 @@ function runGitCommit(directory) {
                 return;
             }
             // Get diff stat for commit body
-            (0, child_process_1.execFile)("git", ["diff", "--cached", "--stat"], { cwd: directory }, (_diffErr, diffOut) => {
+            (0, child_process_1.execFile)("git", ["diff", "--cached", "--stat"], { cwd: directory }, async (_diffErr, diffOut) => {
                 const stat = (diffOut ?? "").trim();
-                const body = stat ? `\n\n${stat}` : "";
-                const message = `chore: ultrawork cycle auto-commit${body}`;
+                const message = await buildCommitMessage(directory, stat);
                 (0, child_process_1.execFile)("git", ["commit", "-m", message], { cwd: directory }, (commitErr, stdout, stderr) => {
                     if (commitErr) {
                         if (stderr?.includes("nothing to commit") || stdout?.includes("nothing to commit")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-immune",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "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.3"
+    "@opencode-ai/plugin": "1.4.7"
   },
   "devDependencies": {
     "@types/node": "^25.5.2",
@@ -29,4 +29,4 @@
     "retry"
   ],
   "license": "MIT"
-}
+}