oh-my-opencode 3.15.0 → 3.15.2

package/dist/cli/index.js

@@ -6360,7 +6360,7 @@ function getOpenCodeConfigPaths(options) {
     configJson: join4(configDir, "opencode.json"),
     configJsonc: join4(configDir, "opencode.jsonc"),
     packageJson: join4(configDir, "package.json"),
-    omoConfig: join4(configDir, "oh-my-opencode.json")
+    omoConfig: join4(configDir, `${CONFIG_BASENAME}.json`)
   };
 }
 var TAURI_APP_IDENTIFIER = "ai.opencode.desktop", TAURI_APP_IDENTIFIER_DEV = "ai.opencode.desktop.dev";
@@ -48336,7 +48336,6 @@ var init_opencode_storage_paths = __esm(() => {
 // src/shared/opencode-message-dir.ts
 var init_opencode_message_dir = __esm(() => {
   init_opencode_storage_paths();
-  init_opencode_storage_detection();
   init_logger();
 });
 
@@ -48621,6 +48620,7 @@ var init_hook_loader = __esm(() => {
 });
 
 // src/features/claude-code-plugin-loader/loader.ts
+var cachedPluginComponentsByKey;
 var init_loader = __esm(() => {
   init_logger();
   init_discovery();
@@ -48635,6 +48635,7 @@ var init_loader = __esm(() => {
   init_agent_loader();
   init_mcp_server_loader();
   init_hook_loader();
+  cachedPluginComponentsByKey = new Map;
 });
 
 // src/features/claude-code-plugin-loader/index.ts
@@ -48765,6 +48766,10 @@ function getConfigJsonc() {
   return getConfigContext().paths.configJsonc;
 }
 function getOmoConfigPath() {
+  const configDir = getConfigContext().paths.configDir;
+  const detected = detectPluginConfigFile(configDir);
+  if (detected.format !== "none")
+    return detected.path;
   return getConfigContext().paths.omoConfig;
 }
 var configContext = null;
@@ -49465,6 +49470,10 @@ var init_detect_current_config = __esm(() => {
 
 // src/cli/config-manager/bun-install.ts
 import { existsSync as existsSync9 } from "fs";
+import { join as join8 } from "path";
+function getDefaultWorkspaceDir() {
+  return join8(getOpenCodeCacheDir(), "packages");
+}
 function readProcessOutput(stream) {
   if (!stream) {
     return Promise.resolve("");
@@ -49487,7 +49496,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 (!existsSync9(packageJsonPath)) {
     return {
@@ -49633,16 +49642,23 @@ function getWindowsAppdataDir() {
     return null;
   return process.env.APPDATA ?? path4.join(os3.homedir(), "AppData", "Roaming");
 }
-var PACKAGE_NAME = "oh-my-opencode", NPM_REGISTRY_URL, NPM_FETCH_TIMEOUT = 5000, CACHE_DIR, VERSION_FILE, USER_CONFIG_DIR, USER_OPENCODE_CONFIG, USER_OPENCODE_CONFIG_JSONC, INSTALLED_PACKAGE_JSON;
+function getUserConfigDir() {
+  return getOpenCodeConfigDir({ binary: "opencode" });
+}
+function getUserOpencodeConfig() {
+  return path4.join(getUserConfigDir(), "opencode.json");
+}
+function getUserOpencodeConfigJsonc() {
+  return path4.join(getUserConfigDir(), "opencode.jsonc");
+}
+var PACKAGE_NAME = "oh-my-openagent", NPM_REGISTRY_URL, NPM_FETCH_TIMEOUT = 5000, CACHE_ROOT_DIR, CACHE_DIR, VERSION_FILE, INSTALLED_PACKAGE_JSON;
 var init_constants3 = __esm(() => {
   init_data_path();
   init_opencode_config_dir();
   NPM_REGISTRY_URL = `https://registry.npmjs.org/-/package/${PACKAGE_NAME}/dist-tags`;
-  CACHE_DIR = getOpenCodeCacheDir();
-  VERSION_FILE = path4.join(CACHE_DIR, "version");
-  USER_CONFIG_DIR = getOpenCodeConfigDir({ binary: "opencode" });
-  USER_OPENCODE_CONFIG = path4.join(USER_CONFIG_DIR, "opencode.json");
-  USER_OPENCODE_CONFIG_JSONC = path4.join(USER_CONFIG_DIR, "opencode.jsonc");
+  CACHE_ROOT_DIR = getOpenCodeCacheDir();
+  CACHE_DIR = path4.join(CACHE_ROOT_DIR, "packages");
+  VERSION_FILE = path4.join(CACHE_ROOT_DIR, "version");
   INSTALLED_PACKAGE_JSON = path4.join(CACHE_DIR, "node_modules", PACKAGE_NAME, "package.json");
 });
 
@@ -49650,17 +49666,18 @@ var init_constants3 = __esm(() => {
 import * as os4 from "os";
 import * as path5 from "path";
 function getConfigPaths(directory) {
+  const userConfigDir = getUserConfigDir();
   const paths = [
     path5.join(directory, ".opencode", "opencode.json"),
     path5.join(directory, ".opencode", "opencode.jsonc"),
-    USER_OPENCODE_CONFIG,
-    USER_OPENCODE_CONFIG_JSONC
+    getUserOpencodeConfig(),
+    getUserOpencodeConfigJsonc()
   ];
   if (process.platform === "win32") {
     const crossPlatformDir = path5.join(os4.homedir(), ".config");
     const appdataDir = getWindowsAppdataDir();
     if (appdataDir) {
-      const alternateDir = USER_CONFIG_DIR === crossPlatformDir ? appdataDir : crossPlatformDir;
+      const alternateDir = userConfigDir === crossPlatformDir ? appdataDir : crossPlatformDir;
       const alternateConfig = path5.join(alternateDir, "opencode", "opencode.json");
       const alternateConfigJsonc = path5.join(alternateDir, "opencode", "opencode.jsonc");
       if (!paths.includes(alternateConfig)) {
@@ -49986,11 +50003,28 @@ function getIntentVersion(pluginInfo) {
   }
   return pluginInfo.pinnedVersion;
 }
+function writeCachePackageJson(cachePackageJsonPath, pkgJson) {
+  const tmpPath = `${cachePackageJsonPath}.${crypto.randomUUID()}`;
+  try {
+    fs9.mkdirSync(path8.dirname(cachePackageJsonPath), { recursive: true });
+    fs9.writeFileSync(tmpPath, JSON.stringify(pkgJson, null, 2));
+    fs9.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 = path8.join(CACHE_DIR, "package.json");
+  const intentVersion = getIntentVersion(pluginInfo);
   if (!fs9.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;
@@ -50007,11 +50041,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}` };
@@ -50024,16 +50067,10 @@ function syncCachePackageJsonToIntent(pluginInfo) {
     log(`[auto-update-checker] Updating cache package.json: "${currentVersion}" \u2192 "${intentVersion}"`);
   }
   pkgJson.dependencies[PACKAGE_NAME] = intentVersion;
-  const tmpPath = `${cachePackageJsonPath}.${crypto.randomUUID()}`;
-  try {
-    fs9.writeFileSync(tmpPath, JSON.stringify(pkgJson, null, 2));
-    fs9.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}"`
+  };
 }
 var EXACT_SEMVER_REGEX2;
 var init_sync_package_json = __esm(() => {
@@ -50097,8 +50134,9 @@ function removeFromBunLock(packageName) {
 }
 function invalidatePackage(packageName = PACKAGE_NAME) {
   try {
+    const userConfigDir = getUserConfigDir();
     const pkgDirs = [
-      path9.join(USER_CONFIG_DIR, "node_modules", packageName),
+      path9.join(userConfigDir, "node_modules", packageName),
       path9.join(CACHE_DIR, "node_modules", packageName)
     ];
     let packageRemoved = false;
@@ -50160,13 +50198,16 @@ var init_update_toasts = __esm(() => {
 
 // src/hooks/auto-update-checker/hook/background-update-check.ts
 import { existsSync as existsSync21 } from "fs";
-import { join as join19 } from "path";
+import { join as join20 } from "path";
+function getCacheWorkspaceDir(deps) {
+  return deps.join(deps.getOpenCodeCacheDir(), "packages");
+}
 function getPinnedVersionToastMessage(latestVersion) {
   return `Update available: ${latestVersion} (version pinned, update manually)`;
 }
 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)) {
@@ -50177,6 +50218,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;
 }
@@ -50193,6 +50239,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) {
@@ -50238,6 +50292,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;
@@ -50257,7 +50317,7 @@ var init_background_update_check = __esm(() => {
   init_update_toasts();
   defaultDeps = {
     existsSync: existsSync21,
-    join: join19,
+    join: join20,
     runBunInstallWithDetails,
     log,
     getOpenCodeCacheDir,
@@ -50537,7 +50597,7 @@ var {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "3.15.0",
+  version: "3.15.2",
   description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   main: "./dist/index.js",
   types: "dist/index.d.ts",
@@ -50615,17 +50675,17 @@ var package_default = {
     typescript: "^5.7.3"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "3.15.0",
-    "oh-my-opencode-darwin-x64": "3.15.0",
-    "oh-my-opencode-darwin-x64-baseline": "3.15.0",
-    "oh-my-opencode-linux-arm64": "3.15.0",
-    "oh-my-opencode-linux-arm64-musl": "3.15.0",
-    "oh-my-opencode-linux-x64": "3.15.0",
-    "oh-my-opencode-linux-x64-baseline": "3.15.0",
-    "oh-my-opencode-linux-x64-musl": "3.15.0",
-    "oh-my-opencode-linux-x64-musl-baseline": "3.15.0",
-    "oh-my-opencode-windows-x64": "3.15.0",
-    "oh-my-opencode-windows-x64-baseline": "3.15.0"
+    "oh-my-opencode-darwin-arm64": "3.15.2",
+    "oh-my-opencode-darwin-x64": "3.15.2",
+    "oh-my-opencode-darwin-x64-baseline": "3.15.2",
+    "oh-my-opencode-linux-arm64": "3.15.2",
+    "oh-my-opencode-linux-arm64-musl": "3.15.2",
+    "oh-my-opencode-linux-x64": "3.15.2",
+    "oh-my-opencode-linux-x64-baseline": "3.15.2",
+    "oh-my-opencode-linux-x64-musl": "3.15.2",
+    "oh-my-opencode-linux-x64-musl-baseline": "3.15.2",
+    "oh-my-opencode-windows-x64": "3.15.2",
+    "oh-my-opencode-windows-x64-baseline": "3.15.2"
   },
   overrides: {
     "@opencode-ai/sdk": "^1.2.24"
@@ -66429,11 +66489,11 @@ init_shared();
 init_logger();
 init_write_file_atomically();
 import { existsSync as existsSync10, readFileSync as readFileSync8, renameSync as renameSync2, rmSync } from "fs";
-import { join as join8, dirname, basename } from "path";
+import { join as join9, dirname, basename } from "path";
 function buildCanonicalPath(legacyPath) {
   const dir = dirname(legacyPath);
   const ext = basename(legacyPath).includes(".jsonc") ? ".jsonc" : ".json";
-  return join8(dir, `${CONFIG_BASENAME}${ext}`);
+  return join9(dir, `${CONFIG_BASENAME}${ext}`);
 }
 function archiveLegacyConfigFile(legacyPath) {
   const backupPath = `${legacyPath}.bak`;
@@ -66616,7 +66676,7 @@ function mergeConfigs(base, override) {
 function loadPluginConfig(directory, ctx) {
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   const userDetected = detectPluginConfigFile(configDir);
-  let userConfigPath = userDetected.format !== "none" ? userDetected.path : path3.join(configDir, "oh-my-opencode.json");
+  let userConfigPath = userDetected.format !== "none" ? userDetected.path : path3.join(configDir, `${CONFIG_BASENAME}.json`);
   if (userDetected.legacyPath) {
     log("Canonical plugin config detected alongside legacy config. Remove the legacy file to avoid confusion.", {
       canonicalPath: userDetected.path,
@@ -66624,12 +66684,15 @@ function loadPluginConfig(directory, ctx) {
     });
   }
   if (userDetected.format !== "none" && path3.basename(userDetected.path).startsWith(LEGACY_CONFIG_BASENAME)) {
-    migrateLegacyConfigFile(userDetected.path);
-    userConfigPath = path3.join(path3.dirname(userDetected.path), `${CONFIG_BASENAME}${path3.extname(userDetected.path)}`);
+    const migrated = migrateLegacyConfigFile(userDetected.path);
+    const canonicalPath = path3.join(path3.dirname(userDetected.path), `${CONFIG_BASENAME}${path3.extname(userDetected.path)}`);
+    if (migrated || fs3.existsSync(canonicalPath)) {
+      userConfigPath = canonicalPath;
+    }
   }
   const projectBasePath = path3.join(directory, ".opencode");
   const projectDetected = detectPluginConfigFile(projectBasePath);
-  let projectConfigPath = projectDetected.format !== "none" ? projectDetected.path : path3.join(projectBasePath, "oh-my-opencode.json");
+  let projectConfigPath = projectDetected.format !== "none" ? projectDetected.path : path3.join(projectBasePath, `${CONFIG_BASENAME}.json`);
   if (projectDetected.legacyPath) {
     log("Canonical plugin config detected alongside legacy config. Remove the legacy file to avoid confusion.", {
       canonicalPath: projectDetected.path,
@@ -66637,8 +66700,11 @@ function loadPluginConfig(directory, ctx) {
     });
   }
   if (projectDetected.format !== "none" && path3.basename(projectDetected.path).startsWith(LEGACY_CONFIG_BASENAME)) {
-    migrateLegacyConfigFile(projectDetected.path);
-    projectConfigPath = path3.join(path3.dirname(projectDetected.path), `${CONFIG_BASENAME}${path3.extname(projectDetected.path)}`);
+    const projectMigrated = migrateLegacyConfigFile(projectDetected.path);
+    const canonicalProjectPath = path3.join(path3.dirname(projectDetected.path), `${CONFIG_BASENAME}${path3.extname(projectDetected.path)}`);
+    if (projectMigrated || fs3.existsSync(canonicalProjectPath)) {
+      projectConfigPath = canonicalProjectPath;
+    }
   }
   const userConfig = loadConfigFromPath(userConfigPath, ctx);
   let config2 = userConfig ?? OhMyOpenCodeConfigSchema.parse({});
@@ -68107,7 +68173,7 @@ var import_picocolors9 = __toESM(require_picocolors(), 1);
 
 // src/cli/run/opencode-binary-resolver.ts
 init_spawn_with_windows_hide();
-import { delimiter, dirname as dirname3, join as join10 } from "path";
+import { delimiter, dirname as dirname3, join as join11 } from "path";
 var OPENCODE_COMMANDS = ["opencode", "opencode-desktop"];
 var WINDOWS_SUFFIXES = ["", ".exe", ".cmd", ".bat", ".ps1"];
 function getCommandCandidates(platform) {
@@ -68130,7 +68196,7 @@ function collectCandidateBinaryPaths(pathEnv, which = Bun.which, platform = proc
   }
   for (const entry of (pathEnv ?? "").split(delimiter).filter(Boolean)) {
     for (const command of commandCandidates) {
-      addCandidate(join10(entry, command));
+      addCandidate(join11(entry, command));
     }
   }
   return candidates;
@@ -68514,10 +68580,10 @@ var NOTEPAD_DIR = "notepads";
 var NOTEPAD_BASE_PATH = `${BOULDER_DIR}/${NOTEPAD_DIR}`;
 // src/features/boulder-state/storage.ts
 import { existsSync as existsSync12, readFileSync as readFileSync10, writeFileSync as writeFileSync5, mkdirSync as mkdirSync4, readdirSync } from "fs";
-import { dirname as dirname4, join as join11, basename as basename3 } from "path";
+import { dirname as dirname4, join as join12, basename as basename3 } from "path";
 var RESERVED_KEYS = new Set(["__proto__", "prototype", "constructor"]);
 function getBoulderFilePath(directory) {
-  return join11(directory, BOULDER_DIR, BOULDER_FILE);
+  return join12(directory, BOULDER_DIR, BOULDER_FILE);
 }
 function readBoulderState(directory) {
   const filePath = getBoulderFilePath(directory);
@@ -68564,9 +68630,9 @@ function getPlanProgress(planPath) {
 var CONTINUATION_MARKER_DIR = ".sisyphus/run-continuation";
 // src/features/run-continuation-state/storage.ts
 import { existsSync as existsSync13, mkdirSync as mkdirSync5, readFileSync as readFileSync11, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "fs";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 function getMarkerPath(directory, sessionID) {
-  return join12(directory, CONTINUATION_MARKER_DIR, `${sessionID}.json`);
+  return join13(directory, CONTINUATION_MARKER_DIR, `${sessionID}.json`);
 }
 function readContinuationMarker(directory, sessionID) {
   const markerPath = getMarkerPath(directory, sessionID);
@@ -68599,7 +68665,7 @@ function getActiveContinuationMarkerReason(marker) {
 // src/hooks/ralph-loop/storage.ts
 init_frontmatter();
 import { existsSync as existsSync14, readFileSync as readFileSync12, writeFileSync as writeFileSync7, unlinkSync, mkdirSync as mkdirSync6 } from "fs";
-import { dirname as dirname5, join as join13 } from "path";
+import { dirname as dirname5, join as join14 } from "path";
 
 // src/hooks/ralph-loop/constants.ts
 var DEFAULT_STATE_FILE = ".sisyphus/ralph-loop.local.md";
@@ -68608,7 +68674,7 @@ var DEFAULT_COMPLETION_PROMISE = "DONE";
 
 // src/hooks/ralph-loop/storage.ts
 function getStateFilePath(directory, customPath) {
-  return customPath ? join13(directory, customPath) : join13(directory, DEFAULT_STATE_FILE);
+  return customPath ? join14(directory, customPath) : join14(directory, DEFAULT_STATE_FILE);
 }
 function readState(directory, customPath) {
   const filePath = getStateFilePath(directory, customPath);
@@ -69328,24 +69394,24 @@ import { existsSync as existsSync25, readFileSync as readFileSync22 } from "fs";
 init_spawn_with_windows_hide();
 import { existsSync as existsSync22 } from "fs";
 import { homedir as homedir5 } from "os";
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 function getDesktopAppPaths(platform) {
   const home = homedir5();
   switch (platform) {
     case "darwin":
       return [
         "/Applications/OpenCode.app/Contents/MacOS/OpenCode",
-        join20(home, "Applications", "OpenCode.app", "Contents", "MacOS", "OpenCode")
+        join21(home, "Applications", "OpenCode.app", "Contents", "MacOS", "OpenCode")
       ];
     case "win32": {
       const programFiles = process.env.ProgramFiles;
       const localAppData = process.env.LOCALAPPDATA;
       const paths = [];
       if (programFiles) {
-        paths.push(join20(programFiles, "OpenCode", "OpenCode.exe"));
+        paths.push(join21(programFiles, "OpenCode", "OpenCode.exe"));
       }
       if (localAppData) {
-        paths.push(join20(localAppData, "OpenCode", "OpenCode.exe"));
+        paths.push(join21(localAppData, "OpenCode", "OpenCode.exe"));
       }
       return paths;
     }
@@ -69353,8 +69419,8 @@ function getDesktopAppPaths(platform) {
       return [
         "/usr/bin/opencode",
         "/usr/lib/opencode/opencode",
-        join20(home, "Applications", "opencode-desktop-linux-x86_64.AppImage"),
-        join20(home, "Applications", "opencode-desktop-linux-aarch64.AppImage")
+        join21(home, "Applications", "opencode-desktop-linux-x86_64.AppImage"),
+        join21(home, "Applications", "opencode-desktop-linux-aarch64.AppImage")
       ];
     default:
       return [];
@@ -69505,21 +69571,21 @@ init_checker();
 init_auto_update_checker();
 import { existsSync as existsSync24, readFileSync as readFileSync21 } from "fs";
 import { homedir as homedir6 } from "os";
-import { join as join21 } from "path";
+import { join as join22 } from "path";
 init_shared();
 function getPlatformDefaultCacheDir(platform = process.platform) {
   if (platform === "darwin")
-    return join21(homedir6(), "Library", "Caches");
+    return join22(homedir6(), "Library", "Caches");
   if (platform === "win32")
-    return process.env.LOCALAPPDATA ?? join21(homedir6(), "AppData", "Local");
-  return join21(homedir6(), ".cache");
+    return process.env.LOCALAPPDATA ?? join22(homedir6(), "AppData", "Local");
+  return join22(homedir6(), ".cache");
 }
 function resolveOpenCodeCacheDir() {
   const xdgCacheHome = process.env.XDG_CACHE_HOME;
   if (xdgCacheHome)
-    return join21(xdgCacheHome, "opencode");
+    return join22(xdgCacheHome, "opencode");
   const fromShared = getOpenCodeCacheDir();
-  const platformDefault = join21(getPlatformDefaultCacheDir(), "opencode");
+  const platformDefault = join22(getPlatformDefaultCacheDir(), "opencode");
   if (existsSync24(fromShared) || !existsSync24(platformDefault))
     return fromShared;
   return platformDefault;
@@ -69552,13 +69618,13 @@ function getLoadedPluginVersion() {
   const candidates = [
     {
       cacheDir: configDir,
-      cachePackagePath: join21(configDir, "package.json"),
-      installedPackagePath: join21(configDir, "node_modules", PACKAGE_NAME2, "package.json")
+      cachePackagePath: join22(configDir, "package.json"),
+      installedPackagePath: join22(configDir, "node_modules", PACKAGE_NAME2, "package.json")
     },
     {
       cacheDir,
-      cachePackagePath: join21(cacheDir, "package.json"),
-      installedPackagePath: join21(cacheDir, "node_modules", PACKAGE_NAME2, "package.json")
+      cachePackagePath: join22(cacheDir, "package.json"),
+      installedPackagePath: join22(cacheDir, "node_modules", PACKAGE_NAME2, "package.json")
     }
   ];
   const selectedCandidate = candidates.find((candidate) => existsSync24(candidate.installedPackagePath)) ?? candidates[0];
@@ -69708,22 +69774,22 @@ async function checkSystem() {
 
 // src/cli/doctor/checks/config.ts
 import { readFileSync as readFileSync25 } from "fs";
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 init_shared();
 
 // src/cli/doctor/checks/model-resolution-cache.ts
 init_shared();
 import { existsSync as existsSync26, readFileSync as readFileSync23 } from "fs";
 import { homedir as homedir7 } from "os";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 function getOpenCodeCacheDir2() {
   const xdgCache = process.env.XDG_CACHE_HOME;
   if (xdgCache)
-    return join22(xdgCache, "opencode");
-  return join22(homedir7(), ".cache", "opencode");
+    return join23(xdgCache, "opencode");
+  return join23(homedir7(), ".cache", "opencode");
 }
 function loadAvailableModelsFromCache() {
-  const cacheFile = join22(getOpenCodeCacheDir2(), "models.json");
+  const cacheFile = join23(getOpenCodeCacheDir2(), "models.json");
   if (!existsSync26(cacheFile)) {
     return { providers: [], modelCount: 0, cacheExists: false };
   }
@@ -69751,9 +69817,8 @@ init_model_capabilities();
 // src/cli/doctor/checks/model-resolution-config.ts
 init_shared();
 import { readFileSync as readFileSync24 } from "fs";
-import { join as join23 } from "path";
-var USER_CONFIG_DIR2 = getOpenCodeConfigPaths({ binary: "opencode", version: null }).configDir;
-var PROJECT_CONFIG_DIR = join23(process.cwd(), ".opencode");
+import { join as join24 } from "path";
+var PROJECT_CONFIG_DIR = join24(process.cwd(), ".opencode");
 function loadOmoConfig() {
   const projectDetected = detectPluginConfigFile(PROJECT_CONFIG_DIR);
   if (projectDetected.format !== "none") {
@@ -69764,7 +69829,8 @@ function loadOmoConfig() {
       return null;
     }
   }
-  const userDetected = detectPluginConfigFile(USER_CONFIG_DIR2);
+  const userConfigDir = getOpenCodeConfigDir({ binary: "opencode" });
+  const userDetected = detectPluginConfigFile(userConfigDir);
   if (userDetected.format !== "none") {
     try {
       const content = readFileSync24(userDetected.path, "utf-8");
@@ -69778,7 +69844,7 @@ function loadOmoConfig() {
 
 // src/cli/doctor/checks/model-resolution-details.ts
 init_shared();
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 
 // src/cli/doctor/checks/model-resolution-variant.ts
 function formatModelWithVariant(model, variant) {
@@ -69820,7 +69886,7 @@ function formatCapabilityResolutionLabel(mode) {
 }
 function buildModelResolutionDetails(options) {
   const details = [];
-  const cacheFile = join24(getOpenCodeCacheDir(), "models.json");
+  const cacheFile = join25(getOpenCodeCacheDir(), "models.json");
   details.push("\u2550\u2550\u2550 Available Models (from cache) \u2550\u2550\u2550");
   details.push("");
   if (options.available.cacheExists) {
@@ -69975,13 +70041,13 @@ async function checkModels() {
 }
 
 // src/cli/doctor/checks/config.ts
-var USER_CONFIG_DIR3 = getOpenCodeConfigDir({ binary: "opencode" });
-var PROJECT_CONFIG_DIR2 = join25(process.cwd(), ".opencode");
+var PROJECT_CONFIG_DIR2 = join26(process.cwd(), ".opencode");
 function findConfigPath() {
   const projectConfig = detectPluginConfigFile(PROJECT_CONFIG_DIR2);
   if (projectConfig.format !== "none")
     return projectConfig.path;
-  const userConfig = detectPluginConfigFile(USER_CONFIG_DIR3);
+  const userConfigDir = getOpenCodeConfigDir({ binary: "opencode" });
+  const userConfig = detectPluginConfigFile(userConfigDir);
   if (userConfig.format !== "none")
     return userConfig.path;
   return null;
@@ -70098,7 +70164,7 @@ async function checkConfig() {
 init_spawn_with_windows_hide();
 import { existsSync as existsSync27 } from "fs";
 import { createRequire } from "module";
-import { dirname as dirname8, join as join26 } from "path";
+import { dirname as dirname9, join as join27 } from "path";
 async function checkBinaryExists(binary2) {
   try {
     const path10 = Bun.which(binary2);
@@ -70155,11 +70221,11 @@ async function checkAstGrepNapi() {
     };
   } catch {
     const { existsSync: existsSync28 } = await import("fs");
-    const { join: join27 } = await import("path");
+    const { join: join28 } = await import("path");
     const { homedir: homedir8 } = await import("os");
     const pathsToCheck = [
-      join27(homedir8(), ".config", "opencode", "node_modules", "@ast-grep", "napi"),
-      join27(process.cwd(), "node_modules", "@ast-grep", "napi")
+      join28(homedir8(), ".config", "opencode", "node_modules", "@ast-grep", "napi"),
+      join28(process.cwd(), "node_modules", "@ast-grep", "napi")
     ];
     for (const napiPath of pathsToCheck) {
       if (existsSync28(napiPath)) {
@@ -70187,7 +70253,7 @@ function findCommentCheckerPackageBinary() {
   try {
     const require2 = createRequire(import.meta.url);
     const pkgPath = require2.resolve("@code-yeongyu/comment-checker/package.json");
-    const binaryPath = join26(dirname8(pkgPath), "bin", binaryName);
+    const binaryPath = join27(dirname9(pkgPath), "bin", binaryName);
     if (existsSync27(binaryPath))
       return binaryPath;
   } catch {}
@@ -70346,7 +70412,7 @@ var BUILTIN_SERVERS = {
 };
 // src/tools/lsp/server-config-loader.ts
 import { existsSync as existsSync28, readFileSync as readFileSync26 } from "fs";
-import { join as join27 } from "path";
+import { join as join28 } from "path";
 init_shared();
 init_jsonc_parser();
 function loadJsonFile(path10) {
@@ -70362,9 +70428,9 @@ function getConfigPaths2() {
   const cwd = process.cwd();
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   return {
-    project: detectPluginConfigFile(join27(cwd, ".opencode")).path,
+    project: detectPluginConfigFile(join28(cwd, ".opencode")).path,
     user: detectPluginConfigFile(configDir).path,
-    opencode: detectConfigFile(join27(configDir, "opencode")).path
+    opencode: detectConfigFile(join28(configDir, "opencode")).path
   };
 }
 function loadAllConfigs() {
@@ -70434,20 +70500,20 @@ function getMergedServers() {
 
 // src/tools/lsp/server-installation.ts
 import { existsSync as existsSync29 } from "fs";
-import { delimiter as delimiter2, join as join29 } from "path";
+import { delimiter as delimiter2, join as join30 } from "path";
 
 // src/tools/lsp/server-path-bases.ts
 init_shared();
-import { join as join28 } from "path";
+import { join as join29 } from "path";
 function getLspServerAdditionalPathBases(workingDirectory) {
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
-  const dataDir = join28(getDataDir(), "opencode");
+  const dataDir = join29(getDataDir(), "opencode");
   return [
-    join28(workingDirectory, "node_modules", ".bin"),
-    join28(configDir, "bin"),
-    join28(configDir, "node_modules", ".bin"),
-    join28(dataDir, "bin"),
-    join28(dataDir, "bin", "node_modules", ".bin")
+    join29(workingDirectory, "node_modules", ".bin"),
+    join29(configDir, "bin"),
+    join29(configDir, "node_modules", ".bin"),
+    join29(dataDir, "bin"),
+    join29(dataDir, "bin", "node_modules", ".bin")
   ];
 }
 
@@ -70478,14 +70544,14 @@ function isServerInstalled(command) {
   const paths = pathEnv.split(delimiter2);
   for (const p2 of paths) {
     for (const suffix of exts) {
-      if (existsSync29(join29(p2, cmd + suffix))) {
+      if (existsSync29(join30(p2, cmd + suffix))) {
         return true;
       }
     }
   }
   for (const base of getLspServerAdditionalPathBases(process.cwd())) {
     for (const suffix of exts) {
-      if (existsSync29(join29(base, cmd + suffix))) {
+      if (existsSync29(join30(base, cmd + suffix))) {
         return true;
       }
     }
@@ -70549,13 +70615,13 @@ function getInstalledLspServers() {
 init_shared();
 import { existsSync as existsSync30, readFileSync as readFileSync27 } from "fs";
 import { homedir as homedir8 } from "os";
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 var BUILTIN_MCP_SERVERS = ["context7", "grep_app"];
 function getMcpConfigPaths() {
   return [
-    join30(homedir8(), ".claude", ".mcp.json"),
-    join30(process.cwd(), ".mcp.json"),
-    join30(process.cwd(), ".claude", ".mcp.json")
+    join31(homedir8(), ".claude", ".mcp.json"),
+    join31(process.cwd(), ".mcp.json"),
+    join31(process.cwd(), ".claude", ".mcp.json")
   ];
 }
 function loadUserMcpConfig() {
@@ -71017,11 +71083,11 @@ async function refreshModelCapabilities(options, deps = {}) {
 
 // src/features/mcp-oauth/storage.ts
 init_shared();
-import { chmodSync, existsSync as existsSync31, mkdirSync as mkdirSync7, readFileSync as readFileSync28, unlinkSync as unlinkSync4, writeFileSync as writeFileSync10 } from "fs";
-import { dirname as dirname9, join as join31 } from "path";
+import { chmodSync, existsSync as existsSync31, mkdirSync as mkdirSync8, readFileSync as readFileSync28, unlinkSync as unlinkSync4, writeFileSync as writeFileSync10 } from "fs";
+import { dirname as dirname10, join as join32 } from "path";
 var STORAGE_FILE_NAME = "mcp-oauth.json";
 function getMcpOauthStoragePath() {
-  return join31(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
+  return join32(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
 }
 function normalizeHost(serverHost) {
   let host = serverHost.trim();
@@ -71071,9 +71137,9 @@ function readStore() {
 function writeStore(store2) {
   const filePath = getMcpOauthStoragePath();
   try {
-    const dir = dirname9(filePath);
+    const dir = dirname10(filePath);
     if (!existsSync31(dir)) {
-      mkdirSync7(dir, { recursive: true });
+      mkdirSync8(dir, { recursive: true });
     }
     writeFileSync10(filePath, JSON.stringify(store2, null, 2), { encoding: "utf-8", mode: 384 });
     chmodSync(filePath, 384);