oh-my-opencode 2.1.0 → 2.1.1

package/dist/index.js

@@ -2257,7 +2257,7 @@ var oracleAgent = {
   temperature: 0.1,
   reasoningEffort: "medium",
   textVerbosity: "high",
-  tools: { write: false, edit: false, read: true, task: false, call_omo_agent: true, background_task: false },
+  tools: { write: false, edit: false, task: false, background_task: false },
   prompt: `You are a strategic technical advisor with deep reasoning capabilities, operating as a specialized consultant within an AI-assisted development environment.
 
 ## Context
@@ -2331,7 +2331,7 @@ var librarianAgent = {
   mode: "subagent",
   model: "anthropic/claude-sonnet-4-5",
   temperature: 0.1,
-  tools: { write: false, edit: false, bash: true, read: true, background_task: false },
+  tools: { write: false, edit: false, background_task: false },
   prompt: `# THE LIBRARIAN
 
 You are **THE LIBRARIAN**, a specialized open-source codebase understanding agent.
@@ -2570,7 +2570,7 @@ var exploreAgent = {
   mode: "subagent",
   model: "opencode/grok-code",
   temperature: 0.1,
-  tools: { write: false, edit: false, bash: true, read: true, background_task: false },
+  tools: { write: false, edit: false, background_task: false },
   prompt: `You are a file search specialist. You excel at thoroughly navigating and exploring codebases.
 
 === CRITICAL: READ-ONLY MODE - NO FILE MODIFICATIONS ===
@@ -3119,7 +3119,7 @@ var multimodalLookerAgent = {
   mode: "subagent",
   model: "google/gemini-2.5-flash",
   temperature: 0.1,
-  tools: { Read: true, background_task: false },
+  tools: { write: false, edit: false, bash: false, background_task: false },
   prompt: `You interpret media files that cannot be read as plain text.
 
 Your job: examine the attached file and extract ONLY what was requested.
@@ -3183,7 +3183,11 @@ import { spawn } from "child_process";
 import { exec } from "child_process";
 import { promisify } from "util";
 import { existsSync } from "fs";
+import { homedir } from "os";
 var DEFAULT_ZSH_PATHS = ["/bin/zsh", "/usr/bin/zsh", "/usr/local/bin/zsh"];
+function getHomeDir() {
+  return process.env.HOME || process.env.USERPROFILE || homedir();
+}
 function findZshPath(customZshPath) {
   if (customZshPath && existsSync(customZshPath)) {
     return customZshPath;
@@ -3197,7 +3201,7 @@ function findZshPath(customZshPath) {
 }
 var execAsync = promisify(exec);
 async function executeHookCommand(command, stdin, cwd, options) {
-  const home = process.env.HOME ?? "";
+  const home = getHomeDir();
   let expandedCommand = command.replace(/^~(?=\/|$)/g, home).replace(/\s~(?=\/)/g, ` ${home}`).replace(/\$CLAUDE_PROJECT_DIR/g, cwd).replace(/\$\{CLAUDE_PROJECT_DIR\}/g, cwd);
   let finalCommand = expandedCommand;
   if (options?.forceZsh) {
@@ -3692,8 +3696,8 @@ import { join as join4 } from "path";
 
 // src/features/hook-message-injector/constants.ts
 import { join as join3 } from "path";
-import { homedir } from "os";
-var xdgData = process.env.XDG_DATA_HOME || join3(homedir(), ".local", "share");
+import { homedir as homedir2 } from "os";
+var xdgData = process.env.XDG_DATA_HOME || join3(homedir2(), ".local", "share");
 var OPENCODE_STORAGE = join3(xdgData, "opencode", "storage");
 var MESSAGE_STORAGE = join3(OPENCODE_STORAGE, "message");
 var PART_STORAGE = join3(OPENCODE_STORAGE, "part");
@@ -4073,7 +4077,7 @@ async function sendNotification(ctx, p, title, message) {
       await ctx.$`osascript -e ${'display notification "' + escapedMessage + '" with title "' + escapedTitle + '"'}`;
       break;
     case "linux":
-      await ctx.$`notify-send ${escapedTitle} ${escapedMessage}`.catch(() => {});
+      await ctx.$`notify-send ${escapedTitle} ${escapedMessage} 2>/dev/null`.catch(() => {});
       break;
     case "win32":
       await ctx.$`powershell -Command ${"[System.Reflection.Assembly]::LoadWithPartialName('System.Windows.Forms'); [System.Windows.Forms.MessageBox]::Show('" + escapedMessage + "', '" + escapedTitle + "')"}`;
@@ -4086,8 +4090,8 @@ async function playSound(ctx, p, soundPath) {
       ctx.$`afplay ${soundPath}`.catch(() => {});
       break;
     case "linux":
-      ctx.$`paplay ${soundPath}`.catch(() => {
-        ctx.$`aplay ${soundPath}`.catch(() => {});
+      ctx.$`paplay ${soundPath} 2>/dev/null`.catch(() => {
+        ctx.$`aplay ${soundPath} 2>/dev/null`.catch(() => {});
       });
       break;
     case "win32":
@@ -4516,7 +4520,25 @@ function getErrorMessage(error) {
   if (typeof error === "string")
     return error.toLowerCase();
   const errorObj = error;
-  return (errorObj.data?.message || errorObj.error?.message || errorObj.message || "").toLowerCase();
+  const paths = [
+    errorObj.data,
+    errorObj.error,
+    errorObj,
+    errorObj.data?.error
+  ];
+  for (const obj of paths) {
+    if (obj && typeof obj === "object") {
+      const msg = obj.message;
+      if (typeof msg === "string" && msg.length > 0) {
+        return msg.toLowerCase();
+      }
+    }
+  }
+  try {
+    return JSON.stringify(error).toLowerCase();
+  } catch {
+    return "";
+  }
 }
 function extractMessageIndex(error) {
   const message = getErrorMessage(error);
@@ -4534,7 +4556,7 @@ function detectErrorType(error) {
   if (message.includes("thinking is disabled") && message.includes("cannot contain")) {
     return "thinking_disabled_violation";
   }
-  if (message.includes("non-empty content") || message.includes("must have non-empty content")) {
+  if (message.includes("non-empty content") || message.includes("must have non-empty content") || message.includes("content") && message.includes("is empty") || message.includes("content field") && message.includes("empty")) {
     return "empty_content_message";
   }
   return null;
@@ -4727,15 +4749,16 @@ import { createRequire as createRequire2 } from "module";
 import { dirname, join as join9 } from "path";
 import { existsSync as existsSync7 } from "fs";
 import * as fs2 from "fs";
+import { tmpdir as tmpdir3 } from "os";
 
 // src/hooks/comment-checker/downloader.ts
 var {spawn: spawn2 } = globalThis.Bun;
 import { existsSync as existsSync6, mkdirSync as mkdirSync3, chmodSync, unlinkSync as unlinkSync2, appendFileSync as appendFileSync2 } from "fs";
 import { join as join8 } from "path";
-import { homedir as homedir2 } from "os";
+import { homedir as homedir3, tmpdir as tmpdir2 } from "os";
 import { createRequire } from "module";
 var DEBUG = process.env.COMMENT_CHECKER_DEBUG === "1";
-var DEBUG_FILE = "/tmp/comment-checker-debug.log";
+var DEBUG_FILE = join8(tmpdir2(), "comment-checker-debug.log");
 function debugLog(...args) {
   if (DEBUG) {
     const msg = `[${new Date().toISOString()}] [comment-checker:downloader] ${args.map((a) => typeof a === "object" ? JSON.stringify(a, null, 2) : String(a)).join(" ")}
@@ -4753,7 +4776,7 @@ var PLATFORM_MAP = {
 };
 function getCacheDir() {
   const xdgCache2 = process.env.XDG_CACHE_HOME;
-  const base = xdgCache2 || join8(homedir2(), ".cache");
+  const base = xdgCache2 || join8(homedir3(), ".cache");
   return join8(base, "oh-my-opencode", "bin");
 }
 function getBinaryName() {
@@ -4863,7 +4886,7 @@ async function ensureCommentCheckerBinary() {
 
 // src/hooks/comment-checker/cli.ts
 var DEBUG2 = process.env.COMMENT_CHECKER_DEBUG === "1";
-var DEBUG_FILE2 = "/tmp/comment-checker-debug.log";
+var DEBUG_FILE2 = join9(tmpdir3(), "comment-checker-debug.log");
 function debugLog2(...args) {
   if (DEBUG2) {
     const msg = `[${new Date().toISOString()}] [comment-checker:cli] ${args.map((a) => typeof a === "object" ? JSON.stringify(a, null, 2) : String(a)).join(" ")}
@@ -4976,8 +4999,10 @@ async function runCommentChecker(input, cliPath) {
 // src/hooks/comment-checker/index.ts
 import * as fs3 from "fs";
 import { existsSync as existsSync8 } from "fs";
+import { tmpdir as tmpdir4 } from "os";
+import { join as join10 } from "path";
 var DEBUG3 = process.env.COMMENT_CHECKER_DEBUG === "1";
-var DEBUG_FILE3 = "/tmp/comment-checker-debug.log";
+var DEBUG_FILE3 = join10(tmpdir4(), "comment-checker-debug.log");
 function debugLog3(...args) {
   if (DEBUG3) {
     const msg = `[${new Date().toISOString()}] [comment-checker:hook] ${args.map((a) => typeof a === "object" ? JSON.stringify(a, null, 2) : String(a)).join(" ")}
@@ -5123,7 +5148,7 @@ function createToolOutputTruncatorHook(ctx) {
 }
 // src/hooks/directory-agents-injector/index.ts
 import { existsSync as existsSync10, readFileSync as readFileSync5 } from "fs";
-import { dirname as dirname2, join as join12, resolve as resolve2 } from "path";
+import { dirname as dirname2, join as join13, resolve as resolve2 } from "path";
 
 // src/hooks/directory-agents-injector/storage.ts
 import {
@@ -5133,17 +5158,17 @@ import {
   writeFileSync as writeFileSync3,
   unlinkSync as unlinkSync3
 } from "fs";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 
 // src/hooks/directory-agents-injector/constants.ts
-import { join as join10 } from "path";
-var OPENCODE_STORAGE3 = join10(xdgData2 ?? "", "opencode", "storage");
-var AGENTS_INJECTOR_STORAGE = join10(OPENCODE_STORAGE3, "directory-agents");
+import { join as join11 } from "path";
+var OPENCODE_STORAGE3 = join11(xdgData2 ?? "", "opencode", "storage");
+var AGENTS_INJECTOR_STORAGE = join11(OPENCODE_STORAGE3, "directory-agents");
 var AGENTS_FILENAME = "AGENTS.md";
 
 // src/hooks/directory-agents-injector/storage.ts
 function getStoragePath(sessionID) {
-  return join11(AGENTS_INJECTOR_STORAGE, `${sessionID}.json`);
+  return join12(AGENTS_INJECTOR_STORAGE, `${sessionID}.json`);
 }
 function loadInjectedPaths(sessionID) {
   const filePath = getStoragePath(sessionID);
@@ -5195,7 +5220,7 @@ function createDirectoryAgentsInjectorHook(ctx) {
     const found = [];
     let current = startDir;
     while (true) {
-      const agentsPath = join12(current, AGENTS_FILENAME);
+      const agentsPath = join13(current, AGENTS_FILENAME);
       if (existsSync10(agentsPath)) {
         found.push(agentsPath);
       }
@@ -5264,7 +5289,7 @@ ${content}`;
 }
 // src/hooks/directory-readme-injector/index.ts
 import { existsSync as existsSync12, readFileSync as readFileSync7 } from "fs";
-import { dirname as dirname3, join as join15, resolve as resolve3 } from "path";
+import { dirname as dirname3, join as join16, resolve as resolve3 } from "path";
 
 // src/hooks/directory-readme-injector/storage.ts
 import {
@@ -5274,17 +5299,17 @@ import {
   writeFileSync as writeFileSync4,
   unlinkSync as unlinkSync4
 } from "fs";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 
 // src/hooks/directory-readme-injector/constants.ts
-import { join as join13 } from "path";
-var OPENCODE_STORAGE4 = join13(xdgData2 ?? "", "opencode", "storage");
-var README_INJECTOR_STORAGE = join13(OPENCODE_STORAGE4, "directory-readme");
+import { join as join14 } from "path";
+var OPENCODE_STORAGE4 = join14(xdgData2 ?? "", "opencode", "storage");
+var README_INJECTOR_STORAGE = join14(OPENCODE_STORAGE4, "directory-readme");
 var README_FILENAME = "README.md";
 
 // src/hooks/directory-readme-injector/storage.ts
 function getStoragePath2(sessionID) {
-  return join14(README_INJECTOR_STORAGE, `${sessionID}.json`);
+  return join15(README_INJECTOR_STORAGE, `${sessionID}.json`);
 }
 function loadInjectedPaths2(sessionID) {
   const filePath = getStoragePath2(sessionID);
@@ -5336,7 +5361,7 @@ function createDirectoryReadmeInjectorHook(ctx) {
     const found = [];
     let current = startDir;
     while (true) {
-      const readmePath = join15(current, README_FILENAME);
+      const readmePath = join16(current, README_FILENAME);
       if (existsSync12(readmePath)) {
         found.push(readmePath);
       }
@@ -5565,11 +5590,15 @@ function parseAnthropicTokenLimitError(err) {
 
 // src/hooks/anthropic-auto-compact/types.ts
 var RETRY_CONFIG = {
-  maxAttempts: 5,
+  maxAttempts: 2,
   initialDelayMs: 2000,
   backoffFactor: 2,
   maxDelayMs: 30000
 };
+var FALLBACK_CONFIG = {
+  maxRevertAttempts: 3,
+  minMessagesRequired: 2
+};
 
 // src/hooks/anthropic-auto-compact/executor.ts
 function calculateRetryDelay(attempt) {
@@ -5589,6 +5618,92 @@ function getOrCreateRetryState(autoCompactState, sessionID) {
   }
   return state;
 }
+function getOrCreateFallbackState(autoCompactState, sessionID) {
+  let state = autoCompactState.fallbackStateBySession.get(sessionID);
+  if (!state) {
+    state = { revertAttempt: 0 };
+    autoCompactState.fallbackStateBySession.set(sessionID, state);
+  }
+  return state;
+}
+async function getLastMessagePair(sessionID, client, directory) {
+  try {
+    const resp = await client.session.messages({
+      path: { id: sessionID },
+      query: { directory }
+    });
+    const data = resp.data;
+    if (!Array.isArray(data) || data.length < FALLBACK_CONFIG.minMessagesRequired) {
+      return null;
+    }
+    const reversed = [...data].reverse();
+    const lastAssistant = reversed.find((m) => {
+      const msg = m;
+      const info = msg.info;
+      return info?.role === "assistant";
+    });
+    const lastUser = reversed.find((m) => {
+      const msg = m;
+      const info = msg.info;
+      return info?.role === "user";
+    });
+    if (!lastUser)
+      return null;
+    const userInfo = lastUser.info;
+    const userMessageID = userInfo?.id;
+    if (!userMessageID)
+      return null;
+    let assistantMessageID;
+    if (lastAssistant) {
+      const assistantInfo = lastAssistant.info;
+      assistantMessageID = assistantInfo?.id;
+    }
+    return { userMessageID, assistantMessageID };
+  } catch {
+    return null;
+  }
+}
+async function executeRevertFallback(sessionID, autoCompactState, client, directory) {
+  const fallbackState = getOrCreateFallbackState(autoCompactState, sessionID);
+  if (fallbackState.revertAttempt >= FALLBACK_CONFIG.maxRevertAttempts) {
+    return false;
+  }
+  const pair = await getLastMessagePair(sessionID, client, directory);
+  if (!pair) {
+    return false;
+  }
+  await client.tui.showToast({
+    body: {
+      title: "\u26A0\uFE0F Emergency Recovery",
+      message: `Context too large. Removing last message pair to recover session...`,
+      variant: "warning",
+      duration: 4000
+    }
+  }).catch(() => {});
+  try {
+    if (pair.assistantMessageID) {
+      await client.session.revert({
+        path: { id: sessionID },
+        body: { messageID: pair.assistantMessageID },
+        query: { directory }
+      });
+    }
+    await client.session.revert({
+      path: { id: sessionID },
+      body: { messageID: pair.userMessageID },
+      query: { directory }
+    });
+    fallbackState.revertAttempt++;
+    fallbackState.lastRevertedMessageID = pair.userMessageID;
+    const retryState = autoCompactState.retryStateBySession.get(sessionID);
+    if (retryState) {
+      retryState.attempt = 0;
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function getLastAssistant(sessionID, client, directory) {
   try {
     const resp = await client.session.messages({
@@ -5615,15 +5730,34 @@ function clearSessionState(autoCompactState, sessionID) {
   autoCompactState.pendingCompact.delete(sessionID);
   autoCompactState.errorDataBySession.delete(sessionID);
   autoCompactState.retryStateBySession.delete(sessionID);
+  autoCompactState.fallbackStateBySession.delete(sessionID);
 }
 async function executeCompact(sessionID, msg, autoCompactState, client, directory) {
   const retryState = getOrCreateRetryState(autoCompactState, sessionID);
   if (!shouldRetry(retryState)) {
+    const fallbackState = getOrCreateFallbackState(autoCompactState, sessionID);
+    if (fallbackState.revertAttempt < FALLBACK_CONFIG.maxRevertAttempts) {
+      const reverted = await executeRevertFallback(sessionID, autoCompactState, client, directory);
+      if (reverted) {
+        await client.tui.showToast({
+          body: {
+            title: "Recovery Attempt",
+            message: "Message removed. Retrying compaction...",
+            variant: "info",
+            duration: 3000
+          }
+        }).catch(() => {});
+        setTimeout(() => {
+          executeCompact(sessionID, msg, autoCompactState, client, directory);
+        }, 1000);
+        return;
+      }
+    }
     clearSessionState(autoCompactState, sessionID);
     await client.tui.showToast({
       body: {
         title: "Auto Compact Failed",
-        message: `Failed after ${RETRY_CONFIG.maxAttempts} attempts. Please try manual compact.`,
+        message: `Failed after ${RETRY_CONFIG.maxAttempts} retries and ${FALLBACK_CONFIG.maxRevertAttempts} message removals. Please start a new session.`,
         variant: "error",
         duration: 5000
       }
@@ -5669,7 +5803,8 @@ function createAutoCompactState() {
   return {
     pendingCompact: new Set,
     errorDataBySession: new Map,
-    retryStateBySession: new Map
+    retryStateBySession: new Map,
+    fallbackStateBySession: new Map
   };
 }
 function createAnthropicAutoCompactHook(ctx) {
@@ -5682,6 +5817,7 @@ function createAnthropicAutoCompactHook(ctx) {
         autoCompactState.pendingCompact.delete(sessionInfo.id);
         autoCompactState.errorDataBySession.delete(sessionInfo.id);
         autoCompactState.retryStateBySession.delete(sessionInfo.id);
+        autoCompactState.fallbackStateBySession.delete(sessionInfo.id);
       }
       return;
     }
@@ -6024,8 +6160,8 @@ function createThinkModeHook() {
   };
 }
 // src/hooks/claude-code-hooks/config.ts
-import { homedir as homedir3 } from "os";
-import { join as join16 } from "path";
+import { homedir as homedir4 } from "os";
+import { join as join17 } from "path";
 import { existsSync as existsSync13 } from "fs";
 function normalizeHookMatcher(raw) {
   return {
@@ -6049,11 +6185,11 @@ function normalizeHooksConfig(raw) {
   return result;
 }
 function getClaudeSettingsPaths(customPath) {
-  const home = homedir3();
+  const home = homedir4();
   const paths = [
-    join16(home, ".claude", "settings.json"),
-    join16(process.cwd(), ".claude", "settings.json"),
-    join16(process.cwd(), ".claude", "settings.local.json")
+    join17(home, ".claude", "settings.json"),
+    join17(process.cwd(), ".claude", "settings.json"),
+    join17(process.cwd(), ".claude", "settings.local.json")
   ];
   if (customPath && existsSync13(customPath)) {
     paths.unshift(customPath);
@@ -6097,11 +6233,11 @@ async function loadClaudeHooksConfig(customSettingsPath) {
 
 // src/hooks/claude-code-hooks/config-loader.ts
 import { existsSync as existsSync14 } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join17 } from "path";
-var USER_CONFIG_PATH = join17(homedir4(), ".config", "opencode", "opencode-cc-plugin.json");
+import { homedir as homedir5 } from "os";
+import { join as join18 } from "path";
+var USER_CONFIG_PATH = join18(homedir5(), ".config", "opencode", "opencode-cc-plugin.json");
 function getProjectConfigPath() {
-  return join17(process.cwd(), ".opencode", "opencode-cc-plugin.json");
+  return join18(process.cwd(), ".opencode", "opencode-cc-plugin.json");
 }
 async function loadConfigFromPath(path3) {
   if (!existsSync14(path3)) {
@@ -6169,8 +6305,9 @@ function isHookCommandDisabled(eventType, command, config) {
 }
 
 // src/hooks/claude-code-hooks/plugin-config.ts
+var isWindows = process.platform === "win32";
 var DEFAULT_CONFIG = {
-  forceZsh: true,
+  forceZsh: !isWindows,
   zshPath: "/bin/zsh"
 };
 
@@ -6282,13 +6419,13 @@ async function executePreToolUseHooks(ctx, config, extendedConfig) {
 }
 
 // src/hooks/claude-code-hooks/transcript.ts
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 import { mkdirSync as mkdirSync6, appendFileSync as appendFileSync5, existsSync as existsSync15, writeFileSync as writeFileSync5, unlinkSync as unlinkSync5 } from "fs";
-import { homedir as homedir5, tmpdir as tmpdir2 } from "os";
+import { homedir as homedir6, tmpdir as tmpdir5 } from "os";
 import { randomUUID } from "crypto";
-var TRANSCRIPT_DIR = join18(homedir5(), ".claude", "transcripts");
+var TRANSCRIPT_DIR = join19(homedir6(), ".claude", "transcripts");
 function getTranscriptPath(sessionId) {
-  return join18(TRANSCRIPT_DIR, `${sessionId}.jsonl`);
+  return join19(TRANSCRIPT_DIR, `${sessionId}.jsonl`);
 }
 function ensureTranscriptDir() {
   if (!existsSync15(TRANSCRIPT_DIR)) {
@@ -6378,7 +6515,7 @@ async function buildTranscriptFromSession(client, sessionId, directory, currentT
       }
     };
     entries.push(JSON.stringify(currentEntry));
-    const tempPath = join18(tmpdir2(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
+    const tempPath = join19(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
     writeFileSync5(tempPath, entries.join(`
 `) + `
 `);
@@ -6398,7 +6535,7 @@ async function buildTranscriptFromSession(client, sessionId, directory, currentT
           ]
         }
       };
-      const tempPath = join18(tmpdir2(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
+      const tempPath = join19(tmpdir5(), `opencode-transcript-${sessionId}-${randomUUID()}.jsonl`);
       writeFileSync5(tempPath, JSON.stringify(currentEntry) + `
 `);
       return tempPath;
@@ -6610,11 +6747,11 @@ ${USER_PROMPT_SUBMIT_TAG_CLOSE}`);
 }
 
 // src/hooks/claude-code-hooks/todo.ts
-import { join as join19 } from "path";
-import { homedir as homedir6 } from "os";
-var TODO_DIR = join19(homedir6(), ".claude", "todos");
+import { join as join20 } from "path";
+import { homedir as homedir7 } from "os";
+var TODO_DIR = join20(homedir7(), ".claude", "todos");
 function getTodoPath(sessionId) {
-  return join19(TODO_DIR, `${sessionId}-agent-${sessionId}.json`);
+  return join20(TODO_DIR, `${sessionId}-agent-${sessionId}.json`);
 }
 
 // src/hooks/claude-code-hooks/stop.ts
@@ -6946,7 +7083,7 @@ ${result.message}`;
 }
 // src/hooks/rules-injector/index.ts
 import { readFileSync as readFileSync9 } from "fs";
-import { homedir as homedir7 } from "os";
+import { homedir as homedir8 } from "os";
 import { relative as relative3, resolve as resolve4 } from "path";
 
 // src/hooks/rules-injector/finder.ts
@@ -6956,12 +7093,12 @@ import {
   realpathSync,
   statSync as statSync2
 } from "fs";
-import { dirname as dirname4, join as join21, relative } from "path";
+import { dirname as dirname4, join as join22, relative } from "path";
 
 // src/hooks/rules-injector/constants.ts
-import { join as join20 } from "path";
-var OPENCODE_STORAGE5 = join20(xdgData2 ?? "", "opencode", "storage");
-var RULES_INJECTOR_STORAGE = join20(OPENCODE_STORAGE5, "rules-injector");
+import { join as join21 } from "path";
+var OPENCODE_STORAGE5 = join21(xdgData2 ?? "", "opencode", "storage");
+var RULES_INJECTOR_STORAGE = join21(OPENCODE_STORAGE5, "rules-injector");
 var PROJECT_MARKERS = [
   ".git",
   "pyproject.toml",
@@ -6988,7 +7125,7 @@ function findProjectRoot(startPath) {
   }
   while (true) {
     for (const marker of PROJECT_MARKERS) {
-      const markerPath = join21(current, marker);
+      const markerPath = join22(current, marker);
       if (existsSync16(markerPath)) {
         return current;
       }
@@ -7006,7 +7143,7 @@ function findRuleFilesRecursive(dir, results) {
   try {
     const entries = readdirSync4(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join21(dir, entry.name);
+      const fullPath = join22(dir, entry.name);
       if (entry.isDirectory()) {
         findRuleFilesRecursive(fullPath, results);
       } else if (entry.isFile()) {
@@ -7032,7 +7169,7 @@ function findRuleFiles(projectRoot, homeDir, currentFile) {
   let distance = 0;
   while (true) {
     for (const [parent, subdir] of PROJECT_RULE_SUBDIRS) {
-      const ruleDir = join21(currentDir, parent, subdir);
+      const ruleDir = join22(currentDir, parent, subdir);
       const files = [];
       findRuleFilesRecursive(ruleDir, files);
       for (const filePath of files) {
@@ -7056,7 +7193,7 @@ function findRuleFiles(projectRoot, homeDir, currentFile) {
     currentDir = parentDir;
     distance++;
   }
-  const userRuleDir = join21(homeDir, USER_RULE_DIR);
+  const userRuleDir = join22(homeDir, USER_RULE_DIR);
   const userFiles = [];
   findRuleFilesRecursive(userRuleDir, userFiles);
   for (const filePath of userFiles) {
@@ -7251,9 +7388,9 @@ import {
   writeFileSync as writeFileSync6,
   unlinkSync as unlinkSync6
 } from "fs";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 function getStoragePath3(sessionID) {
-  return join22(RULES_INJECTOR_STORAGE, `${sessionID}.json`);
+  return join23(RULES_INJECTOR_STORAGE, `${sessionID}.json`);
 }
 function loadInjectedRules(sessionID) {
   const filePath = getStoragePath3(sessionID);
@@ -7314,7 +7451,7 @@ function createRulesInjectorHook(ctx) {
       return;
     const projectRoot = findProjectRoot(filePath);
     const cache2 = getSessionCache(input.sessionID);
-    const home = homedir7();
+    const home = homedir8();
     const ruleFileCandidates = findRuleFiles(projectRoot, home, filePath);
     const toInject = [];
     for (const candidate of ruleFileCandidates) {
@@ -7692,12 +7829,12 @@ import {
   writeFileSync as writeFileSync8,
   unlinkSync as unlinkSync7
 } from "fs";
-import { join as join27 } from "path";
+import { join as join28 } from "path";
 
 // src/hooks/agent-usage-reminder/constants.ts
-import { join as join26 } from "path";
-var OPENCODE_STORAGE6 = join26(xdgData2 ?? "", "opencode", "storage");
-var AGENT_USAGE_REMINDER_STORAGE = join26(OPENCODE_STORAGE6, "agent-usage-reminder");
+import { join as join27 } from "path";
+var OPENCODE_STORAGE6 = join27(xdgData2 ?? "", "opencode", "storage");
+var AGENT_USAGE_REMINDER_STORAGE = join27(OPENCODE_STORAGE6, "agent-usage-reminder");
 var TARGET_TOOLS = new Set([
   "grep",
   "safe_grep",
@@ -7742,7 +7879,7 @@ ALWAYS prefer: Multiple parallel background_task calls > Direct tool calls
 
 // src/hooks/agent-usage-reminder/storage.ts
 function getStoragePath4(sessionID) {
-  return join27(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
+  return join28(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
 }
 function loadAgentUsageState(sessionID) {
   const filePath = getStoragePath4(sessionID);
@@ -7991,12 +8128,12 @@ import {
   writeFileSync as writeFileSync9,
   unlinkSync as unlinkSync8
 } from "fs";
-import { join as join29 } from "path";
+import { join as join30 } from "path";
 
 // src/hooks/interactive-bash-session/constants.ts
-import { join as join28 } from "path";
-var OPENCODE_STORAGE7 = join28(xdgData2 ?? "", "opencode", "storage");
-var INTERACTIVE_BASH_SESSION_STORAGE = join28(OPENCODE_STORAGE7, "interactive-bash-session");
+import { join as join29 } from "path";
+var OPENCODE_STORAGE7 = join29(xdgData2 ?? "", "opencode", "storage");
+var INTERACTIVE_BASH_SESSION_STORAGE = join29(OPENCODE_STORAGE7, "interactive-bash-session");
 var OMO_SESSION_PREFIX = "omo-";
 function buildSessionReminderMessage(sessions) {
   if (sessions.length === 0)
@@ -8008,7 +8145,7 @@ function buildSessionReminderMessage(sessions) {
 
 // src/hooks/interactive-bash-session/storage.ts
 function getStoragePath5(sessionID) {
-  return join29(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
+  return join30(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
 }
 function loadInteractiveBashSessionState(sessionID) {
   const filePath = getStoragePath5(sessionID);
@@ -9782,8 +9919,8 @@ async function createGoogleAntigravityAuthPlugin({
 }
 // src/features/claude-code-command-loader/loader.ts
 import { existsSync as existsSync22, readdirSync as readdirSync5, readFileSync as readFileSync14 } from "fs";
-import { homedir as homedir9 } from "os";
-import { join as join30, basename } from "path";
+import { homedir as homedir10 } from "os";
+import { join as join31, basename } from "path";
 function loadCommandsFromDir(commandsDir, scope) {
   if (!existsSync22(commandsDir)) {
     return [];
@@ -9793,7 +9930,7 @@ function loadCommandsFromDir(commandsDir, scope) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join30(commandsDir, entry.name);
+    const commandPath = join31(commandsDir, entry.name);
     const commandName = basename(entry.name, ".md");
     try {
       const content = readFileSync14(commandPath, "utf-8");
@@ -9836,29 +9973,29 @@ function commandsToRecord(commands) {
   return result;
 }
 function loadUserCommands() {
-  const userCommandsDir = join30(homedir9(), ".claude", "commands");
+  const userCommandsDir = join31(homedir10(), ".claude", "commands");
   const commands = loadCommandsFromDir(userCommandsDir, "user");
   return commandsToRecord(commands);
 }
 function loadProjectCommands() {
-  const projectCommandsDir = join30(process.cwd(), ".claude", "commands");
+  const projectCommandsDir = join31(process.cwd(), ".claude", "commands");
   const commands = loadCommandsFromDir(projectCommandsDir, "project");
   return commandsToRecord(commands);
 }
 function loadOpencodeGlobalCommands() {
-  const opencodeCommandsDir = join30(homedir9(), ".config", "opencode", "command");
+  const opencodeCommandsDir = join31(homedir10(), ".config", "opencode", "command");
   const commands = loadCommandsFromDir(opencodeCommandsDir, "opencode");
   return commandsToRecord(commands);
 }
 function loadOpencodeProjectCommands() {
-  const opencodeProjectDir = join30(process.cwd(), ".opencode", "command");
+  const opencodeProjectDir = join31(process.cwd(), ".opencode", "command");
   const commands = loadCommandsFromDir(opencodeProjectDir, "opencode-project");
   return commandsToRecord(commands);
 }
 // src/features/claude-code-skill-loader/loader.ts
 import { existsSync as existsSync23, readdirSync as readdirSync6, readFileSync as readFileSync15 } from "fs";
-import { homedir as homedir10 } from "os";
-import { join as join31 } from "path";
+import { homedir as homedir11 } from "os";
+import { join as join32 } from "path";
 function loadSkillsFromDir(skillsDir, scope) {
   if (!existsSync23(skillsDir)) {
     return [];
@@ -9868,11 +10005,11 @@ function loadSkillsFromDir(skillsDir, scope) {
   for (const entry of entries) {
     if (entry.name.startsWith("."))
       continue;
-    const skillPath = join31(skillsDir, entry.name);
+    const skillPath = join32(skillsDir, entry.name);
     if (!entry.isDirectory() && !entry.isSymbolicLink())
       continue;
     const resolvedPath = resolveSymlink(skillPath);
-    const skillMdPath = join31(resolvedPath, "SKILL.md");
+    const skillMdPath = join32(resolvedPath, "SKILL.md");
     if (!existsSync23(skillMdPath))
       continue;
     try {
@@ -9907,7 +10044,7 @@ $ARGUMENTS
   return skills;
 }
 function loadUserSkillsAsCommands() {
-  const userSkillsDir = join31(homedir10(), ".claude", "skills");
+  const userSkillsDir = join32(homedir11(), ".claude", "skills");
   const skills = loadSkillsFromDir(userSkillsDir, "user");
   return skills.reduce((acc, skill) => {
     acc[skill.name] = skill.definition;
@@ -9915,7 +10052,7 @@ function loadUserSkillsAsCommands() {
   }, {});
 }
 function loadProjectSkillsAsCommands() {
-  const projectSkillsDir = join31(process.cwd(), ".claude", "skills");
+  const projectSkillsDir = join32(process.cwd(), ".claude", "skills");
   const skills = loadSkillsFromDir(projectSkillsDir, "project");
   return skills.reduce((acc, skill) => {
     acc[skill.name] = skill.definition;
@@ -9924,8 +10061,8 @@ function loadProjectSkillsAsCommands() {
 }
 // src/features/claude-code-agent-loader/loader.ts
 import { existsSync as existsSync24, readdirSync as readdirSync7, readFileSync as readFileSync16 } from "fs";
-import { homedir as homedir11 } from "os";
-import { join as join32, basename as basename2 } from "path";
+import { homedir as homedir12 } from "os";
+import { join as join33, basename as basename2 } from "path";
 function parseToolsConfig(toolsStr) {
   if (!toolsStr)
     return;
@@ -9947,7 +10084,7 @@ function loadAgentsFromDir(agentsDir, scope) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const agentPath = join32(agentsDir, entry.name);
+    const agentPath = join33(agentsDir, entry.name);
     const agentName = basename2(entry.name, ".md");
     try {
       const content = readFileSync16(agentPath, "utf-8");
@@ -9977,7 +10114,7 @@ function loadAgentsFromDir(agentsDir, scope) {
   return agents;
 }
 function loadUserAgents() {
-  const userAgentsDir = join32(homedir11(), ".claude", "agents");
+  const userAgentsDir = join33(homedir12(), ".claude", "agents");
   const agents = loadAgentsFromDir(userAgentsDir, "user");
   const result = {};
   for (const agent of agents) {
@@ -9986,7 +10123,7 @@ function loadUserAgents() {
   return result;
 }
 function loadProjectAgents() {
-  const projectAgentsDir = join32(process.cwd(), ".claude", "agents");
+  const projectAgentsDir = join33(process.cwd(), ".claude", "agents");
   const agents = loadAgentsFromDir(projectAgentsDir, "project");
   const result = {};
   for (const agent of agents) {
@@ -9996,8 +10133,8 @@ function loadProjectAgents() {
 }
 // src/features/claude-code-mcp-loader/loader.ts
 import { existsSync as existsSync25 } from "fs";
-import { homedir as homedir12 } from "os";
-import { join as join33 } from "path";
+import { homedir as homedir13 } from "os";
+import { join as join34 } from "path";
 
 // src/features/claude-code-mcp-loader/env-expander.ts
 function expandEnvVars(value) {
@@ -10063,12 +10200,12 @@ function transformMcpServer(name, server) {
 
 // src/features/claude-code-mcp-loader/loader.ts
 function getMcpConfigPaths() {
-  const home = homedir12();
+  const home = homedir13();
   const cwd = process.cwd();
   return [
-    { path: join33(home, ".claude", ".mcp.json"), scope: "user" },
-    { path: join33(cwd, ".mcp.json"), scope: "project" },
-    { path: join33(cwd, ".claude", ".mcp.json"), scope: "local" }
+    { path: join34(home, ".claude", ".mcp.json"), scope: "user" },
+    { path: join34(cwd, ".mcp.json"), scope: "project" },
+    { path: join34(cwd, ".claude", ".mcp.json"), scope: "local" }
   ];
 }
 async function loadMcpConfigFile(filePath) {
@@ -10359,8 +10496,8 @@ var EXT_TO_LANG = {
 };
 // src/tools/lsp/config.ts
 import { existsSync as existsSync26, readFileSync as readFileSync17 } from "fs";
-import { join as join34 } from "path";
-import { homedir as homedir13 } from "os";
+import { join as join35 } from "path";
+import { homedir as homedir14 } from "os";
 function loadJsonFile(path6) {
   if (!existsSync26(path6))
     return null;
@@ -10373,9 +10510,9 @@ function loadJsonFile(path6) {
 function getConfigPaths2() {
   const cwd = process.cwd();
   return {
-    project: join34(cwd, ".opencode", "oh-my-opencode.json"),
-    user: join34(homedir13(), ".config", "opencode", "oh-my-opencode.json"),
-    opencode: join34(homedir13(), ".config", "opencode", "opencode.json")
+    project: join35(cwd, ".opencode", "oh-my-opencode.json"),
+    user: join35(homedir14(), ".config", "opencode", "oh-my-opencode.json"),
+    opencode: join35(homedir14(), ".config", "opencode", "opencode.json")
   };
 }
 function loadAllConfigs() {
@@ -10468,7 +10605,7 @@ function isServerInstalled(command) {
   const pathEnv = process.env.PATH || "";
   const paths = pathEnv.split(":");
   for (const p of paths) {
-    if (existsSync26(join34(p, cmd))) {
+    if (existsSync26(join35(p, cmd))) {
       return true;
     }
   }
@@ -23967,14 +24104,14 @@ var lsp_code_action_resolve = tool({
 });
 // src/tools/ast-grep/constants.ts
 import { createRequire as createRequire4 } from "module";
-import { dirname as dirname6, join as join36 } from "path";
+import { dirname as dirname6, join as join37 } from "path";
 import { existsSync as existsSync29, statSync as statSync4 } from "fs";
 
 // src/tools/ast-grep/downloader.ts
 var {spawn: spawn5 } = globalThis.Bun;
 import { existsSync as existsSync28, mkdirSync as mkdirSync10, chmodSync as chmodSync2, unlinkSync as unlinkSync9 } from "fs";
-import { join as join35 } from "path";
-import { homedir as homedir14 } from "os";
+import { join as join36 } from "path";
+import { homedir as homedir15 } from "os";
 import { createRequire as createRequire3 } from "module";
 var REPO2 = "ast-grep/ast-grep";
 var DEFAULT_VERSION = "0.40.0";
@@ -23999,18 +24136,18 @@ var PLATFORM_MAP2 = {
 function getCacheDir3() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join35(homedir14(), "AppData", "Local");
-    return join35(base2, "oh-my-opencode", "bin");
+    const base2 = localAppData || join36(homedir15(), "AppData", "Local");
+    return join36(base2, "oh-my-opencode", "bin");
   }
   const xdgCache2 = process.env.XDG_CACHE_HOME;
-  const base = xdgCache2 || join35(homedir14(), ".cache");
-  return join35(base, "oh-my-opencode", "bin");
+  const base = xdgCache2 || join36(homedir15(), ".cache");
+  return join36(base, "oh-my-opencode", "bin");
 }
 function getBinaryName3() {
   return process.platform === "win32" ? "sg.exe" : "sg";
 }
 function getCachedBinaryPath2() {
-  const binaryPath = join35(getCacheDir3(), getBinaryName3());
+  const binaryPath = join36(getCacheDir3(), getBinaryName3());
   return existsSync28(binaryPath) ? binaryPath : null;
 }
 async function extractZip2(archivePath, destDir) {
@@ -24037,7 +24174,7 @@ async function downloadAstGrep(version2 = DEFAULT_VERSION) {
   }
   const cacheDir = getCacheDir3();
   const binaryName = getBinaryName3();
-  const binaryPath = join35(cacheDir, binaryName);
+  const binaryPath = join36(cacheDir, binaryName);
   if (existsSync28(binaryPath)) {
     return binaryPath;
   }
@@ -24053,7 +24190,7 @@ async function downloadAstGrep(version2 = DEFAULT_VERSION) {
     if (!response2.ok) {
       throw new Error(`HTTP ${response2.status}: ${response2.statusText}`);
     }
-    const archivePath = join35(cacheDir, assetName);
+    const archivePath = join36(cacheDir, assetName);
     const arrayBuffer = await response2.arrayBuffer();
     await Bun.write(archivePath, arrayBuffer);
     await extractZip2(archivePath, cacheDir);
@@ -24111,7 +24248,7 @@ function findSgCliPathSync() {
     const require2 = createRequire4(import.meta.url);
     const cliPkgPath = require2.resolve("@ast-grep/cli/package.json");
     const cliDir = dirname6(cliPkgPath);
-    const sgPath = join36(cliDir, binaryName);
+    const sgPath = join37(cliDir, binaryName);
     if (existsSync29(sgPath) && isValidBinary(sgPath)) {
       return sgPath;
     }
@@ -24123,7 +24260,7 @@ function findSgCliPathSync() {
       const pkgPath = require2.resolve(`${platformPkg}/package.json`);
       const pkgDir = dirname6(pkgPath);
       const astGrepName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
-      const binaryPath = join36(pkgDir, astGrepName);
+      const binaryPath = join37(pkgDir, astGrepName);
       if (existsSync29(binaryPath) && isValidBinary(binaryPath)) {
         return binaryPath;
       }
@@ -24499,19 +24636,19 @@ var {spawn: spawn7 } = globalThis.Bun;
 
 // src/tools/grep/constants.ts
 import { existsSync as existsSync32 } from "fs";
-import { join as join38, dirname as dirname7 } from "path";
+import { join as join39, dirname as dirname7 } from "path";
 import { spawnSync } from "child_process";
 
 // src/tools/grep/downloader.ts
 import { existsSync as existsSync31, mkdirSync as mkdirSync11, chmodSync as chmodSync3, unlinkSync as unlinkSync10, readdirSync as readdirSync8 } from "fs";
-import { join as join37 } from "path";
+import { join as join38 } from "path";
 function getInstallDir() {
   const homeDir = process.env.HOME || process.env.USERPROFILE || ".";
-  return join37(homeDir, ".cache", "oh-my-opencode", "bin");
+  return join38(homeDir, ".cache", "oh-my-opencode", "bin");
 }
 function getRgPath() {
-  const isWindows = process.platform === "win32";
-  return join37(getInstallDir(), isWindows ? "rg.exe" : "rg");
+  const isWindows2 = process.platform === "win32";
+  return join38(getInstallDir(), isWindows2 ? "rg.exe" : "rg");
 }
 function getInstalledRipgrepPath() {
   const rgPath = getRgPath();
@@ -24521,8 +24658,8 @@ function getInstalledRipgrepPath() {
 // src/tools/grep/constants.ts
 var cachedCli = null;
 function findExecutable(name) {
-  const isWindows = process.platform === "win32";
-  const cmd = isWindows ? "where" : "which";
+  const isWindows2 = process.platform === "win32";
+  const cmd = isWindows2 ? "where" : "which";
   try {
     const result = spawnSync(cmd, [name], { encoding: "utf-8", timeout: 5000 });
     if (result.status === 0 && result.stdout.trim()) {
@@ -24535,13 +24672,13 @@ function findExecutable(name) {
 function getOpenCodeBundledRg() {
   const execPath = process.execPath;
   const execDir = dirname7(execPath);
-  const isWindows = process.platform === "win32";
-  const rgName = isWindows ? "rg.exe" : "rg";
+  const isWindows2 = process.platform === "win32";
+  const rgName = isWindows2 ? "rg.exe" : "rg";
   const candidates = [
-    join38(execDir, rgName),
-    join38(execDir, "bin", rgName),
-    join38(execDir, "..", "bin", rgName),
-    join38(execDir, "..", "libexec", rgName)
+    join39(execDir, rgName),
+    join39(execDir, "bin", rgName),
+    join39(execDir, "..", "bin", rgName),
+    join39(execDir, "..", "libexec", rgName)
   ];
   for (const candidate of candidates) {
     if (existsSync32(candidate)) {
@@ -24948,8 +25085,8 @@ var glob = tool({
 });
 // src/tools/slashcommand/tools.ts
 import { existsSync as existsSync33, readdirSync as readdirSync9, readFileSync as readFileSync20 } from "fs";
-import { homedir as homedir15 } from "os";
-import { join as join39, basename as basename3, dirname as dirname8 } from "path";
+import { homedir as homedir16 } from "os";
+import { join as join40, basename as basename3, dirname as dirname8 } from "path";
 function discoverCommandsFromDir(commandsDir, scope) {
   if (!existsSync33(commandsDir)) {
     return [];
@@ -24959,7 +25096,7 @@ function discoverCommandsFromDir(commandsDir, scope) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join39(commandsDir, entry.name);
+    const commandPath = join40(commandsDir, entry.name);
     const commandName = basename3(entry.name, ".md");
     try {
       const content = readFileSync20(commandPath, "utf-8");
@@ -24987,10 +25124,10 @@ function discoverCommandsFromDir(commandsDir, scope) {
   return commands;
 }
 function discoverCommandsSync() {
-  const userCommandsDir = join39(homedir15(), ".claude", "commands");
-  const projectCommandsDir = join39(process.cwd(), ".claude", "commands");
-  const opencodeGlobalDir = join39(homedir15(), ".config", "opencode", "command");
-  const opencodeProjectDir = join39(process.cwd(), ".opencode", "command");
+  const userCommandsDir = join40(homedir16(), ".claude", "commands");
+  const projectCommandsDir = join40(process.cwd(), ".claude", "commands");
+  const opencodeGlobalDir = join40(homedir16(), ".config", "opencode", "command");
+  const opencodeProjectDir = join40(process.cwd(), ".opencode", "command");
   const userCommands = discoverCommandsFromDir(userCommandsDir, "user");
   const opencodeGlobalCommands = discoverCommandsFromDir(opencodeGlobalDir, "opencode");
   const projectCommands = discoverCommandsFromDir(projectCommandsDir, "project");
@@ -25123,8 +25260,8 @@ var SkillFrontmatterSchema = exports_external.object({
 });
 // src/tools/skill/tools.ts
 import { existsSync as existsSync34, readdirSync as readdirSync10, readFileSync as readFileSync21 } from "fs";
-import { homedir as homedir16 } from "os";
-import { join as join40, basename as basename4 } from "path";
+import { homedir as homedir17 } from "os";
+import { join as join41, basename as basename4 } from "path";
 function parseSkillFrontmatter(data) {
   return {
     name: typeof data.name === "string" ? data.name : "",
@@ -25143,10 +25280,10 @@ function discoverSkillsFromDir(skillsDir, scope) {
   for (const entry of entries) {
     if (entry.name.startsWith("."))
       continue;
-    const skillPath = join40(skillsDir, entry.name);
+    const skillPath = join41(skillsDir, entry.name);
     if (entry.isDirectory() || entry.isSymbolicLink()) {
       const resolvedPath = resolveSymlink(skillPath);
-      const skillMdPath = join40(resolvedPath, "SKILL.md");
+      const skillMdPath = join41(resolvedPath, "SKILL.md");
       if (!existsSync34(skillMdPath))
         continue;
       try {
@@ -25165,8 +25302,8 @@ function discoverSkillsFromDir(skillsDir, scope) {
   return skills;
 }
 function discoverSkillsSync() {
-  const userSkillsDir = join40(homedir16(), ".claude", "skills");
-  const projectSkillsDir = join40(process.cwd(), ".claude", "skills");
+  const userSkillsDir = join41(homedir17(), ".claude", "skills");
+  const projectSkillsDir = join41(process.cwd(), ".claude", "skills");
   const userSkills = discoverSkillsFromDir(userSkillsDir, "user");
   const projectSkills = discoverSkillsFromDir(projectSkillsDir, "project");
   return [...projectSkills, ...userSkills];
@@ -25176,7 +25313,7 @@ var skillListForDescription = availableSkills.map((s) => `- ${s.name}: ${s.descr
 `);
 async function parseSkillMd(skillPath) {
   const resolvedPath = resolveSymlink(skillPath);
-  const skillMdPath = join40(resolvedPath, "SKILL.md");
+  const skillMdPath = join41(resolvedPath, "SKILL.md");
   if (!existsSync34(skillMdPath)) {
     return null;
   }
@@ -25192,9 +25329,9 @@ async function parseSkillMd(skillPath) {
       allowedTools: frontmatter2["allowed-tools"],
       metadata: frontmatter2.metadata
     };
-    const referencesDir = join40(resolvedPath, "references");
-    const scriptsDir = join40(resolvedPath, "scripts");
-    const assetsDir = join40(resolvedPath, "assets");
+    const referencesDir = join41(resolvedPath, "references");
+    const scriptsDir = join41(resolvedPath, "scripts");
+    const assetsDir = join41(resolvedPath, "assets");
     const references = existsSync34(referencesDir) ? readdirSync10(referencesDir).filter((f) => !f.startsWith(".")) : [];
     const scripts = existsSync34(scriptsDir) ? readdirSync10(scriptsDir).filter((f) => !f.startsWith(".") && !f.startsWith("__")) : [];
     const assets = existsSync34(assetsDir) ? readdirSync10(assetsDir).filter((f) => !f.startsWith(".")) : [];
@@ -25221,7 +25358,7 @@ async function discoverSkillsFromDirAsync(skillsDir) {
   for (const entry of entries) {
     if (entry.name.startsWith("."))
       continue;
-    const skillPath = join40(skillsDir, entry.name);
+    const skillPath = join41(skillsDir, entry.name);
     if (entry.isDirectory() || entry.isSymbolicLink()) {
       const skillInfo = await parseSkillMd(skillPath);
       if (skillInfo) {
@@ -25232,8 +25369,8 @@ async function discoverSkillsFromDirAsync(skillsDir) {
   return skills;
 }
 async function discoverSkills() {
-  const userSkillsDir = join40(homedir16(), ".claude", "skills");
-  const projectSkillsDir = join40(process.cwd(), ".claude", "skills");
+  const userSkillsDir = join41(homedir17(), ".claude", "skills");
+  const projectSkillsDir = join41(process.cwd(), ".claude", "skills");
   const userSkills = await discoverSkillsFromDirAsync(userSkillsDir);
   const projectSkills = await discoverSkillsFromDirAsync(projectSkillsDir);
   return [...projectSkills, ...userSkills];
@@ -25262,7 +25399,7 @@ async function loadSkillWithReferences(skill, includeRefs) {
   const referencesLoaded = [];
   if (includeRefs && skill.references.length > 0) {
     for (const ref of skill.references) {
-      const refPath = join40(skill.path, "references", ref);
+      const refPath = join41(skill.path, "references", ref);
       try {
         let content = readFileSync21(refPath, "utf-8");
         content = await resolveCommandsInText(content);
@@ -25355,17 +25492,33 @@ Try a different skill name.`;
 });
 // src/tools/interactive-bash/constants.ts
 var DEFAULT_TIMEOUT_MS4 = 60000;
+var BLOCKED_TMUX_SUBCOMMANDS = [
+  "capture-pane",
+  "capturep",
+  "save-buffer",
+  "saveb",
+  "show-buffer",
+  "showb",
+  "pipe-pane",
+  "pipep"
+];
 var INTERACTIVE_BASH_DESCRIPTION = `Execute tmux commands for interactive terminal session management.
 
-Use session names following the pattern "omo-{name}" for automatic tracking.`;
+Use session names following the pattern "omo-{name}" for automatic tracking.
+
+BLOCKED COMMANDS (use bash tool instead):
+- capture-pane / capturep: Use bash to read output files or pipe output
+- save-buffer / saveb: Use bash to save content to files
+- show-buffer / showb: Use bash to read buffer content
+- pipe-pane / pipep: Use bash for piping output`;
 
 // src/tools/interactive-bash/utils.ts
 var {spawn: spawn9 } = globalThis.Bun;
 var tmuxPath = null;
 var initPromise3 = null;
 async function findTmuxPath() {
-  const isWindows = process.platform === "win32";
-  const cmd = isWindows ? "where" : "which";
+  const isWindows2 = process.platform === "win32";
+  const cmd = isWindows2 ? "where" : "which";
   try {
     const proc = spawn9([cmd, "tmux"], {
       stdout: "pipe",
@@ -25461,6 +25614,10 @@ var interactive_bash = tool({
       if (parts.length === 0) {
         return "Error: Empty tmux command";
       }
+      const subcommand = parts[0].toLowerCase();
+      if (BLOCKED_TMUX_SUBCOMMANDS.includes(subcommand)) {
+        return `Error: '${parts[0]}' is blocked. Use bash tool instead for capturing/printing terminal output.`;
+      }
       const proc = Bun.spawn([tmuxPath2, ...parts], {
         stdout: "pipe",
         stderr: "pipe"
@@ -26041,15 +26198,15 @@ var builtinTools = {
 };
 // src/features/background-agent/manager.ts
 import { existsSync as existsSync35, readdirSync as readdirSync11 } from "fs";
-import { join as join41 } from "path";
+import { join as join42 } from "path";
 function getMessageDir3(sessionID) {
   if (!existsSync35(MESSAGE_STORAGE))
     return null;
-  const directPath = join41(MESSAGE_STORAGE, sessionID);
+  const directPath = join42(MESSAGE_STORAGE, sessionID);
   if (existsSync35(directPath))
     return directPath;
   for (const dir of readdirSync11(MESSAGE_STORAGE)) {
-    const sessionPath = join41(MESSAGE_STORAGE, dir, sessionID);
+    const sessionPath = join42(MESSAGE_STORAGE, dir, sessionID);
     if (existsSync35(sessionPath))
       return sessionPath;
   }
@@ -26106,7 +26263,6 @@ class BackgroundManager {
         agent: input.agent,
         tools: {
           task: false,
-          call_omo_agent: false,
           background_task: false
         },
         parts: [{ type: "text", text: input.prompt }]
@@ -26149,6 +26305,20 @@ class BackgroundManager {
     }
     return;
   }
+  async checkSessionTodos(sessionID) {
+    try {
+      const response2 = await this.client.session.todo({
+        path: { id: sessionID }
+      });
+      const todos = response2.data ?? response2;
+      if (!todos || todos.length === 0)
+        return false;
+      const incomplete = todos.filter((t) => t.status !== "completed" && t.status !== "cancelled");
+      return incomplete.length > 0;
+    } catch {
+      return false;
+    }
+  }
   handleEvent(event) {
     const props = event.properties;
     if (event.type === "message.part.updated") {
@@ -26180,11 +26350,17 @@ class BackgroundManager {
       const task = this.findBySession(sessionID);
       if (!task || task.status !== "running")
         return;
-      task.status = "completed";
-      task.completedAt = new Date;
-      this.markForNotification(task);
-      this.notifyParentSession(task);
-      log("[background-agent] Task completed via session.idle event:", task.id);
+      this.checkSessionTodos(sessionID).then((hasIncompleteTodos2) => {
+        if (hasIncompleteTodos2) {
+          log("[background-agent] Task has incomplete todos, waiting for todo-continuation:", task.id);
+          return;
+        }
+        task.status = "completed";
+        task.completedAt = new Date;
+        this.markForNotification(task);
+        this.notifyParentSession(task);
+        log("[background-agent] Task completed via session.idle event:", task.id);
+      });
     }
     if (event.type === "session.deleted") {
       const info = props?.info;
@@ -26304,6 +26480,11 @@ class BackgroundManager {
           continue;
         }
         if (sessionStatus.type === "idle") {
+          const hasIncompleteTodos2 = await this.checkSessionTodos(task.sessionID);
+          if (hasIncompleteTodos2) {
+            log("[background-agent] Task has incomplete todos via polling, waiting:", task.id);
+            continue;
+          }
           task.status = "completed";
           task.completedAt = new Date;
           this.markForNotification(task);