oh-my-opencode 5.1.30 → 5.1.33

package/dist/index.js

@@ -20393,7 +20393,8 @@ var OmoMemoryNudgeSchema = z8.object({
 }).strict();
 var OmoMemoryFactsSchema = z8.object({
   enabled: z8.boolean().default(true),
-  debounce_settles: z8.number().int().min(1).default(4)
+  debounce_settles: z8.number().int().min(1).default(4),
+  model: z8.string().min(1).optional()
 }).strict();
 var OmoMemoryDreamSchema = z8.object({
   enabled: z8.boolean().default(true),
@@ -20455,7 +20456,8 @@ var OmoMemoryNudgeLayerSchema = z8.object({
 }).strict();
 var OmoMemoryFactsLayerSchema = z8.object({
   enabled: z8.boolean().optional(),
-  debounce_settles: z8.number().int().min(1).optional()
+  debounce_settles: z8.number().int().min(1).optional(),
+  model: z8.string().min(1).optional()
 }).strict();
 var OmoMemoryDreamLayerSchema = z8.object({
   enabled: z8.boolean().optional(),
@@ -24643,6 +24645,9 @@ function isRuntimeFallbackRetryableError(error, retryOnErrors, options = {}) {
   const errorType = classifyRuntimeFallbackError(error);
   if (errorType === "abort" || errorType === "context_overflow")
     return false;
+  if (getRuntimeFallbackErrorName(error)?.toLowerCase().replace(/[_-]/g, "") === "contentfiltererror") {
+    return true;
+  }
   if (errorType === "missing_api_key" || errorType === "model_not_found" || errorType === "quota_exceeded") {
     return true;
   }
@@ -99132,7 +99137,7 @@ function getCachedVersion(options = {}) {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "5.1.30",
+  version: "5.1.33",
   description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   main: "./dist/index.js",
   types: "dist/index.d.ts",
@@ -99309,7 +99314,7 @@ var package_default = {
   },
   devDependencies: {
     "@clack/prompts": "^1.8.1",
-    "@code-yeongyu/senpi": "2026.10.11",
+    "@code-yeongyu/senpi": "2026.10.13",
     "@modelcontextprotocol/sdk": "^1.30.0",
     "@oh-my-opencode/agents-md-core": "workspace:*",
     "@oh-my-opencode/ast-grep-mcp": "workspace:*",
@@ -99368,18 +99373,18 @@ var package_default = {
     typescript: "^7.0.2"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "5.1.30",
-    "oh-my-opencode-darwin-x64": "5.1.30",
-    "oh-my-opencode-darwin-x64-baseline": "5.1.30",
-    "oh-my-opencode-linux-arm64": "5.1.30",
-    "oh-my-opencode-linux-arm64-musl": "5.1.30",
-    "oh-my-opencode-linux-x64": "5.1.30",
-    "oh-my-opencode-linux-x64-baseline": "5.1.30",
-    "oh-my-opencode-linux-x64-musl": "5.1.30",
-    "oh-my-opencode-linux-x64-musl-baseline": "5.1.30",
-    "oh-my-opencode-windows-arm64": "5.1.30",
-    "oh-my-opencode-windows-x64": "5.1.30",
-    "oh-my-opencode-windows-x64-baseline": "5.1.30"
+    "oh-my-opencode-darwin-arm64": "5.1.33",
+    "oh-my-opencode-darwin-x64": "5.1.33",
+    "oh-my-opencode-darwin-x64-baseline": "5.1.33",
+    "oh-my-opencode-linux-arm64": "5.1.33",
+    "oh-my-opencode-linux-arm64-musl": "5.1.33",
+    "oh-my-opencode-linux-x64": "5.1.33",
+    "oh-my-opencode-linux-x64-baseline": "5.1.33",
+    "oh-my-opencode-linux-x64-musl": "5.1.33",
+    "oh-my-opencode-linux-x64-musl-baseline": "5.1.33",
+    "oh-my-opencode-windows-arm64": "5.1.33",
+    "oh-my-opencode-windows-x64": "5.1.33",
+    "oh-my-opencode-windows-x64-baseline": "5.1.33"
   },
   overrides: {
     hono: "^4.13.8",
@@ -105362,7 +105367,13 @@ task(category="quick", load_skills=["git-master"], run_in_background=true)
 
 ---
 
+## Task resources
+Before the first task command, create and record one \`RUN_TMP=$(mktemp -d)\` per task. Export \`TMPDIR="$RUN_TMP" NODE_COMPILE_CACHE="$RUN_TMP/node-compile-cache" BUN_RUNTIME_TRANSPILER_CACHE_PATH="$RUN_TMP/bun-transpiler"\` for every command; pass the same environment explicitly to children that do not inherit it. Give independent child tasks their own run roots.
+At task end, after owned processes exit, remove only owned directories, including runtime caches. Never wipe shared caches; retain worktrees still needed by open PRs and any parent directory containing them.
+ALWAYS add a cleanup todo AT CREATION for each worktree, cache directory (including the run root), and QA resource (PID, tmux session, browser context, port, container, script or temp path); complete it only after a read-back teardown receipt.
+
 ## EXECUTION RULES
+
 - **TODO format**: \`path: <action> for <scenario-id> \u2014 verify by <check>\` encoding WHERE / WHY (which scenario it advances) / HOW / VERIFY. Exactly ONE in_progress at a time. Mark completed IMMEDIATELY \u2014 never batch.
   - GOOD pair (ordered): \`test/module.test: read the validateEmail cases for S2 - verify by noting intent / coverage / pass in the notepad\` \u2192 \`src/module: Implement validateEmail() for S2 - verify by curl 400 body + module.test green\`
   - BAD: "Implement feature" / "Fix bug" / "Add tests later" \u2192 rewrite.
@@ -105462,7 +105473,7 @@ The real-surface artifact is always required. A new test only where the reposito
 
 **NAME THE EXACT TOOL + EXACT INVOCATION** for every scenario \u2014 the literal \`curl ...\`, \`tmux send-keys ...\`, \`page.click(...)\` with concrete inputs and the binary observable. "run it" / "open the page" is not a scenario.
 
-**CLEANUP IS PART OF QA \u2014 TRACK IT AS TODOS.** The moment a QA scenario spawns any resource, add a teardown todo for it (QA scripts, tmux assets, browser contexts, PIDs, ports, containers, temp dirs). Execute every teardown todo and capture the receipt before declaring done. A leftover process / tmux session / browser context / bound port / temp dir = NOT done.
+**CLEANUP IS PART OF THE TASK \u2014 TRACK IT AS TODOS.** Tear down QA scripts, tmux assets, browser contexts, PIDs, ports, containers and QA temp paths inside \`$RUN_TMP\` before recording QA; leftover QA resources mean NOT done. Remove the run root and eligible worktrees at task end under Task resources.
 </MANUAL_QA_MANDATE>
 
 ### Test Decision (every production code change)
@@ -105710,7 +105721,13 @@ task(subagent_type="plan", load_skills=[], run_in_background=false, prompt="<gat
 
 ---
 
+## Task resources
+Before the first task command, create and record one \`RUN_TMP=$(mktemp -d)\` per task. Export \`TMPDIR="$RUN_TMP" NODE_COMPILE_CACHE="$RUN_TMP/node-compile-cache" BUN_RUNTIME_TRANSPILER_CACHE_PATH="$RUN_TMP/bun-transpiler"\` for every command; pass the same environment explicitly to children that do not inherit it. Give independent child tasks their own run roots.
+At task end, after owned processes exit, remove only owned directories, including runtime caches. Never wipe shared caches; retain worktrees still needed by open PRs and any parent directory containing them.
+ALWAYS add a cleanup todo AT CREATION for each worktree, cache directory (including the run root), and QA resource (PID, tmux session, browser context, port, container, script or temp path); complete it only after a read-back teardown receipt.
+
 ## EXECUTION RULES
+
 - **TODO**: Track EVERY step. Mark complete IMMEDIATELY after each.
 - **PARALLEL**: Fire independent agent calls simultaneously via task(run_in_background=true) - NEVER wait sequentially.
 - **BACKGROUND FIRST**: Use task for exploration/research agents (10+ concurrent if needed).
@@ -105810,7 +105827,7 @@ Trigger if user said "\uC5C4\uBC00"/"strictly"/"rigorously"/"properly review", o
 | Adds a new tool/hook/feature | Test it end-to-end in a real scenario. |
 | Modifies config handling | Load the config. Verify it parses correctly. |
 
-**NAME THE EXACT TOOL + EXACT INVOCATION** per scenario \u2014 the literal \`curl\` / \`send-keys\` / \`page.click\` with inputs and the binary observable. **REGISTER EVERY QA-SPAWNED RESOURCE TEARDOWN AS ITS OWN TODO** (scripts, tmux assets, browser contexts, PIDs, ports, temp dirs), execute it, capture the receipt. A leftover process / tmux session / browser context = NOT done.
+**NAME THE EXACT TOOL + INVOCATION** per scenario. Tear down QA scripts, tmux assets, browser contexts, PIDs, ports, containers and QA temp paths inside \`$RUN_TMP\` before recording QA; leftover QA resources mean NOT done. Remove the run root and eligible worktrees at task end under Task resources.
 
 **UNACCEPTABLE (WILL BE REJECTED):**
 - "This should work" - DID YOU RUN IT? NO? THEN RUN IT.
@@ -105995,6 +106012,11 @@ If a verification command is unavailable or not applicable, state the exact reas
 
 When a \`create_goal\` tool exists, check \`get_goal\` first (continue a matching active goal; never duplicate), then register the run's goal before implementation with exactly \`objective\`, written outcome-first: the concrete outcome that will be true (never an activity), the named deliverable surfaces, the scenario contract as success criteria that can fail, scope bounds, and one WHEN TO STOP line naming the observable end state. Never invent a budget or deadline the user did not state. Without the tool, record the same contract in your working notes and treat it as binding.
 
+## Task resources
+Before the first task command, create and record one \`RUN_TMP=$(mktemp -d)\` per task. Export \`TMPDIR="$RUN_TMP" NODE_COMPILE_CACHE="$RUN_TMP/node-compile-cache" BUN_RUNTIME_TRANSPILER_CACHE_PATH="$RUN_TMP/bun-transpiler"\` for every command; pass the same environment explicitly to children that do not inherit it. Give independent child tasks their own run roots.
+At task end, after owned processes exit, remove only owned directories, including runtime caches. Never wipe shared caches; retain worktrees still needed by open PRs and any parent directory containing them.
+ALWAYS add a cleanup todo AT CREATION for each worktree, cache directory (including the run root), and QA resource (PID, tmux session, browser context, port, container, script or temp path); complete it only after a read-back teardown receipt.
+
 ## TODO DISCIPLINE
 
 Track every multi-step task in a live todo list: one atomic item per action with its verification, exactly one item in progress, status updated the instant it changes, newly discovered work added immediately. Never batch completions.
@@ -106038,7 +106060,7 @@ Tests are necessary and insufficient. Exercise the real surface.
 | Prompt or mode | Verify the prompt loads or the registry resolves it. |
 | Build output | Run build and verify exit code 0. |
 
-If QA starts a server, browser, tmux session, port, temp dir, or background process, clean it up and record the cleanup.
+Tear down QA scripts, tmux assets, browser contexts, PIDs, ports, containers and QA temp paths inside \`$RUN_TMP\` before recording QA; leftover QA resources mean NOT done. Remove the run root and eligible worktrees at task end under Task resources.
 
 ## REVIEWER GATE
 
@@ -106193,6 +106215,11 @@ At start, run \`NOTE=$(mktemp -t ulw-$(date +%Y%m%d-%H%M%S).XXXXXX.md)\` and ech
 
 When a \`create_goal\` tool exists, check \`get_goal\` first (continue a matching active goal; never duplicate), then register the run's goal before implementation with exactly \`objective\`, outcome-first: the concrete outcome that will be true (never an activity), named deliverable surfaces, the scenario contract as criteria that can fail, scope bounds, and the WHEN TO STOP line. No invented budgets or deadlines. No tool \u2192 record the same contract in the notepad and treat it as binding.
 
+## Task resources
+Before the first task command, create and record one \`RUN_TMP=$(mktemp -d)\` per task. Export \`TMPDIR="$RUN_TMP" NODE_COMPILE_CACHE="$RUN_TMP/node-compile-cache" BUN_RUNTIME_TRANSPILER_CACHE_PATH="$RUN_TMP/bun-transpiler"\` for every command; pass the same environment explicitly to children that do not inherit it. Give independent child tasks their own run roots.
+At task end, after owned processes exit, remove only owned directories, including runtime caches. Never wipe shared caches; retain worktrees still needed by open PRs and any parent directory containing them.
+ALWAYS add a cleanup todo AT CREATION for each worktree, cache directory (including the run root), and QA resource (PID, tmux session, browser context, port, container, script or temp path); complete it only after a read-back teardown receipt.
+
 ## TODO DISCIPLINE
 
 Maintain a live todo list for every multi-step task: one atomic item per action (\`path: <action> for <scenario> \u2014 verify by <check>\`), exactly one in_progress, transitions marked the instant they happen, discovered work inserted immediately. Never batch completions.
@@ -106241,7 +106268,7 @@ lsp_diagnostics catches type errors only. Logic bugs, missing behavior, broken f
 | Adds tool/hook/feature | Test end-to-end in a real scenario. |
 | Modifies config handling | Load config. Verify parsed shape. |
 
-Name the exact tool + exact invocation per scenario (literal \`curl\` / \`send-keys\` / \`page.click\` + inputs + binary observable). Register every QA-spawned resource teardown as its own todo (scripts, tmux, browser contexts, PIDs, ports, temp dirs), execute it, capture the receipt. "This should work" / "tests pass" / "lsp clean" / a leftover process are NOT done \u2014 the surface artifact + clean teardown are.
+Name the exact tool and invocation per scenario. Tear down QA scripts, tmux assets, browser contexts, PIDs, ports, containers and QA temp paths inside \`$RUN_TMP\` before recording QA; leftover QA resources mean NOT done. Remove the run root and eligible worktrees at task end under Task resources.
 </MANUAL_QA_MANDATE>
 
 ## REVIEWER GATE (triggered)
@@ -106431,7 +106458,8 @@ var HYPERPLAN_MESSAGE = HYPERPLAN_MODE_PROMPT;
 // packages/omo-opencode/src/hooks/keyword-detector/constants.ts
 var CODE_BLOCK_PATTERN2 = /```[\s\S]*?```/g;
 var INLINE_CODE_PATTERN2 = /`[^`]+`/g;
-var HYPERPLAN_ULTRAWORK_PATTERN = /\b(?:hpp|hyperplan)\s+(?:ulw|ultrawork)\b|\b(?:ulw|ultrawork)\s+(?:hpp|hyperplan)\b/i;
+var ULTRAWORK_PATTERN = /\b(?:ultrawork|ulw(?!-\w))\b/i;
+var HYPERPLAN_ULTRAWORK_PATTERN = /\b(?:hpp|hyperplan)\s+(?:ultrawork|ulw(?!-\w))\b|\b(?:ultrawork|ulw(?!-\w))\s+(?:hpp|hyperplan)\b/i;
 var HYPERPLAN_ULTRAWORK_BANNER = `<hyperplan-ultrawork-mode>
 **MANDATORY**: Say "HYPERPLAN ULTRAWORK MODE ENABLED!" exactly once as your first response. Do NOT say the standalone "ULTRAWORK MODE ENABLED!" or "HYPERPLAN MODE ENABLED!" banners.
 
@@ -106445,7 +106473,7 @@ ${getUltraworkMessage(agentName, modelID)}`;
 var KEYWORD_DETECTORS = [
   {
     type: "ultrawork",
-    pattern: /\b(ultrawork|ulw)\b/i,
+    pattern: ULTRAWORK_PATTERN,
     message: getUltraworkMessage
   },
   {
@@ -121776,6 +121804,8 @@ function createMessageUpdateHandler(deps, helpers) {
       return;
     }
     if (sessionID && role === "assistant" && error) {
+      const isContentFilterError = extractErrorName(error)?.toLowerCase().replace(/[_-]/g, "") === "contentfiltererror";
+      const shouldOverrideRetry = Boolean(retrySignal && timeoutEnabled) || isContentFilterError;
       let state = sessionStates.get(sessionID);
       const pendingFallbackModel = state?.pendingFallbackModel;
       const wasAwaitingFallbackResult = sessionAwaitingFallbackResult.has(sessionID);
@@ -121790,12 +121820,12 @@ function createMessageUpdateHandler(deps, helpers) {
       if (wasAwaitingFallbackResult) {
         sessionAwaitingFallbackResult.delete(sessionID);
       }
-      if (sessionRetryInFlight.has(sessionID) && !retrySignal) {
+      if (sessionRetryInFlight.has(sessionID) && !retrySignal && !isContentFilterError) {
         log2(`[${HOOK_NAME13}] message.updated fallback skipped (retry in flight)`, { sessionID });
         return;
       }
-      if (retrySignal && timeoutEnabled && (sessionRetryInFlight.has(sessionID) || wasAwaitingFallbackResult)) {
-        log2(`[${HOOK_NAME13}] Overriding active retry due to provider auto-retry signal`, {
+      if (shouldOverrideRetry && (sessionRetryInFlight.has(sessionID) || wasAwaitingFallbackResult)) {
+        log2(`[${HOOK_NAME13}] Overriding active retry due to provider retry signal or content-filter error`, {
           sessionID,
           model
         });
@@ -121868,8 +121898,8 @@ function createMessageUpdateHandler(deps, helpers) {
       } else {
         sessionLastAccess.set(sessionID, Date.now());
         if (state.pendingFallbackModel) {
-          if (retrySignal && timeoutEnabled) {
-            log2(`[${HOOK_NAME13}] Clearing pending fallback due to provider auto-retry signal`, {
+          if (shouldOverrideRetry) {
+            log2(`[${HOOK_NAME13}] Clearing pending fallback due to provider retry signal or content-filter error`, {
               sessionID,
               pendingFallbackModel: state.pendingFallbackModel
             });
@@ -131918,6 +131948,58 @@ function isSessionSdkUnavailableError(value) {
   return SDK_UNAVAILABLE_PATTERNS.some((pattern) => haystack.includes(pattern));
 }
 
+// packages/omo-opencode/src/tools/session-manager/session-error.ts
+function textField(record, key) {
+  const value = record[key];
+  return typeof value === "string" && value.length > 0 ? value : undefined;
+}
+function describeSessionError(error) {
+  if (error instanceof Error)
+    return error.message;
+  if (typeof error === "string")
+    return error;
+  if (!error || typeof error !== "object")
+    return String(error);
+  const record = error;
+  const data = record.data && typeof record.data === "object" ? record.data : undefined;
+  const message = textField(record, "message") ?? (data ? textField(data, "message") : undefined);
+  const name = textField(record, "name");
+  const code = textField(record, "code");
+  if (message) {
+    if (name)
+      return `${name}: ${message}`;
+    return code ? `${message} (${code})` : message;
+  }
+  if (name)
+    return name;
+  try {
+    return JSON.stringify(error);
+  } catch {
+    return Object.prototype.toString.call(error);
+  }
+}
+function toSessionError(error) {
+  if (error instanceof Error)
+    return error;
+  const wrapped = new Error(describeSessionError(error), { cause: error });
+  const name = error && typeof error === "object" ? textField(error, "name") : undefined;
+  if (name)
+    wrapped.name = name;
+  return wrapped;
+}
+var SKIPPED_SESSIONS_SHOWN = 5;
+function formatSkippedSessions(skipped) {
+  if (skipped.length === 0)
+    return "";
+  const noun = skipped.length === 1 ? "session" : "sessions";
+  const shown = skipped.slice(0, SKIPPED_SESSIONS_SHOWN).map((entry) => `${entry.id} (${entry.reason})`);
+  const hidden = skipped.length - shown.length;
+  const entries = hidden > 0 ? [...shown, `and ${hidden} more`] : shown;
+  return `
+
+Skipped ${skipped.length} ${noun} that could not be read: ${entries.join(", ")}`;
+}
+
 // packages/omo-opencode/src/tools/session-manager/sdk-storage.ts
 function unwrapSdkResponseError(response) {
   if (!response || typeof response !== "object" || !("error" in response)) {
@@ -131929,7 +132011,7 @@ function throwOnNonFallbackableSdkError(response) {
   const error = unwrapSdkResponseError(response);
   if (!error)
     return;
-  throw error;
+  throw toSessionError(error);
 }
 var SDK_TRANSIENT_RETRY_ATTEMPTS = 3;
 var GLOBAL_SESSION_PAGE_SIZE = 100;
@@ -132062,6 +132144,12 @@ function shouldFallbackFromSdkError(error) {
 }
 
 // packages/omo-opencode/src/tools/session-manager/storage.ts
+function isSdkSessionNotFound(error) {
+  return error instanceof Error && error.name === "NotFoundError";
+}
+function shouldReadFileSession(error) {
+  return shouldFallbackFromSdkError(error) || isSdkSessionNotFound(error);
+}
 function normalizeProjectFilter(directory) {
   if (directory === "/")
     return;
@@ -132096,7 +132184,7 @@ async function getMainSessions(options) {
     } catch (error) {
       if (!shouldFallbackFromSdkError(error))
         throw error;
-      log2("[session-manager] falling back to file session list after SDK unavailable error", { error: String(error) });
+      log2("[session-manager] falling back to file session list after SDK unavailable error", { error: describeSessionError(error) });
     }
   }
   return getFileMainSessions(directory);
@@ -132110,7 +132198,7 @@ async function getAllSessions(limit) {
     } catch (error) {
       if (!shouldFallbackFromSdkError(error))
         throw error;
-      log2("[session-manager] falling back to file session ids after SDK unavailable error", { error: String(error) });
+      log2("[session-manager] falling back to file session ids after SDK unavailable error", { error: describeSessionError(error) });
     }
   }
   return getFileAllSessions();
@@ -132122,9 +132210,9 @@ async function sessionExists2(sessionID) {
       if (existsInSdk)
         return true;
     } catch (error) {
-      if (!shouldFallbackFromSdkError(error))
+      if (!shouldReadFileSession(error))
         throw error;
-      log2("[session-manager] falling back to file sessionExists after SDK unavailable error", { error: String(error), sessionID });
+      log2("[session-manager] reading file sessionExists after SDK error", { error: describeSessionError(error), sessionID });
     }
   }
   return fileSessionExists(sessionID);
@@ -132136,9 +132224,9 @@ async function readSessionMessages2(sessionID) {
       if (sdkMessages.length > 0)
         return sdkMessages;
     } catch (error) {
-      if (!shouldFallbackFromSdkError(error))
+      if (!shouldReadFileSession(error))
         throw error;
-      log2("[session-manager] falling back to file session messages after SDK unavailable error", { error: String(error), sessionID });
+      log2("[session-manager] reading file session messages after SDK error", { error: describeSessionError(error), sessionID });
     }
   }
   return getFileSessionMessages(sessionID);
@@ -132150,9 +132238,9 @@ async function readSessionTodos(sessionID) {
       if (sdkTodos.length > 0)
         return sdkTodos;
     } catch (error) {
-      if (!shouldFallbackFromSdkError(error))
+      if (!shouldReadFileSession(error))
         throw error;
-      log2("[session-manager] falling back to file session todos after SDK unavailable error", { error: String(error), sessionID });
+      log2("[session-manager] reading file session todos after SDK error", { error: describeSessionError(error), sessionID });
     }
   }
   return getFileSessionTodos(sessionID);
@@ -132194,9 +132282,9 @@ async function getSessionInfo(sessionID) {
         };
       }
     } catch (error) {
-      if (!shouldFallbackFromSdkError(error))
+      if (!shouldReadFileSession(error))
         throw error;
-      log2("[session-manager] falling back to file session info after SDK unavailable error", { error: String(error), sessionID });
+      log2("[session-manager] reading file session info after SDK error", { error: describeSessionError(error), sessionID });
     }
   }
   return getFileSessionInfo(sessionID);
@@ -132207,9 +132295,14 @@ async function formatSessionList(sessionIDs) {
   if (sessionIDs.length === 0) {
     return "No sessions found.";
   }
-  const infos = (await Promise.all(sessionIDs.map((id) => getSessionInfo(id)))).filter((info) => info !== null);
+  const skipped = [];
+  const reads = await Promise.all(sessionIDs.map((id) => getSessionInfo(id).catch((error) => {
+    skipped.push({ id, reason: describeSessionError(error) });
+    return null;
+  })));
+  const infos = reads.filter((info) => info !== null);
   if (infos.length === 0) {
-    return "No valid sessions found.";
+    return `No valid sessions found.${formatSkippedSessions(skipped)}`;
   }
   const headers = ["Session ID", "Messages", "First", "Last", "Agents"];
   const rows = infos.map((info) => [
@@ -132225,7 +132318,7 @@ async function formatSessionList(sessionIDs) {
   };
   const separator = "|" + colWidths.map((w) => "-".repeat(w + 2)).join("|") + "|";
   return [formatRow(headers), separator, ...rows.map(formatRow)].join(`
-`);
+`) + formatSkippedSessions(skipped);
 }
 function formatSessionMessages(messages, includeTodos, todos) {
   if (messages.length === 0) {
@@ -132421,7 +132514,7 @@ function createSessionManagerTools(ctx, deps = {}) {
         }
         return await resolvedDeps.formatSessionList(sessionIDs);
       } catch (e) {
-        return `Error: ${e instanceof Error ? e.message : String(e)}`;
+        return `Error: ${describeSessionError(e)}`;
       }
     }
   });
@@ -132449,7 +132542,7 @@ function createSessionManagerTools(ctx, deps = {}) {
         const todos = args.include_todos ? await resolvedDeps.readSessionTodos(args.session_id) : undefined;
         return resolvedDeps.formatSessionMessages(messages, args.include_todos, todos);
       } catch (e) {
-        return `Error: ${e instanceof Error ? e.message : String(e)}`;
+        return `Error: ${describeSessionError(e)}`;
       }
     }
   });
@@ -132464,6 +132557,7 @@ function createSessionManagerTools(ctx, deps = {}) {
     execute: async (args, _context) => {
       try {
         const resultLimit = args.limit && args.limit > 0 ? args.limit : 20;
+        const skipped = [];
         const searchOperation = async () => {
           if (args.session_id) {
             return resolvedDeps.searchInSession(args.session_id, args.query, args.case_sensitive, resultLimit);
@@ -132475,15 +132569,19 @@ function createSessionManagerTools(ctx, deps = {}) {
             if (allResults.length >= resultLimit)
               break;
             const remaining = resultLimit - allResults.length;
-            const sessionResults = await resolvedDeps.searchInSession(sid, args.query, args.case_sensitive, remaining);
-            allResults.push(...sessionResults);
+            try {
+              const sessionResults = await resolvedDeps.searchInSession(sid, args.query, args.case_sensitive, remaining);
+              allResults.push(...sessionResults);
+            } catch (error) {
+              skipped.push({ id: sid, reason: describeSessionError(error) });
+            }
           }
           return allResults.slice(0, resultLimit);
         };
         const results = await withTimeout4(searchOperation(), SEARCH_TIMEOUT_MS, "Search");
-        return resolvedDeps.formatSearchResults(results);
+        return resolvedDeps.formatSearchResults(results) + formatSkippedSessions(skipped);
       } catch (e) {
-        return `Error: ${e instanceof Error ? e.message : String(e)}`;
+        return `Error: ${describeSessionError(e)}`;
       }
     }
   });
@@ -132500,7 +132598,7 @@ function createSessionManagerTools(ctx, deps = {}) {
         }
         return resolvedDeps.formatSessionInfo(info);
       } catch (e) {
-        return `Error: ${e instanceof Error ? e.message : String(e)}`;
+        return `Error: ${describeSessionError(e)}`;
       }
     }
   });
@@ -137865,7 +137963,7 @@ async function createSyncSession(client, input) {
   const createResult = await client.session.create({
     body: {
       parentID: input.parentSessionID,
-      title: `${input.description} (@${input.agentToUse} subagent)`,
+      title: `${input.category ? `[${input.category}] ` : ""}${input.description} (@${input.agentToUse} subagent)`,
       permission: QUESTION_DENIED_SESSION_PERMISSION,
       ...input.categoryModel ? {
         model: {
@@ -138297,6 +138395,7 @@ async function runSyncTaskLoop(input) {
         agentToUse,
         description: args.description,
         defaultDirectory: directory,
+        category: args.category,
         categoryModel: nextFallbackModel
       });
       if (!retrySessionResult.ok) {
@@ -138397,6 +138496,7 @@ async function executeSyncTask(args, ctx, executorCtx, parentContext, agentToUse
       agentToUse,
       description: args.description,
       defaultDirectory: directory,
+      category: args.category,
       categoryModel
     });
     if (!createSessionResult.ok) {
@@ -138915,7 +139015,7 @@ async function resolveSubagentAgentMatch(requestedAgent, executorCtx, options) {
   const hasDemotedPlan = agents.some(isDemotedPlanAgent);
   const serverPrimaryAgent = findPrimaryAgentMatch(agents, requestedAgent);
   const serverMatchedAgent = findCallableAgentMatch(agents, requestedAgent);
-  const mergedAgents = mergeWithClaudeCodeAgents(agents, executorCtx.directory);
+  const mergedAgents = executorCtx.claudeCodeAgentsEnabled === false ? agents : mergeWithClaudeCodeAgents(agents, executorCtx.directory);
   const matchedPrimaryAgent = findPrimaryAgentMatch(mergedAgents, requestedAgent);
   const useHiddenPlanFallback = shouldUseHiddenPlanAgent(requestedAgent, serverPrimaryAgent, serverMatchedAgent, executorCtx.sisyphusAgentConfig, hasDemotedPlan);
   if (isReservedHiddenNativeAgent(requestedAgent) && !serverPrimaryAgent && !serverMatchedAgent) {
@@ -142352,17 +142452,24 @@ class ConcurrencyManager {
     }
     return model;
   }
-  async acquire(model, taskId) {
+  tryAcquire(model) {
     const key = this.getConcurrencyKey(model);
     const limit = this.getConcurrencyLimit(model);
     if (limit === Infinity) {
-      return;
+      return true;
     }
     const current = this.counts.get(key) ?? 0;
     if (current < limit) {
       this.counts.set(key, current + 1);
+      return true;
+    }
+    return false;
+  }
+  async acquire(model, taskId) {
+    if (this.tryAcquire(model)) {
       return;
     }
+    const key = this.getConcurrencyKey(model);
     return new Promise((resolve, reject) => {
       const queue = this.queues.get(key) ?? [];
       const entry = {
@@ -142665,9 +142772,17 @@ async function tryFallbackRetry(args) {
   const rawKey = task.model ? `${task.model.providerID}/${task.model.modelID}` : task.agent;
   const key = concurrencyManager.getConcurrencyKey(rawKey);
   const queue = queuesByKey.get(key) ?? [];
+  const hasContinuation = !!task.originalPrompt && task.originalPrompt !== task.prompt;
+  const retryPrompt = hasContinuation ? `${task.originalPrompt}
+
+[Latest continuation instruction]
+${task.prompt}` : task.prompt;
+  const retryNote = hasContinuation ? `
+
+[Note: this is a retry in a new session after the previous session failed; the earlier session's context is not available. Work from the original task and latest continuation instruction above.]` : "";
   const retryInput = {
     description: task.description,
-    prompt: task.prompt,
+    prompt: `${retryPrompt}${retryNote}`,
     agent: task.agent,
     parentSessionId: task.parentSessionId,
     parentMessageId: task.parentMessageId,
@@ -144199,7 +144314,7 @@ async function verifySessionExists(client, sessionID, directory) {
 
 // packages/omo-opencode/src/features/background-agent/session-stopped-on-error.ts
 var MIN_ERRORED_IDLE_POLLS = 10;
-function describeSessionError(error) {
+function describeSessionError2(error) {
   if (!isRecord9(error)) {
     return String(error);
   }
@@ -144217,7 +144332,7 @@ function getStoppedSessionError(messages) {
   if (error === undefined || error === null) {
     return;
   }
-  return describeSessionError(error);
+  return describeSessionError2(error);
 }
 
 // packages/omo-opencode/src/features/background-agent/session-idle-event-handler.ts
@@ -144601,6 +144716,25 @@ class TaskHistory {
   clearSession(parentSessionID) {
     this.entries.delete(parentSessionID);
   }
+  restoreEntry(parentSessionID, taskID, entry) {
+    const list = this.entries.get(parentSessionID);
+    if (!list) {
+      if (entry)
+        this.record(parentSessionID, entry);
+      return;
+    }
+    const index = list.findIndex((current) => current.id === taskID);
+    if (index !== -1) {
+      if (entry)
+        list[index] = { ...entry };
+      else
+        list.splice(index, 1);
+    } else if (entry) {
+      this.record(parentSessionID, entry);
+    }
+    if (list.length === 0)
+      this.entries.delete(parentSessionID);
+  }
   clearAll() {
     this.entries.clear();
   }
@@ -144773,6 +144907,7 @@ var TERMINAL_TASK_STATUSES = new Set([
 function pruneStaleTasksAndNotifications(args) {
   const { tasks, notifications, onTaskPruned } = args;
   const effectiveTtl = args.taskTtlMs ?? TASK_TTL_MS;
+  const terminalTtl = Math.max(TERMINAL_TASK_TTL_MS, args.taskCleanupDelayMs ?? 0);
   const now = Date.now();
   const tasksWithPendingNotifications = new Set;
   for (const queued of notifications.values()) {
@@ -144784,11 +144919,15 @@ function pruneStaleTasksAndNotifications(args) {
     if (TERMINAL_TASK_STATUSES.has(task.status)) {
       if (tasksWithPendingNotifications.has(taskId))
         continue;
+      if (args.hasPendingRemovalTimer?.(taskId))
+        continue;
+      if (task.sessionId && args.hasAttachedSyncSession?.(task.sessionId))
+        continue;
       const completedAt = task.completedAt?.getTime();
       if (!completedAt)
         continue;
       const age = now - completedAt;
-      if (age <= TERMINAL_TASK_TTL_MS)
+      if (age <= terminalTtl)
         continue;
       removeTaskToastTracking(taskId);
       tasks.delete(taskId);
@@ -145195,6 +145334,7 @@ class BackgroundManager {
   processingKeys = new Set;
   completionTimers = new Map;
   syncAttachedSessions = new Set;
+  resumesAwaitingAdmission = new Set;
   completedTaskArchive = new Map;
   completedTaskSummaries = new Map;
   idleDeferralTimers = new Map;
@@ -145401,8 +145541,12 @@ class BackgroundManager {
     taskIDs.add(task.id);
     this.tasksByParentSession.set(parentSessionID, taskIDs);
   }
-  captureResumeTaskSnapshot(task) {
+  captureResumeTaskSnapshot(task, resumeParentSessionID) {
     return {
+      prompt: task.prompt,
+      originalPrompt: task.originalPrompt,
+      queuedAt: task.queuedAt,
+      historyEntry: this.taskHistory.getByParentSession(resumeParentSessionID).find((entry) => entry.id === task.id),
       status: task.status,
       completedAt: task.completedAt,
       error: task.error,
@@ -145418,16 +145562,23 @@ class BackgroundManager {
     };
   }
   restoreTaskAfterSkippedResume(task, snapshot, skippedStatus) {
+    if (this.shutdownTriggered)
+      return;
     log2("[background-agent] Restoring task after skipped resume prompt:", {
       taskId: task.id,
       sessionID: task.sessionId,
       skippedStatus
     });
+    const resumeParentSessionID = task.parentSessionId;
     this.cleanupPendingByParent(task);
+    this.taskHistory.restoreEntry(resumeParentSessionID, task.id, snapshot.historyEntry);
     if (task.concurrencyKey) {
       this.concurrencyManager.release(task.concurrencyKey);
     }
     task.status = snapshot.status;
+    task.prompt = snapshot.prompt;
+    task.originalPrompt = snapshot.originalPrompt;
+    task.queuedAt = snapshot.queuedAt;
     task.completedAt = snapshot.completedAt;
     task.error = snapshot.error;
     task.startedAt = snapshot.startedAt;
@@ -145444,6 +145595,9 @@ class BackgroundManager {
       this.scheduleTaskRemoval(task.id);
     }
     this.updateBackgroundTaskMarker(task.parentSessionId);
+    if (resumeParentSessionID !== task.parentSessionId) {
+      this.updateBackgroundTaskMarker(resumeParentSessionID);
+    }
   }
   removeTaskFromParentIndex(taskID, parentSessionID) {
     if (!parentSessionID) {
@@ -145621,7 +145775,7 @@ class BackgroundManager {
     const createResult = await this.client.session.create({
       body: {
         parentID: input.parentSessionId,
-        title: `${input.description} (@${input.agent} subagent)`,
+        title: `${input.category ? `[${input.category}] ` : ""}${input.description} (@${input.agent} subagent)`,
         ...input.sessionPermission ? { permission: input.sessionPermission } : {},
         ...input.model ? {
           model: {
@@ -146040,14 +146194,74 @@ The fallback retry session is now created and can be inspected directly.
     if (existingTask.status === "running") {
       throw new Error(`Task ${existingTask.id} is currently running and cannot accept a continuation prompt. ` + "Wait for it to complete before resuming it with task_id.");
     }
-    const resumeSnapshot = this.captureResumeTaskSnapshot(existingTask);
+    if (existingTask.status === "pending" && existingTask.pendingResume) {
+      throw new Error(`Task ${existingTask.id} already has a continuation queued for admission and cannot accept another one. ` + "Wait for it to start and complete before resuming it with task_id.");
+    }
+    if (this.resumesAwaitingAdmission.has(existingTask.id)) {
+      throw new Error(`Task ${existingTask.id} is already being resumed and cannot accept another continuation. ` + "Wait for it to complete before resuming it with task_id.");
+    }
+    const resumeSnapshot = this.captureResumeTaskSnapshot(existingTask, input.parentSessionId);
     const completionTimer = this.completionTimers.get(existingTask.id);
     if (completionTimer) {
       clearTimeout(completionTimer);
       this.completionTimers.delete(existingTask.id);
     }
     const concurrencyKey = this.concurrencyManager.getConcurrencyKey(existingTask.concurrencyGroup ?? existingTask.agent);
-    await this.concurrencyManager.acquire(concurrencyKey);
+    if (this.concurrencyManager.tryAcquire(concurrencyKey)) {
+      this.resumesAwaitingAdmission.add(existingTask.id);
+      try {
+        await Promise.resolve();
+        return await this.startResumedTask(existingTask, input, resumeSnapshot, concurrencyKey);
+      } finally {
+        this.resumesAwaitingAdmission.delete(existingTask.id);
+      }
+    }
+    const admission = this.concurrencyManager.acquire(concurrencyKey, existingTask.id);
+    const resumeToken = {};
+    existingTask.pendingResume = resumeToken;
+    existingTask.status = "pending";
+    existingTask.queuedAt = new Date;
+    existingTask.completedAt = undefined;
+    existingTask.error = undefined;
+    this.updateTaskParent(existingTask, input.parentSessionId);
+    existingTask.parentMessageId = input.parentMessageId;
+    existingTask.parentModel = input.parentModel;
+    existingTask.parentAgent = input.parentAgent;
+    if (input.parentTools)
+      existingTask.parentTools = input.parentTools;
+    if (input.parentSessionId) {
+      const pending = this.pendingByParent.get(input.parentSessionId) ?? new Set;
+      pending.add(existingTask.id);
+      this.pendingByParent.set(input.parentSessionId, pending);
+    }
+    this.taskHistory.record(input.parentSessionId, { id: existingTask.id, sessionID: existingTask.sessionId, agent: existingTask.agent, description: existingTask.description, status: "pending", category: existingTask.category });
+    getTaskToastManager()?.addTask({ id: existingTask.id, description: existingTask.description, agent: existingTask.agent, isBackground: true, status: "queued" });
+    this.updateBackgroundTaskMarker(existingTask.parentSessionId);
+    admission.then(async () => {
+      if (this.shutdownTriggered || existingTask.status !== "pending" || existingTask.pendingResume !== resumeToken) {
+        this.concurrencyManager.release(concurrencyKey);
+        return;
+      }
+      await this.startResumedTask(existingTask, input, resumeSnapshot, concurrencyKey);
+    }).catch((error) => {
+      this.logger("[background-agent] Queued resume was not admitted:", { taskId: existingTask.id, error: error instanceof Error ? error.message : String(error) });
+      if (this.shutdownTriggered || existingTask.status !== "pending" || existingTask.pendingResume !== resumeToken)
+        return;
+      existingTask.pendingResume = undefined;
+      this.restoreTaskAfterSkippedResume(existingTask, resumeSnapshot, "unavailable");
+    });
+    return existingTask;
+  }
+  async startResumedTask(existingTask, input, resumeSnapshot, concurrencyKey) {
+    if (this.shutdownTriggered) {
+      this.concurrencyManager.release(concurrencyKey);
+      return existingTask;
+    }
+    if (!existingTask.sessionId)
+      throw new Error(`Task has no sessionID: ${existingTask.id}`);
+    existingTask.pendingResume = undefined;
+    existingTask.originalPrompt ??= existingTask.prompt;
+    existingTask.prompt = input.prompt;
     existingTask.concurrencyKey = concurrencyKey;
     existingTask.concurrencyGroup = concurrencyKey;
     existingTask.status = "running";
@@ -146061,6 +146275,15 @@ The fallback retry session is now created and can be inspected directly.
       existingTask.parentTools = input.parentTools;
     }
     existingTask.startedAt = new Date;
+    this.taskHistory.record(input.parentSessionId, {
+      id: existingTask.id,
+      sessionID: existingTask.sessionId,
+      agent: existingTask.agent,
+      description: existingTask.description,
+      status: "running",
+      category: existingTask.category,
+      startedAt: existingTask.startedAt
+    });
     existingTask.progress = {
       toolCalls: existingTask.progress?.toolCalls ?? 0,
       toolCallWindow: existingTask.progress?.toolCallWindow,
@@ -146171,6 +146394,16 @@ The fallback retry session is now created and can be inspected directly.
       const errorMessage = errorInfo.message ?? (error instanceof Error ? error.message : String(error));
       existingTask.error = errorMessage;
       existingTask.completedAt = new Date;
+      this.taskHistory.record(existingTask.parentSessionId, {
+        id: existingTask.id,
+        sessionID: existingTask.sessionId,
+        agent: existingTask.agent,
+        description: existingTask.description,
+        status: "interrupt",
+        category: existingTask.category,
+        startedAt: existingTask.startedAt,
+        completedAt: existingTask.completedAt
+      });
       if (existingTask.rootSessionId) {
         this.unregisterRootDescendant(existingTask.rootSessionId);
       }
@@ -147257,7 +147490,10 @@ The task was re-queued on a fallback model after a retryable failure.
       tasks: this.tasks,
       notifications: this.notifications,
       taskTtlMs: this.config?.taskTtlMs,
+      taskCleanupDelayMs: this.config?.taskCleanupDelayMs,
       sessionStatuses: allStatuses,
+      hasPendingRemovalTimer: (taskId) => this.completionTimers.has(taskId),
+      hasAttachedSyncSession: (sessionID) => this.syncAttachedSessions.has(sessionID),
       onTaskPruned: (taskId, task, errorMessage) => {
         const wasPending = task.status === "pending";
         log2("[background-agent] Pruning stale task:", { taskId, status: task.status, age: Math.round(((wasPending ? task.queuedAt?.getTime() : task.startedAt?.getTime()) ? Date.now() - (wasPending ? task.queuedAt.getTime() : task.startedAt.getTime()) : 0) / 1000) + "s" });
@@ -147488,7 +147724,17 @@ The task was re-queued on a fallback model after a retryable failure.
     this.stopPolling();
     const trackedSessionIDs = new Set;
     const abortRequests = [];
+    const queuedResumeParents = new Set;
     for (const task of this.tasks.values()) {
+      if (task.pendingResume) {
+        queuedResumeParents.add(task.parentSessionId);
+        task.pendingResume = undefined;
+        task.status = "cancelled";
+        task.completedAt = new Date;
+        this.concurrencyManager.cancelWaiter(task.concurrencyGroup ?? task.agent, task.id);
+        this.cleanupPendingByParent(task);
+        removeTaskToastTracking(task.id);
+      }
       if (task.sessionId) {
         trackedSessionIDs.add(task.sessionId);
       }
@@ -147554,6 +147800,9 @@ The task was re-queued on a fallback model after a retryable failure.
     this.queuesByKey.clear();
     this.processingKeys.clear();
     this.taskHistory.clearAll();
+    for (const parentSessionID of queuedResumeParents) {
+      this.updateBackgroundTaskMarker(parentSessionID);
+    }
     this.completedTaskSummaries.clear();
     this.unregisterProcessCleanup();
     log2("[background-agent] Shutdown complete");
@@ -172359,7 +172608,8 @@ function createTeamModeToolsRecord(args) {
     team_create: factories.createTeamCreateTool(pluginConfig.team_mode, ctx.client, managers.backgroundManager, managers.tmuxSessionManager, {
       userCategories: pluginConfig.categories,
       sisyphusJuniorModel: getSisyphusJuniorModelOverride(pluginConfig.agents?.["sisyphus-junior"]),
-      agentOverrides: pluginConfig.agents
+      agentOverrides: pluginConfig.agents,
+      claudeCodeAgentsEnabled: pluginConfig.claude_code?.agents ?? true
     }),
     team_delete: factories.createTeamDeleteTool(pluginConfig.team_mode, ctx.client, managers.backgroundManager, managers.tmuxSessionManager),
     team_shutdown_request: factories.createTeamShutdownRequestTool(pluginConfig.team_mode, ctx.client),
@@ -172505,6 +172755,7 @@ function createCoreTools(args) {
     nativeSkills,
     getLoadedSkills,
     sisyphusAgentConfig: pluginConfig.sisyphus_agent,
+    claudeCodeAgentsEnabled: pluginConfig.claude_code?.agents ?? true,
     syncPollTimeoutMs: pluginConfig.background_task?.syncPollTimeoutMs,
     modelFallbackControllerAccessor: managers.modelFallbackControllerAccessor,
     onSyncSessionCreated: async (event) => {
@@ -173657,7 +173908,8 @@ function createTeamCreateTool(config, client, bgMgr, tmuxMgr, executorConfig, de
         directory: projectRoot,
         userCategories: executorConfig?.userCategories,
         sisyphusJuniorModel: executorConfig?.sisyphusJuniorModel,
-        agentOverrides: executorConfig?.agentOverrides
+        agentOverrides: executorConfig?.agentOverrides,
+        claudeCodeAgentsEnabled: executorConfig?.claudeCodeAgentsEnabled
       }, config, bgMgr, tmuxMgr, {
         callerAgentTypeId: callerTeamLead.agentTypeId,
         parentMessageID: runtimeContext.messageID
@@ -174565,7 +174817,7 @@ function buildChatParamsInput(raw) {
     return null;
   const providerID = model.providerID;
   const modelID = typeof model.modelID === "string" ? model.modelID : typeof model.id === "string" ? model.id : undefined;
-  const providerId = provider.id;
+  const providerId = isRecord9(provider.info) ? provider.info.id : provider.id;
   if (typeof providerID !== "string")
     return null;
   if (typeof modelID !== "string")
@@ -174578,7 +174830,8 @@ function buildChatParamsInput(raw) {
     model: { providerID, modelID },
     provider: { id: providerId },
     message,
-    rawMessage: message
+    rawMessage: message,
+    runtimeModel: isRecord9(model.capabilities) ? model : undefined
   };
 }
 function isChatParamsOutput(raw) {
@@ -174616,7 +174869,8 @@ function createChatParamsHandler(_args = {}) {
     }
     const capabilities = getModelCapabilities2({
       providerID: normalizedInput.model.providerID,
-      modelID: normalizedInput.model.modelID
+      modelID: normalizedInput.model.modelID,
+      runtimeModel: normalizedInput.runtimeModel
     });
     const compatibility = resolveCompatibleModelSettings({
       providerID: normalizedInput.model.providerID,
@@ -174950,7 +175204,6 @@ async function resolveValidUltraworkVariant(client, model, variant) {
 // packages/omo-opencode/src/plugin/ultrawork-model-override.ts
 var CODE_BLOCK = /```[\s\S]*?```/g;
 var INLINE_CODE = /`[^`]+`/g;
-var ULTRAWORK_PATTERN = /\b(ultrawork|ulw)\b/i;
 function detectUltrawork(text) {
   const clean = text.replace(CODE_BLOCK, "").replace(INLINE_CODE, "");
   return ULTRAWORK_PATTERN.test(clean);