evil-omo 3.11.7 → 3.12.0

package/dist/index.js

@@ -982,10 +982,10 @@ function detectManagedConfigFile(directory) {
     baseName: CONFIG_BASENAME
   };
 }
-var PLUGIN_NAME = "evil-omo", ALL_PLUGIN_NAMES, CONFIG_BASENAME = "evil-omo", ALL_CONFIG_BASENAMES, LOG_FILENAME = "evil-omo.log", CACHE_DIR_NAME = "evil-omo", SCHEMA_FILENAME = "evil-omo.schema.json";
+var PLUGIN_NAME = "evil-omo", LEGACY_PLUGIN_NAME = "oh-my-opencode", ALL_PLUGIN_NAMES, CONFIG_BASENAME = "evil-omo", ALL_CONFIG_BASENAMES, LOG_FILENAME = "evil-omo.log", CACHE_DIR_NAME = "evil-omo", SCHEMA_FILENAME = "evil-omo.schema.json";
 var init_plugin_identity = __esm(() => {
   init_jsonc_parser();
-  ALL_PLUGIN_NAMES = [PLUGIN_NAME];
+  ALL_PLUGIN_NAMES = [PLUGIN_NAME, LEGACY_PLUGIN_NAME];
   ALL_CONFIG_BASENAMES = [CONFIG_BASENAME];
 });
 
@@ -17575,6 +17575,9 @@ function buildEnvPrefix(env, shellType) {
       return "";
   }
 }
+function shellEscapeForDoubleQuotedCommand(value) {
+  return value.replace(/\\/g, "\\\\").replace(/\$/g, "\\$").replace(/`/g, "\\`").replace(/"/g, "\\\"").replace(/;/g, "\\;").replace(/\|/g, "\\|").replace(/&/g, "\\&").replace(/#/g, "\\#").replace(/\(/g, "\\(").replace(/\)/g, "\\)");
+}
 // src/shared/system-directive.ts
 var SYSTEM_DIRECTIVE_PREFIX = "[SYSTEM DIRECTIVE: OMO-PLUGIN";
 function createSystemDirective(type2) {
@@ -18593,7 +18596,8 @@ async function spawnTmuxPane(sessionId, description, config, serverUrl, targetPa
   }
   log2("[spawnTmuxPane] all checks passed, spawning...");
   const shell = process.env.SHELL || "/bin/sh";
-  const opencodeCmd = `${shell} -c 'opencode attach ${serverUrl} --session ${sessionId}'`;
+  const escapedUrl = shellEscapeForDoubleQuotedCommand(serverUrl);
+  const opencodeCmd = `${shell} -c "opencode attach ${escapedUrl} --session ${sessionId}"`;
   const args = [
     "split-window",
     splitDirection,
@@ -18688,7 +18692,8 @@ async function replaceTmuxPane(paneId, sessionId, description, config, serverUrl
   });
   await ctrlCProc.exited;
   const shell = process.env.SHELL || "/bin/sh";
-  const opencodeCmd = `${shell} -c 'opencode attach ${serverUrl} --session ${sessionId}'`;
+  const escapedUrl = shellEscapeForDoubleQuotedCommand(serverUrl);
+  const opencodeCmd = `${shell} -c "opencode attach ${escapedUrl} --session ${sessionId}"`;
   const proc = spawn7([tmux, "respawn-pane", "-k", "-t", paneId, opencodeCmd], {
     stdout: "pipe",
     stderr: "pipe"
@@ -18710,6 +18715,7 @@ async function replaceTmuxPane(paneId, sessionId, description, config, serverUrl
     const titleStderr = await stderrPromise;
     log2("[replaceTmuxPane] WARNING: failed to set pane title", {
       paneId,
+      title,
       exitCode: titleExitCode,
       stderr: titleStderr.trim()
     });
@@ -20754,17 +20760,8 @@ function createSessionStateStore() {
     };
     const trackedSession = {
       state: rawState,
-      lastAccessedAt: Date.now(),
-      activitySignalCount: 0
+      lastAccessedAt: Date.now()
     };
-    trackedSession.state = new Proxy(rawState, {
-      set(target, property, value, receiver) {
-        if (property === "abortDetectedAt" && value === undefined) {
-          trackedSession.activitySignalCount += 1;
-        }
-        return Reflect.set(target, property, value, receiver);
-      }
-    });
     sessions.set(sessionID, trackedSession);
     return trackedSession;
   }
@@ -20786,10 +20783,8 @@ function createSessionStateStore() {
     const previousStagnationCount = state2.stagnationCount;
     const currentCompletedCount = todos?.filter((todo) => todo.status === "completed").length;
     const currentTodoSnapshot = todos ? getTodoSnapshot(todos) : undefined;
-    const currentActivitySignalCount = trackedSession.activitySignalCount;
     const hasCompletedMoreTodos = currentCompletedCount !== undefined && trackedSession.lastCompletedCount !== undefined && currentCompletedCount > trackedSession.lastCompletedCount;
     const hasTodoSnapshotChanged = currentTodoSnapshot !== undefined && trackedSession.lastTodoSnapshot !== undefined && currentTodoSnapshot !== trackedSession.lastTodoSnapshot;
-    const hasObservedExternalActivity = trackedSession.lastObservedActivitySignalCount !== undefined && currentActivitySignalCount > trackedSession.lastObservedActivitySignalCount;
     const hadSuccessfulInjectionAwaitingProgressCheck = state2.awaitingPostInjectionProgressCheck === true;
     state2.lastIncompleteCount = incompleteCount;
     if (currentCompletedCount !== undefined) {
@@ -20798,7 +20793,6 @@ function createSessionStateStore() {
     if (currentTodoSnapshot !== undefined) {
       trackedSession.lastTodoSnapshot = currentTodoSnapshot;
     }
-    trackedSession.lastObservedActivitySignalCount = currentActivitySignalCount;
     if (previousIncompleteCount === undefined) {
       state2.stagnationCount = 0;
       return {
@@ -20809,7 +20803,7 @@ function createSessionStateStore() {
         progressSource: "none"
       };
     }
-    const progressSource = incompleteCount < previousIncompleteCount || hasCompletedMoreTodos || hasTodoSnapshotChanged ? "todo" : hasObservedExternalActivity ? "activity" : "none";
+    const progressSource = incompleteCount < previousIncompleteCount || hasCompletedMoreTodos || hasTodoSnapshotChanged ? "todo" : "none";
     if (progressSource !== "none") {
       state2.stagnationCount = 0;
       state2.awaitingPostInjectionProgressCheck = false;
@@ -20851,8 +20845,6 @@ function createSessionStateStore() {
     state2.awaitingPostInjectionProgressCheck = false;
     trackedSession.lastCompletedCount = undefined;
     trackedSession.lastTodoSnapshot = undefined;
-    trackedSession.activitySignalCount = 0;
-    trackedSession.lastObservedActivitySignalCount = undefined;
   }
   function cancelCountdown(sessionID) {
     const tracked = sessions.get(sessionID);
@@ -38723,6 +38715,16 @@ class TaskToastManager {
     const running = this.getRunningTasks();
     const queued = this.getQueuedTasks();
     const concurrencyInfo = this.getConcurrencyInfo();
+    const formatTaskIdentifier = (task) => {
+      const modelName = task.modelInfo?.model?.split("/").pop();
+      if (modelName && task.category)
+        return `${modelName}: ${task.category}`;
+      if (modelName)
+        return modelName;
+      if (task.category)
+        return `${task.agent}/${task.category}`;
+      return task.agent;
+    };
     const lines = [];
     const isFallback = newTask.modelInfo && (newTask.modelInfo.type === "inherited" || newTask.modelInfo.type === "system-default" || newTask.modelInfo.type === "runtime-fallback");
     if (isFallback) {
@@ -38741,9 +38743,9 @@ class TaskToastManager {
         const duration3 = this.formatDuration(task.startedAt);
         const bgIcon = task.isBackground ? "[BG]" : "[RUN]";
         const isNew = task.id === newTask.id ? " \u2190 NEW" : "";
-        const categoryInfo = task.category ? `/${task.category}` : "";
+        const taskId = formatTaskIdentifier(task);
         const skillsInfo = task.skills?.length ? ` [${task.skills.join(", ")}]` : "";
-        lines.push(`${bgIcon} ${task.description} (${task.agent}${categoryInfo})${skillsInfo} - ${duration3}${isNew}`);
+        lines.push(`${bgIcon} ${task.description} (${taskId})${skillsInfo} - ${duration3}${isNew}`);
       }
     }
     if (queued.length > 0) {
@@ -38752,10 +38754,10 @@ class TaskToastManager {
       lines.push(`Queued (${queued.length}):`);
       for (const task of queued) {
         const bgIcon = task.isBackground ? "[Q]" : "[W]";
-        const categoryInfo = task.category ? `/${task.category}` : "";
+        const taskId = formatTaskIdentifier(task);
         const skillsInfo = task.skills?.length ? ` [${task.skills.join(", ")}]` : "";
         const isNew = task.id === newTask.id ? " \u2190 NEW" : "";
-        lines.push(`${bgIcon} ${task.description} (${task.agent}${categoryInfo})${skillsInfo} - Queued${isNew}`);
+        lines.push(`${bgIcon} ${task.description} (${taskId})${skillsInfo} - Queued${isNew}`);
       }
     }
     return lines.join(`
@@ -41073,6 +41075,9 @@ function syncCachePackageJsonToIntent(pluginInfo) {
     return { synced: false, error: "write_error", message: "Failed to write cache package.json" };
   }
 }
+// src/hooks/auto-update-checker/hook/background-update-check.ts
+import { existsSync as existsSync48 } from "fs";
+import { join as join54 } from "path";
 // src/cli/config-manager/plugin-name-with-version.ts
 init_plugin_identity();
 // src/cli/config-manager/add-plugin-to-opencode-config.ts
@@ -41167,7 +41172,7 @@ function logCapturedOutputOnFailure(outputMode, output) {
 }
 async function runBunInstallWithDetails(options) {
   const outputMode = options?.outputMode ?? "pipe";
-  const cacheDir = getOpenCodeCacheDir();
+  const cacheDir = options?.workspaceDir ?? getOpenCodeCacheDir();
   const packageJsonPath = `${cacheDir}/package.json`;
   if (!existsSync46(packageJsonPath)) {
     return {
@@ -41329,9 +41334,25 @@ Restart OpenCode to apply.`,
 function getPinnedVersionToastMessage(latestVersion) {
   return `Update available: ${latestVersion} (version pinned, update manually)`;
 }
-async function runBunInstallSafe() {
+function resolveActiveInstallWorkspace() {
+  const configPaths = getOpenCodeConfigPaths({ binary: "opencode" });
+  const cacheDir = getOpenCodeCacheDir();
+  const configInstallPath = join54(configPaths.configDir, "node_modules", PACKAGE_NAME, "package.json");
+  const cacheInstallPath = join54(cacheDir, "node_modules", PACKAGE_NAME, "package.json");
+  if (existsSync48(configInstallPath)) {
+    log(`[auto-update-checker] Active workspace: config-dir (${configPaths.configDir})`);
+    return configPaths.configDir;
+  }
+  if (existsSync48(cacheInstallPath)) {
+    log(`[auto-update-checker] Active workspace: cache-dir (${cacheDir})`);
+    return cacheDir;
+  }
+  log(`[auto-update-checker] Active workspace: config-dir (default, no install detected)`);
+  return configPaths.configDir;
+}
+async function runBunInstallSafe(workspaceDir) {
   try {
-    const result = await runBunInstallWithDetails({ outputMode: "pipe" });
+    const result = await runBunInstallWithDetails({ outputMode: "pipe", workspaceDir });
     if (!result.success && result.error) {
       log("[auto-update-checker] bun install error:", result.error);
     }
@@ -41382,7 +41403,8 @@ async function runBackgroundUpdateCheck(ctx, autoUpdate, getToastMessage) {
     return;
   }
   invalidatePackage(PACKAGE_NAME);
-  const installSuccess = await runBunInstallSafe();
+  const activeWorkspace = resolveActiveInstallWorkspace();
+  const installSuccess = await runBunInstallSafe(activeWorkspace);
   if (installSuccess) {
     await showAutoUpdatedToast(ctx, currentVersion, latestVersion);
     log(`[auto-update-checker] Update installed: ${currentVersion} \u2192 ${latestVersion}`);
@@ -41557,17 +41579,17 @@ v${latestVersion} available. Restart OpenCode to apply.` : "OpenCode is now on S
 }
 // src/hooks/agent-usage-reminder/storage.ts
 import {
-  existsSync as existsSync48,
+  existsSync as existsSync49,
   mkdirSync as mkdirSync10,
   readFileSync as readFileSync33,
   writeFileSync as writeFileSync14,
   unlinkSync as unlinkSync8
 } from "fs";
-import { join as join55 } from "path";
+import { join as join56 } from "path";
 
 // src/hooks/agent-usage-reminder/constants.ts
-import { join as join54 } from "path";
-var AGENT_USAGE_REMINDER_STORAGE = join54(OPENCODE_STORAGE, "agent-usage-reminder");
+import { join as join55 } from "path";
+var AGENT_USAGE_REMINDER_STORAGE = join55(OPENCODE_STORAGE, "agent-usage-reminder");
 var TARGET_TOOLS = new Set([
   "grep",
   "safe_grep",
@@ -41613,11 +41635,11 @@ ALWAYS prefer: Multiple parallel task calls > Direct tool calls
 
 // src/hooks/agent-usage-reminder/storage.ts
 function getStoragePath2(sessionID) {
-  return join55(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
+  return join56(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
 }
 function loadAgentUsageState(sessionID) {
   const filePath = getStoragePath2(sessionID);
-  if (!existsSync48(filePath))
+  if (!existsSync49(filePath))
     return null;
   try {
     const content = readFileSync33(filePath, "utf-8");
@@ -41627,7 +41649,7 @@ function loadAgentUsageState(sessionID) {
   }
 }
 function saveAgentUsageState(state3) {
-  if (!existsSync48(AGENT_USAGE_REMINDER_STORAGE)) {
+  if (!existsSync49(AGENT_USAGE_REMINDER_STORAGE)) {
     mkdirSync10(AGENT_USAGE_REMINDER_STORAGE, { recursive: true });
   }
   const filePath = getStoragePath2(state3.sessionID);
@@ -41635,7 +41657,7 @@ function saveAgentUsageState(state3) {
 }
 function clearAgentUsageState(sessionID) {
   const filePath = getStoragePath2(sessionID);
-  if (existsSync48(filePath)) {
+  if (existsSync49(filePath)) {
     unlinkSync8(filePath);
   }
 }
@@ -42899,17 +42921,17 @@ function createNonInteractiveEnvHook(_ctx) {
 }
 // src/hooks/interactive-bash-session/storage.ts
 import {
-  existsSync as existsSync49,
+  existsSync as existsSync50,
   mkdirSync as mkdirSync11,
   readFileSync as readFileSync34,
   writeFileSync as writeFileSync15,
   unlinkSync as unlinkSync9
 } from "fs";
-import { join as join57 } from "path";
+import { join as join58 } from "path";
 
 // src/hooks/interactive-bash-session/constants.ts
-import { join as join56 } from "path";
-var INTERACTIVE_BASH_SESSION_STORAGE = join56(OPENCODE_STORAGE, "interactive-bash-session");
+import { join as join57 } from "path";
+var INTERACTIVE_BASH_SESSION_STORAGE = join57(OPENCODE_STORAGE, "interactive-bash-session");
 var OMO_SESSION_PREFIX = "omo-";
 function buildSessionReminderMessage(sessions) {
   if (sessions.length === 0)
@@ -42921,11 +42943,11 @@ function buildSessionReminderMessage(sessions) {
 
 // src/hooks/interactive-bash-session/storage.ts
 function getStoragePath3(sessionID) {
-  return join57(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
+  return join58(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
 }
 function loadInteractiveBashSessionState(sessionID) {
   const filePath = getStoragePath3(sessionID);
-  if (!existsSync49(filePath))
+  if (!existsSync50(filePath))
     return null;
   try {
     const content = readFileSync34(filePath, "utf-8");
@@ -42940,7 +42962,7 @@ function loadInteractiveBashSessionState(sessionID) {
   }
 }
 function saveInteractiveBashSessionState(state3) {
-  if (!existsSync49(INTERACTIVE_BASH_SESSION_STORAGE)) {
+  if (!existsSync50(INTERACTIVE_BASH_SESSION_STORAGE)) {
     mkdirSync11(INTERACTIVE_BASH_SESSION_STORAGE, { recursive: true });
   }
   const filePath = getStoragePath3(state3.sessionID);
@@ -42953,7 +42975,7 @@ function saveInteractiveBashSessionState(state3) {
 }
 function clearInteractiveBashSessionState(sessionID) {
   const filePath = getStoragePath3(sessionID);
-  if (existsSync49(filePath)) {
+  if (existsSync50(filePath)) {
     unlinkSync9(filePath);
   }
 }
@@ -43350,14 +43372,14 @@ var DEFAULT_MAX_ITERATIONS = 100;
 var DEFAULT_COMPLETION_PROMISE = "DONE";
 var ULTRAWORK_VERIFICATION_PROMISE = "VERIFIED";
 // src/hooks/ralph-loop/storage.ts
-import { existsSync as existsSync50, readFileSync as readFileSync35, writeFileSync as writeFileSync16, unlinkSync as unlinkSync10, mkdirSync as mkdirSync12 } from "fs";
-import { dirname as dirname11, join as join58 } from "path";
+import { existsSync as existsSync51, readFileSync as readFileSync35, writeFileSync as writeFileSync16, unlinkSync as unlinkSync10, mkdirSync as mkdirSync12 } from "fs";
+import { dirname as dirname11, join as join59 } from "path";
 function getStateFilePath(directory, customPath) {
-  return customPath ? join58(directory, customPath) : join58(directory, DEFAULT_STATE_FILE);
+  return customPath ? join59(directory, customPath) : join59(directory, DEFAULT_STATE_FILE);
 }
 function readState(directory, customPath) {
   const filePath = getStateFilePath(directory, customPath);
-  if (!existsSync50(filePath)) {
+  if (!existsSync51(filePath)) {
     return null;
   }
   try {
@@ -43403,7 +43425,7 @@ function writeState(directory, state3, customPath) {
   const filePath = getStateFilePath(directory, customPath);
   try {
     const dir = dirname11(filePath);
-    if (!existsSync50(dir)) {
+    if (!existsSync51(dir)) {
       mkdirSync12(dir, { recursive: true });
     }
     const sessionIdLine = state3.session_id ? `session_id: "${state3.session_id}"
@@ -43441,7 +43463,7 @@ ${state3.prompt}
 function clearState(directory, customPath) {
   const filePath = getStateFilePath(directory, customPath);
   try {
-    if (existsSync50(filePath)) {
+    if (existsSync51(filePath)) {
       unlinkSync10(filePath);
     }
     return true;
@@ -43770,7 +43792,7 @@ async function handleDetectedCompletion(ctx, input) {
 
 // src/hooks/ralph-loop/completion-promise-detector.ts
 init_logger();
-import { existsSync as existsSync51, readFileSync as readFileSync36 } from "fs";
+import { existsSync as existsSync52, readFileSync as readFileSync36 } from "fs";
 function escapeRegex2(str2) {
   return str2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -43781,7 +43803,7 @@ function detectCompletionInTranscript(transcriptPath, promise2, startedAt) {
   if (!transcriptPath)
     return false;
   try {
-    if (!existsSync51(transcriptPath))
+    if (!existsSync52(transcriptPath))
       return false;
     const content = readFileSync36(transcriptPath, "utf-8");
     const pattern = buildPromisePattern(promise2);
@@ -43998,6 +44020,56 @@ async function handleFailedVerification(ctx, input) {
 }
 
 // src/hooks/ralph-loop/pending-verification-handler.ts
+var ORACLE_AGENT_PATTERN = /Agent:\s*oracle/i;
+var TASK_METADATA_SESSION_PATTERN = /<task_metadata>[\s\S]*?session_id:\s*([^\s<]+)[\s\S]*?<\/task_metadata>/i;
+var VERIFIED_PROMISE_PATTERN = new RegExp(`<promise>\\s*${ULTRAWORK_VERIFICATION_PROMISE}\\s*<\\/promise>`, "i");
+function collectAssistantText(message) {
+  if (!Array.isArray(message.parts)) {
+    return "";
+  }
+  let text = "";
+  for (const part of message.parts) {
+    if (part.type !== "text") {
+      continue;
+    }
+    text += `${text ? `
+` : ""}${part.text ?? ""}`;
+  }
+  return text;
+}
+async function detectOracleVerificationFromParentSession(ctx, parentSessionID, directory, apiTimeoutMs) {
+  try {
+    const response = await withTimeout(ctx.client.session.messages({
+      path: { id: parentSessionID },
+      query: { directory }
+    }), apiTimeoutMs);
+    const messagesResponse = response;
+    const responseData = typeof messagesResponse === "object" && messagesResponse !== null && "data" in messagesResponse ? messagesResponse.data : undefined;
+    const messageArray = Array.isArray(messagesResponse) ? messagesResponse : Array.isArray(responseData) ? responseData : [];
+    for (let index = messageArray.length - 1;index >= 0; index -= 1) {
+      const message = messageArray[index];
+      if (message.info?.role !== "assistant") {
+        continue;
+      }
+      const assistantText = collectAssistantText(message);
+      if (!VERIFIED_PROMISE_PATTERN.test(assistantText) || !ORACLE_AGENT_PATTERN.test(assistantText)) {
+        continue;
+      }
+      const sessionMatch = assistantText.match(TASK_METADATA_SESSION_PATTERN);
+      const detectedOracleSessionID = sessionMatch?.[1]?.trim();
+      if (detectedOracleSessionID) {
+        return detectedOracleSessionID;
+      }
+    }
+    return;
+  } catch (error48) {
+    log(`[${HOOK_NAME3}] Failed to scan parent session for oracle verification evidence`, {
+      parentSessionID,
+      error: String(error48)
+    });
+    return;
+  }
+}
 async function handlePendingVerification(ctx, input) {
   const {
     sessionID,
@@ -44010,6 +44082,19 @@ async function handlePendingVerification(ctx, input) {
     apiTimeoutMs
   } = input;
   if (matchesParentSession || verificationSessionID && matchesVerificationSession) {
+    if (!verificationSessionID && state3.session_id) {
+      const recoveredVerificationSessionID = await detectOracleVerificationFromParentSession(ctx, state3.session_id, directory, apiTimeoutMs);
+      if (recoveredVerificationSessionID) {
+        const updatedState = loopState.setVerificationSessionID(state3.session_id, recoveredVerificationSessionID);
+        if (updatedState) {
+          log(`[${HOOK_NAME3}] Recovered missing verification session from parent evidence`, {
+            parentSessionID: state3.session_id,
+            recoveredVerificationSessionID
+          });
+          return;
+        }
+      }
+    }
     const restarted = await handleFailedVerification(ctx, {
       state: state3,
       loopState,
@@ -44141,6 +44226,12 @@ function createRalphLoopEventHandler(ctx, options) {
           return;
         }
         if (state3.verification_pending) {
+          if (!verificationSessionID && matchesParentSession) {
+            log(`[${HOOK_NAME3}] Verification pending without tracked oracle session, running recovery check`, {
+              sessionID,
+              iteration: state3.iteration
+            });
+          }
           await handlePendingVerification(ctx, {
             sessionID,
             state: state3,
@@ -44664,7 +44755,7 @@ function findSlashCommandPartIndex(parts) {
 // src/hooks/auto-slash-command/executor.ts
 import { dirname as dirname14 } from "path";
 // src/features/opencode-skill-loader/loader.ts
-import { join as join61 } from "path";
+import { join as join62 } from "path";
 import { homedir as homedir11 } from "os";
 
 // src/features/opencode-skill-loader/skill-definition-record.ts
@@ -44692,7 +44783,7 @@ function deduplicateSkillsByName(skills) {
 
 // src/features/opencode-skill-loader/skill-directory-loader.ts
 import { promises as fs16 } from "fs";
-import { join as join60 } from "path";
+import { join as join61 } from "path";
 
 // src/features/opencode-skill-loader/loaded-skill-from-path.ts
 import { promises as fs15 } from "fs";
@@ -44710,7 +44801,7 @@ function parseAllowedTools(allowedTools) {
 
 // src/features/opencode-skill-loader/skill-mcp-config.ts
 import { promises as fs14 } from "fs";
-import { join as join59 } from "path";
+import { join as join60 } from "path";
 function parseSkillMcpConfigFromFrontmatter(content) {
   const frontmatterMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
   if (!frontmatterMatch)
@@ -44726,7 +44817,7 @@ function parseSkillMcpConfigFromFrontmatter(content) {
   return;
 }
 async function loadMcpJsonFromDir(skillDir) {
-  const mcpJsonPath = join59(skillDir, "mcp.json");
+  const mcpJsonPath = join60(skillDir, "mcp.json");
   try {
     const content = await fs14.readFile(mcpJsonPath, "utf-8");
     const parsed = JSON.parse(content);
@@ -44815,10 +44906,10 @@ async function loadSkillsFromDir(options) {
   const directories = entries.filter((entry) => !entry.name.startsWith(".") && (entry.isDirectory() || entry.isSymbolicLink()));
   const files = entries.filter((entry) => !entry.name.startsWith(".") && !entry.isDirectory() && !entry.isSymbolicLink() && isMarkdownFile(entry));
   for (const entry of directories) {
-    const entryPath = join60(options.skillsDir, entry.name);
+    const entryPath = join61(options.skillsDir, entry.name);
     const resolvedPath = await resolveSymlinkAsync(entryPath);
     const dirName = entry.name;
-    const skillMdPath = join60(resolvedPath, "SKILL.md");
+    const skillMdPath = join61(resolvedPath, "SKILL.md");
     try {
       await fs16.access(skillMdPath);
       const skill = await loadSkillFromPath({
@@ -44833,7 +44924,7 @@ async function loadSkillsFromDir(options) {
       }
       continue;
     } catch {}
-    const namedSkillMdPath = join60(resolvedPath, `${dirName}.md`);
+    const namedSkillMdPath = join61(resolvedPath, `${dirName}.md`);
     try {
       await fs16.access(namedSkillMdPath);
       const skill = await loadSkillFromPath({
@@ -44865,7 +44956,7 @@ async function loadSkillsFromDir(options) {
     }
   }
   for (const entry of files) {
-    const entryPath = join60(options.skillsDir, entry.name);
+    const entryPath = join61(options.skillsDir, entry.name);
     const baseName = inferSkillNameFromFileName(entryPath);
     const skill = await loadSkillFromPath({
       skillPath: entryPath,
@@ -44883,12 +44974,12 @@ async function loadSkillsFromDir(options) {
 
 // src/features/opencode-skill-loader/loader.ts
 async function loadUserSkills() {
-  const userSkillsDir = join61(getClaudeConfigDir(), "skills");
+  const userSkillsDir = join62(getClaudeConfigDir(), "skills");
   const skills = await loadSkillsFromDir({ skillsDir: userSkillsDir, scope: "user" });
   return skillsToCommandDefinitionRecord(skills);
 }
 async function loadProjectSkills(directory) {
-  const projectSkillsDir = join61(directory ?? process.cwd(), ".claude", "skills");
+  const projectSkillsDir = join62(directory ?? process.cwd(), ".claude", "skills");
   const skills = await loadSkillsFromDir({ skillsDir: projectSkillsDir, scope: "project" });
   return skillsToCommandDefinitionRecord(skills);
 }
@@ -44898,7 +44989,7 @@ async function loadOpencodeGlobalSkills() {
   return skillsToCommandDefinitionRecord(deduplicateSkillsByName(allSkills.flat()));
 }
 async function loadOpencodeProjectSkills(directory) {
-  const opencodeProjectDir = join61(directory ?? process.cwd(), ".opencode", "skills");
+  const opencodeProjectDir = join62(directory ?? process.cwd(), ".opencode", "skills");
   const skills = await loadSkillsFromDir({ skillsDir: opencodeProjectDir, scope: "opencode-project" });
   return skillsToCommandDefinitionRecord(skills);
 }
@@ -44945,11 +45036,11 @@ async function discoverSkills(options = {}) {
   ]);
 }
 async function discoverUserClaudeSkills() {
-  const userSkillsDir = join61(getClaudeConfigDir(), "skills");
+  const userSkillsDir = join62(getClaudeConfigDir(), "skills");
   return loadSkillsFromDir({ skillsDir: userSkillsDir, scope: "user" });
 }
 async function discoverProjectClaudeSkills(directory) {
-  const projectSkillsDir = join61(directory ?? process.cwd(), ".claude", "skills");
+  const projectSkillsDir = join62(directory ?? process.cwd(), ".claude", "skills");
   return loadSkillsFromDir({ skillsDir: projectSkillsDir, scope: "project" });
 }
 async function discoverOpencodeGlobalSkills() {
@@ -44958,15 +45049,15 @@ async function discoverOpencodeGlobalSkills() {
   return deduplicateSkillsByName(allSkills.flat());
 }
 async function discoverOpencodeProjectSkills(directory) {
-  const opencodeProjectDir = join61(directory ?? process.cwd(), ".opencode", "skills");
+  const opencodeProjectDir = join62(directory ?? process.cwd(), ".opencode", "skills");
   return loadSkillsFromDir({ skillsDir: opencodeProjectDir, scope: "opencode-project" });
 }
 async function discoverProjectAgentsSkills(directory) {
-  const agentsProjectDir = join61(directory ?? process.cwd(), ".agents", "skills");
+  const agentsProjectDir = join62(directory ?? process.cwd(), ".agents", "skills");
   return loadSkillsFromDir({ skillsDir: agentsProjectDir, scope: "project" });
 }
 async function discoverGlobalAgentsSkills() {
-  const agentsGlobalDir = join61(homedir11(), ".agents", "skills");
+  const agentsGlobalDir = join62(homedir11(), ".agents", "skills");
   return loadSkillsFromDir({ skillsDir: agentsGlobalDir, scope: "user" });
 }
 // src/features/opencode-skill-loader/merger/builtin-skill-converter.ts
@@ -44993,7 +45084,7 @@ function builtinToLoadedSkill(builtin) {
 }
 
 // src/features/opencode-skill-loader/merger/config-skill-entry-loader.ts
-import { existsSync as existsSync52, readFileSync as readFileSync37 } from "fs";
+import { existsSync as existsSync53, readFileSync as readFileSync37 } from "fs";
 import { dirname as dirname12, isAbsolute as isAbsolute4, resolve as resolve5 } from "path";
 import { homedir as homedir12 } from "os";
 function resolveFilePath5(from, configDir) {
@@ -45012,7 +45103,7 @@ function resolveFilePath5(from, configDir) {
 }
 function loadSkillFromFile(filePath) {
   try {
-    if (!existsSync52(filePath))
+    if (!existsSync53(filePath))
       return null;
     const content = readFileSync37(filePath, "utf-8");
     const { data, body } = parseFrontmatter(content);
@@ -47508,6 +47599,11 @@ var BabysittingConfigSchema = exports_external.object({
   timeout_ms: exports_external.number().default(120000)
 });
 // src/config/schema/background-task.ts
+var CircuitBreakerConfigSchema = exports_external.object({
+  maxToolCalls: exports_external.number().int().min(10).optional(),
+  windowSize: exports_external.number().int().min(5).optional(),
+  repetitionThresholdPercent: exports_external.number().gt(0).max(100).optional()
+});
 var BackgroundTaskConfigSchema = exports_external.object({
   defaultConcurrency: exports_external.number().min(1).optional(),
   providerConcurrency: exports_external.record(exports_external.string(), exports_external.number().min(0)).optional(),
@@ -47516,7 +47612,9 @@ var BackgroundTaskConfigSchema = exports_external.object({
   maxDescendants: exports_external.number().int().min(1).optional(),
   staleTimeoutMs: exports_external.number().min(60000).optional(),
   messageStalenessTimeoutMs: exports_external.number().min(60000).optional(),
-  syncPollTimeoutMs: exports_external.number().min(60000).optional()
+  syncPollTimeoutMs: exports_external.number().min(60000).optional(),
+  maxToolCalls: exports_external.number().int().min(10).optional(),
+  circuitBreaker: CircuitBreakerConfigSchema.optional()
 });
 // src/config/schema/browser-automation.ts
 var BrowserAutomationProviderSchema = exports_external.enum([
@@ -47902,7 +48000,14 @@ function prefixGitCommandsInBashCodeBlocks(template, prefix) {
   });
 }
 function prefixGitCommandsInCodeBlock(codeBlock, prefix) {
-  return codeBlock.replace(LEADING_GIT_COMMAND_PATTERN, `$1${prefix} git`).replace(INLINE_GIT_COMMAND_PATTERN, `$1${prefix} git`);
+  return codeBlock.split(`
+`).map((line) => {
+    if (line.includes(prefix)) {
+      return line;
+    }
+    return line.replace(LEADING_GIT_COMMAND_PATTERN, `$1${prefix} git`).replace(INLINE_GIT_COMMAND_PATTERN, `$1${prefix} git`);
+  }).join(`
+`);
 }
 function buildCommitFooterInjection(commitFooter, includeCoAuthoredBy, gitEnvPrefix) {
   const sections = [];
@@ -47996,7 +48101,7 @@ async function resolveMultipleSkillsAsync(skillNames, options) {
 // src/features/opencode-skill-loader/config-source-discovery.ts
 var import_picomatch2 = __toESM(require_picomatch2(), 1);
 import { promises as fs17 } from "fs";
-import { dirname as dirname13, extname, isAbsolute as isAbsolute5, join as join62, relative as relative3 } from "path";
+import { dirname as dirname13, extname, isAbsolute as isAbsolute5, join as join63, relative as relative3 } from "path";
 var MAX_RECURSIVE_DEPTH = 10;
 function isHttpUrl(path11) {
   return path11.startsWith("http://") || path11.startsWith("https://");
@@ -48005,7 +48110,7 @@ function toAbsolutePath(path11, configDir) {
   if (isAbsolute5(path11)) {
     return path11;
   }
-  return join62(configDir, path11);
+  return join63(configDir, path11);
 }
 function isMarkdownPath(path11) {
   return extname(path11).toLowerCase() === ".md";
@@ -48075,8 +48180,8 @@ async function discoverConfigSourceSkills(options) {
   return deduplicateSkillsByName(loadedBySource.flat());
 }
 // src/tools/slashcommand/command-discovery.ts
-import { existsSync as existsSync53, readdirSync as readdirSync15, readFileSync as readFileSync39 } from "fs";
-import { basename as basename5, join as join63 } from "path";
+import { existsSync as existsSync54, readdirSync as readdirSync15, readFileSync as readFileSync39 } from "fs";
+import { basename as basename5, join as join64 } from "path";
 // src/features/builtin-commands/templates/init-deep.ts
 var INIT_DEEP_TEMPLATE = `# /init-deep
 
@@ -49459,14 +49564,14 @@ function loadBuiltinCommands(disabledCommands) {
 }
 // src/tools/slashcommand/command-discovery.ts
 function discoverCommandsFromDir(commandsDir, scope) {
-  if (!existsSync53(commandsDir))
+  if (!existsSync54(commandsDir))
     return [];
   const entries = readdirSync15(commandsDir, { withFileTypes: true });
   const commands3 = [];
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join63(commandsDir, entry.name);
+    const commandPath = join64(commandsDir, entry.name);
     const commandName = basename5(entry.name, ".md");
     try {
       const content = readFileSync39(commandPath, "utf-8");
@@ -49509,10 +49614,10 @@ function discoverPluginCommands(options) {
   }));
 }
 function discoverCommandsSync(directory, options) {
-  const userCommandsDir = join63(getClaudeConfigDir(), "commands");
-  const projectCommandsDir = join63(directory ?? process.cwd(), ".claude", "commands");
+  const userCommandsDir = join64(getClaudeConfigDir(), "commands");
+  const projectCommandsDir = join64(directory ?? process.cwd(), ".claude", "commands");
   const opencodeGlobalDirs = getOpenCodeCommandDirs({ binary: "opencode" });
-  const opencodeProjectDir = join63(directory ?? process.cwd(), ".opencode", "command");
+  const opencodeProjectDir = join64(directory ?? process.cwd(), ".opencode", "command");
   const userCommands = discoverCommandsFromDir(userCommandsDir, "user");
   const opencodeGlobalCommands = opencodeGlobalDirs.flatMap((commandsDir) => discoverCommandsFromDir(commandsDir, "opencode"));
   const projectCommands = discoverCommandsFromDir(projectCommandsDir, "project");
@@ -49974,14 +50079,14 @@ var NOTEPAD_DIR = "notepads";
 var NOTEPAD_BASE_PATH = `${BOULDER_DIR}/${NOTEPAD_DIR}`;
 var PROMETHEUS_PLANS_DIR = ".sisyphus/plans";
 // src/features/boulder-state/storage.ts
-import { existsSync as existsSync54, readFileSync as readFileSync40, writeFileSync as writeFileSync17, mkdirSync as mkdirSync13, readdirSync as readdirSync16 } from "fs";
-import { dirname as dirname15, join as join64, basename as basename6 } from "path";
+import { existsSync as existsSync55, readFileSync as readFileSync40, writeFileSync as writeFileSync17, mkdirSync as mkdirSync13, readdirSync as readdirSync16 } from "fs";
+import { dirname as dirname15, join as join65, basename as basename6 } from "path";
 function getBoulderFilePath(directory) {
-  return join64(directory, BOULDER_DIR, BOULDER_FILE);
+  return join65(directory, BOULDER_DIR, BOULDER_FILE);
 }
 function readBoulderState(directory) {
   const filePath = getBoulderFilePath(directory);
-  if (!existsSync54(filePath)) {
+  if (!existsSync55(filePath)) {
     return null;
   }
   try {
@@ -50002,7 +50107,7 @@ function writeBoulderState(directory, state3) {
   const filePath = getBoulderFilePath(directory);
   try {
     const dir = dirname15(filePath);
-    if (!existsSync54(dir)) {
+    if (!existsSync55(dir)) {
       mkdirSync13(dir, { recursive: true });
     }
     writeFileSync17(filePath, JSON.stringify(state3, null, 2), "utf-8");
@@ -50019,17 +50124,20 @@ function appendSessionId(directory, sessionId) {
     if (!Array.isArray(state3.session_ids)) {
       state3.session_ids = [];
     }
+    const originalSessionIds = [...state3.session_ids];
     state3.session_ids.push(sessionId);
     if (writeBoulderState(directory, state3)) {
       return state3;
     }
+    state3.session_ids = originalSessionIds;
+    return null;
   }
   return state3;
 }
 function clearBoulderState(directory) {
   const filePath = getBoulderFilePath(directory);
   try {
-    if (existsSync54(filePath)) {
+    if (existsSync55(filePath)) {
       const { unlinkSync: unlinkSync11 } = __require("fs");
       unlinkSync11(filePath);
     }
@@ -50039,13 +50147,13 @@ function clearBoulderState(directory) {
   }
 }
 function findPrometheusPlans(directory) {
-  const plansDir = join64(directory, PROMETHEUS_PLANS_DIR);
-  if (!existsSync54(plansDir)) {
+  const plansDir = join65(directory, PROMETHEUS_PLANS_DIR);
+  if (!existsSync55(plansDir)) {
     return [];
   }
   try {
     const files = readdirSync16(plansDir);
-    return files.filter((f) => f.endsWith(".md")).map((f) => join64(plansDir, f)).sort((a, b) => {
+    return files.filter((f) => f.endsWith(".md")).map((f) => join65(plansDir, f)).sort((a, b) => {
       const aStat = __require("fs").statSync(a);
       const bStat = __require("fs").statSync(b);
       return bStat.mtimeMs - aStat.mtimeMs;
@@ -50055,7 +50163,7 @@ function findPrometheusPlans(directory) {
   }
 }
 function getPlanProgress(planPath) {
-  if (!existsSync54(planPath)) {
+  if (!existsSync55(planPath)) {
     return { total: 0, completed: 0, isComplete: true };
   }
   try {
@@ -51135,7 +51243,7 @@ function createAtlasEventHandler(input) {
 init_logger();
 
 // src/hooks/atlas/final-wave-plan-state.ts
-import { existsSync as existsSync55, readFileSync as readFileSync41 } from "fs";
+import { existsSync as existsSync56, readFileSync as readFileSync41 } from "fs";
 var TODO_HEADING_PATTERN = /^##\s+TODOs\b/i;
 var FINAL_VERIFICATION_HEADING_PATTERN = /^##\s+Final Verification Wave\b/i;
 var SECOND_LEVEL_HEADING_PATTERN = /^##\s+/;
@@ -51143,7 +51251,7 @@ var UNCHECKED_CHECKBOX_PATTERN = /^\s*[-*]\s*\[\s*\]\s*(.+)$/;
 var TODO_TASK_PATTERN = /^\d+\./;
 var FINAL_WAVE_TASK_PATTERN = /^F\d+\./i;
 function readFinalWavePlanState(planPath) {
-  if (!existsSync55(planPath)) {
+  if (!existsSync56(planPath)) {
     return null;
   }
   try {
@@ -53336,8 +53444,14 @@ function extractStatusCode(error48, retryOnErrors) {
   if (!error48)
     return;
   const errorObj = error48;
-  const statusCode = errorObj.statusCode ?? errorObj.status ?? errorObj.data?.statusCode;
-  if (typeof statusCode === "number") {
+  const statusCode = [
+    errorObj.statusCode,
+    errorObj.status,
+    errorObj.data?.statusCode,
+    errorObj.error?.statusCode,
+    errorObj.cause?.statusCode
+  ].find((code) => typeof code === "number");
+  if (statusCode !== undefined) {
     return statusCode;
   }
   const codes = retryOnErrors ?? DEFAULT_CONFIG2.retry_on_errors;
@@ -54097,8 +54211,8 @@ function createRuntimeFallbackHook(ctx, options) {
   };
 }
 // src/hooks/write-existing-file-guard/hook.ts
-import { existsSync as existsSync57, realpathSync as realpathSync4 } from "fs";
-import { basename as basename7, dirname as dirname16, isAbsolute as isAbsolute7, join as join66, normalize, relative as relative5, resolve as resolve7 } from "path";
+import { existsSync as existsSync58, realpathSync as realpathSync4 } from "fs";
+import { basename as basename7, dirname as dirname16, isAbsolute as isAbsolute7, join as join67, normalize, relative as relative5, resolve as resolve7 } from "path";
 var MAX_TRACKED_SESSIONS = 256;
 var MAX_TRACKED_PATHS_PER_SESSION = 1024;
 function asRecord(value) {
@@ -54119,7 +54233,7 @@ function isPathInsideDirectory(pathToCheck, directory) {
 }
 function toCanonicalPath(absolutePath) {
   let canonicalPath = absolutePath;
-  if (existsSync57(absolutePath)) {
+  if (existsSync58(absolutePath)) {
     try {
       canonicalPath = realpathSync4.native(absolutePath);
     } catch {
@@ -54127,8 +54241,8 @@ function toCanonicalPath(absolutePath) {
     }
   } else {
     const absoluteDir = dirname16(absolutePath);
-    const resolvedDir = existsSync57(absoluteDir) ? realpathSync4.native(absoluteDir) : absoluteDir;
-    canonicalPath = join66(resolvedDir, basename7(absolutePath));
+    const resolvedDir = existsSync58(absoluteDir) ? realpathSync4.native(absoluteDir) : absoluteDir;
+    canonicalPath = join67(resolvedDir, basename7(absolutePath));
   }
   return normalize(canonicalPath);
 }
@@ -54228,7 +54342,7 @@ function createWriteExistingFileGuardHook(ctx) {
         return;
       }
       if (toolName === "read") {
-        if (!existsSync57(resolvedPath) || !input.sessionID) {
+        if (!existsSync58(resolvedPath) || !input.sessionID) {
           return;
         }
         registerReadPermission(input.sessionID, canonicalPath);
@@ -54238,7 +54352,7 @@ function createWriteExistingFileGuardHook(ctx) {
       if (argsRecord && "overwrite" in argsRecord) {
         delete argsRecord.overwrite;
       }
-      if (!existsSync57(resolvedPath)) {
+      if (!existsSync58(resolvedPath)) {
         return;
       }
       const isSisyphusPath2 = canonicalPath.includes("/.sisyphus/");
@@ -55327,12 +55441,12 @@ var DEFAULT_MAX_SYMBOLS = 200;
 var DEFAULT_MAX_DIAGNOSTICS = 200;
 var DEFAULT_MAX_DIRECTORY_FILES = 50;
 // src/tools/lsp/server-config-loader.ts
-import { existsSync as existsSync58, readFileSync as readFileSync43 } from "fs";
-import { join as join67 } from "path";
+import { existsSync as existsSync59, readFileSync as readFileSync43 } from "fs";
+import { join as join68 } from "path";
 init_jsonc_parser();
 init_plugin_identity();
 function loadJsonFile(path12) {
-  if (!existsSync58(path12))
+  if (!existsSync59(path12))
     return null;
   try {
     return parseJsonc(readFileSync43(path12, "utf-8"));
@@ -55344,9 +55458,9 @@ function getConfigPaths3() {
   const cwd = process.cwd();
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   return {
-    project: detectManagedConfigFile(join67(cwd, ".opencode")).path,
+    project: detectManagedConfigFile(join68(cwd, ".opencode")).path,
     user: detectManagedConfigFile(configDir).path,
-    opencode: detectConfigFile(join67(configDir, "opencode")).path
+    opencode: detectConfigFile(join68(configDir, "opencode")).path
   };
 }
 function loadAllConfigs() {
@@ -55415,20 +55529,20 @@ function getMergedServers() {
 }
 
 // src/tools/lsp/server-installation.ts
-import { existsSync as existsSync59 } from "fs";
-import { delimiter, join as join69 } from "path";
+import { existsSync as existsSync60 } from "fs";
+import { delimiter, join as join70 } from "path";
 
 // src/tools/lsp/server-path-bases.ts
-import { join as join68 } from "path";
+import { join as join69 } from "path";
 function getLspServerAdditionalPathBases(workingDirectory) {
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
-  const dataDir = join68(getDataDir(), "opencode");
+  const dataDir = join69(getDataDir(), "opencode");
   return [
-    join68(workingDirectory, "node_modules", ".bin"),
-    join68(configDir, "bin"),
-    join68(configDir, "node_modules", ".bin"),
-    join68(dataDir, "bin"),
-    join68(dataDir, "bin", "node_modules", ".bin")
+    join69(workingDirectory, "node_modules", ".bin"),
+    join69(configDir, "bin"),
+    join69(configDir, "node_modules", ".bin"),
+    join69(dataDir, "bin"),
+    join69(dataDir, "bin", "node_modules", ".bin")
   ];
 }
 
@@ -55438,7 +55552,7 @@ function isServerInstalled(command) {
     return false;
   const cmd = command[0];
   if (cmd.includes("/") || cmd.includes("\\")) {
-    if (existsSync59(cmd))
+    if (existsSync60(cmd))
       return true;
   }
   const isWindows2 = process.platform === "win32";
@@ -55459,14 +55573,14 @@ function isServerInstalled(command) {
   const paths = pathEnv.split(delimiter);
   for (const p of paths) {
     for (const suffix of exts) {
-      if (existsSync59(join69(p, cmd + suffix))) {
+      if (existsSync60(join70(p, cmd + suffix))) {
         return true;
       }
     }
   }
   for (const base of getLspServerAdditionalPathBases(process.cwd())) {
     for (const suffix of exts) {
-      if (existsSync59(join69(base, cmd + suffix))) {
+      if (existsSync60(join70(base, cmd + suffix))) {
         return true;
       }
     }
@@ -55524,13 +55638,13 @@ function getLanguageId(ext) {
 init_logger();
 var {spawn: bunSpawn2 } = globalThis.Bun;
 import { spawn as nodeSpawn2 } from "child_process";
-import { existsSync as existsSync60, statSync as statSync7 } from "fs";
+import { existsSync as existsSync61, statSync as statSync7 } from "fs";
 function shouldUseNodeSpawn() {
   return process.platform === "win32";
 }
 function validateCwd(cwd) {
   try {
-    if (!existsSync60(cwd)) {
+    if (!existsSync61(cwd)) {
       return { valid: false, error: `Working directory does not exist: ${cwd}` };
     }
     const stats = statSync7(cwd);
@@ -56275,9 +56389,9 @@ var lspManager = LSPServerManager.getInstance();
 // src/tools/lsp/lsp-client-wrapper.ts
 import { extname as extname4, resolve as resolve9 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { existsSync as existsSync61, statSync as statSync8 } from "fs";
+import { existsSync as existsSync62, statSync as statSync8 } from "fs";
 function isDirectoryPath(filePath) {
-  if (!existsSync61(filePath)) {
+  if (!existsSync62(filePath)) {
     return false;
   }
   return statSync8(filePath).isDirectory();
@@ -56287,14 +56401,14 @@ function uriToPath(uri) {
 }
 function findWorkspaceRoot(filePath) {
   let dir = resolve9(filePath);
-  if (!existsSync61(dir) || !isDirectoryPath(dir)) {
+  if (!existsSync62(dir) || !isDirectoryPath(dir)) {
     dir = __require("path").dirname(dir);
   }
   const markers = [".git", "package.json", "pyproject.toml", "Cargo.toml", "go.mod", "pom.xml", "build.gradle"];
   let prevDir = "";
   while (dir !== prevDir) {
     for (const marker of markers) {
-      if (existsSync61(__require("path").join(dir, marker))) {
+      if (existsSync62(__require("path").join(dir, marker))) {
         return dir;
       }
     }
@@ -69021,8 +69135,8 @@ var lsp_symbols = tool({
 import { resolve as resolve11 } from "path";
 
 // src/tools/lsp/directory-diagnostics.ts
-import { existsSync as existsSync62, lstatSync as lstatSync2, readdirSync as readdirSync17 } from "fs";
-import { extname as extname5, join as join70, resolve as resolve10 } from "path";
+import { existsSync as existsSync63, lstatSync as lstatSync2, readdirSync as readdirSync17 } from "fs";
+import { extname as extname5, join as join71, resolve as resolve10 } from "path";
 var SKIP_DIRECTORIES = new Set(["node_modules", ".git", "dist", "build", ".next", "out"]);
 function collectFilesWithExtension(dir, extension, maxFiles) {
   const files = [];
@@ -69038,7 +69152,7 @@ function collectFilesWithExtension(dir, extension, maxFiles) {
     for (const entry of entries) {
       if (files.length >= maxFiles)
         return;
-      const fullPath = join70(currentDir, entry);
+      const fullPath = join71(currentDir, entry);
       let stat;
       try {
         stat = lstatSync2(fullPath);
@@ -69067,7 +69181,7 @@ async function aggregateDiagnosticsForDirectory(directory, extension, severity,
     throw new Error(`Extension must start with a dot (e.g., ".ts", not "${extension}"). ` + `Use ".${extension}" instead.`);
   }
   const absDir = resolve10(directory);
-  if (!existsSync62(absDir)) {
+  if (!existsSync63(absDir)) {
     throw new Error(`Directory does not exist: ${absDir}`);
   }
   const serverResult = findServerForExtension(extension);
@@ -69269,12 +69383,12 @@ var DEFAULT_MAX_MATCHES = 500;
 
 // src/tools/ast-grep/sg-cli-path.ts
 import { createRequire as createRequire4 } from "module";
-import { dirname as dirname17, join as join72 } from "path";
-import { existsSync as existsSync64, statSync as statSync9 } from "fs";
+import { dirname as dirname17, join as join73 } from "path";
+import { existsSync as existsSync65, statSync as statSync9 } from "fs";
 
 // src/tools/ast-grep/downloader.ts
-import { existsSync as existsSync63 } from "fs";
-import { join as join71 } from "path";
+import { existsSync as existsSync64 } from "fs";
+import { join as join72 } from "path";
 import { homedir as homedir13 } from "os";
 import { createRequire as createRequire3 } from "module";
 init_logger();
@@ -69302,12 +69416,12 @@ var PLATFORM_MAP2 = {
 function getCacheDir3() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join71(homedir13(), "AppData", "Local");
-    return join71(base2, CACHE_DIR_NAME, "bin");
+    const base2 = localAppData || join72(homedir13(), "AppData", "Local");
+    return join72(base2, CACHE_DIR_NAME, "bin");
   }
   const xdgCache = process.env.XDG_CACHE_HOME;
-  const base = xdgCache || join71(homedir13(), ".cache");
-  return join71(base, CACHE_DIR_NAME, "bin");
+  const base = xdgCache || join72(homedir13(), ".cache");
+  return join72(base, CACHE_DIR_NAME, "bin");
 }
 function getBinaryName3() {
   return process.platform === "win32" ? "sg.exe" : "sg";
@@ -69324,8 +69438,8 @@ async function downloadAstGrep(version3 = DEFAULT_VERSION) {
   }
   const cacheDir = getCacheDir3();
   const binaryName = getBinaryName3();
-  const binaryPath = join71(cacheDir, binaryName);
-  if (existsSync63(binaryPath)) {
+  const binaryPath = join72(cacheDir, binaryName);
+  if (existsSync64(binaryPath)) {
     return binaryPath;
   }
   const { arch, os: os6 } = platformInfo;
@@ -69333,7 +69447,7 @@ async function downloadAstGrep(version3 = DEFAULT_VERSION) {
   const downloadUrl = `https://github.com/${REPO2}/releases/download/${version3}/${assetName}`;
   log(`[${PLUGIN_NAME}] Downloading ast-grep binary...`);
   try {
-    const archivePath = join71(cacheDir, assetName);
+    const archivePath = join72(cacheDir, assetName);
     ensureCacheDir(cacheDir);
     await downloadArchive(downloadUrl, archivePath);
     await extractZipArchive(archivePath, cacheDir);
@@ -69387,8 +69501,8 @@ function findSgCliPathSync() {
     const require2 = createRequire4(import.meta.url);
     const cliPackageJsonPath = require2.resolve("@ast-grep/cli/package.json");
     const cliDirectory = dirname17(cliPackageJsonPath);
-    const sgPath = join72(cliDirectory, binaryName);
-    if (existsSync64(sgPath) && isValidBinary(sgPath)) {
+    const sgPath = join73(cliDirectory, binaryName);
+    if (existsSync65(sgPath) && isValidBinary(sgPath)) {
       return sgPath;
     }
   } catch {}
@@ -69399,8 +69513,8 @@ function findSgCliPathSync() {
       const packageJsonPath = require2.resolve(`${platformPackage}/package.json`);
       const packageDirectory = dirname17(packageJsonPath);
       const astGrepBinaryName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
-      const binaryPath = join72(packageDirectory, astGrepBinaryName);
-      if (existsSync64(binaryPath) && isValidBinary(binaryPath)) {
+      const binaryPath = join73(packageDirectory, astGrepBinaryName);
+      if (existsSync65(binaryPath) && isValidBinary(binaryPath)) {
         return binaryPath;
       }
     } catch {}
@@ -69408,7 +69522,7 @@ function findSgCliPathSync() {
   if (process.platform === "darwin") {
     const homebrewPaths = ["/opt/homebrew/bin/sg", "/usr/local/bin/sg"];
     for (const path12 of homebrewPaths) {
-      if (existsSync64(path12) && isValidBinary(path12)) {
+      if (existsSync65(path12) && isValidBinary(path12)) {
         return path12;
       }
     }
@@ -69432,14 +69546,14 @@ function setSgCliPath(path12) {
 }
 // src/tools/ast-grep/cli.ts
 var {spawn: spawn10 } = globalThis.Bun;
-import { existsSync as existsSync66 } from "fs";
+import { existsSync as existsSync67 } from "fs";
 
 // src/tools/ast-grep/cli-binary-path-resolution.ts
-import { existsSync as existsSync65 } from "fs";
+import { existsSync as existsSync66 } from "fs";
 var resolvedCliPath3 = null;
 var initPromise3 = null;
 async function getAstGrepPath() {
-  if (resolvedCliPath3 !== null && existsSync65(resolvedCliPath3)) {
+  if (resolvedCliPath3 !== null && existsSync66(resolvedCliPath3)) {
     return resolvedCliPath3;
   }
   if (initPromise3) {
@@ -69447,7 +69561,7 @@ async function getAstGrepPath() {
   }
   initPromise3 = (async () => {
     const syncPath = findSgCliPathSync();
-    if (syncPath && existsSync65(syncPath)) {
+    if (syncPath && existsSync66(syncPath)) {
       resolvedCliPath3 = syncPath;
       setSgCliPath(syncPath);
       return syncPath;
@@ -69546,7 +69660,7 @@ async function runSg(options) {
   const paths = options.paths && options.paths.length > 0 ? options.paths : ["."];
   args.push(...paths);
   let cliPath = getSgCliPath();
-  if (!cliPath || !existsSync66(cliPath)) {
+  if (!cliPath || !existsSync67(cliPath)) {
     const downloadedPath = await getAstGrepPath();
     if (downloadedPath) {
       cliPath = downloadedPath;
@@ -69800,20 +69914,20 @@ import { resolve as resolve12 } from "path";
 var {spawn: spawn11 } = globalThis.Bun;
 
 // src/tools/grep/constants.ts
-import { existsSync as existsSync68 } from "fs";
-import { join as join74, dirname as dirname18 } from "path";
+import { existsSync as existsSync69 } from "fs";
+import { join as join75, dirname as dirname18 } from "path";
 import { spawnSync as spawnSync2 } from "child_process";
 
 // src/tools/grep/downloader.ts
-import { existsSync as existsSync67, readdirSync as readdirSync18 } from "fs";
-import { join as join73 } from "path";
+import { existsSync as existsSync68, readdirSync as readdirSync18 } from "fs";
+import { join as join74 } from "path";
 init_plugin_identity();
 function findFileRecursive(dir, filename) {
   try {
     const entries = readdirSync18(dir, { withFileTypes: true, recursive: true });
     for (const entry of entries) {
       if (entry.isFile() && entry.name === filename) {
-        return join73(entry.parentPath ?? dir, entry.name);
+        return join74(entry.parentPath ?? dir, entry.name);
       }
     }
   } catch {
@@ -69834,11 +69948,11 @@ function getPlatformKey() {
 }
 function getInstallDir() {
   const homeDir = process.env.HOME || process.env.USERPROFILE || ".";
-  return join73(homeDir, ".cache", CACHE_DIR_NAME, "bin");
+  return join74(homeDir, ".cache", CACHE_DIR_NAME, "bin");
 }
 function getRgPath() {
   const isWindows2 = process.platform === "win32";
-  return join73(getInstallDir(), isWindows2 ? "rg.exe" : "rg");
+  return join74(getInstallDir(), isWindows2 ? "rg.exe" : "rg");
 }
 async function extractTarGz2(archivePath, destDir) {
   const platformKey = getPlatformKey();
@@ -69855,7 +69969,7 @@ async function extractZip2(archivePath, destDir) {
   const binaryName = process.platform === "win32" ? "rg.exe" : "rg";
   const foundPath = findFileRecursive(destDir, binaryName);
   if (foundPath) {
-    const destPath = join73(destDir, binaryName);
+    const destPath = join74(destDir, binaryName);
     if (foundPath !== destPath) {
       const { renameSync: renameSync2 } = await import("fs");
       renameSync2(foundPath, destPath);
@@ -69870,13 +69984,13 @@ async function downloadAndInstallRipgrep() {
   }
   const installDir = getInstallDir();
   const rgPath = getRgPath();
-  if (existsSync67(rgPath)) {
+  if (existsSync68(rgPath)) {
     return rgPath;
   }
   ensureCacheDir(installDir);
   const filename = `ripgrep-${RG_VERSION}-${config4.platform}.${config4.extension}`;
   const url3 = `https://github.com/BurntSushi/ripgrep/releases/download/${RG_VERSION}/${filename}`;
-  const archivePath = join73(installDir, filename);
+  const archivePath = join74(installDir, filename);
   try {
     await downloadArchive(url3, archivePath);
     if (config4.extension === "tar.gz") {
@@ -69885,7 +69999,7 @@ async function downloadAndInstallRipgrep() {
       await extractZip2(archivePath, installDir);
     }
     ensureExecutable(rgPath);
-    if (!existsSync67(rgPath)) {
+    if (!existsSync68(rgPath)) {
       throw new Error("ripgrep binary not found after extraction");
     }
     return rgPath;
@@ -69897,7 +70011,7 @@ async function downloadAndInstallRipgrep() {
 }
 function getInstalledRipgrepPath() {
   const rgPath = getRgPath();
-  return existsSync67(rgPath) ? rgPath : null;
+  return existsSync68(rgPath) ? rgPath : null;
 }
 
 // src/tools/grep/constants.ts
@@ -69921,14 +70035,14 @@ function getOpenCodeBundledRg() {
   const isWindows2 = process.platform === "win32";
   const rgName = isWindows2 ? "rg.exe" : "rg";
   const candidates = [
-    join74(getDataDir(), "opencode", "bin", rgName),
-    join74(execDir, rgName),
-    join74(execDir, "bin", rgName),
-    join74(execDir, "..", "bin", rgName),
-    join74(execDir, "..", "libexec", rgName)
+    join75(getDataDir(), "opencode", "bin", rgName),
+    join75(execDir, rgName),
+    join75(execDir, "bin", rgName),
+    join75(execDir, "..", "bin", rgName),
+    join75(execDir, "..", "libexec", rgName)
   ];
   for (const candidate of candidates) {
-    if (existsSync68(candidate)) {
+    if (existsSync69(candidate)) {
       return candidate;
     }
   }
@@ -70817,6 +70931,7 @@ function createSkillTool(options = {}) {
     },
     async execute(args, ctx) {
       const skills2 = await getSkills();
+      cachedDescription = null;
       const commands3 = getCommands();
       const requestedName = args.name.replace(/^\//, "");
       const matchedSkill = skills2.find((s) => s.name.toLowerCase() === requestedName.toLowerCase());
@@ -70869,9 +70984,9 @@ function createSkillTool(options = {}) {
 }
 var skill = createSkillTool();
 // src/tools/session-manager/constants.ts
-import { join as join75 } from "path";
-var TODO_DIR2 = join75(getClaudeConfigDir(), "todos");
-var TRANSCRIPT_DIR2 = join75(getClaudeConfigDir(), "transcripts");
+import { join as join76 } from "path";
+var TODO_DIR2 = join76(getClaudeConfigDir(), "todos");
+var TRANSCRIPT_DIR2 = join76(getClaudeConfigDir(), "transcripts");
 var SESSION_LIST_DESCRIPTION = `List all OpenCode sessions with optional filtering.
 
 Returns a list of available session IDs with metadata including message count, date range, and agents used.
@@ -70944,9 +71059,9 @@ Has Todos: Yes (12 items, 8 completed)
 Has Transcript: Yes (234 entries)`;
 
 // src/tools/session-manager/storage.ts
-import { existsSync as existsSync69 } from "fs";
+import { existsSync as existsSync70 } from "fs";
 import { readdir, readFile } from "fs/promises";
-import { join as join76 } from "path";
+import { join as join77 } from "path";
 var sdkClient = null;
 function setStorageClient(client2) {
   sdkClient = client2;
@@ -70965,7 +71080,7 @@ async function getMainSessions(options) {
       return [];
     }
   }
-  if (!existsSync69(SESSION_STORAGE))
+  if (!existsSync70(SESSION_STORAGE))
     return [];
   const sessions = [];
   try {
@@ -70973,13 +71088,13 @@ async function getMainSessions(options) {
     for (const projectDir of projectDirs) {
       if (!projectDir.isDirectory())
         continue;
-      const projectPath = join76(SESSION_STORAGE, projectDir.name);
+      const projectPath = join77(SESSION_STORAGE, projectDir.name);
       const sessionFiles = await readdir(projectPath);
       for (const file3 of sessionFiles) {
         if (!file3.endsWith(".json"))
           continue;
         try {
-          const content = await readFile(join76(projectPath, file3), "utf-8");
+          const content = await readFile(join77(projectPath, file3), "utf-8");
           const meta3 = JSON.parse(content);
           if (meta3.parentID)
             continue;
@@ -71006,7 +71121,7 @@ async function getAllSessions() {
       return [];
     }
   }
-  if (!existsSync69(MESSAGE_STORAGE))
+  if (!existsSync70(MESSAGE_STORAGE))
     return [];
   const sessions = [];
   async function scanDirectory(dir) {
@@ -71014,7 +71129,7 @@ async function getAllSessions() {
       const entries = await readdir(dir, { withFileTypes: true });
       for (const entry of entries) {
         if (entry.isDirectory()) {
-          const sessionPath = join76(dir, entry.name);
+          const sessionPath = join77(dir, entry.name);
           const files = await readdir(sessionPath);
           if (files.some((f) => f.endsWith(".json"))) {
             sessions.push(entry.name);
@@ -71075,7 +71190,7 @@ async function readSessionMessages2(sessionID) {
     }
   }
   const messageDir = getMessageDir(sessionID);
-  if (!messageDir || !existsSync69(messageDir))
+  if (!messageDir || !existsSync70(messageDir))
     return [];
   const messages = [];
   try {
@@ -71084,7 +71199,7 @@ async function readSessionMessages2(sessionID) {
       if (!file3.endsWith(".json"))
         continue;
       try {
-        const content = await readFile(join76(messageDir, file3), "utf-8");
+        const content = await readFile(join77(messageDir, file3), "utf-8");
         const meta3 = JSON.parse(content);
         const parts = await readParts2(meta3.id);
         messages.push({
@@ -71110,8 +71225,8 @@ async function readSessionMessages2(sessionID) {
   });
 }
 async function readParts2(messageID) {
-  const partDir = join76(PART_STORAGE, messageID);
-  if (!existsSync69(partDir))
+  const partDir = join77(PART_STORAGE, messageID);
+  if (!existsSync70(partDir))
     return [];
   const parts = [];
   try {
@@ -71120,7 +71235,7 @@ async function readParts2(messageID) {
       if (!file3.endsWith(".json"))
         continue;
       try {
-        const content = await readFile(join76(partDir, file3), "utf-8");
+        const content = await readFile(join77(partDir, file3), "utf-8");
         parts.push(JSON.parse(content));
       } catch {
         continue;
@@ -71146,14 +71261,14 @@ async function readSessionTodos(sessionID) {
       return [];
     }
   }
-  if (!existsSync69(TODO_DIR2))
+  if (!existsSync70(TODO_DIR2))
     return [];
   try {
     const allFiles = await readdir(TODO_DIR2);
     const todoFiles = allFiles.filter((f) => f.includes(sessionID) && f.endsWith(".json"));
     for (const file3 of todoFiles) {
       try {
-        const content = await readFile(join76(TODO_DIR2, file3), "utf-8");
+        const content = await readFile(join77(TODO_DIR2, file3), "utf-8");
         const data = JSON.parse(content);
         if (Array.isArray(data)) {
           return data.map((item) => ({
@@ -71173,10 +71288,10 @@ async function readSessionTodos(sessionID) {
   return [];
 }
 async function readSessionTranscript(sessionID) {
-  if (!existsSync69(TRANSCRIPT_DIR2))
+  if (!existsSync70(TRANSCRIPT_DIR2))
     return 0;
-  const transcriptFile = join76(TRANSCRIPT_DIR2, `${sessionID}.jsonl`);
-  if (!existsSync69(transcriptFile))
+  const transcriptFile = join77(TRANSCRIPT_DIR2, `${sessionID}.jsonl`);
+  if (!existsSync70(transcriptFile))
     return 0;
   try {
     const content = await readFile(transcriptFile, "utf-8");
@@ -72806,7 +72921,7 @@ function createCallOmoAgent(ctx, backgroundManager, disabledAgents = [], agentOv
 }
 // src/tools/look-at/constants.ts
 var MULTIMODAL_LOOKER_AGENT = "multimodal-looker";
-var LOOK_AT_DESCRIPTION = `Analyze media files (PDFs, images, diagrams) that require interpretation beyond raw text. Extracts specific information or summaries from documents, describes visual content. Use when you need analyzed/extracted data rather than literal file contents.`;
+var LOOK_AT_DESCRIPTION = `Extract basic information from media files (PDFs, images, diagrams) when a quick summary suffices over precise reading. Good for simple text-based content extraction without using the Read tool. NEVER use for visual precision, aesthetic evaluation, or exact accuracy \u2014 use Read tool instead for those cases.`;
 // src/tools/look-at/tools.ts
 import { basename as basename8 } from "path";
 import { pathToFileURL as pathToFileURL3 } from "url";
@@ -73025,9 +73140,9 @@ async function resolveMultimodalLookerAgentMetadata(ctx) {
 
 // src/tools/look-at/image-converter.ts
 import { execFileSync as execFileSync3 } from "child_process";
-import { existsSync as existsSync70, mkdtempSync, readFileSync as readFileSync46, rmSync as rmSync3, unlinkSync as unlinkSync11, writeFileSync as writeFileSync19 } from "fs";
+import { existsSync as existsSync71, mkdtempSync, readFileSync as readFileSync46, rmSync as rmSync3, unlinkSync as unlinkSync11, writeFileSync as writeFileSync19 } from "fs";
 import { tmpdir as tmpdir6 } from "os";
-import { dirname as dirname21, join as join77 } from "path";
+import { dirname as dirname21, join as join78 } from "path";
 var SUPPORTED_FORMATS = new Set([
   "image/jpeg",
   "image/png",
@@ -73065,11 +73180,11 @@ function needsConversion(mimeType) {
   return mimeType.startsWith("image/");
 }
 function convertImageToJpeg(inputPath, mimeType) {
-  if (!existsSync70(inputPath)) {
+  if (!existsSync71(inputPath)) {
     throw new Error(`File not found: ${inputPath}`);
   }
-  const tempDir = mkdtempSync(join77(tmpdir6(), "opencode-img-"));
-  const outputPath = join77(tempDir, "converted.jpg");
+  const tempDir = mkdtempSync(join78(tmpdir6(), "opencode-img-"));
+  const outputPath = join78(tempDir, "converted.jpg");
   log(`[image-converter] Converting ${mimeType} to JPEG: ${inputPath}`);
   try {
     if (process.platform === "darwin") {
@@ -73079,7 +73194,7 @@ function convertImageToJpeg(inputPath, mimeType) {
           encoding: "utf-8",
           timeout: CONVERSION_TIMEOUT_MS
         });
-        if (existsSync70(outputPath)) {
+        if (existsSync71(outputPath)) {
           log(`[image-converter] Converted using sips: ${outputPath}`);
           return outputPath;
         }
@@ -73094,7 +73209,7 @@ function convertImageToJpeg(inputPath, mimeType) {
         encoding: "utf-8",
         timeout: CONVERSION_TIMEOUT_MS
       });
-      if (existsSync70(outputPath)) {
+      if (existsSync71(outputPath)) {
         log(`[image-converter] Converted using ImageMagick: ${outputPath}`);
         return outputPath;
       }
@@ -73107,7 +73222,7 @@ function convertImageToJpeg(inputPath, mimeType) {
 ` + `  RHEL/CentOS: sudo yum install ImageMagick`);
   } catch (error92) {
     try {
-      if (existsSync70(outputPath)) {
+      if (existsSync71(outputPath)) {
         unlinkSync11(outputPath);
       }
     } catch {}
@@ -73121,11 +73236,11 @@ function convertImageToJpeg(inputPath, mimeType) {
 function cleanupConvertedImage(filePath) {
   try {
     const tempDirectory = dirname21(filePath);
-    if (existsSync70(filePath)) {
+    if (existsSync71(filePath)) {
       unlinkSync11(filePath);
       log(`[image-converter] Cleaned up temporary file: ${filePath}`);
     }
-    if (existsSync70(tempDirectory)) {
+    if (existsSync71(tempDirectory)) {
       rmSync3(tempDirectory, { recursive: true, force: true });
       log(`[image-converter] Cleaned up temporary directory: ${tempDirectory}`);
     }
@@ -73134,9 +73249,9 @@ function cleanupConvertedImage(filePath) {
   }
 }
 function convertBase64ImageToJpeg(base64Data, mimeType) {
-  const tempDir = mkdtempSync(join77(tmpdir6(), "opencode-b64-"));
+  const tempDir = mkdtempSync(join78(tmpdir6(), "opencode-b64-"));
   const inputExt = mimeType.split("/")[1] || "bin";
-  const inputPath = join77(tempDir, `input.${inputExt}`);
+  const inputPath = join78(tempDir, `input.${inputExt}`);
   const tempFiles = [inputPath];
   try {
     const cleanBase64 = base64Data.replace(/^data:[^;]+;base64,/, "");
@@ -73152,7 +73267,7 @@ function convertBase64ImageToJpeg(base64Data, mimeType) {
   } catch (error92) {
     tempFiles.forEach((file3) => {
       try {
-        if (existsSync70(file3))
+        if (existsSync71(file3))
           unlinkSync11(file3);
       } catch {}
     });
@@ -73671,7 +73786,7 @@ var POLL_INTERVAL_MS = 1000;
 var MIN_STABILITY_TIME_MS = 1e4;
 var STABILITY_POLLS_REQUIRED = 3;
 var WAIT_FOR_SESSION_INTERVAL_MS = 100;
-var WAIT_FOR_SESSION_TIMEOUT_MS = 30000;
+var WAIT_FOR_SESSION_TIMEOUT_MS = 60000;
 var DEFAULT_POLL_TIMEOUT_MS = 30 * 60 * 1000;
 var MAX_POLL_TIME_MS = DEFAULT_POLL_TIMEOUT_MS;
 var SESSION_CONTINUATION_STABILITY_MS = 5000;
@@ -74663,7 +74778,7 @@ function resolveModelForDelegateTask(input) {
     return { model: userModel };
   }
   if (input.availableModels.size === 0 && !hasProviderModelsCache() && !hasConnectedProvidersCache()) {
-    return;
+    return { skipped: true };
   }
   const categoryDefault = normalizeModel(input.categoryDefaultModel);
   const explicitHighBaseModel = categoryDefault ? getExplicitHighBaseModel(categoryDefault) : null;
@@ -74790,6 +74905,7 @@ Available categories: ${allCategoryNames}`
   let actualModel;
   let modelInfo;
   let categoryModel;
+  let isModelResolutionSkipped = false;
   const overrideModel = sisyphusJuniorModel;
   const explicitCategoryModel = userCategories?.[args.category]?.model;
   if (!requirement) {
@@ -74806,7 +74922,9 @@ Available categories: ${allCategoryNames}`
       availableModels,
       systemDefaultModel
     });
-    if (resolution) {
+    if (resolution && "skipped" in resolution) {
+      isModelResolutionSkipped = true;
+    } else if (resolution) {
       const { model: resolvedModel2, variant: resolvedVariant } = resolution;
       actualModel = resolvedModel2;
       if (!parseModelString(actualModel)) {
@@ -74941,7 +75059,7 @@ Create the work plan directly - that's your job as the planning agent.`
         availableModels,
         systemDefaultModel: undefined
       });
-      if (resolution) {
+      if (resolution && !("skipped" in resolution)) {
         const normalized = normalizeModelFormat(resolution.model);
         if (normalized) {
           const variantToUse = agentOverride?.variant ?? resolution.variant;
@@ -75027,7 +75145,7 @@ function createDelegateTask(options) {
     Available categories:
   ${categoryList}
   - subagent_type: Use specific agent directly (explore, librarian, oracle, metis, momus)
-  - run_in_background: true=async (returns task_id), false=sync (waits). Default: false. Use background=true ONLY for parallel exploration with 5+ independent queries.
+  - run_in_background: REQUIRED. true=async (returns task_id), false=sync (waits). Use background=true ONLY for parallel exploration with 5+ independent queries.
   - session_id: Existing Task session to continue (from previous task output). Continues agent with FULL CONTEXT PRESERVED - saves tokens, maintains continuity.
   - command: The command that triggered this task (optional, for slash command tracking).
   
@@ -75043,7 +75161,7 @@ function createDelegateTask(options) {
       load_skills: tool.schema.array(tool.schema.string()).describe("Skill names to inject. REQUIRED - pass [] if no skills needed."),
       description: tool.schema.string().describe("Short task description (3-5 words)"),
       prompt: tool.schema.string().describe("Full detailed prompt for the agent"),
-      run_in_background: tool.schema.boolean().describe("true=async (returns task_id), false=sync (waits). Default: false"),
+      run_in_background: tool.schema.boolean().describe("REQUIRED. true=async (returns task_id), false=sync (waits). Use false for task delegation, true ONLY for parallel exploration."),
       category: tool.schema.string().optional().describe(`REQUIRED if subagent_type not provided. Do NOT provide both category and subagent_type.`),
       subagent_type: tool.schema.string().optional().describe("REQUIRED if category not provided. Do NOT provide both category and subagent_type."),
       session_id: tool.schema.string().optional().describe("Existing Task session to continue"),
@@ -75064,11 +75182,7 @@ function createDelegateTask(options) {
         title: args.description
       });
       if (args.run_in_background === undefined) {
-        if (args.category || args.subagent_type || args.session_id) {
-          args.run_in_background = false;
-        } else {
-          throw new Error(`Invalid arguments: 'run_in_background' parameter is REQUIRED. Use run_in_background=false for task delegation, run_in_background=true only for parallel exploration.`);
-        }
+        throw new Error(`Invalid arguments: 'run_in_background' parameter is REQUIRED. Specify run_in_background=false for task delegation, or run_in_background=true for parallel exploration.`);
       }
       if (typeof args.load_skills === "string") {
         try {
@@ -75186,7 +75300,7 @@ function createDelegateTask(options) {
 // src/tools/delegate-task/index.ts
 init_constants();
 // src/tools/task/task-create.ts
-import { join as join79 } from "path";
+import { join as join80 } from "path";
 
 // src/tools/task/types.ts
 var TaskStatusSchema = exports_external.enum(["pending", "in_progress", "completed", "deleted"]);
@@ -75240,18 +75354,18 @@ var TaskDeleteInputSchema = exports_external.object({
 });
 
 // src/features/claude-tasks/storage.ts
-import { join as join78, dirname as dirname22, basename as basename9, isAbsolute as isAbsolute8 } from "path";
-import { existsSync as existsSync71, mkdirSync as mkdirSync14, readFileSync as readFileSync47, writeFileSync as writeFileSync20, renameSync as renameSync2, unlinkSync as unlinkSync12, readdirSync as readdirSync19 } from "fs";
+import { join as join79, dirname as dirname22, basename as basename9, isAbsolute as isAbsolute8 } from "path";
+import { existsSync as existsSync72, mkdirSync as mkdirSync14, readFileSync as readFileSync47, writeFileSync as writeFileSync20, renameSync as renameSync2, unlinkSync as unlinkSync12, readdirSync as readdirSync19 } from "fs";
 import { randomUUID as randomUUID3 } from "crypto";
 function getTaskDir(config4 = {}) {
   const tasksConfig = config4.sisyphus?.tasks;
   const storagePath = tasksConfig?.storage_path;
   if (storagePath) {
-    return isAbsolute8(storagePath) ? storagePath : join78(process.cwd(), storagePath);
+    return isAbsolute8(storagePath) ? storagePath : join79(process.cwd(), storagePath);
   }
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   const listId = resolveTaskListId(config4);
-  return join78(configDir, "tasks", listId);
+  return join79(configDir, "tasks", listId);
 }
 function sanitizePathSegment(value) {
   return value.replace(/[^a-zA-Z0-9_-]/g, "-") || "default";
@@ -75269,13 +75383,13 @@ function resolveTaskListId(config4 = {}) {
   return sanitizePathSegment(basename9(process.cwd()));
 }
 function ensureDir(dirPath) {
-  if (!existsSync71(dirPath)) {
+  if (!existsSync72(dirPath)) {
     mkdirSync14(dirPath, { recursive: true });
   }
 }
 function readJsonSafe(filePath, schema2) {
   try {
-    if (!existsSync71(filePath)) {
+    if (!existsSync72(filePath)) {
       return null;
     }
     const content = readFileSync47(filePath, "utf-8");
@@ -75298,7 +75412,7 @@ function writeJsonAtomic(filePath, data) {
     renameSync2(tempPath, filePath);
   } catch (error92) {
     try {
-      if (existsSync71(tempPath)) {
+      if (existsSync72(tempPath)) {
         unlinkSync12(tempPath);
       }
     } catch {}
@@ -75310,7 +75424,7 @@ function generateTaskId() {
   return `T-${randomUUID3()}`;
 }
 function acquireLock(dirPath) {
-  const lockPath = join78(dirPath, ".lock");
+  const lockPath = join79(dirPath, ".lock");
   const lockId = randomUUID3();
   const createLock = (timestamp2) => {
     writeFileSync20(lockPath, JSON.stringify({ id: lockId, timestamp: timestamp2 }), {
@@ -75358,7 +75472,7 @@ function acquireLock(dirPath) {
     acquired: true,
     release: () => {
       try {
-        if (!existsSync71(lockPath))
+        if (!existsSync72(lockPath))
           return;
         const lockContent = readFileSync47(lockPath, "utf-8");
         const lockData = JSON.parse(lockContent);
@@ -75523,7 +75637,7 @@ async function handleCreate(args, config4, ctx, context) {
         threadID: context.sessionID
       };
       const validatedTask = TaskObjectSchema.parse(task);
-      writeJsonAtomic(join79(taskDir, `${taskId}.json`), validatedTask);
+      writeJsonAtomic(join80(taskDir, `${taskId}.json`), validatedTask);
       await syncTaskTodoUpdate(ctx, validatedTask, context.sessionID);
       return JSON.stringify({
         task: {
@@ -75545,7 +75659,7 @@ async function handleCreate(args, config4, ctx, context) {
   }
 }
 // src/tools/task/task-get.ts
-import { join as join80 } from "path";
+import { join as join81 } from "path";
 var TASK_ID_PATTERN = /^T-[A-Za-z0-9-]+$/;
 function parseTaskId(id) {
   if (!TASK_ID_PATTERN.test(id))
@@ -75570,7 +75684,7 @@ Returns null if the task does not exist or the file is invalid.`,
           return JSON.stringify({ error: "invalid_task_id" });
         }
         const taskDir = getTaskDir(config4);
-        const taskPath = join80(taskDir, `${taskId}.json`);
+        const taskPath = join81(taskDir, `${taskId}.json`);
         const task = readJsonSafe(taskPath, TaskObjectSchema);
         return JSON.stringify({ task: task ?? null });
       } catch (error92) {
@@ -75583,8 +75697,8 @@ Returns null if the task does not exist or the file is invalid.`,
   });
 }
 // src/tools/task/task-list.ts
-import { join as join81 } from "path";
-import { existsSync as existsSync72, readdirSync as readdirSync20 } from "fs";
+import { join as join82 } from "path";
+import { existsSync as existsSync73, readdirSync as readdirSync20 } from "fs";
 function createTaskList(config4) {
   return tool({
     description: `List all active tasks with summary information.
@@ -75595,7 +75709,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
     args: {},
     execute: async () => {
       const taskDir = getTaskDir(config4);
-      if (!existsSync72(taskDir)) {
+      if (!existsSync73(taskDir)) {
         return JSON.stringify({ tasks: [] });
       }
       const files = readdirSync20(taskDir).filter((f) => f.endsWith(".json") && f.startsWith("T-")).map((f) => f.replace(".json", ""));
@@ -75604,7 +75718,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
       }
       const allTasks = [];
       for (const fileId of files) {
-        const task = readJsonSafe(join81(taskDir, `${fileId}.json`), TaskObjectSchema);
+        const task = readJsonSafe(join82(taskDir, `${fileId}.json`), TaskObjectSchema);
         if (task) {
           allTasks.push(task);
         }
@@ -75631,7 +75745,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
   });
 }
 // src/tools/task/task-update.ts
-import { join as join82 } from "path";
+import { join as join83 } from "path";
 var TASK_ID_PATTERN2 = /^T-[A-Za-z0-9-]+$/;
 function parseTaskId2(id) {
   if (!TASK_ID_PATTERN2.test(id))
@@ -75679,7 +75793,7 @@ async function handleUpdate(args, config4, ctx, context) {
       return JSON.stringify({ error: "task_lock_unavailable" });
     }
     try {
-      const taskPath = join82(taskDir, `${taskId}.json`);
+      const taskPath = join83(taskDir, `${taskId}.json`);
       const task = readJsonSafe(taskPath, TaskObjectSchema);
       if (!task) {
         return JSON.stringify({ error: "task_not_found" });
@@ -77098,66 +77212,92 @@ WORKFLOW:
 4. If same file needs another call, re-read first.
 5. Use anchors as "LINE#ID" only (never include trailing "|content").
 
-VALIDATION:
-  Payload shape: { "filePath": string, "edits": [...], "delete"?: boolean, "rename"?: string }
-  Each edit must be one of: replace, append, prepend
-  Edit shape: { "op": "replace"|"append"|"prepend", "pos"?: "LINE#ID", "end"?: "LINE#ID", "lines": string|string[]|null }
-  lines must contain plain replacement text only (no LINE#ID prefixes, no diff + markers)
-  CRITICAL: all operations validate against the same pre-edit file snapshot and apply bottom-up. Refs/tags are interpreted against the last-read version of the file.
+<must>
+- SNAPSHOT: All edits in one call reference the ORIGINAL file state. Do NOT adjust line numbers for prior edits in the same call \u2014 the system applies them bottom-up automatically.
+- replace removes lines pos..end (inclusive) and inserts lines in their place. Lines BEFORE pos and AFTER end are UNTOUCHED \u2014 do NOT include them in lines. If you do, they will appear twice.
+- lines must contain ONLY the content that belongs inside the consumed range. Content after end survives unchanged.
+- Tags MUST be copied exactly from read output or >>> mismatch output. NEVER guess tags.
+- Batch = multiple operations in edits[], NOT one big replace covering everything. Each operation targets the smallest possible change.
+- lines must contain plain replacement text only (no LINE#ID prefixes, no diff + markers).
+</must>
+
+<operations>
+LINE#ID FORMAT:
+  Each line reference must be in "{line_number}#{hash_id}" format where:
+  {line_number}: 1-based line number
+  {hash_id}: Two CID letters from the set ZPMQVRWSNKTXJBYH
 
-LINE#ID FORMAT (CRITICAL):
- Each line reference must be in "{line_number}#{hash_id}" format where:
- {line_number}: 1-based line number
- {hash_id}: Two CID letters from the set ZPMQVRWSNKTXJBYH
-
-FILE MODES:
- delete=true deletes file and requires edits=[] with no rename
- rename moves final content to a new path and removes old path
+OPERATION CHOICE:
+  replace with pos only -> replace one line at pos
+  replace with pos+end -> replace range pos..end inclusive as a block (ranges MUST NOT overlap across edits)
+  append with pos/end anchor -> insert after that anchor
+  prepend with pos/end anchor -> insert before that anchor
+  append/prepend without anchors -> EOF/BOF insertion (also creates missing files)
 
 CONTENT FORMAT:
   lines can be a string (single line) or string[] (multi-line, preferred).
   If you pass a multi-line string, it is split by real newline characters.
-  Literal "\\n" is preserved as text.
+  lines: null or lines: [] with replace -> delete those lines.
 
-FILE CREATION:
-  append without anchors adds content at EOF. If file does not exist, creates it.
-  prepend without anchors adds content at BOF. If file does not exist, creates it.
-  CRITICAL: only unanchored append/prepend can create a missing file.
+FILE MODES:
+  delete=true deletes file and requires edits=[] with no rename
+  rename moves final content to a new path and removes old path
 
-OPERATION CHOICE:
-  replace with pos only -> replace one line at pos
-  replace with pos+end -> replace ENTIRE range pos..end as a block (ranges MUST NOT overlap across edits)
-  append with pos/end anchor -> insert after that anchor
-  prepend with pos/end anchor -> insert before that anchor
-  append/prepend without anchors -> EOF/BOF insertion
-
-RULES (CRITICAL):
- 1. Minimize scope: one logical mutation site per operation.
- 2. Preserve formatting: keep indentation, punctuation, line breaks, trailing commas, brace style.
- 3. Prefer insertion over neighbor rewrites: anchor to structural boundaries (}, ], },), not interior property lines.
- 4. No no-ops: replacement content must differ from current content.
- 5. Touch only requested code: avoid incidental edits.
- 6. Use exact current tokens: NEVER rewrite approximately.
- 7. For swaps/moves: prefer one range operation over multiple single-line operations.
- 8. Output tool calls only; no prose or commentary between them.
-
-TAG CHOICE (ALWAYS):
- - Copy tags exactly from read output or >>> mismatch output.
- - NEVER guess tags.
-  - Anchor to structural lines (function/class/brace), NEVER blank lines.
-  - Anti-pattern warning: blank/whitespace anchors are fragile.
-  - Re-read after each successful edit call before issuing another on the same file.
-
-AUTOCORRECT (built-in - you do NOT need to handle these):
- Merged lines are auto-expanded back to original line count.
- Indentation is auto-restored from original lines.
- BOM and CRLF line endings are preserved automatically.
- Hashline prefixes and diff markers in text are auto-stripped.
+RULES:
+  1. Minimize scope: one logical mutation site per operation.
+  2. Preserve formatting: keep indentation, punctuation, line breaks, trailing commas, brace style.
+  3. Prefer insertion over neighbor rewrites: anchor to structural boundaries (}, ], },), not interior property lines.
+  4. No no-ops: replacement content must differ from current content.
+  5. Touch only requested code: avoid incidental edits.
+  6. Use exact current tokens: NEVER rewrite approximately.
+  7. For swaps/moves: prefer one range operation over multiple single-line operations.
+  8. Anchor to structural lines (function/class/brace), NEVER blank lines.
+  9. Re-read after each successful edit call before issuing another on the same file.
+</operations>
+
+<examples>
+Given this file content after read:
+  10#VK|function hello() {
+  11#XJ|  console.log("hi");
+  12#MB|  console.log("bye");
+  13#QR|}
+  14#TN|
+  15#WS|function world() {
+
+Single-line replace (change line 11):
+  { op: "replace", pos: "11#XJ", lines: ["  console.log(\\"hello\\");"] }
+  Result: line 11 replaced. Lines 10, 12-15 unchanged.
+
+Range replace (rewrite function body, lines 11-12):
+  { op: "replace", pos: "11#XJ", end: "12#MB", lines: ["  return \\"hello world\\";"] }
+  Result: lines 11-12 removed, replaced by 1 new line. Lines 10, 13-15 unchanged.
+
+Delete a line:
+  { op: "replace", pos: "12#MB", lines: null }
+  Result: line 12 removed. Lines 10-11, 13-15 unchanged.
+
+Insert after line 13 (between functions):
+  { op: "append", pos: "13#QR", lines: ["", "function added() {", "  return true;", "}"] }
+  Result: 4 new lines inserted after line 13. All existing lines unchanged.
+
+BAD \u2014 lines extend past end (DUPLICATES line 13):
+  { op: "replace", pos: "11#XJ", end: "12#MB", lines: ["  return \\"hi\\";", "}"] }
+  Line 13 is "}" which already exists after end. Including "}" in lines duplicates it.
+  CORRECT: { op: "replace", pos: "11#XJ", end: "12#MB", lines: ["  return \\"hi\\";"] }
+</examples>
+
+<auto>
+Built-in autocorrect (you do NOT need to handle these):
+  Merged lines are auto-expanded back to original line count.
+  Indentation is auto-restored from original lines.
+  BOM and CRLF line endings are preserved automatically.
+  Hashline prefixes and diff markers in text are auto-stripped.
+  Boundary echo lines (duplicating adjacent surviving lines) are auto-stripped.
+</auto>
 
 RECOVERY (when >>> mismatch error appears):
- Copy the updated LINE#ID tags shown in the error output directly.
- Re-read only if the needed tags are missing from the error snippet.
- ALWAYS batch all edits for one file in a single call.`;
+  Copy the updated LINE#ID tags shown in the error output directly.
+  Re-read only if the needed tags are missing from the error snippet.`;
 
 // src/tools/hashline-edit/tools.ts
 function createHashlineEditTool() {
@@ -77175,7 +77315,7 @@ function createHashlineEditTool() {
         ]).describe("Hashline edit operation mode"),
         pos: tool.schema.string().optional().describe("Primary anchor in LINE#ID format"),
         end: tool.schema.string().optional().describe("Range end anchor in LINE#ID format"),
-        lines: tool.schema.union([tool.schema.string(), tool.schema.null()]).describe("Replacement or inserted lines as newline-delimited string. null deletes with replace")
+        lines: tool.schema.union([tool.schema.array(tool.schema.string()), tool.schema.string(), tool.schema.null()]).describe("Replacement or inserted lines as newline-delimited string. null deletes with replace")
       })).describe("Array of edit operations to apply (empty when delete=true)")
     },
     execute: async (args, context) => executeHashlineEditTool(args, context)
@@ -77886,9 +78026,13 @@ class ConcurrencyManager {
 
 // src/features/background-agent/constants.ts
 var TASK_TTL_MS = 30 * 60 * 1000;
+var TERMINAL_TASK_TTL_MS = 30 * 60 * 1000;
 var MIN_STABILITY_TIME_MS2 = 10 * 1000;
-var DEFAULT_STALE_TIMEOUT_MS = 180000;
+var DEFAULT_STALE_TIMEOUT_MS = 1200000;
 var DEFAULT_MESSAGE_STALENESS_TIMEOUT_MS = 1800000;
+var DEFAULT_MAX_TOOL_CALLS = 200;
+var DEFAULT_CIRCUIT_BREAKER_WINDOW_SIZE = 20;
+var DEFAULT_CIRCUIT_BREAKER_REPETITION_THRESHOLD_PERCENT = 80;
 var MIN_RUNTIME_BEFORE_STALE_MS = 30000;
 var MIN_IDLE_TIME_MS = 5000;
 var POLLING_INTERVAL_MS = 3000;
@@ -78134,7 +78278,7 @@ function unregisterManagerForCleanup(manager) {
 
 // src/features/background-agent/compaction-aware-message-resolver.ts
 import { readdirSync as readdirSync21, readFileSync as readFileSync48 } from "fs";
-import { join as join83 } from "path";
+import { join as join84 } from "path";
 function isCompactionAgent4(agent) {
   return agent?.trim().toLowerCase() === "compaction";
 }
@@ -78213,7 +78357,7 @@ function findNearestMessageExcludingCompaction(messageDir, sessionID) {
     const messages = [];
     for (const file3 of files) {
       try {
-        const content = readFileSync48(join83(messageDir, file3), "utf-8");
+        const content = readFileSync48(join84(messageDir, file3), "utf-8");
         messages.push(JSON.parse(content));
       } catch {
         continue;
@@ -78299,7 +78443,7 @@ function handleSessionIdleBackgroundEvent(args) {
 }
 
 // src/features/background-agent/manager.ts
-import { join as join84 } from "path";
+import { join as join85 } from "path";
 
 // src/features/background-agent/remove-task-toast-tracking.ts
 function removeTaskToastTracking(taskId) {
@@ -78310,7 +78454,6 @@ function removeTaskToastTracking(taskId) {
 }
 
 // src/features/background-agent/task-poller.ts
-var TERMINAL_TASK_TTL_MS = 30 * 60 * 1000;
 var TERMINAL_TASK_STATUSES = new Set([
   "completed",
   "error",
@@ -78441,6 +78584,57 @@ async function checkAndInterruptStaleTasks(args) {
   }
 }
 
+// src/features/background-agent/loop-detector.ts
+function resolveCircuitBreakerSettings(config4) {
+  return {
+    maxToolCalls: config4?.circuitBreaker?.maxToolCalls ?? config4?.maxToolCalls ?? DEFAULT_MAX_TOOL_CALLS,
+    windowSize: config4?.circuitBreaker?.windowSize ?? DEFAULT_CIRCUIT_BREAKER_WINDOW_SIZE,
+    repetitionThresholdPercent: config4?.circuitBreaker?.repetitionThresholdPercent ?? DEFAULT_CIRCUIT_BREAKER_REPETITION_THRESHOLD_PERCENT
+  };
+}
+function recordToolCall(window, toolName, settings) {
+  const previous = window?.toolNames ?? [];
+  const toolNames = [...previous, toolName].slice(-settings.windowSize);
+  return {
+    toolNames,
+    windowSize: settings.windowSize,
+    thresholdPercent: settings.repetitionThresholdPercent
+  };
+}
+function detectRepetitiveToolUse(window) {
+  if (!window || window.toolNames.length === 0) {
+    return { triggered: false };
+  }
+  const counts = new Map;
+  for (const toolName of window.toolNames) {
+    counts.set(toolName, (counts.get(toolName) ?? 0) + 1);
+  }
+  let repeatedTool;
+  let repeatedCount = 0;
+  for (const [toolName, count] of counts.entries()) {
+    if (count > repeatedCount) {
+      repeatedTool = toolName;
+      repeatedCount = count;
+    }
+  }
+  const sampleSize = window.toolNames.length;
+  const minimumSampleSize = Math.min(window.windowSize, Math.ceil(window.windowSize * window.thresholdPercent / 100));
+  if (sampleSize < minimumSampleSize) {
+    return { triggered: false };
+  }
+  const thresholdCount = Math.ceil(sampleSize * window.thresholdPercent / 100);
+  if (!repeatedTool || repeatedCount < thresholdCount) {
+    return { triggered: false };
+  }
+  return {
+    triggered: true,
+    toolName: repeatedTool,
+    repeatedCount,
+    sampleSize,
+    thresholdPercent: window.thresholdPercent
+  };
+}
+
 // src/features/background-agent/subagent-spawn-limits.ts
 var DEFAULT_MAX_SUBAGENT_DEPTH = 3;
 var DEFAULT_MAX_ROOT_SESSION_SPAWN_BUDGET = 50;
@@ -78499,6 +78693,18 @@ function createSubagentDescendantLimitError(input) {
 }
 
 // src/features/background-agent/manager.ts
+function resolveMessagePartInfo(properties) {
+  if (!properties || typeof properties !== "object") {
+    return;
+  }
+  const nestedPart = properties.part;
+  if (nestedPart && typeof nestedPart === "object") {
+    return nestedPart;
+  }
+  return properties;
+}
+var MAX_TASK_REMOVAL_RESCHEDULES = 6;
+
 class BackgroundManager {
   tasks;
   notifications;
@@ -78987,6 +79193,8 @@ class BackgroundManager {
     existingTask.startedAt = new Date;
     existingTask.progress = {
       toolCalls: existingTask.progress?.toolCalls ?? 0,
+      toolCallWindow: existingTask.progress?.toolCallWindow,
+      countedToolPartIDs: existingTask.progress?.countedToolPartIDs,
       lastUpdate: new Date
     };
     this.startPolling();
@@ -79094,9 +79302,7 @@ class BackgroundManager {
       this.tryFallbackRetry(task, errorInfo, "message.updated");
     }
     if (event.type === "message.part.updated" || event.type === "message.part.delta") {
-      if (!props || typeof props !== "object" || !("sessionID" in props))
-        return;
-      const partInfo = props;
+      const partInfo = resolveMessagePartInfo(props);
       const sessionID = partInfo?.sessionID;
       if (!sessionID)
         return;
@@ -79116,8 +79322,51 @@ class BackgroundManager {
       }
       task.progress.lastUpdate = new Date;
       if (partInfo?.type === "tool" || partInfo?.tool) {
+        const countedToolPartIDs = task.progress.countedToolPartIDs ?? [];
+        const shouldCountToolCall = !partInfo.id || partInfo.state?.status !== "running" || !countedToolPartIDs.includes(partInfo.id);
+        if (!shouldCountToolCall) {
+          return;
+        }
+        if (partInfo.id && partInfo.state?.status === "running") {
+          task.progress.countedToolPartIDs = [...countedToolPartIDs, partInfo.id];
+        }
         task.progress.toolCalls += 1;
         task.progress.lastTool = partInfo.tool;
+        const circuitBreaker = resolveCircuitBreakerSettings(this.config);
+        if (partInfo.tool) {
+          task.progress.toolCallWindow = recordToolCall(task.progress.toolCallWindow, partInfo.tool, circuitBreaker);
+          const loopDetection = detectRepetitiveToolUse(task.progress.toolCallWindow);
+          if (loopDetection.triggered) {
+            log("[background-agent] Circuit breaker: repetitive tool usage detected", {
+              taskId: task.id,
+              agent: task.agent,
+              sessionID,
+              toolName: loopDetection.toolName,
+              repeatedCount: loopDetection.repeatedCount,
+              sampleSize: loopDetection.sampleSize,
+              thresholdPercent: loopDetection.thresholdPercent
+            });
+            this.cancelTask(task.id, {
+              source: "circuit-breaker",
+              reason: `Subagent repeatedly called ${loopDetection.toolName} ${loopDetection.repeatedCount}/${loopDetection.sampleSize} times in the recent tool-call window (${loopDetection.thresholdPercent}% threshold). This usually indicates an infinite loop. The task was automatically cancelled to prevent excessive token usage.`
+            });
+            return;
+          }
+        }
+        const maxToolCalls = circuitBreaker.maxToolCalls;
+        if (task.progress.toolCalls >= maxToolCalls) {
+          log("[background-agent] Circuit breaker: tool call limit reached", {
+            taskId: task.id,
+            toolCalls: task.progress.toolCalls,
+            maxToolCalls,
+            agent: task.agent,
+            sessionID
+          });
+          this.cancelTask(task.id, {
+            source: "circuit-breaker",
+            reason: `Subagent exceeded maximum tool call limit (${maxToolCalls}). This usually indicates an infinite loop. The task was automatically cancelled to prevent excessive token usage.`
+          });
+        }
       }
     }
     if (event.type === "session.idle") {
@@ -79362,7 +79611,7 @@ ${originalText}`;
     this.taskHistory.clearSession(parentSessionID);
     this.completedTaskSummaries.delete(parentSessionID);
   }
-  scheduleTaskRemoval(taskId) {
+  scheduleTaskRemoval(taskId, rescheduleCount = 0) {
     const existingTimer = this.completionTimers.get(taskId);
     if (existingTimer) {
       clearTimeout(existingTimer);
@@ -79371,17 +79620,26 @@ ${originalText}`;
     const timer = setTimeout(() => {
       this.completionTimers.delete(taskId);
       const task = this.tasks.get(taskId);
-      if (task) {
-        this.clearNotificationsForTask(taskId);
-        this.tasks.delete(taskId);
-        this.clearTaskHistoryWhenParentTasksGone(task.parentSessionID);
-        if (task.sessionID) {
-          subagentSessions.delete(task.sessionID);
-          SessionCategoryRegistry.remove(task.sessionID);
+      if (!task)
+        return;
+      if (task.parentSessionID) {
+        const siblings = this.getTasksByParentSession(task.parentSessionID);
+        const runningOrPendingSiblings = siblings.filter((sibling) => sibling.id !== taskId && (sibling.status === "running" || sibling.status === "pending"));
+        const completedAtTimestamp = task.completedAt?.getTime();
+        const reachedTaskTtl = completedAtTimestamp !== undefined && Date.now() - completedAtTimestamp >= TASK_TTL_MS;
+        if (runningOrPendingSiblings.length > 0 && rescheduleCount < MAX_TASK_REMOVAL_RESCHEDULES && !reachedTaskTtl) {
+          this.scheduleTaskRemoval(taskId, rescheduleCount + 1);
+          return;
         }
-        log("[background-agent] Removed completed task from memory:", taskId);
-        this.clearTaskHistoryWhenParentTasksGone(task?.parentSessionID);
       }
+      this.clearNotificationsForTask(taskId);
+      this.tasks.delete(taskId);
+      this.clearTaskHistoryWhenParentTasksGone(task.parentSessionID);
+      if (task.sessionID) {
+        subagentSessions.delete(task.sessionID);
+        SessionCategoryRegistry.remove(task.sessionID);
+      }
+      log("[background-agent] Removed completed task from memory:", taskId);
     }, TASK_CLEANUP_DELAY_MS);
     this.completionTimers.set(taskId, timer);
   }
@@ -79602,7 +79860,7 @@ Use \`background_output(task_id="${task.id}")\` to retrieve this result when rea
             parentSessionID: task.parentSessionID
           });
         }
-        const messageDir = join84(MESSAGE_STORAGE, task.parentSessionID);
+        const messageDir = join85(MESSAGE_STORAGE, task.parentSessionID);
         const currentMessage = messageDir ? findNearestMessageExcludingCompaction(messageDir, task.parentSessionID) : null;
         agent = currentMessage?.agent ?? task.parentAgent;
         model = currentMessage?.model?.providerID && currentMessage?.model?.modelID ? { providerID: currentMessage.model.providerID, modelID: currentMessage.model.modelID } : undefined;
@@ -83708,11 +83966,11 @@ class StreamableHTTPClientTransport {
 }
 
 // src/features/mcp-oauth/storage.ts
-import { chmodSync as chmodSync2, existsSync as existsSync73, mkdirSync as mkdirSync15, readFileSync as readFileSync49, unlinkSync as unlinkSync13, writeFileSync as writeFileSync21 } from "fs";
-import { dirname as dirname23, join as join85 } from "path";
+import { chmodSync as chmodSync2, existsSync as existsSync74, mkdirSync as mkdirSync15, readFileSync as readFileSync49, unlinkSync as unlinkSync13, writeFileSync as writeFileSync21 } from "fs";
+import { dirname as dirname23, join as join86 } from "path";
 var STORAGE_FILE_NAME = "mcp-oauth.json";
 function getMcpOauthStoragePath() {
-  return join85(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
+  return join86(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
 }
 function normalizeHost(serverHost) {
   let host = serverHost.trim();
@@ -83749,7 +84007,7 @@ function buildKey(serverHost, resource) {
 }
 function readStore() {
   const filePath = getMcpOauthStoragePath();
-  if (!existsSync73(filePath)) {
+  if (!existsSync74(filePath)) {
     return null;
   }
   try {
@@ -83763,7 +84021,7 @@ function writeStore(store2) {
   const filePath = getMcpOauthStoragePath();
   try {
     const dir = dirname23(filePath);
-    if (!existsSync73(dir)) {
+    if (!existsSync74(dir)) {
       mkdirSync15(dir, { recursive: true });
     }
     writeFileSync21(filePath, JSON.stringify(store2, null, 2), { encoding: "utf-8", mode: 384 });
@@ -84565,7 +84823,19 @@ var EXCLUDED_ENV_PATTERNS = [
   /^npm_config_/,
   /^YARN_/,
   /^PNPM_/,
-  /^NO_UPDATE_NOTIFIER$/
+  /^NO_UPDATE_NOTIFIER$/,
+  /^ANTHROPIC_API_KEY$/i,
+  /^AWS_ACCESS_KEY_ID$/i,
+  /^AWS_SECRET_ACCESS_KEY$/i,
+  /^GITHUB_TOKEN$/i,
+  /^DATABASE_URL$/i,
+  /^OPENAI_API_KEY$/i,
+  /_KEY$/i,
+  /_SECRET$/i,
+  /_TOKEN$/i,
+  /_PASSWORD$/i,
+  /_CREDENTIAL$/i,
+  /_API_KEY$/i
 ];
 function createCleanMcpEnvironment(customEnv = {}) {
   const cleanEnv = {};
@@ -91652,7 +91922,7 @@ function createHephaestusAgent2(model, availableAgents, availableToolNames, avai
 }
 createHephaestusAgent2.mode = MODE10;
 // src/agents/builtin-agents/resolve-file-uri.ts
-import { existsSync as existsSync74, readFileSync as readFileSync50 } from "fs";
+import { existsSync as existsSync75, readFileSync as readFileSync50 } from "fs";
 import { homedir as homedir14 } from "os";
 import { isAbsolute as isAbsolute9, resolve as resolve15 } from "path";
 function resolvePromptAppend(promptAppend, configDir) {
@@ -91667,7 +91937,7 @@ function resolvePromptAppend(promptAppend, configDir) {
   } catch {
     return `[WARNING: Malformed file URI (invalid percent-encoding): ${promptAppend}]`;
   }
-  if (!existsSync74(filePath)) {
+  if (!existsSync75(filePath)) {
     return `[WARNING: Could not resolve file URI: ${promptAppend}]`;
   }
   try {
@@ -92954,8 +93224,8 @@ async function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, dir
   return result;
 }
 // src/features/claude-code-agent-loader/loader.ts
-import { existsSync as existsSync75, readdirSync as readdirSync22, readFileSync as readFileSync51 } from "fs";
-import { join as join86, basename as basename10 } from "path";
+import { existsSync as existsSync76, readdirSync as readdirSync22, readFileSync as readFileSync51 } from "fs";
+import { join as join87, basename as basename10 } from "path";
 function parseToolsConfig2(toolsStr) {
   if (!toolsStr)
     return;
@@ -92969,7 +93239,7 @@ function parseToolsConfig2(toolsStr) {
   return result;
 }
 function loadAgentsFromDir(agentsDir, scope) {
-  if (!existsSync75(agentsDir)) {
+  if (!existsSync76(agentsDir)) {
     return [];
   }
   const entries = readdirSync22(agentsDir, { withFileTypes: true });
@@ -92977,7 +93247,7 @@ function loadAgentsFromDir(agentsDir, scope) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const agentPath = join86(agentsDir, entry.name);
+    const agentPath = join87(agentsDir, entry.name);
     const agentName = basename10(entry.name, ".md");
     try {
       const content = readFileSync51(agentPath, "utf-8");
@@ -93010,7 +93280,7 @@ function loadAgentsFromDir(agentsDir, scope) {
   return agents;
 }
 function loadUserAgents() {
-  const userAgentsDir = join86(getClaudeConfigDir(), "agents");
+  const userAgentsDir = join87(getClaudeConfigDir(), "agents");
   const agents = loadAgentsFromDir(userAgentsDir, "user");
   const result = {};
   for (const agent of agents) {
@@ -93019,7 +93289,7 @@ function loadUserAgents() {
   return result;
 }
 function loadProjectAgents(directory) {
-  const projectAgentsDir = join86(directory ?? process.cwd(), ".claude", "agents");
+  const projectAgentsDir = join87(directory ?? process.cwd(), ".claude", "agents");
   const agents = loadAgentsFromDir(projectAgentsDir, "project");
   const result = {};
   for (const agent of agents) {
@@ -95471,7 +95741,7 @@ async function applyAgentConfig(params) {
 }
 // src/features/claude-code-command-loader/loader.ts
 import { promises as fs19 } from "fs";
-import { join as join87, basename as basename11 } from "path";
+import { join as join88, basename as basename11 } from "path";
 init_logger();
 async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix = "") {
   try {
@@ -95502,7 +95772,7 @@ async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix
     if (entry.isDirectory()) {
       if (entry.name.startsWith("."))
         continue;
-      const subDirPath = join87(commandsDir, entry.name);
+      const subDirPath = join88(commandsDir, entry.name);
       const subPrefix = prefix ? `${prefix}:${entry.name}` : entry.name;
       const subCommands = await loadCommandsFromDir(subDirPath, scope, visited, subPrefix);
       commands3.push(...subCommands);
@@ -95510,7 +95780,7 @@ async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix
     }
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join87(commandsDir, entry.name);
+    const commandPath = join88(commandsDir, entry.name);
     const baseCommandName = basename11(entry.name, ".md");
     const commandName = prefix ? `${prefix}:${baseCommandName}` : baseCommandName;
     try {
@@ -95557,23 +95827,23 @@ function commandsToRecord(commands3) {
   return result;
 }
 async function loadUserCommands() {
-  const userCommandsDir = join87(getClaudeConfigDir(), "commands");
+  const userCommandsDir = join88(getClaudeConfigDir(), "commands");
   const commands3 = await loadCommandsFromDir(userCommandsDir, "user");
   return commandsToRecord(commands3);
 }
 async function loadProjectCommands(directory) {
-  const projectCommandsDir = join87(directory ?? process.cwd(), ".claude", "commands");
+  const projectCommandsDir = join88(directory ?? process.cwd(), ".claude", "commands");
   const commands3 = await loadCommandsFromDir(projectCommandsDir, "project");
   return commandsToRecord(commands3);
 }
 async function loadOpencodeGlobalCommands() {
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
-  const opencodeCommandsDir = join87(configDir, "command");
+  const opencodeCommandsDir = join88(configDir, "command");
   const commands3 = await loadCommandsFromDir(opencodeCommandsDir, "opencode");
   return commandsToRecord(commands3);
 }
 async function loadOpencodeProjectCommands(directory) {
-  const opencodeProjectDir = join87(directory ?? process.cwd(), ".opencode", "command");
+  const opencodeProjectDir = join88(directory ?? process.cwd(), ".opencode", "command");
   const commands3 = await loadCommandsFromDir(opencodeProjectDir, "opencode-project");
   return commandsToRecord(commands3);
 }
@@ -95632,22 +95902,22 @@ function remapCommandAgentFields(commands3) {
   }
 }
 // src/features/claude-code-mcp-loader/loader.ts
-import { existsSync as existsSync76, readFileSync as readFileSync52 } from "fs";
-import { join as join88 } from "path";
+import { existsSync as existsSync77, readFileSync as readFileSync52 } from "fs";
+import { join as join89 } from "path";
 import { homedir as homedir15 } from "os";
 init_logger();
 function getMcpConfigPaths() {
   const claudeConfigDir = getClaudeConfigDir();
   const cwd = process.cwd();
   return [
-    { path: join88(homedir15(), ".claude.json"), scope: "user" },
-    { path: join88(claudeConfigDir, ".mcp.json"), scope: "user" },
-    { path: join88(cwd, ".mcp.json"), scope: "project" },
-    { path: join88(cwd, ".claude", ".mcp.json"), scope: "local" }
+    { path: join89(homedir15(), ".claude.json"), scope: "user" },
+    { path: join89(claudeConfigDir, ".mcp.json"), scope: "user" },
+    { path: join89(cwd, ".mcp.json"), scope: "project" },
+    { path: join89(cwd, ".claude", ".mcp.json"), scope: "local" }
   ];
 }
 async function loadMcpConfigFile(filePath) {
-  if (!existsSync76(filePath)) {
+  if (!existsSync77(filePath)) {
     return null;
   }
   try {
@@ -95662,7 +95932,7 @@ function getSystemMcpServerNames() {
   const names = new Set;
   const paths = getMcpConfigPaths();
   for (const { path: path12 } of paths) {
-    if (!existsSync76(path12))
+    if (!existsSync77(path12))
       continue;
     try {
       const content = readFileSync52(path12, "utf-8");
@@ -96480,10 +96750,10 @@ function createChatHeadersHandler(args) {
 
 // src/plugin/ultrawork-db-model-override.ts
 import { Database } from "bun:sqlite";
-import { join as join89 } from "path";
-import { existsSync as existsSync77 } from "fs";
+import { join as join90 } from "path";
+import { existsSync as existsSync78 } from "fs";
 function getDbPath() {
-  return join89(getDataDir(), "opencode", "opencode.db");
+  return join90(getDataDir(), "opencode", "opencode.db");
 }
 var MAX_MICROTASK_RETRIES = 10;
 function tryUpdateMessageModel(db, messageId, targetModel, variant) {
@@ -96560,7 +96830,7 @@ function retryViaMicrotask(db, messageId, targetModel, variant, attempt) {
 function scheduleDeferredModelOverride(messageId, targetModel, variant) {
   queueMicrotask(() => {
     const dbPath = getDbPath();
-    if (!existsSync77(dbPath)) {
+    if (!existsSync78(dbPath)) {
       log("[ultrawork-db-override] DB not found, skipping deferred override");
       return;
     }
@@ -97172,6 +97442,9 @@ function createEventHandler2(args) {
     if (event.type === "session.status") {
       const sessionID = props?.sessionID;
       const status = props?.status;
+      if (sessionID && status?.type === "idle") {
+        lastHandledRetryStatusKey.delete(sessionID);
+      }
       if (sessionID && status?.type === "retry" && isModelFallbackEnabled && !isRuntimeFallbackEnabled) {
         try {
           const retryMessage = typeof status.message === "string" ? status.message : "";
@@ -97294,11 +97567,37 @@ function createToolExecuteAfterHandler3(args) {
       const prompt = typeof output.metadata?.prompt === "string" ? output.metadata.prompt : undefined;
       const verificationAttemptId = prompt?.match(VERIFICATION_ATTEMPT_PATTERN)?.[1]?.trim();
       const loopState = directory ? readState(directory) : null;
-      if (agent === "oracle" && sessionId && verificationAttemptId && directory && loopState?.active === true && loopState.ultrawork === true && loopState.verification_pending === true && loopState.session_id === input.sessionID && loopState.verification_attempt_id === verificationAttemptId) {
+      const isVerificationContext = agent === "oracle" && !!sessionId && !!directory && loopState?.active === true && loopState.ultrawork === true && loopState.verification_pending === true && loopState.session_id === input.sessionID;
+      log("[tool-execute-after] ULW verification tracking check", {
+        tool: input.tool,
+        agent,
+        parentSessionID: input.sessionID,
+        oracleSessionID: sessionId,
+        hasPromptInMetadata: typeof prompt === "string",
+        extractedVerificationAttemptId: verificationAttemptId
+      });
+      if (isVerificationContext && verificationAttemptId && loopState.verification_attempt_id === verificationAttemptId) {
+        writeState(directory, {
+          ...loopState,
+          verification_session_id: sessionId
+        });
+        log("[tool-execute-after] Stored oracle verification session via attempt match", {
+          parentSessionID: input.sessionID,
+          oracleSessionID: sessionId,
+          verificationAttemptId
+        });
+      } else if (isVerificationContext && !verificationAttemptId) {
         writeState(directory, {
           ...loopState,
           verification_session_id: sessionId
         });
+        log("[tool-execute-after] Fallback: stored oracle verification session without attempt match", {
+          parentSessionID: input.sessionID,
+          oracleSessionID: sessionId,
+          hasPromptInMetadata: typeof prompt === "string",
+          expectedAttemptId: loopState.verification_attempt_id,
+          extractedAttemptId: verificationAttemptId
+        });
       }
     }
     const runToolExecuteAfterHooks = async () => {
@@ -97416,6 +97715,12 @@ function createToolExecuteBeforeHandler3(args) {
       const shouldInjectOracleVerification = normalizedSubagentType === "oracle" && loopState?.active === true && loopState.ultrawork === true && loopState.verification_pending === true && loopState.session_id === input.sessionID;
       if (shouldInjectOracleVerification) {
         const verificationAttemptId = randomUUID4();
+        log("[tool-execute-before] Injecting ULW oracle verification attempt", {
+          sessionID: input.sessionID,
+          callID: input.callID,
+          verificationAttemptId,
+          loopSessionID: loopState.session_id
+        });
         writeState(ctx.directory, {
           ...loopState,
           verification_attempt_id: verificationAttemptId,