oh-my-opencode 3.15.0 → 3.15.1

package/dist/index.js

@@ -60911,8 +60911,6 @@ function getMessageDir(sessionID) {
     return null;
   if (/[/\\]|\.\./.test(sessionID))
     return null;
-  if (isSqliteBackend())
-    return null;
   if (!existsSync12(MESSAGE_STORAGE))
     return null;
   const directPath = join14(MESSAGE_STORAGE, sessionID);
@@ -63600,6 +63598,12 @@ function startCountdown(args) {
 }
 
 // src/hooks/todo-continuation-enforcer/idle-event.ts
+function shouldAllowActivityProgress(modelID) {
+  if (!modelID) {
+    return false;
+  }
+  return !modelID.toLowerCase().includes("codex");
+}
 async function handleSessionIdle(args) {
   const {
     ctx,
@@ -63731,7 +63735,7 @@ async function handleSessionIdle(args) {
     log(`[${HOOK_NAME}] Skipped: continuation stopped for session`, { sessionID });
     return;
   }
-  const progressUpdate = sessionStateStore.trackContinuationProgress(sessionID, incompleteCount, todos);
+  const progressUpdate = sessionStateStore.trackContinuationProgress(sessionID, incompleteCount, todos, { allowActivityProgress: shouldAllowActivityProgress(resolvedInfo?.model?.modelID) });
   if (shouldStopForStagnation({ sessionID, incompleteCount, progressUpdate })) {
     return;
   }
@@ -63770,6 +63774,7 @@ function handleNonIdleEvent(args) {
       if (state2) {
         state2.abortDetectedAt = undefined;
         state2.wasCancelled = false;
+        sessionStateStore.recordActivity(sessionID);
       }
       sessionStateStore.cancelCountdown(sessionID);
       return;
@@ -63779,6 +63784,7 @@ function handleNonIdleEvent(args) {
       if (state2) {
         state2.abortDetectedAt = undefined;
         state2.wasCancelled = false;
+        sessionStateStore.recordActivity(sessionID);
       }
       sessionStateStore.cancelCountdown(sessionID);
       return;
@@ -63792,8 +63798,10 @@ function handleNonIdleEvent(args) {
     const targetSessionID = sessionID ?? legacySessionID;
     if (targetSessionID) {
       const state2 = sessionStateStore.getExistingState(targetSessionID);
-      if (state2)
+      if (state2) {
         state2.abortDetectedAt = undefined;
+        sessionStateStore.recordActivity(targetSessionID);
+      }
       sessionStateStore.cancelCountdown(targetSessionID);
     }
     return;
@@ -63805,6 +63813,7 @@ function handleNonIdleEvent(args) {
       if (state2) {
         state2.abortDetectedAt = undefined;
         state2.wasCancelled = false;
+        sessionStateStore.recordActivity(sessionID);
       }
       sessionStateStore.cancelCountdown(sessionID);
     }
@@ -63817,6 +63826,7 @@ function handleNonIdleEvent(args) {
       if (state2) {
         state2.abortDetectedAt = undefined;
         state2.wasCancelled = false;
+        sessionStateStore.recordActivity(sessionID);
       }
       sessionStateStore.cancelCountdown(sessionID);
     }
@@ -63953,7 +63963,8 @@ function createSessionStateStore() {
     };
     const trackedSession = {
       state: rawState,
-      lastAccessedAt: Date.now()
+      lastAccessedAt: Date.now(),
+      activitySignalCount: 0
     };
     sessions.set(sessionID, trackedSession);
     return trackedSession;
@@ -63969,15 +63980,21 @@ function createSessionStateStore() {
     }
     return;
   }
-  function trackContinuationProgress(sessionID, incompleteCount, todos) {
+  function recordActivity(sessionID) {
+    const trackedSession = getTrackedSession(sessionID);
+    trackedSession.activitySignalCount += 1;
+  }
+  function trackContinuationProgress(sessionID, incompleteCount, todos, options = {}) {
     const trackedSession = getTrackedSession(sessionID);
     const state2 = trackedSession.state;
     const previousIncompleteCount = state2.lastIncompleteCount;
     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 = options.allowActivityProgress === true && trackedSession.lastObservedActivitySignalCount !== undefined && currentActivitySignalCount > trackedSession.lastObservedActivitySignalCount;
     const hadSuccessfulInjectionAwaitingProgressCheck = state2.awaitingPostInjectionProgressCheck === true;
     state2.lastIncompleteCount = incompleteCount;
     if (currentCompletedCount !== undefined) {
@@ -63986,6 +64003,7 @@ function createSessionStateStore() {
     if (currentTodoSnapshot !== undefined) {
       trackedSession.lastTodoSnapshot = currentTodoSnapshot;
     }
+    trackedSession.lastObservedActivitySignalCount = currentActivitySignalCount;
     if (previousIncompleteCount === undefined) {
       state2.stagnationCount = 0;
       return {
@@ -63996,7 +64014,7 @@ function createSessionStateStore() {
         progressSource: "none"
       };
     }
-    const progressSource = incompleteCount < previousIncompleteCount || hasCompletedMoreTodos || hasTodoSnapshotChanged ? "todo" : "none";
+    const progressSource = incompleteCount < previousIncompleteCount || hasCompletedMoreTodos || hasTodoSnapshotChanged ? "todo" : hasObservedExternalActivity ? "activity" : "none";
     if (progressSource !== "none") {
       state2.stagnationCount = 0;
       state2.awaitingPostInjectionProgressCheck = false;
@@ -64038,6 +64056,8 @@ 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);
@@ -64074,6 +64094,7 @@ function createSessionStateStore() {
   return {
     getState,
     getExistingState,
+    recordActivity,
     trackContinuationProgress,
     resetContinuationProgress,
     cancelCountdown,
@@ -82148,11 +82169,13 @@ async function applyFallbackToChatMessage(params) {
 var RETRYABLE_ERROR_NAMES = new Set([
   "providermodelnotfounderror",
   "ratelimiterror",
-  "quotaexceedederror",
-  "insufficientcreditserror",
   "modelunavailableerror",
   "providerconnectionerror",
-  "authenticationerror",
+  "authenticationerror"
+]);
+var STOP_ERROR_NAMES = new Set([
+  "quotaexceedederror",
+  "insufficientcreditserror",
   "freeusagelimiterror"
 ]);
 var NON_RETRYABLE_ERROR_NAMES = new Set([
@@ -82223,6 +82246,9 @@ function isRetryableModelError(error48) {
     if (NON_RETRYABLE_ERROR_NAMES.has(errorNameLower)) {
       return false;
     }
+    if (STOP_ERROR_NAMES.has(errorNameLower)) {
+      return false;
+    }
     if (RETRYABLE_ERROR_NAMES.has(errorNameLower)) {
       return true;
     }
@@ -84390,11 +84416,12 @@ import { fileURLToPath as fileURLToPath2 } from "url";
 // src/hooks/auto-update-checker/constants.ts
 import * as path5 from "path";
 import * as os4 from "os";
-var PACKAGE_NAME = "oh-my-opencode";
+var PACKAGE_NAME = "oh-my-openagent";
 var NPM_REGISTRY_URL = `https://registry.npmjs.org/-/package/${PACKAGE_NAME}/dist-tags`;
 var NPM_FETCH_TIMEOUT = 5000;
-var CACHE_DIR = getOpenCodeCacheDir();
-var VERSION_FILE = path5.join(CACHE_DIR, "version");
+var CACHE_ROOT_DIR = getOpenCodeCacheDir();
+var CACHE_DIR = path5.join(CACHE_ROOT_DIR, "packages");
+var VERSION_FILE = path5.join(CACHE_ROOT_DIR, "version");
 function getWindowsAppdataDir2() {
   if (process.platform !== "win32")
     return null;
@@ -84642,11 +84669,28 @@ function getIntentVersion(pluginInfo) {
   }
   return pluginInfo.pinnedVersion;
 }
+function writeCachePackageJson(cachePackageJsonPath, pkgJson) {
+  const tmpPath = `${cachePackageJsonPath}.${crypto2.randomUUID()}`;
+  try {
+    fs12.mkdirSync(path9.dirname(cachePackageJsonPath), { recursive: true });
+    fs12.writeFileSync(tmpPath, JSON.stringify(pkgJson, null, 2));
+    fs12.renameSync(tmpPath, cachePackageJsonPath);
+    return { synced: true, error: null };
+  } catch (err) {
+    log("[auto-update-checker] Failed to write cache package.json:", err);
+    safeUnlink(tmpPath);
+    return { synced: false, error: "write_error", message: "Failed to write cache package.json" };
+  }
+}
 function syncCachePackageJsonToIntent(pluginInfo) {
   const cachePackageJsonPath = path9.join(CACHE_DIR, "package.json");
+  const intentVersion = getIntentVersion(pluginInfo);
   if (!fs12.existsSync(cachePackageJsonPath)) {
-    log("[auto-update-checker] Cache package.json not found, nothing to sync");
-    return { synced: false, error: "file_not_found", message: "Cache package.json not found" };
+    log("[auto-update-checker] Cache package.json missing, creating workspace package.json", { intentVersion });
+    return {
+      ...writeCachePackageJson(cachePackageJsonPath, { dependencies: { [PACKAGE_NAME]: intentVersion } }),
+      message: `Created cache package.json with: ${intentVersion}`
+    };
   }
   let content;
   let pkgJson;
@@ -84663,11 +84707,20 @@ function syncCachePackageJsonToIntent(pluginInfo) {
     return { synced: false, error: "parse_error", message: "Failed to parse cache package.json (malformed JSON)" };
   }
   if (!pkgJson || !pkgJson.dependencies?.[PACKAGE_NAME]) {
-    log("[auto-update-checker] Plugin not in cache package.json dependencies, nothing to sync");
-    return { synced: false, error: "plugin_not_in_deps", message: "Plugin not in cache package.json dependencies" };
+    log("[auto-update-checker] Plugin missing from cache package.json dependencies, adding dependency", { intentVersion });
+    const nextPkgJson = {
+      ...pkgJson ?? {},
+      dependencies: {
+        ...pkgJson?.dependencies ?? {},
+        [PACKAGE_NAME]: intentVersion
+      }
+    };
+    return {
+      ...writeCachePackageJson(cachePackageJsonPath, nextPkgJson),
+      message: `Added ${PACKAGE_NAME}: ${intentVersion}`
+    };
   }
   const currentVersion = pkgJson.dependencies[PACKAGE_NAME];
-  const intentVersion = getIntentVersion(pluginInfo);
   if (currentVersion === intentVersion) {
     log("[auto-update-checker] Cache package.json already matches intent:", intentVersion);
     return { synced: false, error: null, message: `Already matches intent: ${intentVersion}` };
@@ -84680,20 +84733,14 @@ function syncCachePackageJsonToIntent(pluginInfo) {
     log(`[auto-update-checker] Updating cache package.json: "${currentVersion}" \u2192 "${intentVersion}"`);
   }
   pkgJson.dependencies[PACKAGE_NAME] = intentVersion;
-  const tmpPath = `${cachePackageJsonPath}.${crypto2.randomUUID()}`;
-  try {
-    fs12.writeFileSync(tmpPath, JSON.stringify(pkgJson, null, 2));
-    fs12.renameSync(tmpPath, cachePackageJsonPath);
-    return { synced: true, error: null, message: `Updated: "${currentVersion}" \u2192 "${intentVersion}"` };
-  } catch (err) {
-    log("[auto-update-checker] Failed to write cache package.json:", err);
-    safeUnlink(tmpPath);
-    return { synced: false, error: "write_error", message: "Failed to write cache package.json" };
-  }
+  return {
+    ...writeCachePackageJson(cachePackageJsonPath, pkgJson),
+    message: `Updated: "${currentVersion}" \u2192 "${intentVersion}"`
+  };
 }
 // src/hooks/auto-update-checker/hook/background-update-check.ts
 import { existsSync as existsSync52 } from "fs";
-import { join as join55 } from "path";
+import { join as join56 } from "path";
 // src/shared/spawn-with-windows-hide.ts
 var {spawn: bunSpawn } = globalThis.Bun;
 import { spawn as nodeSpawn } from "child_process";
@@ -84754,9 +84801,13 @@ function spawnWithWindowsHide(command, options) {
 }
 // src/cli/config-manager/bun-install.ts
 import { existsSync as existsSync50 } from "fs";
+import { join as join54 } from "path";
 init_logger();
 var BUN_INSTALL_TIMEOUT_SECONDS = 60;
 var BUN_INSTALL_TIMEOUT_MS = BUN_INSTALL_TIMEOUT_SECONDS * 1000;
+function getDefaultWorkspaceDir() {
+  return join54(getOpenCodeCacheDir(), "packages");
+}
 function readProcessOutput(stream) {
   if (!stream) {
     return Promise.resolve("");
@@ -84779,7 +84830,7 @@ function logCapturedOutputOnFailure(outputMode, output) {
 }
 async function runBunInstallWithDetails(options) {
   const outputMode = options?.outputMode ?? "pipe";
-  const cacheDir = options?.workspaceDir ?? getOpenCodeCacheDir();
+  const cacheDir = options?.workspaceDir ?? getDefaultWorkspaceDir();
   const packageJsonPath = `${cacheDir}/package.json`;
   if (!existsSync50(packageJsonPath)) {
     return {
@@ -84938,9 +84989,12 @@ Restart OpenCode to apply.`,
 }
 
 // src/hooks/auto-update-checker/hook/background-update-check.ts
+function getCacheWorkspaceDir(deps) {
+  return deps.join(deps.getOpenCodeCacheDir(), "packages");
+}
 var defaultDeps = {
   existsSync: existsSync52,
-  join: join55,
+  join: join56,
   runBunInstallWithDetails,
   log,
   getOpenCodeCacheDir,
@@ -84959,7 +85013,7 @@ function getPinnedVersionToastMessage(latestVersion) {
 }
 function resolveActiveInstallWorkspace(deps) {
   const configPaths = deps.getOpenCodeConfigPaths({ binary: "opencode" });
-  const cacheDir = deps.getOpenCodeCacheDir();
+  const cacheDir = getCacheWorkspaceDir(deps);
   const configInstallPath = deps.join(configPaths.configDir, "node_modules", PACKAGE_NAME, "package.json");
   const cacheInstallPath = deps.join(cacheDir, "node_modules", PACKAGE_NAME, "package.json");
   if (deps.existsSync(configInstallPath)) {
@@ -84970,6 +85024,11 @@ function resolveActiveInstallWorkspace(deps) {
     deps.log(`[auto-update-checker] Active workspace: cache-dir (${cacheDir})`);
     return cacheDir;
   }
+  const cachePackageJsonPath = deps.join(cacheDir, "package.json");
+  if (deps.existsSync(cachePackageJsonPath)) {
+    deps.log(`[auto-update-checker] Active workspace: cache-dir (${cacheDir}, package.json present)`);
+    return cacheDir;
+  }
   deps.log(`[auto-update-checker] Active workspace: config-dir (default, no install detected)`);
   return configPaths.configDir;
 }
@@ -84986,6 +85045,14 @@ async function runBunInstallSafe(workspaceDir, deps) {
     return false;
   }
 }
+async function primeCacheWorkspace(activeWorkspace, deps) {
+  const cacheWorkspace = getCacheWorkspaceDir(deps);
+  if (activeWorkspace === cacheWorkspace) {
+    return true;
+  }
+  deps.log(`[auto-update-checker] Priming cache workspace after install: ${cacheWorkspace}`);
+  return runBunInstallSafe(cacheWorkspace, deps);
+}
 function createBackgroundUpdateCheckRunner(overrides = {}) {
   const deps = { ...defaultDeps, ...overrides };
   return async function runBackgroundUpdateCheck(ctx, autoUpdate, getToastMessage) {
@@ -85031,6 +85098,12 @@ function createBackgroundUpdateCheckRunner(overrides = {}) {
     const activeWorkspace = resolveActiveInstallWorkspace(deps);
     const installSuccess = await runBunInstallSafe(activeWorkspace, deps);
     if (installSuccess) {
+      const cachePrimed = await primeCacheWorkspace(activeWorkspace, deps);
+      if (!cachePrimed) {
+        await deps.showUpdateAvailableToast(ctx, latestVersion, getToastMessage);
+        deps.log("[auto-update-checker] cache workspace priming failed after install");
+        return;
+      }
       await deps.showAutoUpdatedToast(ctx, currentVersion, latestVersion);
       deps.log(`[auto-update-checker] Update installed: ${currentVersion} \u2192 ${latestVersion}`);
       return;
@@ -85243,16 +85316,16 @@ v${latestVersion} available. Restart OpenCode to apply.` : "OpenCode is now on S
 // src/hooks/agent-usage-reminder/storage.ts
 import {
   existsSync as existsSync53,
-  mkdirSync as mkdirSync11,
+  mkdirSync as mkdirSync12,
   readFileSync as readFileSync35,
   writeFileSync as writeFileSync15,
   unlinkSync as unlinkSync8
 } from "fs";
-import { join as join57 } from "path";
+import { join as join58 } from "path";
 
 // src/hooks/agent-usage-reminder/constants.ts
-import { join as join56 } from "path";
-var AGENT_USAGE_REMINDER_STORAGE = join56(OPENCODE_STORAGE, "agent-usage-reminder");
+import { join as join57 } from "path";
+var AGENT_USAGE_REMINDER_STORAGE = join57(OPENCODE_STORAGE, "agent-usage-reminder");
 var TARGET_TOOLS = new Set([
   "grep",
   "safe_grep",
@@ -85298,7 +85371,7 @@ ALWAYS prefer: Multiple parallel task calls > Direct tool calls
 
 // src/hooks/agent-usage-reminder/storage.ts
 function getStoragePath2(sessionID) {
-  return join57(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
+  return join58(AGENT_USAGE_REMINDER_STORAGE, `${sessionID}.json`);
 }
 function loadAgentUsageState(sessionID) {
   const filePath = getStoragePath2(sessionID);
@@ -85313,7 +85386,7 @@ function loadAgentUsageState(sessionID) {
 }
 function saveAgentUsageState(state3) {
   if (!existsSync53(AGENT_USAGE_REMINDER_STORAGE)) {
-    mkdirSync11(AGENT_USAGE_REMINDER_STORAGE, { recursive: true });
+    mkdirSync12(AGENT_USAGE_REMINDER_STORAGE, { recursive: true });
   }
   const filePath = getStoragePath2(state3.sessionID);
   writeFileSync15(filePath, JSON.stringify(state3, null, 2));
@@ -86596,16 +86669,16 @@ function createNonInteractiveEnvHook(_ctx) {
 // src/hooks/interactive-bash-session/storage.ts
 import {
   existsSync as existsSync54,
-  mkdirSync as mkdirSync12,
+  mkdirSync as mkdirSync13,
   readFileSync as readFileSync36,
   writeFileSync as writeFileSync16,
   unlinkSync as unlinkSync9
 } from "fs";
-import { join as join59 } from "path";
+import { join as join60 } from "path";
 
 // src/hooks/interactive-bash-session/constants.ts
-import { join as join58 } from "path";
-var INTERACTIVE_BASH_SESSION_STORAGE = join58(OPENCODE_STORAGE, "interactive-bash-session");
+import { join as join59 } from "path";
+var INTERACTIVE_BASH_SESSION_STORAGE = join59(OPENCODE_STORAGE, "interactive-bash-session");
 var OMO_SESSION_PREFIX = "omo-";
 function buildSessionReminderMessage(sessions) {
   if (sessions.length === 0)
@@ -86617,7 +86690,7 @@ function buildSessionReminderMessage(sessions) {
 
 // src/hooks/interactive-bash-session/storage.ts
 function getStoragePath3(sessionID) {
-  return join59(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
+  return join60(INTERACTIVE_BASH_SESSION_STORAGE, `${sessionID}.json`);
 }
 function loadInteractiveBashSessionState(sessionID) {
   const filePath = getStoragePath3(sessionID);
@@ -86637,7 +86710,7 @@ function loadInteractiveBashSessionState(sessionID) {
 }
 function saveInteractiveBashSessionState(state3) {
   if (!existsSync54(INTERACTIVE_BASH_SESSION_STORAGE)) {
-    mkdirSync12(INTERACTIVE_BASH_SESSION_STORAGE, { recursive: true });
+    mkdirSync13(INTERACTIVE_BASH_SESSION_STORAGE, { recursive: true });
   }
   const filePath = getStoragePath3(state3.sessionID);
   const serialized = {
@@ -87155,10 +87228,10 @@ var DEFAULT_MAX_ITERATIONS = 100;
 var DEFAULT_COMPLETION_PROMISE = "DONE";
 var ULTRAWORK_VERIFICATION_PROMISE = "VERIFIED";
 // src/hooks/ralph-loop/storage.ts
-import { existsSync as existsSync55, readFileSync as readFileSync37, writeFileSync as writeFileSync17, unlinkSync as unlinkSync10, mkdirSync as mkdirSync13 } from "fs";
-import { dirname as dirname14, join as join60 } from "path";
+import { existsSync as existsSync55, readFileSync as readFileSync37, writeFileSync as writeFileSync17, unlinkSync as unlinkSync10, mkdirSync as mkdirSync14 } from "fs";
+import { dirname as dirname15, join as join61 } from "path";
 function getStateFilePath(directory, customPath) {
-  return customPath ? join60(directory, customPath) : join60(directory, DEFAULT_STATE_FILE);
+  return customPath ? join61(directory, customPath) : join61(directory, DEFAULT_STATE_FILE);
 }
 function readState(directory, customPath) {
   const filePath = getStateFilePath(directory, customPath);
@@ -87207,9 +87280,9 @@ function readState(directory, customPath) {
 function writeState(directory, state3, customPath) {
   const filePath = getStateFilePath(directory, customPath);
   try {
-    const dir = dirname14(filePath);
+    const dir = dirname15(filePath);
     if (!existsSync55(dir)) {
-      mkdirSync13(dir, { recursive: true });
+      mkdirSync14(dir, { recursive: true });
     }
     const sessionIdLine = state3.session_id ? `session_id: "${state3.session_id}"
 ` : "";
@@ -88336,9 +88409,9 @@ function findSlashCommandPartIndex(parts) {
   return -1;
 }
 // src/hooks/auto-slash-command/executor.ts
-import { dirname as dirname17 } from "path";
+import { dirname as dirname18 } from "path";
 // src/features/opencode-skill-loader/loader.ts
-import { join as join63 } from "path";
+import { join as join64 } from "path";
 import { homedir as homedir11 } from "os";
 
 // src/features/opencode-skill-loader/skill-definition-record.ts
@@ -88366,7 +88439,7 @@ function deduplicateSkillsByName(skills) {
 
 // src/features/opencode-skill-loader/skill-directory-loader.ts
 import { promises as fs16 } from "fs";
-import { join as join62 } from "path";
+import { join as join63 } from "path";
 
 // src/features/opencode-skill-loader/loaded-skill-from-path.ts
 import { promises as fs15 } from "fs";
@@ -88384,7 +88457,7 @@ function parseAllowedTools(allowedTools) {
 
 // src/features/opencode-skill-loader/skill-mcp-config.ts
 import { promises as fs14 } from "fs";
-import { join as join61 } from "path";
+import { join as join62 } from "path";
 function parseSkillMcpConfigFromFrontmatter(content) {
   const frontmatterMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
   if (!frontmatterMatch)
@@ -88400,7 +88473,7 @@ function parseSkillMcpConfigFromFrontmatter(content) {
   return;
 }
 async function loadMcpJsonFromDir(skillDir) {
-  const mcpJsonPath = join61(skillDir, "mcp.json");
+  const mcpJsonPath = join62(skillDir, "mcp.json");
   try {
     const content = await fs14.readFile(mcpJsonPath, "utf-8");
     const parsed = JSON.parse(content);
@@ -88489,10 +88562,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 = join62(options.skillsDir, entry.name);
+    const entryPath = join63(options.skillsDir, entry.name);
     const resolvedPath = await resolveSymlinkAsync(entryPath);
     const dirName = entry.name;
-    const skillMdPath = join62(resolvedPath, "SKILL.md");
+    const skillMdPath = join63(resolvedPath, "SKILL.md");
     try {
       await fs16.access(skillMdPath);
       const skill = await loadSkillFromPath({
@@ -88507,7 +88580,7 @@ async function loadSkillsFromDir(options) {
       }
       continue;
     } catch {}
-    const namedSkillMdPath = join62(resolvedPath, `${dirName}.md`);
+    const namedSkillMdPath = join63(resolvedPath, `${dirName}.md`);
     try {
       await fs16.access(namedSkillMdPath);
       const skill = await loadSkillFromPath({
@@ -88539,7 +88612,7 @@ async function loadSkillsFromDir(options) {
     }
   }
   for (const entry of files) {
-    const entryPath = join62(options.skillsDir, entry.name);
+    const entryPath = join63(options.skillsDir, entry.name);
     const baseName = inferSkillNameFromFileName(entryPath);
     const skill = await loadSkillFromPath({
       skillPath: entryPath,
@@ -88557,7 +88630,7 @@ async function loadSkillsFromDir(options) {
 
 // src/features/opencode-skill-loader/loader.ts
 async function loadUserSkills() {
-  const userSkillsDir = join63(getClaudeConfigDir(), "skills");
+  const userSkillsDir = join64(getClaudeConfigDir(), "skills");
   const skills = await loadSkillsFromDir({ skillsDir: userSkillsDir, scope: "user" });
   return skillsToCommandDefinitionRecord(skills);
 }
@@ -88582,7 +88655,7 @@ async function loadProjectAgentsSkills(directory) {
   return skillsToCommandDefinitionRecord(deduplicateSkillsByName(allSkills.flat()));
 }
 async function loadGlobalAgentsSkills() {
-  const agentsGlobalDir = join63(homedir11(), ".agents", "skills");
+  const agentsGlobalDir = join64(homedir11(), ".agents", "skills");
   const skills = await loadSkillsFromDir({ skillsDir: agentsGlobalDir, scope: "user" });
   return skillsToCommandDefinitionRecord(skills);
 }
@@ -88629,7 +88702,7 @@ async function discoverSkills(options = {}) {
   ]);
 }
 async function discoverUserClaudeSkills() {
-  const userSkillsDir = join63(getClaudeConfigDir(), "skills");
+  const userSkillsDir = join64(getClaudeConfigDir(), "skills");
   return loadSkillsFromDir({ skillsDir: userSkillsDir, scope: "user" });
 }
 async function discoverProjectClaudeSkills(directory) {
@@ -88653,7 +88726,7 @@ async function discoverProjectAgentsSkills(directory) {
   return deduplicateSkillsByName(allSkills.flat());
 }
 async function discoverGlobalAgentsSkills() {
-  const agentsGlobalDir = join63(homedir11(), ".agents", "skills");
+  const agentsGlobalDir = join64(homedir11(), ".agents", "skills");
   return loadSkillsFromDir({ skillsDir: agentsGlobalDir, scope: "user" });
 }
 // src/features/opencode-skill-loader/merger/builtin-skill-converter.ts
@@ -88681,7 +88754,7 @@ function builtinToLoadedSkill(builtin) {
 
 // src/features/opencode-skill-loader/merger/config-skill-entry-loader.ts
 import { existsSync as existsSync57, readFileSync as readFileSync39 } from "fs";
-import { dirname as dirname15, isAbsolute as isAbsolute7, resolve as resolve10 } from "path";
+import { dirname as dirname16, isAbsolute as isAbsolute7, resolve as resolve10 } from "path";
 import { homedir as homedir12 } from "os";
 init_logger();
 function resolveFilePath5(from, configDir) {
@@ -88736,7 +88809,7 @@ function configEntryToLoadedSkill(name, entry, configDir) {
     return null;
   }
   const description = entry.description || fileMetadata.description || "";
-  const resolvedPath = sourcePath ? dirname15(sourcePath) : configDir || process.cwd();
+  const resolvedPath = sourcePath ? dirname16(sourcePath) : configDir || process.cwd();
   const resolvedTemplate = resolveSkillPathReferences(template.trim(), resolvedPath);
   const wrappedTemplate = `<skill-instruction>
 Base directory for this skill: ${resolvedPath}/
@@ -92467,7 +92540,7 @@ async function resolveMultipleSkillsAsync(skillNames, options) {
 var import_picomatch2 = __toESM(require_picomatch2(), 1);
 import { promises as fs17 } from "fs";
 import { homedir as homedir13 } from "os";
-import { dirname as dirname16, extname, isAbsolute as isAbsolute8, join as join64, relative as relative6 } from "path";
+import { dirname as dirname17, extname, isAbsolute as isAbsolute8, join as join65, relative as relative6 } from "path";
 var MAX_RECURSIVE_DEPTH = 10;
 function isHttpUrl(path11) {
   return path11.startsWith("http://") || path11.startsWith("https://");
@@ -92477,12 +92550,12 @@ function toAbsolutePath(path11, configDir) {
     return homedir13();
   }
   if (path11.startsWith("~/")) {
-    return join64(homedir13(), path11.slice(2));
+    return join65(homedir13(), path11.slice(2));
   }
   if (isAbsolute8(path11)) {
     return path11;
   }
-  return join64(configDir, path11);
+  return join65(configDir, path11);
 }
 function isMarkdownPath(path11) {
   return extname(path11).toLowerCase() === ".md";
@@ -92513,13 +92586,13 @@ async function loadSourcePath(options) {
       return [];
     const loaded = await loadSkillFromPath({
       skillPath: absolutePath,
-      resolvedPath: dirname16(absolutePath),
+      resolvedPath: dirname17(absolutePath),
       defaultName: inferSkillNameFromFileName(absolutePath),
       scope: "config"
     });
     if (!loaded)
       return [];
-    return filterByGlob([loaded], dirname16(absolutePath), options.globPattern);
+    return filterByGlob([loaded], dirname17(absolutePath), options.globPattern);
   }
   if (!stat.isDirectory())
     return [];
@@ -92553,7 +92626,7 @@ async function discoverConfigSourceSkills(options) {
 }
 // src/tools/slashcommand/command-discovery.ts
 import { existsSync as existsSync58, readdirSync as readdirSync15, readFileSync as readFileSync41, statSync as statSync6 } from "fs";
-import { basename as basename7, join as join65 } from "path";
+import { basename as basename7, join as join66 } from "path";
 // src/features/builtin-commands/templates/init-deep.ts
 var INIT_DEEP_TEMPLATE = `# /init-deep
 
@@ -94104,12 +94177,12 @@ function discoverCommandsFromDir(commandsDir, scope, prefix = "") {
       if (entry.name.startsWith("."))
         continue;
       const nestedPrefix = prefix ? `${prefix}${NESTED_COMMAND_SEPARATOR}${entry.name}` : entry.name;
-      commands3.push(...discoverCommandsFromDir(join65(commandsDir, entry.name), scope, nestedPrefix));
+      commands3.push(...discoverCommandsFromDir(join66(commandsDir, entry.name), scope, nestedPrefix));
       continue;
     }
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join65(commandsDir, entry.name);
+    const commandPath = join66(commandsDir, entry.name);
     const baseCommandName = basename7(entry.name, ".md");
     const commandName = prefix ? `${prefix}${NESTED_COMMAND_SEPARATOR}${baseCommandName}` : baseCommandName;
     try {
@@ -94165,8 +94238,8 @@ function deduplicateCommandInfosByName(commands3) {
   return deduplicatedCommands;
 }
 function discoverCommandsSync(directory, options) {
-  const userCommandsDir = join65(getClaudeConfigDir(), "commands");
-  const projectCommandsDir = join65(directory ?? process.cwd(), ".claude", "commands");
+  const userCommandsDir = join66(getClaudeConfigDir(), "commands");
+  const projectCommandsDir = join66(directory ?? process.cwd(), ".claude", "commands");
   const opencodeGlobalDirs = getOpenCodeCommandDirs({ binary: "opencode" });
   const opencodeProjectDirs = findProjectOpencodeCommandDirs(directory ?? process.cwd());
   const userCommands = discoverCommandsFromDir(userCommandsDir, "user");
@@ -94269,7 +94342,7 @@ async function formatCommandTemplate(cmd, args) {
   if (!content && cmd.lazyContentLoader) {
     content = await cmd.lazyContentLoader.load();
   }
-  const commandDir = cmd.path ? dirname17(cmd.path) : process.cwd();
+  const commandDir = cmd.path ? dirname18(cmd.path) : process.cwd();
   const withFileRefs = await resolveFileReferencesInText(content, commandDir);
   const resolvedContent = await resolveCommandsInText(withFileRefs);
   const resolvedArguments = args;
@@ -94651,11 +94724,11 @@ 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 existsSync59, readFileSync as readFileSync42, writeFileSync as writeFileSync18, mkdirSync as mkdirSync14, readdirSync as readdirSync16 } from "fs";
-import { dirname as dirname18, join as join66, basename as basename8 } from "path";
+import { existsSync as existsSync59, readFileSync as readFileSync42, writeFileSync as writeFileSync18, mkdirSync as mkdirSync15, readdirSync as readdirSync16 } from "fs";
+import { dirname as dirname19, join as join67, basename as basename8 } from "path";
 var RESERVED_KEYS = new Set(["__proto__", "prototype", "constructor"]);
 function getBoulderFilePath(directory) {
-  return join66(directory, BOULDER_DIR, BOULDER_FILE);
+  return join67(directory, BOULDER_DIR, BOULDER_FILE);
 }
 function readBoulderState(directory) {
   const filePath = getBoulderFilePath(directory);
@@ -94682,9 +94755,9 @@ function readBoulderState(directory) {
 function writeBoulderState(directory, state3) {
   const filePath = getBoulderFilePath(directory);
   try {
-    const dir = dirname18(filePath);
+    const dir = dirname19(filePath);
     if (!existsSync59(dir)) {
-      mkdirSync14(dir, { recursive: true });
+      mkdirSync15(dir, { recursive: true });
     }
     writeFileSync18(filePath, JSON.stringify(state3, null, 2), "utf-8");
     return true;
@@ -94754,13 +94827,13 @@ function upsertTaskSessionState(directory, input) {
   return null;
 }
 function findPrometheusPlans(directory) {
-  const plansDir = join66(directory, PROMETHEUS_PLANS_DIR);
+  const plansDir = join67(directory, PROMETHEUS_PLANS_DIR);
   if (!existsSync59(plansDir)) {
     return [];
   }
   try {
     const files = readdirSync16(plansDir);
-    return files.filter((f) => f.endsWith(".md")).map((f) => join66(plansDir, f)).sort((a, b) => {
+    return files.filter((f) => f.endsWith(".md")).map((f) => join67(plansDir, f)).sort((a, b) => {
       const aStat = __require("fs").statSync(a);
       const bStat = __require("fs").statSync(b);
       return bStat.mtimeMs - aStat.mtimeMs;
@@ -98049,11 +98122,11 @@ import * as path11 from "path";
 // src/shared/migrate-legacy-config-file.ts
 init_logger();
 import { existsSync as existsSync62, readFileSync as readFileSync45, renameSync as renameSync4, rmSync as rmSync3 } from "fs";
-import { join as join67, dirname as dirname19, basename as basename9 } from "path";
+import { join as join68, dirname as dirname20, basename as basename9 } from "path";
 function buildCanonicalPath(legacyPath) {
-  const dir = dirname19(legacyPath);
+  const dir = dirname20(legacyPath);
   const ext = basename9(legacyPath).includes(".jsonc") ? ".jsonc" : ".json";
-  return join67(dir, `${CONFIG_BASENAME}${ext}`);
+  return join68(dir, `${CONFIG_BASENAME}${ext}`);
 }
 function archiveLegacyConfigFile(legacyPath) {
   const backupPath = `${legacyPath}.bak`;
@@ -99570,7 +99643,7 @@ function createRuntimeFallbackHook(ctx, options) {
 }
 // src/hooks/write-existing-file-guard/hook.ts
 import { existsSync as existsSync65, realpathSync as realpathSync7 } from "fs";
-import { basename as basename11, dirname as dirname21, isAbsolute as isAbsolute10, join as join69, normalize as normalize2, relative as relative8, resolve as resolve12 } from "path";
+import { basename as basename11, dirname as dirname22, isAbsolute as isAbsolute10, join as join70, normalize as normalize2, relative as relative8, resolve as resolve12 } from "path";
 
 // src/hooks/write-existing-file-guard/tool-execute-before-handler.ts
 import { existsSync as existsSync64 } from "fs";
@@ -99743,9 +99816,9 @@ function toCanonicalPath2(absolutePath) {
       canonicalPath = absolutePath;
     }
   } else {
-    const absoluteDir = dirname21(absolutePath);
+    const absoluteDir = dirname22(absolutePath);
     const resolvedDir = existsSync65(absoluteDir) ? realpathSync7.native(absoluteDir) : absoluteDir;
-    canonicalPath = join69(resolvedDir, basename11(absolutePath));
+    canonicalPath = join70(resolvedDir, basename11(absolutePath));
   }
   return normalize2(canonicalPath);
 }
@@ -100761,11 +100834,11 @@ init_logger();
 
 // src/hooks/legacy-plugin-toast/auto-migrate.ts
 import { existsSync as existsSync66, readFileSync as readFileSync47 } from "fs";
-import { join as join70 } from "path";
+import { join as join71 } from "path";
 function detectOpenCodeConfigPath(overrideConfigDir) {
   if (overrideConfigDir) {
-    const jsoncPath = join70(overrideConfigDir, "opencode.jsonc");
-    const jsonPath = join70(overrideConfigDir, "opencode.json");
+    const jsoncPath = join71(overrideConfigDir, "opencode.jsonc");
+    const jsonPath = join71(overrideConfigDir, "opencode.json");
     if (existsSync66(jsoncPath))
       return jsoncPath;
     if (existsSync66(jsonPath))
@@ -101179,7 +101252,7 @@ var DEFAULT_MAX_DIAGNOSTICS = 200;
 var DEFAULT_MAX_DIRECTORY_FILES = 50;
 // src/tools/lsp/server-config-loader.ts
 import { existsSync as existsSync67, readFileSync as readFileSync48 } from "fs";
-import { join as join71 } from "path";
+import { join as join72 } from "path";
 function loadJsonFile(path12) {
   if (!existsSync67(path12))
     return null;
@@ -101193,9 +101266,9 @@ function getConfigPaths3() {
   const cwd = process.cwd();
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   return {
-    project: detectPluginConfigFile(join71(cwd, ".opencode")).path,
+    project: detectPluginConfigFile(join72(cwd, ".opencode")).path,
     user: detectPluginConfigFile(configDir).path,
-    opencode: detectConfigFile(join71(configDir, "opencode")).path
+    opencode: detectConfigFile(join72(configDir, "opencode")).path
   };
 }
 function loadAllConfigs() {
@@ -101265,19 +101338,19 @@ function getMergedServers() {
 
 // src/tools/lsp/server-installation.ts
 import { existsSync as existsSync68 } from "fs";
-import { delimiter, join as join73 } from "path";
+import { delimiter, join as join74 } from "path";
 
 // src/tools/lsp/server-path-bases.ts
-import { join as join72 } from "path";
+import { join as join73 } from "path";
 function getLspServerAdditionalPathBases(workingDirectory) {
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
-  const dataDir = join72(getDataDir(), "opencode");
+  const dataDir = join73(getDataDir(), "opencode");
   return [
-    join72(workingDirectory, "node_modules", ".bin"),
-    join72(configDir, "bin"),
-    join72(configDir, "node_modules", ".bin"),
-    join72(dataDir, "bin"),
-    join72(dataDir, "bin", "node_modules", ".bin")
+    join73(workingDirectory, "node_modules", ".bin"),
+    join73(configDir, "bin"),
+    join73(configDir, "node_modules", ".bin"),
+    join73(dataDir, "bin"),
+    join73(dataDir, "bin", "node_modules", ".bin")
   ];
 }
 
@@ -101308,14 +101381,14 @@ function isServerInstalled(command) {
   const paths = pathEnv.split(delimiter);
   for (const p of paths) {
     for (const suffix of exts) {
-      if (existsSync68(join73(p, cmd + suffix))) {
+      if (existsSync68(join74(p, cmd + suffix))) {
         return true;
       }
     }
   }
   for (const base of getLspServerAdditionalPathBases(process.cwd())) {
     for (const suffix of exts) {
-      if (existsSync68(join73(base, cmd + suffix))) {
+      if (existsSync68(join74(base, cmd + suffix))) {
         return true;
       }
     }
@@ -114888,7 +114961,7 @@ import { resolve as resolve16 } from "path";
 
 // src/tools/lsp/directory-diagnostics.ts
 import { existsSync as existsSync71, lstatSync as lstatSync2, readdirSync as readdirSync17 } from "fs";
-import { extname as extname6, join as join74, resolve as resolve15 } from "path";
+import { extname as extname6, join as join75, resolve as resolve15 } from "path";
 var SKIP_DIRECTORIES = new Set(["node_modules", ".git", "dist", "build", ".next", "out"]);
 function collectFilesWithExtension(dir, extension, maxFiles) {
   const files = [];
@@ -114904,7 +114977,7 @@ function collectFilesWithExtension(dir, extension, maxFiles) {
     for (const entry of entries) {
       if (files.length >= maxFiles)
         return;
-      const fullPath = join74(currentDir, entry);
+      const fullPath = join75(currentDir, entry);
       let stat;
       try {
         stat = lstatSync2(fullPath);
@@ -115007,7 +115080,7 @@ async function aggregateDiagnosticsForDirectory(directory, extension, severity,
 
 // src/tools/lsp/infer-extension.ts
 import { readdirSync as readdirSync18, lstatSync as lstatSync3 } from "fs";
-import { extname as extname7, join as join75 } from "path";
+import { extname as extname7, join as join76 } from "path";
 var SKIP_DIRECTORIES2 = new Set(["node_modules", ".git", "dist", "build", ".next", "out"]);
 var MAX_SCAN_ENTRIES = 500;
 function inferExtensionFromDirectory(directory) {
@@ -115025,7 +115098,7 @@ function inferExtensionFromDirectory(directory) {
     for (const entry of entries) {
       if (scanned >= MAX_SCAN_ENTRIES)
         return;
-      const fullPath = join75(dir, entry);
+      const fullPath = join76(dir, entry);
       let stat;
       try {
         stat = lstatSync3(fullPath);
@@ -115190,12 +115263,12 @@ var DEFAULT_MAX_MATCHES = 500;
 
 // src/tools/ast-grep/sg-cli-path.ts
 import { createRequire as createRequire4 } from "module";
-import { dirname as dirname22, join as join77 } from "path";
+import { dirname as dirname23, join as join78 } from "path";
 import { existsSync as existsSync73, statSync as statSync10 } from "fs";
 
 // src/tools/ast-grep/downloader.ts
 import { existsSync as existsSync72 } from "fs";
-import { join as join76 } from "path";
+import { join as join77 } from "path";
 import { homedir as homedir14 } from "os";
 import { createRequire as createRequire3 } from "module";
 init_logger();
@@ -115222,12 +115295,12 @@ var PLATFORM_MAP2 = {
 function getCacheDir3() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join76(homedir14(), "AppData", "Local");
-    return join76(base2, "oh-my-opencode", "bin");
+    const base2 = localAppData || join77(homedir14(), "AppData", "Local");
+    return join77(base2, "oh-my-opencode", "bin");
   }
   const xdgCache = process.env.XDG_CACHE_HOME;
-  const base = xdgCache || join76(homedir14(), ".cache");
-  return join76(base, "oh-my-opencode", "bin");
+  const base = xdgCache || join77(homedir14(), ".cache");
+  return join77(base, "oh-my-opencode", "bin");
 }
 function getBinaryName3() {
   return process.platform === "win32" ? "sg.exe" : "sg";
@@ -115244,7 +115317,7 @@ async function downloadAstGrep(version3 = DEFAULT_VERSION) {
   }
   const cacheDir = getCacheDir3();
   const binaryName = getBinaryName3();
-  const binaryPath = join76(cacheDir, binaryName);
+  const binaryPath = join77(cacheDir, binaryName);
   if (existsSync72(binaryPath)) {
     return binaryPath;
   }
@@ -115253,7 +115326,7 @@ async function downloadAstGrep(version3 = DEFAULT_VERSION) {
   const downloadUrl = `https://github.com/${REPO2}/releases/download/${version3}/${assetName}`;
   log(`[oh-my-opencode] Downloading ast-grep binary...`);
   try {
-    const archivePath = join76(cacheDir, assetName);
+    const archivePath = join77(cacheDir, assetName);
     ensureCacheDir(cacheDir);
     await downloadArchive(downloadUrl, archivePath);
     await extractZipArchive(archivePath, cacheDir);
@@ -115306,8 +115379,8 @@ function findSgCliPathSync() {
   try {
     const require2 = createRequire4(import.meta.url);
     const cliPackageJsonPath = require2.resolve("@ast-grep/cli/package.json");
-    const cliDirectory = dirname22(cliPackageJsonPath);
-    const sgPath = join77(cliDirectory, binaryName);
+    const cliDirectory = dirname23(cliPackageJsonPath);
+    const sgPath = join78(cliDirectory, binaryName);
     if (existsSync73(sgPath) && isValidBinary(sgPath)) {
       return sgPath;
     }
@@ -115317,9 +115390,9 @@ function findSgCliPathSync() {
     try {
       const require2 = createRequire4(import.meta.url);
       const packageJsonPath = require2.resolve(`${platformPackage}/package.json`);
-      const packageDirectory = dirname22(packageJsonPath);
+      const packageDirectory = dirname23(packageJsonPath);
       const astGrepBinaryName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
-      const binaryPath = join77(packageDirectory, astGrepBinaryName);
+      const binaryPath = join78(packageDirectory, astGrepBinaryName);
       if (existsSync73(binaryPath) && isValidBinary(binaryPath)) {
         return binaryPath;
       }
@@ -115721,18 +115794,18 @@ var {spawn: spawn18 } = globalThis.Bun;
 
 // src/tools/grep/constants.ts
 import { existsSync as existsSync77 } from "fs";
-import { join as join79, dirname as dirname23 } from "path";
+import { join as join80, dirname as dirname24 } from "path";
 import { spawnSync as spawnSync4 } from "child_process";
 
 // src/tools/grep/downloader.ts
 import { existsSync as existsSync76, readdirSync as readdirSync19 } from "fs";
-import { join as join78 } from "path";
+import { join as join79 } from "path";
 function findFileRecursive(dir, filename) {
   try {
     const entries = readdirSync19(dir, { withFileTypes: true, recursive: true });
     for (const entry of entries) {
       if (entry.isFile() && entry.name === filename) {
-        return join78(entry.parentPath ?? dir, entry.name);
+        return join79(entry.parentPath ?? dir, entry.name);
       }
     }
   } catch {
@@ -115753,11 +115826,11 @@ function getPlatformKey() {
 }
 function getInstallDir() {
   const homeDir = process.env.HOME || process.env.USERPROFILE || ".";
-  return join78(homeDir, ".cache", "oh-my-opencode", "bin");
+  return join79(homeDir, ".cache", "oh-my-opencode", "bin");
 }
 function getRgPath() {
   const isWindows2 = process.platform === "win32";
-  return join78(getInstallDir(), isWindows2 ? "rg.exe" : "rg");
+  return join79(getInstallDir(), isWindows2 ? "rg.exe" : "rg");
 }
 async function extractTarGz2(archivePath, destDir) {
   const platformKey = getPlatformKey();
@@ -115774,7 +115847,7 @@ async function extractZip2(archivePath, destDir) {
   const binaryName = process.platform === "win32" ? "rg.exe" : "rg";
   const foundPath = findFileRecursive(destDir, binaryName);
   if (foundPath) {
-    const destPath = join78(destDir, binaryName);
+    const destPath = join79(destDir, binaryName);
     if (foundPath !== destPath) {
       const { renameSync: renameSync5 } = await import("fs");
       renameSync5(foundPath, destPath);
@@ -115795,7 +115868,7 @@ async function downloadAndInstallRipgrep() {
   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 = join78(installDir, filename);
+  const archivePath = join79(installDir, filename);
   try {
     await downloadArchive(url3, archivePath);
     if (config4.extension === "tar.gz") {
@@ -115837,15 +115910,15 @@ function findExecutable(name) {
 }
 function getOpenCodeBundledRg() {
   const execPath = process.execPath;
-  const execDir = dirname23(execPath);
+  const execDir = dirname24(execPath);
   const isWindows2 = process.platform === "win32";
   const rgName = isWindows2 ? "rg.exe" : "rg";
   const candidates = [
-    join79(getDataDir(), "opencode", "bin", rgName),
-    join79(execDir, rgName),
-    join79(execDir, "bin", rgName),
-    join79(execDir, "..", "bin", rgName),
-    join79(execDir, "..", "libexec", rgName)
+    join80(getDataDir(), "opencode", "bin", rgName),
+    join80(execDir, rgName),
+    join80(execDir, "bin", rgName),
+    join80(execDir, "..", "bin", rgName),
+    join80(execDir, "..", "libexec", rgName)
   ];
   for (const candidate of candidates) {
     if (existsSync77(candidate)) {
@@ -116496,9 +116569,9 @@ Use this when a task matches an available skill's or command's description.
 - The tool will return detailed instructions with your context applied.
 `;
 // src/tools/skill/tools.ts
-import { dirname as dirname25 } from "path";
+import { dirname as dirname26 } from "path";
 // src/tools/slashcommand/command-output-formatter.ts
-import { dirname as dirname24 } from "path";
+import { dirname as dirname25 } from "path";
 async function formatLoadedCommand(command, userMessage) {
   const sections = [];
   sections.push(`# /${command.name} Command
@@ -116537,7 +116610,7 @@ async function formatLoadedCommand(command, userMessage) {
   if (!content && command.lazyContentLoader) {
     content = await command.lazyContentLoader.load();
   }
-  const commandDir = command.path ? dirname24(command.path) : process.cwd();
+  const commandDir = command.path ? dirname25(command.path) : process.cwd();
   const withFileReferences = await resolveFileReferencesInText(content, commandDir);
   const resolvedContent = await resolveCommandsInText(withFileReferences);
   let finalContent = resolvedContent.trim();
@@ -116917,7 +116990,7 @@ function createSkillTool(options = {}) {
         if (matchedSkill.name === "git-master") {
           body = injectGitMasterConfig(body, options.gitMasterConfig);
         }
-        const dir = matchedSkill.path ? dirname25(matchedSkill.path) : matchedSkill.resolvedPath || process.cwd();
+        const dir = matchedSkill.path ? dirname26(matchedSkill.path) : matchedSkill.resolvedPath || process.cwd();
         const output = [
           `## Skill: ${matchedSkill.name}`,
           "",
@@ -116957,9 +117030,9 @@ function createSkillTool(options = {}) {
 }
 var skill = createSkillTool();
 // src/tools/session-manager/constants.ts
-import { join as join80 } from "path";
-var TODO_DIR2 = join80(getClaudeConfigDir(), "todos");
-var TRANSCRIPT_DIR2 = join80(getClaudeConfigDir(), "transcripts");
+import { join as join81 } from "path";
+var TODO_DIR2 = join81(getClaudeConfigDir(), "todos");
+var TRANSCRIPT_DIR2 = join81(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.
@@ -117034,7 +117107,7 @@ Has Transcript: Yes (234 entries)`;
 // src/tools/session-manager/file-storage.ts
 import { existsSync as existsSync78 } from "fs";
 import { readdir, readFile } from "fs/promises";
-import { join as join81 } from "path";
+import { join as join82 } from "path";
 async function getFileMainSessions(directory) {
   if (!existsSync78(SESSION_STORAGE))
     return [];
@@ -117044,13 +117117,13 @@ async function getFileMainSessions(directory) {
     for (const projectDir of projectDirs) {
       if (!projectDir.isDirectory())
         continue;
-      const projectPath = join81(SESSION_STORAGE, projectDir.name);
+      const projectPath = join82(SESSION_STORAGE, projectDir.name);
       const sessionFiles = await readdir(projectPath);
       for (const file3 of sessionFiles) {
         if (!file3.endsWith(".json"))
           continue;
         try {
-          const content = await readFile(join81(projectPath, file3), "utf-8");
+          const content = await readFile(join82(projectPath, file3), "utf-8");
           const meta3 = JSON.parse(content);
           if (meta3.parentID)
             continue;
@@ -117077,7 +117150,7 @@ async function getFileAllSessions() {
       for (const entry of entries) {
         if (!entry.isDirectory())
           continue;
-        const sessionPath = join81(dir, entry.name);
+        const sessionPath = join82(dir, entry.name);
         const files = await readdir(sessionPath);
         if (files.some((file3) => file3.endsWith(".json"))) {
           sessions.push(entry.name);
@@ -117106,7 +117179,7 @@ async function getFileSessionMessages(sessionID) {
       if (!file3.endsWith(".json"))
         continue;
       try {
-        const content = await readFile(join81(messageDir, file3), "utf-8");
+        const content = await readFile(join82(messageDir, file3), "utf-8");
         const meta3 = JSON.parse(content);
         const parts = await readParts2(meta3.id);
         messages.push({
@@ -117132,7 +117205,7 @@ async function getFileSessionMessages(sessionID) {
   });
 }
 async function readParts2(messageID) {
-  const partDir = join81(PART_STORAGE, messageID);
+  const partDir = join82(PART_STORAGE, messageID);
   if (!existsSync78(partDir))
     return [];
   const parts = [];
@@ -117142,7 +117215,7 @@ async function readParts2(messageID) {
       if (!file3.endsWith(".json"))
         continue;
       try {
-        const content = await readFile(join81(partDir, file3), "utf-8");
+        const content = await readFile(join82(partDir, file3), "utf-8");
         parts.push(JSON.parse(content));
       } catch {
         continue;
@@ -117161,7 +117234,7 @@ async function getFileSessionTodos(sessionID) {
     const todoFiles = allFiles.filter((file3) => file3 === `${sessionID}.json`);
     for (const file3 of todoFiles) {
       try {
-        const content = await readFile(join81(TODO_DIR2, file3), "utf-8");
+        const content = await readFile(join82(TODO_DIR2, file3), "utf-8");
         const data = JSON.parse(content);
         if (!Array.isArray(data))
           continue;
@@ -117183,7 +117256,7 @@ async function getFileSessionTodos(sessionID) {
 async function getFileSessionTranscript(sessionID) {
   if (!existsSync78(TRANSCRIPT_DIR2))
     return 0;
-  const transcriptFile = join81(TRANSCRIPT_DIR2, `${sessionID}.jsonl`);
+  const transcriptFile = join82(TRANSCRIPT_DIR2, `${sessionID}.jsonl`);
   if (!existsSync78(transcriptFile))
     return 0;
   try {
@@ -117349,6 +117422,19 @@ function shouldFallbackFromSdkError(error92) {
 }
 
 // src/tools/session-manager/storage.ts
+function mergeSessionMetadataLists(sdkSessions, fileSessions) {
+  const merged = new Map;
+  for (const session of fileSessions) {
+    merged.set(session.id, session);
+  }
+  for (const session of sdkSessions) {
+    merged.set(session.id, session);
+  }
+  return [...merged.values()].sort((a, b) => b.time.updated - a.time.updated);
+}
+function mergeSessionIds(sdkSessionIds, fileSessionIds) {
+  return [...new Set([...sdkSessionIds, ...fileSessionIds])];
+}
 var sdkClient = null;
 function setStorageClient(client2) {
   sdkClient = client2;
@@ -117356,7 +117442,9 @@ function setStorageClient(client2) {
 async function getMainSessions(options) {
   if (isSqliteBackend() && sdkClient) {
     try {
-      return await getSdkMainSessions(sdkClient, options.directory);
+      const sdkSessions = await getSdkMainSessions(sdkClient, options.directory);
+      const fileSessions = await getFileMainSessions(options.directory);
+      return mergeSessionMetadataLists(sdkSessions, fileSessions);
     } catch (error92) {
       if (!shouldFallbackFromSdkError(error92))
         throw error92;
@@ -117368,7 +117456,9 @@ async function getMainSessions(options) {
 async function getAllSessions() {
   if (isSqliteBackend() && sdkClient) {
     try {
-      return await getSdkAllSessions(sdkClient);
+      const sdkSessionIds = await getSdkAllSessions(sdkClient);
+      const fileSessionIds = await getFileAllSessions();
+      return mergeSessionIds(sdkSessionIds, fileSessionIds);
     } catch (error92) {
       if (!shouldFallbackFromSdkError(error92))
         throw error92;
@@ -117380,7 +117470,9 @@ async function getAllSessions() {
 async function sessionExists2(sessionID) {
   if (isSqliteBackend() && sdkClient) {
     try {
-      return await sdkSessionExists(sdkClient, sessionID);
+      const existsInSdk = await sdkSessionExists(sdkClient, sessionID);
+      if (existsInSdk)
+        return true;
     } catch (error92) {
       if (!shouldFallbackFromSdkError(error92))
         throw error92;
@@ -117392,7 +117484,9 @@ async function sessionExists2(sessionID) {
 async function readSessionMessages2(sessionID) {
   if (isSqliteBackend() && sdkClient) {
     try {
-      return await getSdkSessionMessages(sdkClient, sessionID);
+      const sdkMessages = await getSdkSessionMessages(sdkClient, sessionID);
+      if (sdkMessages.length > 0)
+        return sdkMessages;
     } catch (error92) {
       if (!shouldFallbackFromSdkError(error92))
         throw error92;
@@ -117404,7 +117498,9 @@ async function readSessionMessages2(sessionID) {
 async function readSessionTodos(sessionID) {
   if (isSqliteBackend() && sdkClient) {
     try {
-      return await getSdkSessionTodos(sdkClient, sessionID);
+      const sdkTodos = await getSdkSessionTodos(sdkClient, sessionID);
+      if (sdkTodos.length > 0)
+        return sdkTodos;
     } catch (error92) {
       if (!shouldFallbackFromSdkError(error92))
         throw error92;
@@ -119396,7 +119492,7 @@ async function resolveMultimodalLookerAgentMetadata(ctx) {
 import * as childProcess from "child_process";
 import { existsSync as existsSync79, mkdtempSync, readFileSync as readFileSync51, rmSync as rmSync4, unlinkSync as unlinkSync11, writeFileSync as writeFileSync20 } from "fs";
 import { tmpdir as tmpdir7 } from "os";
-import { dirname as dirname26, join as join82 } from "path";
+import { dirname as dirname27, join as join83 } from "path";
 var SUPPORTED_FORMATS = new Set([
   "image/jpeg",
   "image/png",
@@ -119437,8 +119533,8 @@ function convertImageToJpeg(inputPath, mimeType) {
   if (!existsSync79(inputPath)) {
     throw new Error(`File not found: ${inputPath}`);
   }
-  const tempDir = mkdtempSync(join82(tmpdir7(), "opencode-img-"));
-  const outputPath = join82(tempDir, "converted.jpg");
+  const tempDir = mkdtempSync(join83(tmpdir7(), "opencode-img-"));
+  const outputPath = join83(tempDir, "converted.jpg");
   log(`[image-converter] Converting ${mimeType} to JPEG: ${inputPath}`);
   try {
     if (process.platform === "darwin") {
@@ -119489,7 +119585,7 @@ function convertImageToJpeg(inputPath, mimeType) {
 }
 function cleanupConvertedImage(filePath) {
   try {
-    const tempDirectory = dirname26(filePath);
+    const tempDirectory = dirname27(filePath);
     if (existsSync79(filePath)) {
       unlinkSync11(filePath);
       log(`[image-converter] Cleaned up temporary file: ${filePath}`);
@@ -119503,9 +119599,9 @@ function cleanupConvertedImage(filePath) {
   }
 }
 function convertBase64ImageToJpeg(base64Data, mimeType) {
-  const tempDir = mkdtempSync(join82(tmpdir7(), "opencode-b64-"));
+  const tempDir = mkdtempSync(join83(tmpdir7(), "opencode-b64-"));
   const inputExt = mimeType.split("/")[1] || "bin";
-  const inputPath = join82(tempDir, `input.${inputExt}`);
+  const inputPath = join83(tempDir, `input.${inputExt}`);
   const tempFiles = [inputPath];
   try {
     const cleanBase64 = base64Data.replace(/^data:[^;]+;base64,/, "");
@@ -120062,6 +120158,7 @@ function getTimingConfig() {
 // src/tools/delegate-task/sync-session-poller.ts
 init_logger();
 var NON_TERMINAL_FINISH_REASONS = new Set(["tool-calls", "unknown"]);
+var PENDING_TOOL_PART_TYPES = new Set(["tool", "tool_use", "tool-call"]);
 function wait(milliseconds) {
   const sharedBuffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
   const typedArray = new Int32Array(sharedBuffer);
@@ -120094,6 +120191,8 @@ function isSessionComplete(messages) {
     return false;
   if (NON_TERMINAL_FINISH_REASONS.has(lastAssistant.info.finish))
     return false;
+  if (lastAssistant.parts?.some((part) => part.type && PENDING_TOOL_PART_TYPES.has(part.type)))
+    return false;
   if (!lastUser?.info?.id || !lastAssistant?.info?.id)
     return false;
   return lastUser.info.id < lastAssistant.info.id;
@@ -121789,7 +121888,7 @@ function createDelegateTask(options) {
 // src/tools/delegate-task/index.ts
 init_constants();
 // src/tools/task/task-create.ts
-import { join as join84 } from "path";
+import { join as join85 } from "path";
 
 // src/tools/task/types.ts
 var TaskStatusSchema = exports_external.enum(["pending", "in_progress", "completed", "deleted"]);
@@ -121843,18 +121942,18 @@ var TaskDeleteInputSchema = exports_external.object({
 });
 
 // src/features/claude-tasks/storage.ts
-import { join as join83, dirname as dirname27, basename as basename13, isAbsolute as isAbsolute11 } from "path";
-import { existsSync as existsSync80, mkdirSync as mkdirSync15, readFileSync as readFileSync52, writeFileSync as writeFileSync21, renameSync as renameSync5, unlinkSync as unlinkSync12, readdirSync as readdirSync20 } from "fs";
+import { join as join84, dirname as dirname28, basename as basename13, isAbsolute as isAbsolute11 } from "path";
+import { existsSync as existsSync80, mkdirSync as mkdirSync16, readFileSync as readFileSync52, writeFileSync as writeFileSync21, renameSync as renameSync5, unlinkSync as unlinkSync12, readdirSync as readdirSync20 } from "fs";
 import { randomUUID as randomUUID3 } from "crypto";
 function getTaskDir(config4 = {}) {
   const tasksConfig = config4.sisyphus?.tasks;
   const storagePath = tasksConfig?.storage_path;
   if (storagePath) {
-    return isAbsolute11(storagePath) ? storagePath : join83(process.cwd(), storagePath);
+    return isAbsolute11(storagePath) ? storagePath : join84(process.cwd(), storagePath);
   }
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   const listId = resolveTaskListId(config4);
-  return join83(configDir, "tasks", listId);
+  return join84(configDir, "tasks", listId);
 }
 function sanitizePathSegment(value) {
   return value.replace(/[^a-zA-Z0-9_-]/g, "-") || "default";
@@ -121873,7 +121972,7 @@ function resolveTaskListId(config4 = {}) {
 }
 function ensureDir(dirPath) {
   if (!existsSync80(dirPath)) {
-    mkdirSync15(dirPath, { recursive: true });
+    mkdirSync16(dirPath, { recursive: true });
   }
 }
 function readJsonSafe(filePath, schema2) {
@@ -121893,7 +121992,7 @@ function readJsonSafe(filePath, schema2) {
   }
 }
 function writeJsonAtomic(filePath, data) {
-  const dir = dirname27(filePath);
+  const dir = dirname28(filePath);
   ensureDir(dir);
   const tempPath = `${filePath}.tmp.${Date.now()}`;
   try {
@@ -121913,7 +122012,7 @@ function generateTaskId() {
   return `T-${randomUUID3()}`;
 }
 function acquireLock(dirPath) {
-  const lockPath = join83(dirPath, ".lock");
+  const lockPath = join84(dirPath, ".lock");
   const lockId = randomUUID3();
   const createLock = (timestamp2) => {
     writeFileSync21(lockPath, JSON.stringify({ id: lockId, timestamp: timestamp2 }), {
@@ -122126,7 +122225,7 @@ async function handleCreate(args, config4, ctx, context) {
         threadID: context.sessionID
       };
       const validatedTask = TaskObjectSchema.parse(task);
-      writeJsonAtomic(join84(taskDir, `${taskId}.json`), validatedTask);
+      writeJsonAtomic(join85(taskDir, `${taskId}.json`), validatedTask);
       await syncTaskTodoUpdate(ctx, validatedTask, context.sessionID);
       return JSON.stringify({
         task: {
@@ -122148,7 +122247,7 @@ async function handleCreate(args, config4, ctx, context) {
   }
 }
 // src/tools/task/task-get.ts
-import { join as join85 } from "path";
+import { join as join86 } from "path";
 var TASK_ID_PATTERN = /^T-[A-Za-z0-9-]+$/;
 function parseTaskId(id) {
   if (!TASK_ID_PATTERN.test(id))
@@ -122173,7 +122272,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 = join85(taskDir, `${taskId}.json`);
+        const taskPath = join86(taskDir, `${taskId}.json`);
         const task = readJsonSafe(taskPath, TaskObjectSchema);
         return JSON.stringify({ task: task ?? null });
       } catch (error92) {
@@ -122186,7 +122285,7 @@ Returns null if the task does not exist or the file is invalid.`,
   });
 }
 // src/tools/task/task-list.ts
-import { join as join86 } from "path";
+import { join as join87 } from "path";
 import { existsSync as existsSync81, readdirSync as readdirSync21 } from "fs";
 function createTaskList(config4) {
   return tool({
@@ -122207,7 +122306,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
       }
       const allTasks = [];
       for (const fileId of files) {
-        const task = readJsonSafe(join86(taskDir, `${fileId}.json`), TaskObjectSchema);
+        const task = readJsonSafe(join87(taskDir, `${fileId}.json`), TaskObjectSchema);
         if (task) {
           allTasks.push(task);
         }
@@ -122235,7 +122334,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
   });
 }
 // src/tools/task/task-update.ts
-import { join as join87 } from "path";
+import { join as join88 } from "path";
 var TASK_ID_PATTERN2 = /^T-[A-Za-z0-9-]+$/;
 function parseTaskId2(id) {
   if (!TASK_ID_PATTERN2.test(id))
@@ -122283,7 +122382,7 @@ async function handleUpdate(args, config4, ctx, context) {
       return JSON.stringify({ error: "task_lock_unavailable" });
     }
     try {
-      const taskPath = join87(taskDir, `${taskId}.json`);
+      const taskPath = join88(taskDir, `${taskId}.json`);
       const task = readJsonSafe(taskPath, TaskObjectSchema);
       if (!task) {
         return JSON.stringify({ error: "task_not_found" });
@@ -125005,7 +125104,7 @@ function unregisterManagerForCleanup(manager) {
 
 // src/features/background-agent/compaction-aware-message-resolver.ts
 import { readdirSync as readdirSync22, readFileSync as readFileSync53 } from "fs";
-import { join as join88 } from "path";
+import { join as join89 } from "path";
 function isCompactionAgent4(agent) {
   return agent?.trim().toLowerCase() === "compaction";
 }
@@ -125084,7 +125183,7 @@ function findNearestMessageExcludingCompaction(messageDir, sessionID) {
     const messages = [];
     for (const file3 of files) {
       try {
-        const content = readFileSync53(join88(messageDir, file3), "utf-8");
+        const content = readFileSync53(join89(messageDir, file3), "utf-8");
         messages.push(JSON.parse(content));
       } catch {
         continue;
@@ -125170,7 +125269,7 @@ function handleSessionIdleBackgroundEvent(args) {
 }
 
 // src/features/background-agent/manager.ts
-import { join as join89 } from "path";
+import { join as join90 } from "path";
 
 // src/features/background-agent/remove-task-toast-tracking.ts
 function removeTaskToastTracking(taskId) {
@@ -126797,7 +126896,7 @@ ${originalText}`;
             parentSessionID: task.parentSessionID
           });
         }
-        const messageDir = join89(MESSAGE_STORAGE, task.parentSessionID);
+        const messageDir = join90(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;
@@ -127125,11 +127224,11 @@ ${originalText}`;
   }
 }
 // src/features/mcp-oauth/storage.ts
-import { chmodSync as chmodSync2, existsSync as existsSync82, mkdirSync as mkdirSync16, readFileSync as readFileSync54, unlinkSync as unlinkSync13, writeFileSync as writeFileSync22 } from "fs";
-import { dirname as dirname28, join as join90 } from "path";
+import { chmodSync as chmodSync2, existsSync as existsSync82, mkdirSync as mkdirSync17, readFileSync as readFileSync54, unlinkSync as unlinkSync13, writeFileSync as writeFileSync22 } from "fs";
+import { dirname as dirname29, join as join91 } from "path";
 var STORAGE_FILE_NAME = "mcp-oauth.json";
 function getMcpOauthStoragePath() {
-  return join90(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
+  return join91(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
 }
 function normalizeHost(serverHost) {
   let host = serverHost.trim();
@@ -127179,9 +127278,9 @@ function readStore() {
 function writeStore(store2) {
   const filePath = getMcpOauthStoragePath();
   try {
-    const dir = dirname28(filePath);
+    const dir = dirname29(filePath);
     if (!existsSync82(dir)) {
-      mkdirSync16(dir, { recursive: true });
+      mkdirSync17(dir, { recursive: true });
     }
     writeFileSync22(filePath, JSON.stringify(store2, null, 2), { encoding: "utf-8", mode: 384 });
     chmodSync2(filePath, 384);
@@ -133676,17 +133775,17 @@ var SESSION_TIMEOUT_MS3 = 10 * 60 * 1000;
 var MIN_STABILITY_TIME_MS4 = 10 * 1000;
 // src/features/claude-code-mcp-loader/loader.ts
 import { existsSync as existsSync83, readFileSync as readFileSync55 } from "fs";
-import { join as join91 } from "path";
+import { join as join92 } from "path";
 import { homedir as homedir15 } from "os";
 init_logger();
 function getMcpConfigPaths() {
   const claudeConfigDir = getClaudeConfigDir();
   const cwd = process.cwd();
   return [
-    { path: join91(homedir15(), ".claude.json"), scope: "user" },
-    { path: join91(claudeConfigDir, ".mcp.json"), scope: "user" },
-    { path: join91(cwd, ".mcp.json"), scope: "project" },
-    { path: join91(cwd, ".claude", ".mcp.json"), scope: "local" }
+    { path: join92(homedir15(), ".claude.json"), scope: "user" },
+    { path: join92(claudeConfigDir, ".mcp.json"), scope: "user" },
+    { path: join92(cwd, ".mcp.json"), scope: "project" },
+    { path: join92(cwd, ".claude", ".mcp.json"), scope: "local" }
   ];
 }
 async function loadMcpConfigFile(filePath) {
@@ -140388,7 +140487,7 @@ async function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, dir
 }
 // src/features/claude-code-agent-loader/loader.ts
 import { existsSync as existsSync85, readdirSync as readdirSync23, readFileSync as readFileSync57 } from "fs";
-import { join as join92, basename as basename14 } from "path";
+import { join as join93, basename as basename14 } from "path";
 function parseToolsConfig2(toolsStr) {
   if (!toolsStr)
     return;
@@ -140410,7 +140509,7 @@ function loadAgentsFromDir(agentsDir, scope) {
   for (const entry of entries) {
     if (!isMarkdownFile(entry))
       continue;
-    const agentPath = join92(agentsDir, entry.name);
+    const agentPath = join93(agentsDir, entry.name);
     const agentName = basename14(entry.name, ".md");
     try {
       const content = readFileSync57(agentPath, "utf-8");
@@ -140443,7 +140542,7 @@ function loadAgentsFromDir(agentsDir, scope) {
   return agents;
 }
 function loadUserAgents() {
-  const userAgentsDir = join92(getClaudeConfigDir(), "agents");
+  const userAgentsDir = join93(getClaudeConfigDir(), "agents");
   const agents = loadAgentsFromDir(userAgentsDir, "user");
   const result = {};
   for (const agent of agents) {
@@ -140452,7 +140551,7 @@ function loadUserAgents() {
   return result;
 }
 function loadProjectAgents(directory) {
-  const projectAgentsDir = join92(directory ?? process.cwd(), ".claude", "agents");
+  const projectAgentsDir = join93(directory ?? process.cwd(), ".claude", "agents");
   const agents = loadAgentsFromDir(projectAgentsDir, "project");
   const result = {};
   for (const agent of agents) {
@@ -142942,7 +143041,7 @@ async function applyAgentConfig(params) {
 }
 // src/features/claude-code-command-loader/loader.ts
 import { promises as fs19 } from "fs";
-import { join as join93, basename as basename15 } from "path";
+import { join as join94, basename as basename15 } from "path";
 init_logger();
 async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix = "") {
   try {
@@ -142973,7 +143072,7 @@ async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix
     if (entry.isDirectory()) {
       if (entry.name.startsWith("."))
         continue;
-      const subDirPath = join93(commandsDir, entry.name);
+      const subDirPath = join94(commandsDir, entry.name);
       const subPrefix = prefix ? `${prefix}/${entry.name}` : entry.name;
       const subCommands = await loadCommandsFromDir(subDirPath, scope, visited, subPrefix);
       commands3.push(...subCommands);
@@ -142981,7 +143080,7 @@ async function loadCommandsFromDir(commandsDir, scope, visited = new Set, prefix
     }
     if (!isMarkdownFile(entry))
       continue;
-    const commandPath = join93(commandsDir, entry.name);
+    const commandPath = join94(commandsDir, entry.name);
     const baseCommandName = basename15(entry.name, ".md");
     const commandName = prefix ? `${prefix}/${baseCommandName}` : baseCommandName;
     try {
@@ -143040,12 +143139,12 @@ function commandsToRecord(commands3) {
   return result;
 }
 async function loadUserCommands() {
-  const userCommandsDir = join93(getClaudeConfigDir(), "commands");
+  const userCommandsDir = join94(getClaudeConfigDir(), "commands");
   const commands3 = await loadCommandsFromDir(userCommandsDir, "user");
   return commandsToRecord(commands3);
 }
 async function loadProjectCommands(directory) {
-  const projectCommandsDir = join93(directory ?? process.cwd(), ".claude", "commands");
+  const projectCommandsDir = join94(directory ?? process.cwd(), ".claude", "commands");
   const commands3 = await loadCommandsFromDir(projectCommandsDir, "project");
   return commandsToRecord(commands3);
 }
@@ -144023,10 +144122,10 @@ function createChatHeadersHandler(args) {
 
 // src/plugin/ultrawork-db-model-override.ts
 import { Database } from "bun:sqlite";
-import { join as join94 } from "path";
+import { join as join95 } from "path";
 import { existsSync as existsSync86 } from "fs";
 function getDbPath() {
-  return join94(getDataDir(), "opencode", "opencode.db");
+  return join95(getDataDir(), "opencode", "opencode.db");
 }
 var MAX_MICROTASK_RETRIES = 10;
 function tryUpdateMessageModel(db, messageId, targetModel, variant) {