oh-my-opencode 3.11.2 → 3.12.0

package/dist/cli/index.js

@@ -4977,6 +4977,9 @@ var init_tool_name = () => {};
 // src/shared/file-utils.ts
 var init_file_utils = () => {};
 
+// src/shared/context-limit-resolver.ts
+var init_context_limit_resolver = () => {};
+
 // src/shared/normalize-sdk-response.ts
 function normalizeSDKResponse(response, fallback, options) {
   if (response === null || response === undefined) {
@@ -5002,7 +5005,9 @@ function normalizeSDKResponse(response, fallback, options) {
 }
 
 // src/shared/dynamic-truncator.ts
-var init_dynamic_truncator = () => {};
+var init_dynamic_truncator = __esm(() => {
+  init_context_limit_resolver();
+});
 
 // src/shared/data-path.ts
 import * as path2 from "path";
@@ -6017,7 +6022,8 @@ var init_hook_names = __esm(() => {
     "anthropic-auto-compact": "anthropic-context-window-limit-recovery",
     "sisyphus-orchestrator": "atlas",
     "sisyphus-gpt-hephaestus-reminder": "no-sisyphus-gpt",
-    "empty-message-sanitizer": null
+    "empty-message-sanitizer": null,
+    "delegate-task-english-directive": null
   };
 });
 
@@ -6218,20 +6224,6 @@ function getCliConfigDir() {
   if (envConfigDir) {
     return resolve(envConfigDir);
   }
-  if (process.platform === "win32") {
-    const crossPlatformDir = join3(homedir2(), ".config", "opencode");
-    const crossPlatformConfig = join3(crossPlatformDir, "opencode.json");
-    if (existsSync2(crossPlatformConfig)) {
-      return crossPlatformDir;
-    }
-    const appData = process.env.APPDATA || join3(homedir2(), "AppData", "Roaming");
-    const appdataDir = join3(appData, "opencode");
-    const appdataConfig = join3(appdataDir, "opencode.json");
-    if (existsSync2(appdataConfig)) {
-      return appdataDir;
-    }
-    return crossPlatformDir;
-  }
   const xdgConfig = process.env.XDG_CONFIG_HOME || join3(homedir2(), ".config");
   return join3(xdgConfig, "opencode");
 }
@@ -6304,6 +6296,7 @@ var init_model_requirements = __esm(() => {
           model: "claude-opus-4-6",
           variant: "max"
         },
+        { providers: ["opencode-go"], model: "kimi-k2.5" },
         { providers: ["kimi-for-coding"], model: "k2p5" },
         {
           providers: [
@@ -6349,22 +6342,22 @@ var init_model_requirements = __esm(() => {
           providers: ["anthropic", "github-copilot", "opencode"],
           model: "claude-opus-4-6",
           variant: "max"
-        }
+        },
+        { providers: ["opencode-go"], model: "glm-5" }
       ]
     },
     librarian: {
       fallbackChain: [
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3-flash"
-        },
+        { providers: ["opencode-go"], model: "minimax-m2.5" },
         { providers: ["opencode"], model: "minimax-m2.5-free" },
-        { providers: ["opencode"], model: "big-pickle" }
+        { providers: ["anthropic", "opencode"], model: "claude-haiku-4-5" },
+        { providers: ["opencode"], model: "gpt-5-nano" }
       ]
     },
     explore: {
       fallbackChain: [
         { providers: ["github-copilot"], model: "grok-code-fast-1" },
+        { providers: ["opencode-go"], model: "minimax-m2.5" },
         { providers: ["opencode"], model: "minimax-m2.5-free" },
         { providers: ["anthropic", "opencode"], model: "claude-haiku-4-5" },
         { providers: ["opencode"], model: "gpt-5-nano" }
@@ -6372,21 +6365,10 @@ var init_model_requirements = __esm(() => {
     },
     "multimodal-looker": {
       fallbackChain: [
-        {
-          providers: ["openai", "opencode"],
-          model: "gpt-5.4",
-          variant: "medium"
-        },
-        { providers: ["kimi-for-coding"], model: "k2p5" },
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3-flash"
-        },
+        { providers: ["openai", "opencode"], model: "gpt-5.4", variant: "medium" },
+        { providers: ["opencode-go"], model: "kimi-k2.5" },
         { providers: ["zai-coding-plan"], model: "glm-4.6v" },
-        {
-          providers: ["openai", "github-copilot", "opencode"],
-          model: "gpt-5-nano"
-        }
+        { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5-nano" }
       ]
     },
     prometheus: {
@@ -6401,6 +6383,7 @@ var init_model_requirements = __esm(() => {
           model: "gpt-5.4",
           variant: "high"
         },
+        { providers: ["opencode-go"], model: "glm-5" },
         {
           providers: ["google", "github-copilot", "opencode"],
           model: "gemini-3.1-pro"
@@ -6419,11 +6402,8 @@ var init_model_requirements = __esm(() => {
           model: "gpt-5.4",
           variant: "high"
         },
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3.1-pro",
-          variant: "high"
-        }
+        { providers: ["opencode-go"], model: "glm-5" },
+        { providers: ["kimi-for-coding"], model: "k2p5" }
       ]
     },
     momus: {
@@ -6442,16 +6422,31 @@ var init_model_requirements = __esm(() => {
           providers: ["google", "github-copilot", "opencode"],
           model: "gemini-3.1-pro",
           variant: "high"
-        }
+        },
+        { providers: ["opencode-go"], model: "glm-5" }
       ]
     },
     atlas: {
       fallbackChain: [
+        { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-6" },
+        { providers: ["opencode-go"], model: "kimi-k2.5" },
         {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-sonnet-4-6"
+          providers: ["openai", "github-copilot", "opencode"],
+          model: "gpt-5.4",
+          variant: "medium"
+        }
+      ]
+    },
+    "sisyphus-junior": {
+      fallbackChain: [
+        { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-6" },
+        { providers: ["opencode-go"], model: "kimi-k2.5" },
+        {
+          providers: ["openai", "github-copilot", "opencode"],
+          model: "gpt-5.4",
+          variant: "medium"
         },
-        { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.4", variant: "medium" }
+        { providers: ["opencode"], model: "big-pickle" }
       ]
     }
   };
@@ -6468,14 +6463,16 @@ var init_model_requirements = __esm(() => {
           providers: ["anthropic", "github-copilot", "opencode"],
           model: "claude-opus-4-6",
           variant: "max"
-        }
+        },
+        { providers: ["opencode-go"], model: "glm-5" },
+        { providers: ["kimi-for-coding"], model: "k2p5" }
       ]
     },
     ultrabrain: {
       fallbackChain: [
         {
           providers: ["openai", "opencode"],
-          model: "gpt-5.3-codex",
+          model: "gpt-5.4",
           variant: "xhigh"
         },
         {
@@ -6487,7 +6484,8 @@ var init_model_requirements = __esm(() => {
           providers: ["anthropic", "github-copilot", "opencode"],
           model: "claude-opus-4-6",
           variant: "max"
-        }
+        },
+        { providers: ["opencode-go"], model: "glm-5" }
       ]
     },
     deep: {
@@ -6536,6 +6534,7 @@ var init_model_requirements = __esm(() => {
           providers: ["google", "github-copilot", "opencode"],
           model: "gemini-3-flash"
         },
+        { providers: ["opencode-go"], model: "minimax-m2.5" },
         { providers: ["opencode"], model: "gpt-5-nano" }
       ]
     },
@@ -6550,6 +6549,7 @@ var init_model_requirements = __esm(() => {
           model: "gpt-5.3-codex",
           variant: "medium"
         },
+        { providers: ["opencode-go"], model: "kimi-k2.5" },
         {
           providers: ["google", "github-copilot", "opencode"],
           model: "gemini-3-flash"
@@ -6558,18 +6558,20 @@ var init_model_requirements = __esm(() => {
     },
     "unspecified-high": {
       fallbackChain: [
-        {
-          providers: ["openai", "github-copilot", "opencode"],
-          model: "gpt-5.4",
-          variant: "high"
-        },
         {
           providers: ["anthropic", "github-copilot", "opencode"],
           model: "claude-opus-4-6",
           variant: "max"
         },
+        {
+          providers: ["openai", "github-copilot", "opencode"],
+          model: "gpt-5.4",
+          variant: "high"
+        },
         { providers: ["zai-coding-plan", "opencode"], model: "glm-5" },
         { providers: ["kimi-for-coding"], model: "k2p5" },
+        { providers: ["opencode-go"], model: "glm-5" },
+        { providers: ["opencode"], model: "kimi-k2.5" },
         {
           providers: [
             "opencode",
@@ -6589,6 +6591,7 @@ var init_model_requirements = __esm(() => {
           providers: ["google", "github-copilot", "opencode"],
           model: "gemini-3-flash"
         },
+        { providers: ["opencode-go"], model: "kimi-k2.5" },
         {
           providers: ["anthropic", "github-copilot", "opencode"],
           model: "claude-sonnet-4-6"
@@ -6940,6 +6943,11 @@ var init_git_worktree = __esm(() => {
 var init_safe_create_hook = __esm(() => {
   init_logger();
 });
+// src/shared/opencode-command-dirs.ts
+var init_opencode_command_dirs = __esm(() => {
+  init_opencode_config_dir();
+});
+
 // src/shared/session-directory-resolver.ts
 var init_session_directory_resolver = () => {};
 
@@ -6975,12 +6983,22 @@ var init_skill_loader = __esm(() => {
   init_skill_path_resolver();
   init_logger();
 });
+// src/features/claude-code-agent-loader/claude-model-mapper.ts
+var ANTHROPIC_PREFIX = "anthropic/", CLAUDE_CODE_ALIAS_MAP;
+var init_claude_model_mapper = __esm(() => {
+  CLAUDE_CODE_ALIAS_MAP = new Map([
+    ["sonnet", `${ANTHROPIC_PREFIX}claude-sonnet-4-6`],
+    ["opus", `${ANTHROPIC_PREFIX}claude-opus-4-6`],
+    ["haiku", `${ANTHROPIC_PREFIX}claude-haiku-4-5`]
+  ]);
+});
 
 // src/features/claude-code-plugin-loader/agent-loader.ts
 var init_agent_loader = __esm(() => {
   init_frontmatter();
   init_file_utils();
   init_logger();
+  init_claude_model_mapper();
 });
 // src/features/claude-code-mcp-loader/transformer.ts
 var init_transformer = () => {};
@@ -7034,6 +7052,9 @@ var init_session_category_registry = __esm(() => {
   sessionCategoryMap = new Map;
 });
 
+// src/shared/plugin-identity.ts
+var PLUGIN_NAME = "oh-my-opencode", LEGACY_PLUGIN_NAME = "oh-my-openagent";
+
 // src/shared/index.ts
 var init_shared = __esm(() => {
   init_model_resolver();
@@ -7068,6 +7089,7 @@ var init_shared = __esm(() => {
   init_model_availability();
   init_fallback_model_availability();
   init_connected_providers_cache();
+  init_context_limit_resolver();
   init_session_utils();
   init_tmux();
   init_model_suggestion_retry();
@@ -7078,6 +7100,7 @@ var init_shared = __esm(() => {
   init_safe_create_hook();
   init_opencode_storage_paths();
   init_opencode_message_dir();
+  init_opencode_command_dirs();
   init_session_directory_resolver();
   init_prompt_tools();
   init_plugin_command_discovery();
@@ -7129,26 +7152,26 @@ async function fetchNpmDistTags(packageName) {
 var NPM_FETCH_TIMEOUT_MS = 5000;
 
 // src/cli/config-manager/plugin-name-with-version.ts
-function getFallbackEntry(version) {
+function getFallbackEntry(version, packageName) {
   const prereleaseMatch = version.match(/-([a-zA-Z][a-zA-Z0-9-]*)(?:\.|$)/);
   if (prereleaseMatch) {
-    return `${PACKAGE_NAME}@${prereleaseMatch[1]}`;
+    return `${packageName}@${prereleaseMatch[1]}`;
   }
-  return PACKAGE_NAME;
+  return packageName;
 }
-async function getPluginNameWithVersion(currentVersion) {
-  const distTags = await fetchNpmDistTags(PACKAGE_NAME);
+async function getPluginNameWithVersion(currentVersion, packageName = DEFAULT_PACKAGE_NAME) {
+  const distTags = await fetchNpmDistTags(packageName);
   if (distTags) {
     const allTags = new Set([...PRIORITIZED_TAGS, ...Object.keys(distTags)]);
     for (const tag of allTags) {
       if (distTags[tag] === currentVersion) {
-        return `${PACKAGE_NAME}@${tag}`;
+        return `${packageName}@${tag}`;
       }
     }
   }
-  return getFallbackEntry(currentVersion);
+  return getFallbackEntry(currentVersion, packageName);
 }
-var PACKAGE_NAME = "oh-my-opencode", PRIORITIZED_TAGS;
+var DEFAULT_PACKAGE_NAME = "oh-my-opencode", PRIORITIZED_TAGS;
 var init_plugin_name_with_version = __esm(() => {
   PRIORITIZED_TAGS = ["latest", "beta", "next"];
 });
@@ -7258,7 +7281,7 @@ async function addPluginToOpenCodeConfig(currentVersion) {
     };
   }
   const { format: format2, path: path3 } = detectConfigFormat();
-  const pluginEntry = await getPluginNameWithVersion(currentVersion);
+  const pluginEntry = await getPluginNameWithVersion(currentVersion, PLUGIN_NAME);
   try {
     if (format2 === "none") {
       const config2 = { plugin: [pluginEntry] };
@@ -7276,12 +7299,15 @@ async function addPluginToOpenCodeConfig(currentVersion) {
     }
     const config = parseResult.config;
     const plugins = config.plugin ?? [];
-    const existingIndex = plugins.findIndex((p) => p === PACKAGE_NAME2 || p.startsWith(`${PACKAGE_NAME2}@`));
-    if (existingIndex !== -1) {
-      if (plugins[existingIndex] === pluginEntry) {
+    const currentNameIndex = plugins.findIndex((plugin) => plugin === PLUGIN_NAME || plugin.startsWith(`${PLUGIN_NAME}@`));
+    const legacyNameIndex = plugins.findIndex((plugin) => plugin === LEGACY_PLUGIN_NAME || plugin.startsWith(`${LEGACY_PLUGIN_NAME}@`));
+    if (currentNameIndex !== -1) {
+      if (plugins[currentNameIndex] === pluginEntry) {
         return { success: true, configPath: path3 };
       }
-      plugins[existingIndex] = pluginEntry;
+      plugins[currentNameIndex] = pluginEntry;
+    } else if (legacyNameIndex !== -1) {
+      plugins[legacyNameIndex] = pluginEntry;
     } else {
       plugins.push(pluginEntry);
     }
@@ -7315,8 +7341,8 @@ async function addPluginToOpenCodeConfig(currentVersion) {
     };
   }
 }
-var PACKAGE_NAME2 = "oh-my-opencode";
 var init_add_plugin_to_opencode_config = __esm(() => {
+  init_shared();
   init_config_context();
   init_ensure_config_directory_exists();
   init_opencode_config_format();
@@ -7327,290 +7353,39 @@ var init_add_plugin_to_opencode_config = __esm(() => {
 // src/cli/model-fallback-requirements.ts
 var CLI_AGENT_MODEL_REQUIREMENTS, CLI_CATEGORY_MODEL_REQUIREMENTS;
 var init_model_fallback_requirements = __esm(() => {
-  CLI_AGENT_MODEL_REQUIREMENTS = {
-    sisyphus: {
-      fallbackChain: [
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-opus-4-6",
-          variant: "max"
-        },
-        { providers: ["kimi-for-coding"], model: "k2p5" },
-        { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.4", variant: "medium" },
-        { providers: ["zai-coding-plan", "opencode"], model: "glm-5" }
-      ],
-      requiresAnyModel: true
-    },
-    hephaestus: {
-      fallbackChain: [
-        {
-          providers: ["openai", "opencode"],
-          model: "gpt-5.3-codex",
-          variant: "medium"
-        }
-      ],
-      requiresProvider: ["openai", "opencode"]
-    },
-    oracle: {
-      fallbackChain: [
-        {
-          providers: ["openai", "github-copilot", "opencode"],
-          model: "gpt-5.4",
-          variant: "high"
-        },
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3.1-pro",
-          variant: "high"
-        },
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-opus-4-6",
-          variant: "max"
-        }
-      ]
-    },
-    librarian: {
-      fallbackChain: [
-        { providers: ["zai-coding-plan"], model: "glm-4.7" },
-        { providers: ["opencode"], model: "glm-4.7-free" },
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-sonnet-4-5"
-        }
-      ]
-    },
-    explore: {
-      fallbackChain: [
-        { providers: ["github-copilot"], model: "grok-code-fast-1" },
-        { providers: ["anthropic", "opencode"], model: "claude-haiku-4-5" },
-        { providers: ["opencode"], model: "gpt-5-nano" }
-      ]
-    },
-    "multimodal-looker": {
-      fallbackChain: [
-        {
-          providers: ["openai", "opencode"],
-          model: "gpt-5.4",
-          variant: "medium"
-        },
-        { providers: ["kimi-for-coding"], model: "k2p5" },
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3-flash"
-        },
-        { providers: ["zai-coding-plan"], model: "glm-4.6v" },
-        { providers: ["opencode"], model: "gpt-5-nano" }
-      ]
-    },
-    prometheus: {
-      fallbackChain: [
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-opus-4-6",
-          variant: "max"
-        },
-        { providers: ["kimi-for-coding"], model: "k2p5" },
-        {
-          providers: ["openai", "github-copilot", "opencode"],
-          model: "gpt-5.4",
-          variant: "high"
-        },
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3.1-pro"
-        }
-      ]
-    },
-    metis: {
-      fallbackChain: [
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-opus-4-6",
-          variant: "max"
-        },
-        { providers: ["kimi-for-coding"], model: "k2p5" },
-        {
-          providers: ["openai", "github-copilot", "opencode"],
-          model: "gpt-5.4",
-          variant: "high"
-        },
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3.1-pro",
-          variant: "high"
-        }
-      ]
-    },
-    momus: {
-      fallbackChain: [
-        {
-          providers: ["openai", "github-copilot", "opencode"],
-          model: "gpt-5.4",
-          variant: "xhigh"
-        },
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-opus-4-6",
-          variant: "max"
-        },
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3.1-pro",
-          variant: "high"
-        }
-      ]
+  init_model_requirements();
+  CLI_AGENT_MODEL_REQUIREMENTS = AGENT_MODEL_REQUIREMENTS;
+  CLI_CATEGORY_MODEL_REQUIREMENTS = CATEGORY_MODEL_REQUIREMENTS;
+});
+
+// src/cli/openai-only-model-catalog.ts
+function isOpenAiOnlyAvailability(availability) {
+  return availability.native.openai && !availability.native.claude && !availability.native.gemini && !availability.opencodeGo && !availability.opencodeZen && !availability.copilot && !availability.zai && !availability.kimiForCoding;
+}
+function applyOpenAiOnlyModelCatalog(config) {
+  return {
+    ...config,
+    agents: {
+      ...config.agents,
+      ...OPENAI_ONLY_AGENT_OVERRIDES
     },
-    atlas: {
-      fallbackChain: [
-        { providers: ["kimi-for-coding"], model: "k2p5" },
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-sonnet-4-5"
-        },
-        { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.4", variant: "medium" },
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3.1-pro"
-        }
-      ]
+    categories: {
+      ...config.categories,
+      ...OPENAI_ONLY_CATEGORY_OVERRIDES
     }
   };
-  CLI_CATEGORY_MODEL_REQUIREMENTS = {
-    "visual-engineering": {
-      fallbackChain: [
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3.1-pro",
-          variant: "high"
-        },
-        { providers: ["zai-coding-plan", "opencode"], model: "glm-5" },
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-opus-4-6",
-          variant: "max"
-        },
-        { providers: ["kimi-for-coding"], model: "k2p5" }
-      ]
-    },
-    ultrabrain: {
-      fallbackChain: [
-        {
-          providers: ["openai", "opencode"],
-          model: "gpt-5.3-codex",
-          variant: "xhigh"
-        },
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3.1-pro",
-          variant: "high"
-        },
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-opus-4-6",
-          variant: "max"
-        }
-      ]
-    },
-    deep: {
-      fallbackChain: [
-        {
-          providers: ["openai", "opencode"],
-          model: "gpt-5.3-codex",
-          variant: "medium"
-        },
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-opus-4-6",
-          variant: "max"
-        },
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3.1-pro",
-          variant: "high"
-        }
-      ],
-      requiresModel: "gpt-5.3-codex"
-    },
-    artistry: {
-      fallbackChain: [
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3.1-pro",
-          variant: "high"
-        },
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-opus-4-6",
-          variant: "max"
-        },
-        {
-          providers: ["openai", "github-copilot", "opencode"],
-          model: "gpt-5.4"
-        }
-      ],
-      requiresModel: "gemini-3.1-pro"
-    },
-    quick: {
-      fallbackChain: [
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-haiku-4-5"
-        },
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3-flash"
-        },
-        { providers: ["opencode"], model: "gpt-5-nano" }
-      ]
-    },
-    "unspecified-low": {
-      fallbackChain: [
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-sonnet-4-5"
-        },
-        {
-          providers: ["openai", "opencode"],
-          model: "gpt-5.3-codex",
-          variant: "medium"
-        },
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3-flash"
-        }
-      ]
-    },
-    "unspecified-high": {
-      fallbackChain: [
-        {
-          providers: ["openai", "github-copilot", "opencode"],
-          model: "gpt-5.4",
-          variant: "high"
-        },
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-opus-4-6",
-          variant: "max"
-        },
-        { providers: ["zai-coding-plan", "opencode"], model: "glm-5" },
-        { providers: ["kimi-for-coding"], model: "k2p5" },
-        { providers: ["opencode"], model: "kimi-k2.5" }
-      ]
-    },
-    writing: {
-      fallbackChain: [
-        { providers: ["kimi-for-coding"], model: "k2p5" },
-        {
-          providers: ["google", "github-copilot", "opencode"],
-          model: "gemini-3-flash"
-        },
-        {
-          providers: ["anthropic", "github-copilot", "opencode"],
-          model: "claude-sonnet-4-5"
-        }
-      ]
-    }
+}
+var OPENAI_ONLY_AGENT_OVERRIDES, OPENAI_ONLY_CATEGORY_OVERRIDES;
+var init_openai_only_model_catalog = __esm(() => {
+  OPENAI_ONLY_AGENT_OVERRIDES = {
+    explore: { model: "openai/gpt-5.4", variant: "medium" },
+    librarian: { model: "openai/gpt-5.4", variant: "medium" }
+  };
+  OPENAI_ONLY_CATEGORY_OVERRIDES = {
+    artistry: { model: "openai/gpt-5.4", variant: "xhigh" },
+    quick: { model: "openai/gpt-5.3-codex", variant: "low" },
+    "visual-engineering": { model: "openai/gpt-5.4", variant: "high" },
+    writing: { model: "openai/gpt-5.4", variant: "medium" }
   };
 });
 
@@ -7626,6 +7401,7 @@ function toProviderAvailability(config) {
     copilot: config.hasCopilot,
     zai: config.hasZaiCodingPlan,
     kimiForCoding: config.hasKimiForCoding,
+    opencodeGo: config.hasOpencodeGo,
     isMaxPlan: config.isMax20
   };
 }
@@ -7637,7 +7413,8 @@ function isProviderAvailable(provider, availability) {
     "github-copilot": availability.copilot,
     opencode: availability.opencodeZen,
     "zai-coding-plan": availability.zai,
-    "kimi-for-coding": availability.kimiForCoding
+    "kimi-for-coding": availability.kimiForCoding,
+    "opencode-go": availability.opencodeGo
   };
   return mapping[provider] ?? false;
 }
@@ -7683,7 +7460,7 @@ var init_fallback_chain_resolution = __esm(() => {
 // src/cli/model-fallback.ts
 function generateModelConfig(config) {
   const avail = toProviderAvailability(config);
-  const hasAnyProvider = avail.native.claude || avail.native.openai || avail.native.gemini || avail.opencodeZen || avail.copilot || avail.zai || avail.kimiForCoding;
+  const hasAnyProvider = avail.native.claude || avail.native.openai || avail.native.gemini || avail.opencodeZen || avail.copilot || avail.zai || avail.kimiForCoding || avail.opencodeGo;
   if (!hasAnyProvider) {
     return {
       $schema: SCHEMA_URL,
@@ -7694,8 +7471,12 @@ function generateModelConfig(config) {
   const agents = {};
   const categories = {};
   for (const [role, req] of Object.entries(CLI_AGENT_MODEL_REQUIREMENTS)) {
-    if (role === "librarian" && avail.zai) {
-      agents[role] = { model: ZAI_MODEL };
+    if (role === "librarian") {
+      if (avail.opencodeGo) {
+        agents[role] = { model: "opencode-go/minimax-m2.5" };
+      } else if (avail.zai) {
+        agents[role] = { model: ZAI_MODEL };
+      }
       continue;
     }
     if (role === "explore") {
@@ -7703,6 +7484,8 @@ function generateModelConfig(config) {
         agents[role] = { model: "anthropic/claude-haiku-4-5" };
       } else if (avail.opencodeZen) {
         agents[role] = { model: "opencode/claude-haiku-4-5" };
+      } else if (avail.opencodeGo) {
+        agents[role] = { model: "opencode-go/minimax-m2.5" };
       } else if (avail.copilot) {
         agents[role] = { model: "github-copilot/gpt-5-mini" };
       } else {
@@ -7752,15 +7535,17 @@ function generateModelConfig(config) {
       categories[cat] = { model: ULTIMATE_FALLBACK };
     }
   }
-  return {
+  const generatedConfig = {
     $schema: SCHEMA_URL,
     agents,
     categories
   };
+  return isOpenAiOnlyAvailability(avail) ? applyOpenAiOnlyModelCatalog(generatedConfig) : generatedConfig;
 }
-var ZAI_MODEL = "zai-coding-plan/glm-4.7", ULTIMATE_FALLBACK = "opencode/glm-4.7-free", SCHEMA_URL = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/dev/assets/oh-my-opencode.schema.json";
+var ZAI_MODEL = "zai-coding-plan/glm-4.7", ULTIMATE_FALLBACK = "opencode/gpt-5-nano", SCHEMA_URL = "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json";
 var init_model_fallback = __esm(() => {
   init_model_fallback_requirements();
+  init_openai_only_model_catalog();
   init_fallback_chain_resolution();
 });
 
@@ -7954,24 +7739,46 @@ import { existsSync as existsSync8, readFileSync as readFileSync7 } from "fs";
 function detectProvidersFromOmoConfig() {
   const omoConfigPath = getOmoConfigPath();
   if (!existsSync8(omoConfigPath)) {
-    return { hasOpenAI: true, hasOpencodeZen: true, hasZaiCodingPlan: false, hasKimiForCoding: false };
+    return {
+      hasOpenAI: true,
+      hasOpencodeZen: true,
+      hasZaiCodingPlan: false,
+      hasKimiForCoding: false,
+      hasOpencodeGo: false
+    };
   }
   try {
     const content = readFileSync7(omoConfigPath, "utf-8");
     const omoConfig = parseJsonc(content);
     if (!omoConfig || typeof omoConfig !== "object") {
-      return { hasOpenAI: true, hasOpencodeZen: true, hasZaiCodingPlan: false, hasKimiForCoding: false };
+      return {
+        hasOpenAI: true,
+        hasOpencodeZen: true,
+        hasZaiCodingPlan: false,
+        hasKimiForCoding: false,
+        hasOpencodeGo: false
+      };
     }
     const configStr = JSON.stringify(omoConfig);
     const hasOpenAI = configStr.includes('"openai/');
     const hasOpencodeZen = configStr.includes('"opencode/');
     const hasZaiCodingPlan = configStr.includes('"zai-coding-plan/');
     const hasKimiForCoding = configStr.includes('"kimi-for-coding/');
-    return { hasOpenAI, hasOpencodeZen, hasZaiCodingPlan, hasKimiForCoding };
+    const hasOpencodeGo = configStr.includes('"opencode-go/');
+    return { hasOpenAI, hasOpencodeZen, hasZaiCodingPlan, hasKimiForCoding, hasOpencodeGo };
   } catch {
-    return { hasOpenAI: true, hasOpencodeZen: true, hasZaiCodingPlan: false, hasKimiForCoding: false };
+    return {
+      hasOpenAI: true,
+      hasOpencodeZen: true,
+      hasZaiCodingPlan: false,
+      hasKimiForCoding: false,
+      hasOpencodeGo: false
+    };
   }
 }
+function isOurPlugin(plugin) {
+  return plugin === PLUGIN_NAME || plugin.startsWith(`${PLUGIN_NAME}@`) || plugin === LEGACY_PLUGIN_NAME || plugin.startsWith(`${LEGACY_PLUGIN_NAME}@`);
+}
 function detectCurrentConfig() {
   const result = {
     isInstalled: false,
@@ -7982,7 +7789,8 @@ function detectCurrentConfig() {
     hasCopilot: false,
     hasOpencodeZen: true,
     hasZaiCodingPlan: false,
-    hasKimiForCoding: false
+    hasKimiForCoding: false,
+    hasOpencodeGo: false
   };
   const { format: format2, path: path3 } = detectConfigFormat();
   if (format2 === "none") {
@@ -7994,17 +7802,18 @@ function detectCurrentConfig() {
   }
   const openCodeConfig = parseResult.config;
   const plugins = openCodeConfig.plugin ?? [];
-  result.isInstalled = plugins.some((p) => p.startsWith("oh-my-opencode"));
+  result.isInstalled = plugins.some(isOurPlugin);
   if (!result.isInstalled) {
     return result;
   }
   const providers = openCodeConfig.provider;
   result.hasGemini = providers ? "google" in providers : false;
-  const { hasOpenAI, hasOpencodeZen, hasZaiCodingPlan, hasKimiForCoding } = detectProvidersFromOmoConfig();
+  const { hasOpenAI, hasOpencodeZen, hasZaiCodingPlan, hasKimiForCoding, hasOpencodeGo } = detectProvidersFromOmoConfig();
   result.hasOpenAI = hasOpenAI;
   result.hasOpencodeZen = hasOpencodeZen;
   result.hasZaiCodingPlan = hasZaiCodingPlan;
   result.hasKimiForCoding = hasKimiForCoding;
+  result.hasOpencodeGo = hasOpencodeGo;
   return result;
 }
 var init_detect_current_config = __esm(() => {
@@ -8015,35 +7824,75 @@ var init_detect_current_config = __esm(() => {
 });
 
 // src/cli/config-manager/bun-install.ts
-async function runBunInstall() {
-  const result = await runBunInstallWithDetails();
-  return result.success;
+import { existsSync as existsSync9 } from "fs";
+function readProcessOutput(stream) {
+  if (!stream) {
+    return Promise.resolve("");
+  }
+  return Bun.readableStreamToText(stream);
 }
-async function runBunInstallWithDetails() {
+function logCapturedOutputOnFailure(outputMode, output) {
+  if (outputMode !== "pipe") {
+    return;
+  }
+  const stdout = output.stdout.trim();
+  const stderr = output.stderr.trim();
+  if (!stdout && !stderr) {
+    return;
+  }
+  log("[bun-install] Captured output from failed bun install", {
+    stdout,
+    stderr
+  });
+}
+async function runBunInstallWithDetails(options) {
+  const outputMode = options?.outputMode ?? "pipe";
+  const cacheDir = options?.workspaceDir ?? getOpenCodeCacheDir();
+  const packageJsonPath = `${cacheDir}/package.json`;
+  if (!existsSync9(packageJsonPath)) {
+    return {
+      success: false,
+      error: `Workspace not initialized: ${packageJsonPath} not found. OpenCode should create this on first run.`
+    };
+  }
   try {
     const proc = spawnWithWindowsHide(["bun", "install"], {
-      cwd: getConfigDir(),
-      stdout: "inherit",
-      stderr: "inherit"
+      cwd: cacheDir,
+      stdout: outputMode,
+      stderr: outputMode
     });
+    const outputPromise = Promise.all([readProcessOutput(proc.stdout), readProcessOutput(proc.stderr)]).then(([stdout, stderr]) => ({ stdout, stderr }));
     let timeoutId;
     const timeoutPromise = new Promise((resolve2) => {
       timeoutId = setTimeout(() => resolve2("timeout"), BUN_INSTALL_TIMEOUT_MS);
     });
     const exitPromise = proc.exited.then(() => "completed");
     const result = await Promise.race([exitPromise, timeoutPromise]);
-    clearTimeout(timeoutId);
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
     if (result === "timeout") {
       try {
         proc.kill();
-      } catch {}
+      } catch (err) {
+        log("[cli/install] Failed to kill timed out bun install process:", err);
+      }
+      if (outputMode === "pipe") {
+        outputPromise.then((output2) => {
+          logCapturedOutputOnFailure(outputMode, output2);
+        }).catch((err) => {
+          log("[bun-install] Failed to read captured output after timeout:", err);
+        });
+      }
       return {
         success: false,
         timedOut: true,
-        error: `bun install timed out after ${BUN_INSTALL_TIMEOUT_SECONDS} seconds. Try running manually: cd ${getConfigDir()} && bun i`
+        error: `bun install timed out after ${BUN_INSTALL_TIMEOUT_SECONDS} seconds. Try running manually: cd "${cacheDir}" && bun i`
       };
     }
+    const output = await outputPromise;
     if (proc.exitCode !== 0) {
+      logCapturedOutputOnFailure(outputMode, output);
       return {
         success: false,
         error: `bun install failed with exit code ${proc.exitCode}`
@@ -8060,7 +7909,8 @@ async function runBunInstallWithDetails() {
 }
 var BUN_INSTALL_TIMEOUT_SECONDS = 60, BUN_INSTALL_TIMEOUT_MS;
 var init_bun_install = __esm(() => {
-  init_config_context();
+  init_data_path();
+  init_logger();
   init_spawn_with_windows_hide();
   BUN_INSTALL_TIMEOUT_MS = BUN_INSTALL_TIMEOUT_SECONDS * 1000;
 });
@@ -8138,27 +7988,22 @@ var require_src = __commonJS((exports, module) => {
 // src/hooks/auto-update-checker/constants.ts
 import * as path4 from "path";
 import * as os3 from "os";
-function getCacheDir2() {
-  if (process.platform === "win32") {
-    return path4.join(process.env.LOCALAPPDATA ?? os3.homedir(), "opencode");
-  }
-  return path4.join(os3.homedir(), ".cache", "opencode");
-}
 function getWindowsAppdataDir() {
   if (process.platform !== "win32")
     return null;
   return process.env.APPDATA ?? path4.join(os3.homedir(), "AppData", "Roaming");
 }
-var PACKAGE_NAME3 = "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;
+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;
 var init_constants3 = __esm(() => {
-  init_shared();
-  NPM_REGISTRY_URL = `https://registry.npmjs.org/-/package/${PACKAGE_NAME3}/dist-tags`;
-  CACHE_DIR = getCacheDir2();
+  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");
-  INSTALLED_PACKAGE_JSON = path4.join(USER_CONFIG_DIR, "node_modules", PACKAGE_NAME3, "package.json");
+  INSTALLED_PACKAGE_JSON = path4.join(CACHE_DIR, "node_modules", PACKAGE_NAME, "package.json");
 });
 
 // src/hooks/auto-update-checker/checker/config-paths.ts
@@ -8212,7 +8057,7 @@ function getLocalDevPath(directory) {
       const config2 = JSON.parse(stripJsonComments(content));
       const plugins = config2.plugin ?? [];
       for (const entry of plugins) {
-        if (entry.startsWith("file://") && entry.includes(PACKAGE_NAME3)) {
+        if (entry.startsWith("file://") && entry.includes(PACKAGE_NAME)) {
           try {
             return fileURLToPath(entry);
           } catch {
@@ -8244,7 +8089,7 @@ function findPackageJsonUp(startPath) {
         try {
           const content = fs5.readFileSync(pkgPath, "utf-8");
           const pkg = JSON.parse(content);
-          if (pkg.name === PACKAGE_NAME3)
+          if (pkg.name === PACKAGE_NAME)
             return pkgPath;
         } catch {}
       }
@@ -8284,9 +8129,6 @@ var init_local_dev_version = __esm(() => {
 
 // src/hooks/auto-update-checker/checker/plugin-entry.ts
 import * as fs7 from "fs";
-function isExplicitVersionPin(pinnedVersion) {
-  return /^\d+\.\d+\.\d+/.test(pinnedVersion);
-}
 function findPluginEntry(directory) {
   for (const configPath of getConfigPaths(directory)) {
     try {
@@ -8296,12 +8138,12 @@ function findPluginEntry(directory) {
       const config2 = JSON.parse(stripJsonComments(content));
       const plugins = config2.plugin ?? [];
       for (const entry of plugins) {
-        if (entry === PACKAGE_NAME3) {
+        if (entry === PACKAGE_NAME) {
           return { entry, isPinned: false, pinnedVersion: null, configPath };
         }
-        if (entry.startsWith(`${PACKAGE_NAME3}@`)) {
-          const pinnedVersion = entry.slice(PACKAGE_NAME3.length + 1);
-          const isPinned = isExplicitVersionPin(pinnedVersion);
+        if (entry.startsWith(`${PACKAGE_NAME}@`)) {
+          const pinnedVersion = entry.slice(PACKAGE_NAME.length + 1);
+          const isPinned = EXACT_SEMVER_REGEX.test(pinnedVersion.trim());
           return { entry, isPinned, pinnedVersion, configPath };
         }
       }
@@ -8311,9 +8153,11 @@ function findPluginEntry(directory) {
   }
   return null;
 }
+var EXACT_SEMVER_REGEX;
 var init_plugin_entry = __esm(() => {
   init_constants3();
   init_config_paths();
+  EXACT_SEMVER_REGEX = /^\d+\.\d+\.\d+(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$/;
 });
 
 // src/hooks/auto-update-checker/checker/cached-version.ts
@@ -8362,52 +8206,6 @@ var init_cached_version = __esm(() => {
 });
 
 // src/hooks/auto-update-checker/checker/pinned-version-updater.ts
-import * as fs9 from "fs";
-function replacePluginEntry(configPath, oldEntry, newEntry) {
-  try {
-    const content = fs9.readFileSync(configPath, "utf-8");
-    const pluginMatch = content.match(/"plugin"\s*:\s*\[/);
-    if (!pluginMatch || pluginMatch.index === undefined) {
-      log(`[auto-update-checker] No "plugin" array found in ${configPath}`);
-      return false;
-    }
-    const startIndex = pluginMatch.index + pluginMatch[0].length;
-    let bracketCount = 1;
-    let endIndex = startIndex;
-    for (let i2 = startIndex;i2 < content.length && bracketCount > 0; i2++) {
-      if (content[i2] === "[")
-        bracketCount++;
-      else if (content[i2] === "]")
-        bracketCount--;
-      endIndex = i2;
-    }
-    const before = content.slice(0, startIndex);
-    const pluginArrayContent = content.slice(startIndex, endIndex);
-    const after = content.slice(endIndex);
-    const escapedOldEntry = oldEntry.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const regex = new RegExp(`["']${escapedOldEntry}["']`);
-    if (!regex.test(pluginArrayContent)) {
-      log(`[auto-update-checker] Entry "${oldEntry}" not found in plugin array of ${configPath}`);
-      return false;
-    }
-    const updatedPluginArray = pluginArrayContent.replace(regex, `"${newEntry}"`);
-    const updatedContent = before + updatedPluginArray + after;
-    if (updatedContent === content) {
-      log(`[auto-update-checker] No changes made to ${configPath}`);
-      return false;
-    }
-    fs9.writeFileSync(configPath, updatedContent, "utf-8");
-    log(`[auto-update-checker] Updated ${configPath}: ${oldEntry} \u2192 ${newEntry}`);
-    return true;
-  } catch (err) {
-    log(`[auto-update-checker] Failed to update config file ${configPath}:`, err);
-    return false;
-  }
-}
-function revertPinnedVersion(configPath, failedVersion, originalEntry) {
-  const failedEntry = `${PACKAGE_NAME3}@${failedVersion}`;
-  return replacePluginEntry(configPath, failedEntry, originalEntry);
-}
 var init_pinned_version_updater = __esm(() => {
   init_logger();
   init_constants3();
@@ -8531,6 +8329,79 @@ var init_check_for_update = __esm(() => {
   init_latest_version();
 });
 
+// src/hooks/auto-update-checker/checker/sync-package-json.ts
+import * as crypto from "crypto";
+import * as fs9 from "fs";
+import * as path8 from "path";
+function safeUnlink(filePath) {
+  try {
+    fs9.unlinkSync(filePath);
+  } catch (err) {
+    log(`[auto-update-checker] Failed to cleanup temp file: ${filePath}`, err);
+  }
+}
+function getIntentVersion(pluginInfo) {
+  if (!pluginInfo.pinnedVersion) {
+    return "latest";
+  }
+  return pluginInfo.pinnedVersion;
+}
+function syncCachePackageJsonToIntent(pluginInfo) {
+  const cachePackageJsonPath = path8.join(CACHE_DIR, "package.json");
+  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" };
+  }
+  let content;
+  let pkgJson;
+  try {
+    content = fs9.readFileSync(cachePackageJsonPath, "utf-8");
+  } catch (err) {
+    log("[auto-update-checker] Failed to read cache package.json:", err);
+    return { synced: false, error: "parse_error", message: "Failed to read cache package.json" };
+  }
+  try {
+    pkgJson = JSON.parse(content);
+  } catch (err) {
+    log("[auto-update-checker] Failed to parse cache package.json:", err);
+    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" };
+  }
+  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}` };
+  }
+  const intentIsTag = !EXACT_SEMVER_REGEX2.test(intentVersion.trim());
+  const currentIsSemver = EXACT_SEMVER_REGEX2.test(String(currentVersion).trim());
+  if (intentIsTag && currentIsSemver) {
+    log(`[auto-update-checker] Syncing cache package.json: "${currentVersion}" \u2192 "${intentVersion}" (opencode.json intent)`);
+  } else {
+    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" };
+  }
+}
+var EXACT_SEMVER_REGEX2;
+var init_sync_package_json = __esm(() => {
+  init_constants3();
+  init_logger();
+  EXACT_SEMVER_REGEX2 = /^\d+\.\d+\.\d+(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$/;
+});
+
 // src/hooks/auto-update-checker/checker.ts
 var init_checker = __esm(() => {
   init_local_dev_path();
@@ -8540,48 +8411,57 @@ var init_checker = __esm(() => {
   init_pinned_version_updater();
   init_latest_version();
   init_check_for_update();
+  init_sync_package_json();
 });
 
 // src/hooks/auto-update-checker/cache.ts
 import * as fs10 from "fs";
-import * as path8 from "path";
+import * as path9 from "path";
 function stripTrailingCommas(json3) {
   return json3.replace(/,(\s*[}\]])/g, "$1");
 }
-function removeFromBunLock(packageName) {
-  const lockPath = path8.join(USER_CONFIG_DIR, "bun.lock");
-  if (!fs10.existsSync(lockPath))
-    return false;
+function removeFromTextBunLock(lockPath, packageName) {
   try {
     const content = fs10.readFileSync(lockPath, "utf-8");
     const lock = JSON.parse(stripTrailingCommas(content));
-    let modified = false;
-    if (lock.workspaces?.[""]?.dependencies?.[packageName]) {
-      delete lock.workspaces[""].dependencies[packageName];
-      modified = true;
-    }
     if (lock.packages?.[packageName]) {
       delete lock.packages[packageName];
-      modified = true;
-    }
-    if (modified) {
       fs10.writeFileSync(lockPath, JSON.stringify(lock, null, 2));
       log(`[auto-update-checker] Removed from bun.lock: ${packageName}`);
+      return true;
     }
-    return modified;
+    return false;
+  } catch {
+    return false;
+  }
+}
+function deleteBinaryBunLock(lockPath) {
+  try {
+    fs10.unlinkSync(lockPath);
+    log(`[auto-update-checker] Removed bun.lockb to force re-resolution`);
+    return true;
   } catch {
     return false;
   }
 }
-function invalidatePackage(packageName = PACKAGE_NAME3) {
+function removeFromBunLock(packageName) {
+  const textLockPath = path9.join(CACHE_DIR, "bun.lock");
+  const binaryLockPath = path9.join(CACHE_DIR, "bun.lockb");
+  if (fs10.existsSync(textLockPath)) {
+    return removeFromTextBunLock(textLockPath, packageName);
+  }
+  if (fs10.existsSync(binaryLockPath)) {
+    return deleteBinaryBunLock(binaryLockPath);
+  }
+  return false;
+}
+function invalidatePackage(packageName = PACKAGE_NAME) {
   try {
     const pkgDirs = [
-      path8.join(USER_CONFIG_DIR, "node_modules", packageName),
-      path8.join(CACHE_DIR, "node_modules", packageName)
+      path9.join(USER_CONFIG_DIR, "node_modules", packageName),
+      path9.join(CACHE_DIR, "node_modules", packageName)
     ];
-    const pkgJsonPath = path8.join(USER_CONFIG_DIR, "package.json");
     let packageRemoved = false;
-    let dependencyRemoved = false;
     let lockRemoved = false;
     for (const pkgDir of pkgDirs) {
       if (fs10.existsSync(pkgDir)) {
@@ -8590,18 +8470,8 @@ function invalidatePackage(packageName = PACKAGE_NAME3) {
         packageRemoved = true;
       }
     }
-    if (fs10.existsSync(pkgJsonPath)) {
-      const content = fs10.readFileSync(pkgJsonPath, "utf-8");
-      const pkgJson = JSON.parse(content);
-      if (pkgJson.dependencies?.[packageName]) {
-        delete pkgJson.dependencies[packageName];
-        fs10.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
-        log(`[auto-update-checker] Dependency removed from package.json: ${packageName}`);
-        dependencyRemoved = true;
-      }
-    }
     lockRemoved = removeFromBunLock(packageName);
-    if (!packageRemoved && !dependencyRemoved && !lockRemoved) {
+    if (!packageRemoved && !lockRemoved) {
       log(`[auto-update-checker] Package not found, nothing to invalidate: ${packageName}`);
       return false;
     }
@@ -8649,12 +8519,34 @@ var init_update_toasts = __esm(() => {
 });
 
 // src/hooks/auto-update-checker/hook/background-update-check.ts
+import { existsSync as existsSync20 } from "fs";
+import { join as join17 } from "path";
 function getPinnedVersionToastMessage(latestVersion) {
   return `Update available: ${latestVersion} (version pinned, update manually)`;
 }
-async function runBunInstallSafe() {
+function resolveActiveInstallWorkspace() {
+  const configPaths = getOpenCodeConfigPaths({ binary: "opencode" });
+  const cacheDir = getOpenCodeCacheDir();
+  const configInstallPath = join17(configPaths.configDir, "node_modules", PACKAGE_NAME, "package.json");
+  const cacheInstallPath = join17(cacheDir, "node_modules", PACKAGE_NAME, "package.json");
+  if (existsSync20(configInstallPath)) {
+    log(`[auto-update-checker] Active workspace: config-dir (${configPaths.configDir})`);
+    return configPaths.configDir;
+  }
+  if (existsSync20(cacheInstallPath)) {
+    log(`[auto-update-checker] Active workspace: cache-dir (${cacheDir})`);
+    return cacheDir;
+  }
+  log(`[auto-update-checker] Active workspace: config-dir (default, no install detected)`);
+  return configPaths.configDir;
+}
+async function runBunInstallSafe(workspaceDir) {
   try {
-    return await runBunInstall();
+    const result = await runBunInstallWithDetails({ outputMode: "pipe", workspaceDir });
+    if (!result.success && result.error) {
+      log("[auto-update-checker] bun install error:", result.error);
+    }
+    return result.success;
   } catch (err) {
     const errorMessage = err instanceof Error ? err.message : String(err);
     log("[auto-update-checker] bun install error:", errorMessage);
@@ -8694,23 +8586,27 @@ async function runBackgroundUpdateCheck(ctx, autoUpdate, getToastMessage) {
     log(`[auto-update-checker] User-pinned version detected (${pluginInfo.entry}), skipping auto-update. Notification only.`);
     return;
   }
-  invalidatePackage(PACKAGE_NAME3);
-  const installSuccess = await runBunInstallSafe();
+  const syncResult = syncCachePackageJsonToIntent(pluginInfo);
+  if (syncResult.error) {
+    log(`[auto-update-checker] Sync failed with error: ${syncResult.error}`, syncResult.message);
+    await showUpdateAvailableToast(ctx, latestVersion, getToastMessage);
+    return;
+  }
+  invalidatePackage(PACKAGE_NAME);
+  const activeWorkspace = resolveActiveInstallWorkspace();
+  const installSuccess = await runBunInstallSafe(activeWorkspace);
   if (installSuccess) {
     await showAutoUpdatedToast(ctx, currentVersion, latestVersion);
     log(`[auto-update-checker] Update installed: ${currentVersion} \u2192 ${latestVersion}`);
     return;
   }
-  if (pluginInfo.isPinned) {
-    revertPinnedVersion(pluginInfo.configPath, latestVersion, pluginInfo.entry);
-    log("[auto-update-checker] Config reverted due to install failure");
-  }
   await showUpdateAvailableToast(ctx, latestVersion, getToastMessage);
   log("[auto-update-checker] bun install failed; update not installed (falling back to notification-only)");
 }
 var init_background_update_check = __esm(() => {
   init_config_manager();
   init_logger();
+  init_shared();
   init_cache();
   init_constants3();
   init_checker();
@@ -8940,7 +8836,7 @@ var {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "3.11.2",
+  version: "3.12.0",
   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",
@@ -8992,13 +8888,13 @@ var package_default = {
   },
   homepage: "https://github.com/code-yeongyu/oh-my-openagent#readme",
   dependencies: {
-    "@ast-grep/cli": "^0.40.0",
-    "@ast-grep/napi": "^0.40.0",
+    "@ast-grep/cli": "^0.41.1",
+    "@ast-grep/napi": "^0.41.1",
     "@clack/prompts": "^0.11.0",
     "@code-yeongyu/comment-checker": "^0.7.0",
     "@modelcontextprotocol/sdk": "^1.25.2",
-    "@opencode-ai/plugin": "^1.2.16",
-    "@opencode-ai/sdk": "^1.2.17",
+    "@opencode-ai/plugin": "^1.2.24",
+    "@opencode-ai/sdk": "^1.2.24",
     commander: "^14.0.2",
     "detect-libc": "^2.0.0",
     diff: "^8.0.3",
@@ -9012,24 +8908,24 @@ var package_default = {
   devDependencies: {
     "@types/js-yaml": "^4.0.9",
     "@types/picomatch": "^3.0.2",
-    "bun-types": "1.3.6",
+    "bun-types": "1.3.10",
     typescript: "^5.7.3"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "3.11.2",
-    "oh-my-opencode-darwin-x64": "3.11.2",
-    "oh-my-opencode-darwin-x64-baseline": "3.11.2",
-    "oh-my-opencode-linux-arm64": "3.11.2",
-    "oh-my-opencode-linux-arm64-musl": "3.11.2",
-    "oh-my-opencode-linux-x64": "3.11.2",
-    "oh-my-opencode-linux-x64-baseline": "3.11.2",
-    "oh-my-opencode-linux-x64-musl": "3.11.2",
-    "oh-my-opencode-linux-x64-musl-baseline": "3.11.2",
-    "oh-my-opencode-windows-x64": "3.11.2",
-    "oh-my-opencode-windows-x64-baseline": "3.11.2"
+    "oh-my-opencode-darwin-arm64": "3.12.0",
+    "oh-my-opencode-darwin-x64": "3.12.0",
+    "oh-my-opencode-darwin-x64-baseline": "3.12.0",
+    "oh-my-opencode-linux-arm64": "3.12.0",
+    "oh-my-opencode-linux-arm64-musl": "3.12.0",
+    "oh-my-opencode-linux-x64": "3.12.0",
+    "oh-my-opencode-linux-x64-baseline": "3.12.0",
+    "oh-my-opencode-linux-x64-musl": "3.12.0",
+    "oh-my-opencode-linux-x64-musl-baseline": "3.12.0",
+    "oh-my-opencode-windows-x64": "3.12.0",
+    "oh-my-opencode-windows-x64-baseline": "3.12.0"
   },
   overrides: {
-    "@opencode-ai/sdk": "^1.2.17"
+    "@opencode-ai/sdk": "^1.2.24"
   },
   trustedDependencies: [
     "@ast-grep/cli",
@@ -9053,6 +8949,7 @@ var SYMBOLS = {
   warn: import_picocolors.default.yellow("[!]"),
   star: import_picocolors.default.yellow("*")
 };
+var ANSI_COLOR_PATTERN = new RegExp("\x1B\\[[0-9;]*m", "g");
 function formatProvider(name, enabled, detail) {
   const status = enabled ? SYMBOLS.check : import_picocolors.default.dim("\u25CB");
   const label = enabled ? import_picocolors.default.white(name) : import_picocolors.default.dim(name);
@@ -9106,7 +9003,7 @@ function printWarning(message) {
 function printBox(content, title) {
   const lines = content.split(`
 `);
-  const maxWidth = Math.max(...lines.map((line) => line.replace(/\x1b\[[0-9;]*m/g, "").length), title?.length ?? 0) + 4;
+  const maxWidth = Math.max(...lines.map((line) => line.replace(ANSI_COLOR_PATTERN, "").length), title?.length ?? 0) + 4;
   const border = import_picocolors.default.dim("\u2500".repeat(maxWidth));
   console.log();
   if (title) {
@@ -9115,7 +9012,7 @@ function printBox(content, title) {
     console.log(import_picocolors.default.dim("\u250C") + border + import_picocolors.default.dim("\u2510"));
   }
   for (const line of lines) {
-    const stripped = line.replace(/\x1b\[[0-9;]*m/g, "");
+    const stripped = line.replace(ANSI_COLOR_PATTERN, "");
     const padding = maxWidth - stripped.length;
     console.log(import_picocolors.default.dim("\u2502") + ` ${line}${" ".repeat(padding - 1)}` + import_picocolors.default.dim("\u2502"));
   }
@@ -9142,6 +9039,9 @@ function validateNonTuiArgs(args) {
   if (args.openai !== undefined && !["no", "yes"].includes(args.openai)) {
     errors.push(`Invalid --openai value: ${args.openai} (expected: no, yes)`);
   }
+  if (args.opencodeGo !== undefined && !["no", "yes"].includes(args.opencodeGo)) {
+    errors.push(`Invalid --opencode-go value: ${args.opencodeGo} (expected: no, yes)`);
+  }
   if (args.opencodeZen !== undefined && !["no", "yes"].includes(args.opencodeZen)) {
     errors.push(`Invalid --opencode-zen value: ${args.opencodeZen} (expected: no, yes)`);
   }
@@ -9162,7 +9062,8 @@ function argsToConfig(args) {
     hasCopilot: args.copilot === "yes",
     hasOpencodeZen: args.opencodeZen === "yes",
     hasZaiCodingPlan: args.zaiCodingPlan === "yes",
-    hasKimiForCoding: args.kimiForCoding === "yes"
+    hasKimiForCoding: args.kimiForCoding === "yes",
+    hasOpencodeGo: args.opencodeGo === "yes"
   };
 }
 function detectedToInitialValues(detected) {
@@ -9177,7 +9078,8 @@ function detectedToInitialValues(detected) {
     copilot: detected.hasCopilot ? "yes" : "no",
     opencodeZen: detected.hasOpencodeZen ? "yes" : "no",
     zaiCodingPlan: detected.hasZaiCodingPlan ? "yes" : "no",
-    kimiForCoding: detected.hasKimiForCoding ? "yes" : "no"
+    kimiForCoding: detected.hasKimiForCoding ? "yes" : "no",
+    opencodeGo: detected.hasOpencodeGo ? "yes" : "no"
   };
 }
 
@@ -9252,7 +9154,7 @@ async function runCliInstaller(args, version) {
 ` + `All features work like magic\u2014parallel agents, background tasks,
 ` + `deep exploration, and relentless execution until completion.`, "The Magic Word");
   console.log(`${SYMBOLS.star} ${import_picocolors2.default.yellow("If you found this helpful, consider starring the repo!")}`);
-  console.log(`  ${import_picocolors2.default.dim("gh api --silent --method PUT /user/starred/code-yeongyu/oh-my-opencode >/dev/null 2>&1 || true")}`);
+  console.log(`  ${import_picocolors2.default.dim("gh api --silent --method PUT /user/starred/code-yeongyu/oh-my-openagent >/dev/null 2>&1 || true")}`);
   console.log();
   console.log(import_picocolors2.default.dim("oMoMoMoMo... Enjoy!"));
   console.log();
@@ -9937,6 +9839,16 @@ async function promptInstallConfig(detected) {
   });
   if (!kimiForCoding)
     return null;
+  const opencodeGo = await selectOrCancel({
+    message: "Do you have an OpenCode Go subscription?",
+    options: [
+      { value: "no", label: "No", hint: "Will use other configured providers" },
+      { value: "yes", label: "Yes", hint: "OpenCode Go for quick tasks" }
+    ],
+    initialValue: initial.opencodeGo
+  });
+  if (!opencodeGo)
+    return null;
   return {
     hasClaude: claude !== "no",
     isMax20: claude === "max20",
@@ -9945,7 +9857,8 @@ async function promptInstallConfig(detected) {
     hasCopilot: copilot === "yes",
     hasOpencodeZen: opencodeZen === "yes",
     hasZaiCodingPlan: zaiCodingPlan === "yes",
-    hasKimiForCoding: kimiForCoding === "yes"
+    hasKimiForCoding: kimiForCoding === "yes",
+    hasOpencodeGo: opencodeGo === "yes"
   };
 }
 
@@ -10015,7 +9928,7 @@ async function runTuiInstaller(args, version) {
 ` + `All features work like magic\u2014parallel agents, background tasks,
 ` + `deep exploration, and relentless execution until completion.`, "The Magic Word");
   M2.message(`${import_picocolors4.default.yellow("\u2605")} If you found this helpful, consider starring the repo!`);
-  M2.message(`  ${import_picocolors4.default.dim("gh api --silent --method PUT /user/starred/code-yeongyu/oh-my-opencode >/dev/null 2>&1 || true")}`);
+  M2.message(`  ${import_picocolors4.default.dim("gh api --silent --method PUT /user/starred/code-yeongyu/oh-my-openagent >/dev/null 2>&1 || true")}`);
   Se(import_picocolors4.default.green("oMoMoMoMo... Enjoy!"));
   if ((config.hasClaude || config.hasGemini || config.hasCopilot) && !args.skipAuth) {
     const providers = [];
@@ -10044,7 +9957,7 @@ async function install(args) {
 }
 
 // src/cli/run/runner.ts
-var import_picocolors15 = __toESM(require_picocolors(), 1);
+var import_picocolors14 = __toESM(require_picocolors(), 1);
 
 // src/cli/run/event-state.ts
 function createEventState() {
@@ -24286,7 +24199,8 @@ var BuiltinAgentNameSchema = exports_external.enum([
   "multimodal-looker",
   "metis",
   "momus",
-  "atlas"
+  "atlas",
+  "sisyphus-junior"
 ]);
 var BuiltinSkillNameSchema = exports_external.enum([
   "playwright",
@@ -24386,13 +24300,22 @@ var BabysittingConfigSchema = exports_external.object({
   timeout_ms: exports_external.number().default(120000)
 });
 // src/config/schema/background-task.ts
+var CircuitBreakerConfigSchema = exports_external.object({
+  maxToolCalls: exports_external.number().int().min(10).optional(),
+  windowSize: exports_external.number().int().min(5).optional(),
+  repetitionThresholdPercent: exports_external.number().gt(0).max(100).optional()
+});
 var BackgroundTaskConfigSchema = exports_external.object({
   defaultConcurrency: exports_external.number().min(1).optional(),
   providerConcurrency: exports_external.record(exports_external.string(), exports_external.number().min(0)).optional(),
   modelConcurrency: exports_external.record(exports_external.string(), exports_external.number().min(0)).optional(),
+  maxDepth: exports_external.number().int().min(1).optional(),
+  maxDescendants: exports_external.number().int().min(1).optional(),
   staleTimeoutMs: exports_external.number().min(60000).optional(),
   messageStalenessTimeoutMs: exports_external.number().min(60000).optional(),
-  syncPollTimeoutMs: exports_external.number().min(60000).optional()
+  syncPollTimeoutMs: exports_external.number().min(60000).optional(),
+  maxToolCalls: exports_external.number().int().min(10).optional(),
+  circuitBreaker: CircuitBreakerConfigSchema.optional()
 });
 // src/config/schema/browser-automation.ts
 var BrowserAutomationProviderSchema = exports_external.enum([
@@ -24505,13 +24428,25 @@ var ExperimentalConfigSchema = exports_external.object({
   hashline_edit: exports_external.boolean().optional(),
   model_fallback_title: exports_external.boolean().optional()
 });
+// src/config/schema/git-env-prefix.ts
+var GIT_ENV_ASSIGNMENT_PATTERN = /^(?:[A-Za-z_][A-Za-z0-9_]*=[A-Za-z0-9_-]*)(?: [A-Za-z_][A-Za-z0-9_]*=[A-Za-z0-9_-]*)*$/;
+var GIT_ENV_PREFIX_VALIDATION_MESSAGE = 'git_env_prefix must be empty or use shell-safe env assignments like "GIT_MASTER=1"';
+function isValidGitEnvPrefix(value) {
+  if (value === "") {
+    return true;
+  }
+  return GIT_ENV_ASSIGNMENT_PATTERN.test(value);
+}
+var GitEnvPrefixSchema = exports_external.string().refine(isValidGitEnvPrefix, { message: GIT_ENV_PREFIX_VALIDATION_MESSAGE }).default("GIT_MASTER=1");
 // src/config/schema/git-master.ts
 var GitMasterConfigSchema = exports_external.object({
   commit_footer: exports_external.union([exports_external.boolean(), exports_external.string()]).default(true),
-  include_co_authored_by: exports_external.boolean().default(true)
+  include_co_authored_by: exports_external.boolean().default(true),
+  git_env_prefix: GitEnvPrefixSchema
 });
 // src/config/schema/hooks.ts
 var HookNameSchema = exports_external.enum([
+  "gpt-permission-continuation",
   "todo-continuation-enforcer",
   "context-window-monitor",
   "session-recovery",
@@ -24700,6 +24635,14 @@ var OhMyOpenCodeConfigSchema = exports_external.object({
 });
 // src/plugin-config.ts
 init_shared();
+var PARTIAL_STRING_ARRAY_KEYS = new Set([
+  "disabled_mcps",
+  "disabled_agents",
+  "disabled_skills",
+  "disabled_hooks",
+  "disabled_commands",
+  "disabled_tools"
+]);
 function parseConfigPartially(rawConfig) {
   const fullResult = OhMyOpenCodeConfigSchema.safeParse(rawConfig);
   if (fullResult.success) {
@@ -24708,6 +24651,13 @@ function parseConfigPartially(rawConfig) {
   const partialConfig = {};
   const invalidSections = [];
   for (const key of Object.keys(rawConfig)) {
+    if (PARTIAL_STRING_ARRAY_KEYS.has(key)) {
+      const sectionValue = rawConfig[key];
+      if (Array.isArray(sectionValue) && sectionValue.every((value) => typeof value === "string")) {
+        partialConfig[key] = sectionValue;
+      }
+      continue;
+    }
     const sectionResult = OhMyOpenCodeConfigSchema.safeParse({ [key]: rawConfig[key] });
     if (sectionResult.success) {
       const parsed = sectionResult.data;
@@ -24793,6 +24743,12 @@ function mergeConfigs(base, override) {
         ...override.disabled_skills ?? []
       ])
     ],
+    disabled_tools: [
+      ...new Set([
+        ...base.disabled_tools ?? [],
+        ...override.disabled_tools ?? []
+      ])
+    ],
     claude_code: deepMerge(base.claude_code, override.claude_code)
   };
 }
@@ -26506,14 +26462,28 @@ function createJsonOutputManager(options = {}) {
 
 // src/cli/run/on-complete-hook.ts
 init_spawn_with_windows_hide();
-var import_picocolors11 = __toESM(require_picocolors(), 1);
+init_shared();
+async function readOutput(stream, streamName) {
+  if (!stream) {
+    return "";
+  }
+  try {
+    return await new Response(stream).text();
+  } catch (error48) {
+    log("Failed to read on-complete hook output", {
+      stream: streamName,
+      error: error48 instanceof Error ? error48.message : String(error48)
+    });
+    return "";
+  }
+}
 async function executeOnCompleteHook(options) {
   const { command, sessionId, exitCode, durationMs, messageCount } = options;
   const trimmedCommand = command.trim();
   if (!trimmedCommand) {
     return;
   }
-  console.error(import_picocolors11.default.dim(`Running on-complete hook: ${trimmedCommand}`));
+  log("Running on-complete hook", { command: trimmedCommand });
   try {
     const proc = spawnWithWindowsHide(["sh", "-c", trimmedCommand], {
       env: {
@@ -26523,21 +26493,37 @@ async function executeOnCompleteHook(options) {
         DURATION_MS: String(durationMs),
         MESSAGE_COUNT: String(messageCount)
       },
-      stdout: "inherit",
-      stderr: "inherit"
+      stdout: "pipe",
+      stderr: "pipe"
     });
-    const hookExitCode = await proc.exited;
+    const [hookExitCode, stdout, stderr] = await Promise.all([
+      proc.exited,
+      readOutput(proc.stdout, "stdout"),
+      readOutput(proc.stderr, "stderr")
+    ]);
+    if (stdout.trim()) {
+      log("On-complete hook stdout", { command: trimmedCommand, stdout: stdout.trim() });
+    }
+    if (stderr.trim()) {
+      log("On-complete hook stderr", { command: trimmedCommand, stderr: stderr.trim() });
+    }
     if (hookExitCode !== 0) {
-      console.error(import_picocolors11.default.yellow(`Warning: on-complete hook exited with code ${hookExitCode}`));
+      log("On-complete hook exited with non-zero code", {
+        command: trimmedCommand,
+        exitCode: hookExitCode
+      });
     }
   } catch (error48) {
-    console.error(import_picocolors11.default.yellow(`Warning: Failed to execute on-complete hook: ${error48 instanceof Error ? error48.message : String(error48)}`));
+    log("Failed to execute on-complete hook", {
+      command: trimmedCommand,
+      error: error48 instanceof Error ? error48.message : String(error48)
+    });
   }
 }
 
 // src/cli/run/agent-resolver.ts
 init_agent_display_names();
-var import_picocolors12 = __toESM(require_picocolors(), 1);
+var import_picocolors11 = __toESM(require_picocolors(), 1);
 var CORE_AGENT_ORDER = ["sisyphus", "hephaestus", "prometheus", "atlas"];
 var DEFAULT_AGENT = "sisyphus";
 var normalizeAgentName = (agent) => {
@@ -26582,21 +26568,45 @@ var resolveRunAgent = (options, pluginConfig, env = process.env) => {
     const fallbackName = getAgentDisplayName(fallback);
     const fallbackDisabled = isAgentDisabled(fallback, pluginConfig);
     if (fallbackDisabled) {
-      console.log(import_picocolors12.default.yellow(`Requested agent "${resolved.resolvedName}" is disabled and no enabled core agent was found. Proceeding with "${fallbackName}".`));
+      console.log(import_picocolors11.default.yellow(`Requested agent "${resolved.resolvedName}" is disabled and no enabled core agent was found. Proceeding with "${fallbackName}".`));
       return fallbackName;
     }
-    console.log(import_picocolors12.default.yellow(`Requested agent "${resolved.resolvedName}" is disabled. Falling back to "${fallbackName}".`));
+    console.log(import_picocolors11.default.yellow(`Requested agent "${resolved.resolvedName}" is disabled. Falling back to "${fallbackName}".`));
     return fallbackName;
   }
   return resolved.resolvedName;
 };
 
+// src/cli/run/model-resolver.ts
+function resolveRunModel(modelString) {
+  if (modelString === undefined) {
+    return;
+  }
+  const trimmed = modelString.trim();
+  if (trimmed.length === 0) {
+    throw new Error("Model string cannot be empty");
+  }
+  const parts = trimmed.split("/");
+  if (parts.length < 2) {
+    throw new Error("Model string must be in 'provider/model' format");
+  }
+  const providerID = parts[0];
+  if (providerID.length === 0) {
+    throw new Error("Provider cannot be empty");
+  }
+  const modelID = parts.slice(1).join("/");
+  if (modelID.length === 0) {
+    throw new Error("Model ID cannot be empty");
+  }
+  return { providerID, modelID };
+}
+
 // src/cli/run/poll-for-completion.ts
-var import_picocolors14 = __toESM(require_picocolors(), 1);
+var import_picocolors13 = __toESM(require_picocolors(), 1);
 
 // src/cli/run/completion.ts
 init_shared();
-var import_picocolors13 = __toESM(require_picocolors(), 1);
+var import_picocolors12 = __toESM(require_picocolors(), 1);
 // src/features/boulder-state/constants.ts
 var BOULDER_DIR = ".sisyphus";
 var BOULDER_FILE = "boulder.json";
@@ -26604,14 +26614,14 @@ var BOULDER_STATE_PATH = `${BOULDER_DIR}/${BOULDER_FILE}`;
 var NOTEPAD_DIR = "notepads";
 var NOTEPAD_BASE_PATH = `${BOULDER_DIR}/${NOTEPAD_DIR}`;
 // src/features/boulder-state/storage.ts
-import { existsSync as existsSync10, readFileSync as readFileSync9, writeFileSync as writeFileSync5, mkdirSync as mkdirSync3, readdirSync } from "fs";
+import { existsSync as existsSync11, readFileSync as readFileSync9, writeFileSync as writeFileSync5, mkdirSync as mkdirSync3, readdirSync } from "fs";
 import { dirname as dirname2, join as join9, basename } from "path";
 function getBoulderFilePath(directory) {
   return join9(directory, BOULDER_DIR, BOULDER_FILE);
 }
 function readBoulderState(directory) {
   const filePath = getBoulderFilePath(directory);
-  if (!existsSync10(filePath)) {
+  if (!existsSync11(filePath)) {
     return null;
   }
   try {
@@ -26629,7 +26639,7 @@ function readBoulderState(directory) {
   }
 }
 function getPlanProgress(planPath) {
-  if (!existsSync10(planPath)) {
+  if (!existsSync11(planPath)) {
     return { total: 0, completed: 0, isComplete: true };
   }
   try {
@@ -26650,14 +26660,14 @@ function getPlanProgress(planPath) {
 // src/features/run-continuation-state/constants.ts
 var CONTINUATION_MARKER_DIR = ".sisyphus/run-continuation";
 // src/features/run-continuation-state/storage.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync4, readFileSync as readFileSync10, rmSync, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync4, readFileSync as readFileSync10, rmSync, writeFileSync as writeFileSync6 } from "fs";
 import { join as join10 } from "path";
 function getMarkerPath(directory, sessionID) {
   return join10(directory, CONTINUATION_MARKER_DIR, `${sessionID}.json`);
 }
 function readContinuationMarker(directory, sessionID) {
   const markerPath = getMarkerPath(directory, sessionID);
-  if (!existsSync11(markerPath))
+  if (!existsSync12(markerPath))
     return null;
   try {
     const raw = readFileSync10(markerPath, "utf-8");
@@ -26685,7 +26695,7 @@ function getActiveContinuationMarkerReason(marker) {
 }
 // src/hooks/ralph-loop/storage.ts
 init_frontmatter();
-import { existsSync as existsSync12, readFileSync as readFileSync11, writeFileSync as writeFileSync7, unlinkSync, mkdirSync as mkdirSync5 } from "fs";
+import { existsSync as existsSync13, readFileSync as readFileSync11, writeFileSync as writeFileSync7, unlinkSync, mkdirSync as mkdirSync5 } from "fs";
 import { dirname as dirname3, join as join11 } from "path";
 
 // src/hooks/ralph-loop/constants.ts
@@ -26699,7 +26709,7 @@ function getStateFilePath(directory, customPath) {
 }
 function readState(directory, customPath) {
   const filePath = getStateFilePath(directory, customPath);
-  if (!existsSync12(filePath)) {
+  if (!existsSync13(filePath)) {
     return null;
   }
   try {
@@ -26793,7 +26803,7 @@ async function checkCompletionConditions(ctx) {
     }
     return true;
   } catch (err) {
-    console.error(import_picocolors13.default.red(`[completion] API error: ${err}`));
+    console.error(import_picocolors12.default.red(`[completion] API error: ${err}`));
     return false;
   }
 }
@@ -26854,7 +26864,7 @@ function logWaiting(ctx, message) {
   if (!ctx.verbose) {
     return;
   }
-  console.log(import_picocolors13.default.dim(`  Waiting: ${message}`));
+  console.log(import_picocolors12.default.dim(`  Waiting: ${message}`));
 }
 
 // src/cli/run/poll-for-completion.ts
@@ -26885,10 +26895,10 @@ async function pollForCompletion(ctx, eventState, abortController, options = {})
     if (eventState.mainSessionError) {
       errorCycleCount++;
       if (errorCycleCount >= ERROR_GRACE_CYCLES) {
-        console.error(import_picocolors14.default.red(`
+        console.error(import_picocolors13.default.red(`
 
 Session ended with error: ${eventState.lastError}`));
-        console.error(import_picocolors14.default.yellow("Check if todos were completed before the error."));
+        console.error(import_picocolors13.default.yellow("Check if todos were completed before the error."));
         return 1;
       }
       continue;
@@ -26899,7 +26909,7 @@ Session ended with error: ${eventState.lastError}`));
     if (eventState.lastEventTimestamp !== null) {
       const timeSinceLastEvent = Date.now() - eventState.lastEventTimestamp;
       if (timeSinceLastEvent > eventWatchdogMs) {
-        console.log(import_picocolors14.default.yellow(`
+        console.log(import_picocolors13.default.yellow(`
   No events for ${Math.round(timeSinceLastEvent / 1000)}s, verifying session status...`));
         mainSessionStatus = await getMainSessionStatus(ctx);
         if (mainSessionStatus === "idle") {
@@ -26948,7 +26958,7 @@ Session ended with error: ${eventState.lastError}`));
         const hasActiveWork = hasActiveChildren || hasActiveTodos;
         if (hasActiveWork) {
           eventState.hasReceivedMeaningfulWork = true;
-          console.log(import_picocolors14.default.yellow(`
+          console.log(import_picocolors13.default.yellow(`
   No meaningful work events for ${Math.round(secondaryMeaningfulWorkTimeoutMs / 1000)}s but session has active work - assuming in progress`));
         }
       }
@@ -26968,7 +26978,7 @@ Session ended with error: ${eventState.lastError}`));
       }
       consecutiveCompleteChecks++;
       if (consecutiveCompleteChecks >= requiredConsecutive) {
-        console.log(import_picocolors14.default.green(`
+        console.log(import_picocolors13.default.green(`
 
 All tasks completed.`));
         return 0;
@@ -27125,6 +27135,7 @@ async function run(options) {
   const resolvedAgent = resolveRunAgent(options, pluginConfig);
   const abortController = new AbortController;
   try {
+    const resolvedModel = resolveRunModel(options.model);
     const { client: client3, cleanup: serverCleanup } = await createServerConnection({
       port: options.port,
       attach: options.attach,
@@ -27135,7 +27146,7 @@ async function run(options) {
     };
     const restoreInput = suppressRunInput();
     const handleSigint = () => {
-      console.log(import_picocolors15.default.yellow(`
+      console.log(import_picocolors14.default.yellow(`
 Interrupted. Shutting down...`));
       restoreInput();
       cleanup();
@@ -27148,7 +27159,10 @@ Interrupted. Shutting down...`));
         sessionId: options.sessionId,
         directory
       });
-      console.log(import_picocolors15.default.dim(`Session: ${sessionID}`));
+      console.log(import_picocolors14.default.dim(`Session: ${sessionID}`));
+      if (resolvedModel) {
+        console.log(import_picocolors14.default.dim(`Model: ${resolvedModel.providerID}/${resolvedModel.modelID}`));
+      }
       const ctx = {
         client: client3,
         sessionID,
@@ -27164,6 +27178,7 @@ Interrupted. Shutting down...`));
         path: { id: sessionID },
         body: {
           agent: resolvedAgent,
+          ...resolvedModel ? { model: resolvedModel } : {},
           tools: {
             question: false
           },
@@ -27209,7 +27224,7 @@ Interrupted. Shutting down...`));
     if (err instanceof Error && err.name === "AbortError") {
       return 130;
     }
-    console.error(import_picocolors15.default.red(`Error: ${serializeError(err)}`));
+    console.error(import_picocolors14.default.red(`Error: ${serializeError(err)}`));
     return 1;
   } finally {
     timestampOutput?.restore();
@@ -27219,53 +27234,53 @@ Interrupted. Shutting down...`));
 init_checker();
 
 // src/cli/get-local-version/formatter.ts
-var import_picocolors16 = __toESM(require_picocolors(), 1);
+var import_picocolors15 = __toESM(require_picocolors(), 1);
 var SYMBOLS2 = {
-  check: import_picocolors16.default.green("[OK]"),
-  cross: import_picocolors16.default.red("[X]"),
-  arrow: import_picocolors16.default.cyan("->"),
-  info: import_picocolors16.default.blue("[i]"),
-  warn: import_picocolors16.default.yellow("[!]"),
-  pin: import_picocolors16.default.magenta("[PINNED]"),
-  dev: import_picocolors16.default.cyan("[DEV]")
+  check: import_picocolors15.default.green("[OK]"),
+  cross: import_picocolors15.default.red("[X]"),
+  arrow: import_picocolors15.default.cyan("->"),
+  info: import_picocolors15.default.blue("[i]"),
+  warn: import_picocolors15.default.yellow("[!]"),
+  pin: import_picocolors15.default.magenta("[PINNED]"),
+  dev: import_picocolors15.default.cyan("[DEV]")
 };
 function formatVersionOutput(info) {
   const lines = [];
   lines.push("");
-  lines.push(import_picocolors16.default.bold(import_picocolors16.default.white("oh-my-opencode Version Information")));
-  lines.push(import_picocolors16.default.dim("\u2500".repeat(50)));
+  lines.push(import_picocolors15.default.bold(import_picocolors15.default.white("oh-my-opencode Version Information")));
+  lines.push(import_picocolors15.default.dim("\u2500".repeat(50)));
   lines.push("");
   if (info.currentVersion) {
-    lines.push(`  Current Version: ${import_picocolors16.default.cyan(info.currentVersion)}`);
+    lines.push(`  Current Version: ${import_picocolors15.default.cyan(info.currentVersion)}`);
   } else {
-    lines.push(`  Current Version: ${import_picocolors16.default.dim("unknown")}`);
+    lines.push(`  Current Version: ${import_picocolors15.default.dim("unknown")}`);
   }
   if (!info.isLocalDev && info.latestVersion) {
-    lines.push(`  Latest Version:  ${import_picocolors16.default.cyan(info.latestVersion)}`);
+    lines.push(`  Latest Version:  ${import_picocolors15.default.cyan(info.latestVersion)}`);
   }
   lines.push("");
   switch (info.status) {
     case "up-to-date":
-      lines.push(`  ${SYMBOLS2.check} ${import_picocolors16.default.green("You're up to date!")}`);
+      lines.push(`  ${SYMBOLS2.check} ${import_picocolors15.default.green("You're up to date!")}`);
       break;
     case "outdated":
-      lines.push(`  ${SYMBOLS2.warn} ${import_picocolors16.default.yellow("Update available")}`);
-      lines.push(`  ${import_picocolors16.default.dim("Run:")} ${import_picocolors16.default.cyan("cd ~/.config/opencode && bun update oh-my-opencode")}`);
+      lines.push(`  ${SYMBOLS2.warn} ${import_picocolors15.default.yellow("Update available")}`);
+      lines.push(`  ${import_picocolors15.default.dim("Run:")} ${import_picocolors15.default.cyan("cd ~/.config/opencode && bun update oh-my-opencode")}`);
       break;
     case "local-dev":
-      lines.push(`  ${SYMBOLS2.dev} ${import_picocolors16.default.cyan("Running in local development mode")}`);
-      lines.push(`  ${import_picocolors16.default.dim("Using file:// protocol from config")}`);
+      lines.push(`  ${SYMBOLS2.dev} ${import_picocolors15.default.cyan("Running in local development mode")}`);
+      lines.push(`  ${import_picocolors15.default.dim("Using file:// protocol from config")}`);
       break;
     case "pinned":
-      lines.push(`  ${SYMBOLS2.pin} ${import_picocolors16.default.magenta(`Version pinned to ${info.pinnedVersion}`)}`);
-      lines.push(`  ${import_picocolors16.default.dim("Update check skipped for pinned versions")}`);
+      lines.push(`  ${SYMBOLS2.pin} ${import_picocolors15.default.magenta(`Version pinned to ${info.pinnedVersion}`)}`);
+      lines.push(`  ${import_picocolors15.default.dim("Update check skipped for pinned versions")}`);
       break;
     case "error":
-      lines.push(`  ${SYMBOLS2.cross} ${import_picocolors16.default.red("Unable to check for updates")}`);
-      lines.push(`  ${import_picocolors16.default.dim("Network error or npm registry unavailable")}`);
+      lines.push(`  ${SYMBOLS2.cross} ${import_picocolors15.default.red("Unable to check for updates")}`);
+      lines.push(`  ${import_picocolors15.default.dim("Network error or npm registry unavailable")}`);
       break;
     case "unknown":
-      lines.push(`  ${SYMBOLS2.info} ${import_picocolors16.default.yellow("Version information unavailable")}`);
+      lines.push(`  ${SYMBOLS2.info} ${import_picocolors15.default.yellow("Version information unavailable")}`);
       break;
   }
   lines.push("");
@@ -27365,21 +27380,21 @@ async function getLocalVersion(options = {}) {
   }
 }
 // src/cli/doctor/constants.ts
-var import_picocolors17 = __toESM(require_picocolors(), 1);
+var import_picocolors16 = __toESM(require_picocolors(), 1);
 var SYMBOLS3 = {
-  check: import_picocolors17.default.green("\u2713"),
-  cross: import_picocolors17.default.red("\u2717"),
-  warn: import_picocolors17.default.yellow("\u26A0"),
-  info: import_picocolors17.default.blue("\u2139"),
-  arrow: import_picocolors17.default.cyan("\u2192"),
-  bullet: import_picocolors17.default.dim("\u2022"),
-  skip: import_picocolors17.default.dim("\u25CB")
+  check: import_picocolors16.default.green("\u2713"),
+  cross: import_picocolors16.default.red("\u2717"),
+  warn: import_picocolors16.default.yellow("\u26A0"),
+  info: import_picocolors16.default.blue("\u2139"),
+  arrow: import_picocolors16.default.cyan("\u2192"),
+  bullet: import_picocolors16.default.dim("\u2022"),
+  skip: import_picocolors16.default.dim("\u25CB")
 };
 var STATUS_COLORS = {
-  pass: import_picocolors17.default.green,
-  fail: import_picocolors17.default.red,
-  warn: import_picocolors17.default.yellow,
-  skip: import_picocolors17.default.dim
+  pass: import_picocolors16.default.green,
+  fail: import_picocolors16.default.red,
+  warn: import_picocolors16.default.yellow,
+  skip: import_picocolors16.default.dim
 };
 var CHECK_IDS = {
   SYSTEM: "system",
@@ -27398,34 +27413,34 @@ var EXIT_CODES = {
   FAILURE: 1
 };
 var MIN_OPENCODE_VERSION = "1.0.150";
-var PACKAGE_NAME4 = "oh-my-opencode";
+var PACKAGE_NAME2 = "oh-my-opencode";
 var OPENCODE_BINARIES2 = ["opencode", "opencode-desktop"];
 
 // src/cli/doctor/checks/system.ts
-import { existsSync as existsSync21, readFileSync as readFileSync21 } from "fs";
+import { existsSync as existsSync24, readFileSync as readFileSync21 } from "fs";
 
 // src/cli/doctor/checks/system-binary.ts
 init_spawn_with_windows_hide();
-import { existsSync as existsSync18 } from "fs";
+import { existsSync as existsSync21 } from "fs";
 import { homedir as homedir5 } from "os";
-import { join as join16 } from "path";
+import { join as join18 } from "path";
 function getDesktopAppPaths(platform) {
   const home = homedir5();
   switch (platform) {
     case "darwin":
       return [
         "/Applications/OpenCode.app/Contents/MacOS/OpenCode",
-        join16(home, "Applications", "OpenCode.app", "Contents", "MacOS", "OpenCode")
+        join18(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(join16(programFiles, "OpenCode", "OpenCode.exe"));
+        paths.push(join18(programFiles, "OpenCode", "OpenCode.exe"));
       }
       if (localAppData) {
-        paths.push(join16(localAppData, "OpenCode", "OpenCode.exe"));
+        paths.push(join18(localAppData, "OpenCode", "OpenCode.exe"));
       }
       return paths;
     }
@@ -27433,8 +27448,8 @@ function getDesktopAppPaths(platform) {
       return [
         "/usr/bin/opencode",
         "/usr/lib/opencode/opencode",
-        join16(home, "Applications", "opencode-desktop-linux-x86_64.AppImage"),
-        join16(home, "Applications", "opencode-desktop-linux-aarch64.AppImage")
+        join18(home, "Applications", "opencode-desktop-linux-x86_64.AppImage"),
+        join18(home, "Applications", "opencode-desktop-linux-aarch64.AppImage")
       ];
     default:
       return [];
@@ -27446,7 +27461,7 @@ function buildVersionCommand(binaryPath, platform) {
   }
   return [binaryPath, "--version"];
 }
-function findDesktopBinary(platform = process.platform, checkExists = existsSync18) {
+function findDesktopBinary(platform = process.platform, checkExists = existsSync21) {
   for (const desktopPath of getDesktopAppPaths(platform)) {
     if (checkExists(desktopPath)) {
       return { binary: "opencode", path: desktopPath };
@@ -27456,9 +27471,9 @@ function findDesktopBinary(platform = process.platform, checkExists = existsSync
 }
 async function findOpenCodeBinary() {
   for (const binary2 of OPENCODE_BINARIES2) {
-    const path9 = Bun.which(binary2);
-    if (path9) {
-      return { binary: binary2, path: path9 };
+    const path10 = Bun.which(binary2);
+    if (path10) {
+      return { binary: binary2, path: path10 };
     }
   }
   return findDesktopBinary();
@@ -27493,30 +27508,40 @@ function compareVersions(current, minimum) {
 }
 
 // src/cli/doctor/checks/system-plugin.ts
-import { existsSync as existsSync19, readFileSync as readFileSync19 } from "fs";
 init_shared();
+import { existsSync as existsSync22, readFileSync as readFileSync19 } from "fs";
 function detectConfigPath() {
   const paths = getOpenCodeConfigPaths({ binary: "opencode", version: null });
-  if (existsSync19(paths.configJsonc))
+  if (existsSync22(paths.configJsonc))
     return paths.configJsonc;
-  if (existsSync19(paths.configJson))
+  if (existsSync22(paths.configJson))
     return paths.configJson;
   return null;
 }
 function parsePluginVersion(entry) {
-  if (!entry.startsWith(`${PACKAGE_NAME4}@`))
-    return null;
-  const value = entry.slice(PACKAGE_NAME4.length + 1);
-  if (!value || value === "latest")
-    return null;
-  return value;
+  if (entry.startsWith(`${PLUGIN_NAME}@`)) {
+    const value = entry.slice(PLUGIN_NAME.length + 1);
+    if (!value || value === "latest")
+      return null;
+    return value;
+  }
+  if (entry.startsWith(`${LEGACY_PLUGIN_NAME}@`)) {
+    const value = entry.slice(LEGACY_PLUGIN_NAME.length + 1);
+    if (!value || value === "latest")
+      return null;
+    return value;
+  }
+  return null;
 }
 function findPluginEntry2(entries) {
   for (const entry of entries) {
-    if (entry === PACKAGE_NAME4 || entry.startsWith(`${PACKAGE_NAME4}@`)) {
+    if (entry === PLUGIN_NAME || entry.startsWith(`${PLUGIN_NAME}@`)) {
+      return { entry, isLocalDev: false };
+    }
+    if (entry === LEGACY_PLUGIN_NAME || entry.startsWith(`${LEGACY_PLUGIN_NAME}@`)) {
       return { entry, isLocalDev: false };
     }
-    if (entry.startsWith("file://") && entry.includes(PACKAGE_NAME4)) {
+    if (entry.startsWith("file://") && (entry.includes(PLUGIN_NAME) || entry.includes(LEGACY_PLUGIN_NAME))) {
       return { entry, isLocalDev: true };
     }
   }
@@ -27553,7 +27578,7 @@ function getPluginInfo() {
       registered: true,
       configPath,
       entry: pluginEntry.entry,
-      isPinned: pinnedVersion !== null && /^\d+\.\d+\.\d+/.test(pinnedVersion),
+      isPinned: pinnedVersion !== null && /^\d+\.\d+\.\d+/.test(pinnedVersion ?? ""),
       pinnedVersion,
       isLocalDev: pluginEntry.isLocalDev
     };
@@ -27572,29 +27597,29 @@ function getPluginInfo() {
 // src/cli/doctor/checks/system-loaded-version.ts
 init_checker();
 init_auto_update_checker();
-import { existsSync as existsSync20, readFileSync as readFileSync20 } from "fs";
+import { existsSync as existsSync23, readFileSync as readFileSync20 } from "fs";
 import { homedir as homedir6 } from "os";
-import { join as join17 } from "path";
+import { join as join19 } from "path";
 init_shared();
 function getPlatformDefaultCacheDir(platform = process.platform) {
   if (platform === "darwin")
-    return join17(homedir6(), "Library", "Caches");
+    return join19(homedir6(), "Library", "Caches");
   if (platform === "win32")
-    return process.env.LOCALAPPDATA ?? join17(homedir6(), "AppData", "Local");
-  return join17(homedir6(), ".cache");
+    return process.env.LOCALAPPDATA ?? join19(homedir6(), "AppData", "Local");
+  return join19(homedir6(), ".cache");
 }
 function resolveOpenCodeCacheDir() {
   const xdgCacheHome = process.env.XDG_CACHE_HOME;
   if (xdgCacheHome)
-    return join17(xdgCacheHome, "opencode");
+    return join19(xdgCacheHome, "opencode");
   const fromShared = getOpenCodeCacheDir();
-  const platformDefault = join17(getPlatformDefaultCacheDir(), "opencode");
-  if (existsSync20(fromShared) || !existsSync20(platformDefault))
+  const platformDefault = join19(getPlatformDefaultCacheDir(), "opencode");
+  if (existsSync23(fromShared) || !existsSync23(platformDefault))
     return fromShared;
   return platformDefault;
 }
 function readPackageJson(filePath) {
-  if (!existsSync20(filePath))
+  if (!existsSync23(filePath))
     return null;
   try {
     const content = readFileSync20(filePath, "utf-8");
@@ -27610,15 +27635,28 @@ function normalizeVersion(value) {
   return match?.[0] ?? null;
 }
 function getLoadedPluginVersion() {
+  const configPaths = getOpenCodeConfigPaths({ binary: "opencode" });
   const cacheDir = resolveOpenCodeCacheDir();
-  const cachePackagePath = join17(cacheDir, "package.json");
-  const installedPackagePath = join17(cacheDir, "node_modules", PACKAGE_NAME4, "package.json");
+  const candidates = [
+    {
+      cacheDir: configPaths.configDir,
+      cachePackagePath: configPaths.packageJson,
+      installedPackagePath: join19(configPaths.configDir, "node_modules", PACKAGE_NAME2, "package.json")
+    },
+    {
+      cacheDir,
+      cachePackagePath: join19(cacheDir, "package.json"),
+      installedPackagePath: join19(cacheDir, "node_modules", PACKAGE_NAME2, "package.json")
+    }
+  ];
+  const selectedCandidate = candidates.find((candidate) => existsSync23(candidate.installedPackagePath)) ?? candidates[0];
+  const { cacheDir: selectedDir, cachePackagePath, installedPackagePath } = selectedCandidate;
   const cachePackage = readPackageJson(cachePackagePath);
   const installedPackage = readPackageJson(installedPackagePath);
-  const expectedVersion = normalizeVersion(cachePackage?.dependencies?.[PACKAGE_NAME4]);
+  const expectedVersion = normalizeVersion(cachePackage?.dependencies?.[PACKAGE_NAME2]);
   const loadedVersion = normalizeVersion(installedPackage?.version);
   return {
-    cacheDir,
+    cacheDir: selectedDir,
     cachePackagePath,
     installedPackagePath,
     expectedVersion,
@@ -27638,7 +27676,7 @@ init_shared();
 function isConfigValid(configPath) {
   if (!configPath)
     return true;
-  if (!existsSync21(configPath))
+  if (!existsSync24(configPath))
     return false;
   try {
     parseJsonc(readFileSync21(configPath, "utf-8"));
@@ -27665,7 +27703,7 @@ async function gatherSystemInfo() {
   const [binaryInfo, pluginInfo] = await Promise.all([findOpenCodeBinary(), Promise.resolve(getPluginInfo())]);
   const loadedInfo = getLoadedPluginVersion();
   const opencodeVersion = binaryInfo ? await getOpenCodeVersion2(binaryInfo.path) : null;
-  const pluginVersion = pluginInfo.pinnedVersion ?? loadedInfo.expectedVersion;
+  const pluginVersion = pluginInfo.pinnedVersion ?? loadedInfo.expectedVersion ?? loadedInfo.loadedVersion;
   return {
     opencodeVersion,
     opencodePath: binaryInfo?.path ?? null,
@@ -27745,23 +27783,23 @@ async function checkSystem() {
 
 // src/cli/doctor/checks/config.ts
 import { readFileSync as readFileSync24 } from "fs";
-import { join as join21 } from "path";
+import { join as join23 } from "path";
 init_shared();
 
 // src/cli/doctor/checks/model-resolution-cache.ts
 init_shared();
-import { existsSync as existsSync22, readFileSync as readFileSync22 } from "fs";
+import { existsSync as existsSync25, readFileSync as readFileSync22 } from "fs";
 import { homedir as homedir7 } from "os";
-import { join as join18 } from "path";
+import { join as join20 } from "path";
 function getOpenCodeCacheDir2() {
   const xdgCache = process.env.XDG_CACHE_HOME;
   if (xdgCache)
-    return join18(xdgCache, "opencode");
-  return join18(homedir7(), ".cache", "opencode");
+    return join20(xdgCache, "opencode");
+  return join20(homedir7(), ".cache", "opencode");
 }
 function loadAvailableModelsFromCache() {
-  const cacheFile = join18(getOpenCodeCacheDir2(), "models.json");
-  if (!existsSync22(cacheFile)) {
+  const cacheFile = join20(getOpenCodeCacheDir2(), "models.json");
+  if (!existsSync25(cacheFile)) {
     return { providers: [], modelCount: 0, cacheExists: false };
   }
   try {
@@ -27787,10 +27825,10 @@ init_model_requirements();
 // src/cli/doctor/checks/model-resolution-config.ts
 init_shared();
 import { readFileSync as readFileSync23 } from "fs";
-import { join as join19 } from "path";
-var PACKAGE_NAME5 = "oh-my-opencode";
-var USER_CONFIG_BASE = join19(getOpenCodeConfigPaths({ binary: "opencode", version: null }).configDir, PACKAGE_NAME5);
-var PROJECT_CONFIG_BASE = join19(process.cwd(), ".opencode", PACKAGE_NAME5);
+import { join as join21 } from "path";
+var PACKAGE_NAME3 = "oh-my-opencode";
+var USER_CONFIG_BASE = join21(getOpenCodeConfigPaths({ binary: "opencode", version: null }).configDir, PACKAGE_NAME3);
+var PROJECT_CONFIG_BASE = join21(process.cwd(), ".opencode", PACKAGE_NAME3);
 function loadOmoConfig() {
   const projectDetected = detectConfigFile(PROJECT_CONFIG_BASE);
   if (projectDetected.format !== "none") {
@@ -27815,7 +27853,7 @@ function loadOmoConfig() {
 
 // src/cli/doctor/checks/model-resolution-details.ts
 init_shared();
-import { join as join20 } from "path";
+import { join as join22 } from "path";
 
 // src/cli/doctor/checks/model-resolution-variant.ts
 function formatModelWithVariant(model, variant) {
@@ -27854,7 +27892,7 @@ function getCategoryEffectiveVariant(categoryName, requirement, config2) {
 // src/cli/doctor/checks/model-resolution-details.ts
 function buildModelResolutionDetails(options) {
   const details = [];
-  const cacheFile = join20(getOpenCodeCacheDir(), "models.json");
+  const cacheFile = join22(getOpenCodeCacheDir(), "models.json");
   details.push("\u2550\u2550\u2550 Available Models (from cache) \u2550\u2550\u2550");
   details.push("");
   if (options.available.cacheExists) {
@@ -27966,8 +28004,8 @@ async function checkModels() {
 }
 
 // src/cli/doctor/checks/config.ts
-var USER_CONFIG_BASE2 = join21(getOpenCodeConfigDir({ binary: "opencode" }), PACKAGE_NAME4);
-var PROJECT_CONFIG_BASE2 = join21(process.cwd(), ".opencode", PACKAGE_NAME4);
+var USER_CONFIG_BASE2 = join23(getOpenCodeConfigDir({ binary: "opencode" }), PACKAGE_NAME2);
+var PROJECT_CONFIG_BASE2 = join23(process.cwd(), ".opencode", PACKAGE_NAME2);
 function findConfigPath() {
   const projectConfig = detectConfigFile(PROJECT_CONFIG_BASE2);
   if (projectConfig.format !== "none")
@@ -28087,14 +28125,14 @@ async function checkConfig() {
 
 // src/cli/doctor/checks/dependencies.ts
 init_spawn_with_windows_hide();
-import { existsSync as existsSync23 } from "fs";
+import { existsSync as existsSync26 } from "fs";
 import { createRequire } from "module";
-import { dirname as dirname6, join as join22 } from "path";
+import { dirname as dirname6, join as join24 } from "path";
 async function checkBinaryExists(binary2) {
   try {
-    const path9 = Bun.which(binary2);
-    if (path9) {
-      return { exists: true, path: path9 };
+    const path10 = Bun.which(binary2);
+    if (path10) {
+      return { exists: true, path: path10 };
     }
   } catch {}
   return { exists: false, path: null };
@@ -28145,15 +28183,15 @@ async function checkAstGrepNapi() {
       path: null
     };
   } catch {
-    const { existsSync: existsSync24 } = await import("fs");
-    const { join: join23 } = await import("path");
+    const { existsSync: existsSync27 } = await import("fs");
+    const { join: join25 } = await import("path");
     const { homedir: homedir8 } = await import("os");
     const pathsToCheck = [
-      join23(homedir8(), ".config", "opencode", "node_modules", "@ast-grep", "napi"),
-      join23(process.cwd(), "node_modules", "@ast-grep", "napi")
+      join25(homedir8(), ".config", "opencode", "node_modules", "@ast-grep", "napi"),
+      join25(process.cwd(), "node_modules", "@ast-grep", "napi")
     ];
     for (const napiPath of pathsToCheck) {
-      if (existsSync24(napiPath)) {
+      if (existsSync27(napiPath)) {
         return {
           name: "AST-Grep NAPI",
           required: false,
@@ -28178,8 +28216,8 @@ function findCommentCheckerPackageBinary() {
   try {
     const require2 = createRequire(import.meta.url);
     const pkgPath = require2.resolve("@code-yeongyu/comment-checker/package.json");
-    const binaryPath = join22(dirname6(pkgPath), "bin", binaryName);
-    if (existsSync23(binaryPath))
+    const binaryPath = join24(dirname6(pkgPath), "bin", binaryName);
+    if (existsSync26(binaryPath))
       return binaryPath;
   } catch {}
   return null;
@@ -28292,20 +28330,163 @@ async function getGhCliInfo() {
     error: authStatus.error
   };
 }
+// src/tools/lsp/server-definitions.ts
+var BUILTIN_SERVERS = {
+  typescript: { command: ["typescript-language-server", "--stdio"], extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts"] },
+  deno: { command: ["deno", "lsp"], extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs"] },
+  vue: { command: ["vue-language-server", "--stdio"], extensions: [".vue"] },
+  eslint: { command: ["vscode-eslint-language-server", "--stdio"], extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts", ".vue"] },
+  oxlint: { command: ["oxlint", "--lsp"], extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts", ".vue", ".astro", ".svelte"] },
+  biome: { command: ["biome", "lsp-proxy", "--stdio"], extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts", ".json", ".jsonc", ".vue", ".astro", ".svelte", ".css", ".graphql", ".gql", ".html"] },
+  gopls: { command: ["gopls"], extensions: [".go"] },
+  "ruby-lsp": { command: ["rubocop", "--lsp"], extensions: [".rb", ".rake", ".gemspec", ".ru"] },
+  basedpyright: { command: ["basedpyright-langserver", "--stdio"], extensions: [".py", ".pyi"] },
+  pyright: { command: ["pyright-langserver", "--stdio"], extensions: [".py", ".pyi"] },
+  ty: { command: ["ty", "server"], extensions: [".py", ".pyi"] },
+  ruff: { command: ["ruff", "server"], extensions: [".py", ".pyi"] },
+  "elixir-ls": { command: ["elixir-ls"], extensions: [".ex", ".exs"] },
+  zls: { command: ["zls"], extensions: [".zig", ".zon"] },
+  csharp: { command: ["csharp-ls"], extensions: [".cs"] },
+  fsharp: { command: ["fsautocomplete"], extensions: [".fs", ".fsi", ".fsx", ".fsscript"] },
+  "sourcekit-lsp": { command: ["sourcekit-lsp"], extensions: [".swift", ".objc", ".objcpp"] },
+  rust: { command: ["rust-analyzer"], extensions: [".rs"] },
+  clangd: { command: ["clangd", "--background-index", "--clang-tidy"], extensions: [".c", ".cpp", ".cc", ".cxx", ".c++", ".h", ".hpp", ".hh", ".hxx", ".h++"] },
+  svelte: { command: ["svelteserver", "--stdio"], extensions: [".svelte"] },
+  astro: { command: ["astro-ls", "--stdio"], extensions: [".astro"] },
+  bash: { command: ["bash-language-server", "start"], extensions: [".sh", ".bash", ".zsh", ".ksh"] },
+  "bash-ls": { command: ["bash-language-server", "start"], extensions: [".sh", ".bash", ".zsh", ".ksh"] },
+  jdtls: { command: ["jdtls"], extensions: [".java"] },
+  "yaml-ls": { command: ["yaml-language-server", "--stdio"], extensions: [".yaml", ".yml"] },
+  "lua-ls": { command: ["lua-language-server"], extensions: [".lua"] },
+  php: { command: ["intelephense", "--stdio"], extensions: [".php"] },
+  dart: { command: ["dart", "language-server", "--lsp"], extensions: [".dart"] },
+  terraform: { command: ["terraform-ls", "serve"], extensions: [".tf", ".tfvars"] },
+  "terraform-ls": { command: ["terraform-ls", "serve"], extensions: [".tf", ".tfvars"] },
+  prisma: { command: ["prisma", "language-server"], extensions: [".prisma"] },
+  "ocaml-lsp": { command: ["ocamllsp"], extensions: [".ml", ".mli"] },
+  texlab: { command: ["texlab"], extensions: [".tex", ".bib"] },
+  dockerfile: { command: ["docker-langserver", "--stdio"], extensions: [".dockerfile"] },
+  gleam: { command: ["gleam", "lsp"], extensions: [".gleam"] },
+  "clojure-lsp": { command: ["clojure-lsp", "listen"], extensions: [".clj", ".cljs", ".cljc", ".edn"] },
+  nixd: { command: ["nixd"], extensions: [".nix"] },
+  tinymist: { command: ["tinymist"], extensions: [".typ", ".typc"] },
+  "haskell-language-server": { command: ["haskell-language-server-wrapper", "--lsp"], extensions: [".hs", ".lhs"] },
+  "kotlin-ls": { command: ["kotlin-lsp"], extensions: [".kt", ".kts"] }
+};
 // src/tools/lsp/server-config-loader.ts
+import { existsSync as existsSync27, readFileSync as readFileSync25 } from "fs";
+import { join as join25 } from "path";
 init_shared();
 init_jsonc_parser();
+function loadJsonFile(path10) {
+  if (!existsSync27(path10))
+    return null;
+  try {
+    return parseJsonc(readFileSync25(path10, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function getConfigPaths2() {
+  const cwd = process.cwd();
+  const configDir = getOpenCodeConfigDir({ binary: "opencode" });
+  return {
+    project: detectConfigFile(join25(cwd, ".opencode", "oh-my-opencode")).path,
+    user: detectConfigFile(join25(configDir, "oh-my-opencode")).path,
+    opencode: detectConfigFile(join25(configDir, "opencode")).path
+  };
+}
+function loadAllConfigs() {
+  const paths = getConfigPaths2();
+  const configs = new Map;
+  const project = loadJsonFile(paths.project);
+  if (project)
+    configs.set("project", project);
+  const user = loadJsonFile(paths.user);
+  if (user)
+    configs.set("user", user);
+  const opencode = loadJsonFile(paths.opencode);
+  if (opencode)
+    configs.set("opencode", opencode);
+  return configs;
+}
+function getMergedServers() {
+  const configs = loadAllConfigs();
+  const servers = [];
+  const disabled = new Set;
+  const seen = new Set;
+  const sources = ["project", "user", "opencode"];
+  for (const source of sources) {
+    const config2 = configs.get(source);
+    if (!config2?.lsp)
+      continue;
+    for (const [id, entry] of Object.entries(config2.lsp)) {
+      if (entry.disabled) {
+        disabled.add(id);
+        continue;
+      }
+      if (seen.has(id))
+        continue;
+      if (!entry.command || !entry.extensions)
+        continue;
+      servers.push({
+        id,
+        command: entry.command,
+        extensions: entry.extensions,
+        priority: entry.priority ?? 0,
+        env: entry.env,
+        initialization: entry.initialization,
+        source
+      });
+      seen.add(id);
+    }
+  }
+  for (const [id, config2] of Object.entries(BUILTIN_SERVERS)) {
+    if (disabled.has(id) || seen.has(id))
+      continue;
+    servers.push({
+      id,
+      command: config2.command,
+      extensions: config2.extensions,
+      priority: -100,
+      source: "opencode"
+    });
+  }
+  return servers.sort((a, b3) => {
+    if (a.source !== b3.source) {
+      const order = { project: 0, user: 1, opencode: 2 };
+      return order[a.source] - order[b3.source];
+    }
+    return b3.priority - a.priority;
+  });
+}
 
 // src/tools/lsp/server-installation.ts
+import { existsSync as existsSync28 } from "fs";
+import { delimiter as delimiter2, join as join27 } from "path";
+
+// src/tools/lsp/server-path-bases.ts
 init_shared();
-import { existsSync as existsSync24 } from "fs";
-import { join as join23 } from "path";
+import { join as join26 } from "path";
+function getLspServerAdditionalPathBases(workingDirectory) {
+  const configDir = getOpenCodeConfigDir({ binary: "opencode" });
+  const dataDir = join26(getDataDir(), "opencode");
+  return [
+    join26(workingDirectory, "node_modules", ".bin"),
+    join26(configDir, "bin"),
+    join26(configDir, "node_modules", ".bin"),
+    join26(dataDir, "bin"),
+    join26(dataDir, "bin", "node_modules", ".bin")
+  ];
+}
+
+// src/tools/lsp/server-installation.ts
 function isServerInstalled(command) {
   if (command.length === 0)
     return false;
   const cmd = command[0];
   if (cmd.includes("/") || cmd.includes("\\")) {
-    if (existsSync24(cmd))
+    if (existsSync28(cmd))
       return true;
   }
   const isWindows = process.platform === "win32";
@@ -28323,27 +28504,17 @@ function isServerInstalled(command) {
   if (isWindows && !pathEnv) {
     pathEnv = process.env.Path || "";
   }
-  const pathSeparator = isWindows ? ";" : ":";
-  const paths = pathEnv.split(pathSeparator);
+  const paths = pathEnv.split(delimiter2);
   for (const p2 of paths) {
     for (const suffix of exts) {
-      if (existsSync24(join23(p2, cmd + suffix))) {
+      if (existsSync28(join27(p2, cmd + suffix))) {
         return true;
       }
     }
   }
-  const cwd = process.cwd();
-  const configDir = getOpenCodeConfigDir({ binary: "opencode" });
-  const dataDir = join23(getDataDir(), "opencode");
-  const additionalBases = [
-    join23(cwd, "node_modules", ".bin"),
-    join23(configDir, "bin"),
-    join23(configDir, "node_modules", ".bin"),
-    join23(dataDir, "bin")
-  ];
-  for (const base of additionalBases) {
+  for (const base of getLspServerAdditionalPathBases(process.cwd())) {
     for (const suffix of exts) {
-      if (existsSync24(join23(base, cmd + suffix))) {
+      if (existsSync28(join27(base, cmd + suffix))) {
         return true;
       }
     }
@@ -28353,48 +28524,76 @@ function isServerInstalled(command) {
   }
   return false;
 }
-// src/cli/doctor/checks/tools-lsp.ts
-var DEFAULT_LSP_SERVERS = [
-  { id: "typescript-language-server", binary: "typescript-language-server", extensions: [".ts", ".tsx", ".js", ".jsx"] },
-  { id: "pyright", binary: "pyright-langserver", extensions: [".py"] },
-  { id: "rust-analyzer", binary: "rust-analyzer", extensions: [".rs"] },
-  { id: "gopls", binary: "gopls", extensions: [".go"] }
-];
-function getLspServersInfo() {
-  return DEFAULT_LSP_SERVERS.map((server2) => ({
-    id: server2.id,
-    installed: isServerInstalled([server2.binary]),
-    extensions: server2.extensions,
-    source: "builtin"
-  }));
+
+// src/tools/lsp/server-resolution.ts
+function getAllServers() {
+  const configs = loadAllConfigs();
+  const servers = getMergedServers();
+  const disabled = new Set;
+  for (const config2 of configs.values()) {
+    if (!config2.lsp)
+      continue;
+    for (const [id, entry] of Object.entries(config2.lsp)) {
+      if (entry.disabled)
+        disabled.add(id);
+    }
+  }
+  const result = [];
+  const seen = new Set;
+  for (const server2 of servers) {
+    if (seen.has(server2.id))
+      continue;
+    result.push({
+      id: server2.id,
+      installed: isServerInstalled(server2.command),
+      extensions: server2.extensions,
+      disabled: false,
+      source: server2.source,
+      priority: server2.priority
+    });
+    seen.add(server2.id);
+  }
+  for (const id of disabled) {
+    if (seen.has(id))
+      continue;
+    const builtin = BUILTIN_SERVERS[id];
+    result.push({
+      id,
+      installed: builtin ? isServerInstalled(builtin.command) : false,
+      extensions: builtin?.extensions || [],
+      disabled: true,
+      source: "disabled",
+      priority: 0
+    });
+  }
+  return result;
 }
-function getLspServerStats(servers) {
-  return {
-    installed: servers.filter((server2) => server2.installed).length,
-    total: servers.length
-  };
+// src/cli/doctor/checks/tools-lsp.ts
+function getInstalledLspServers() {
+  const servers = getAllServers();
+  return servers.filter((s) => s.installed && !s.disabled).map((s) => ({ id: s.id, extensions: s.extensions }));
 }
 
 // src/cli/doctor/checks/tools-mcp.ts
 init_shared();
-import { existsSync as existsSync25, readFileSync as readFileSync25 } from "fs";
+import { existsSync as existsSync29, readFileSync as readFileSync26 } from "fs";
 import { homedir as homedir8 } from "os";
-import { join as join24 } from "path";
+import { join as join28 } from "path";
 var BUILTIN_MCP_SERVERS = ["context7", "grep_app"];
 function getMcpConfigPaths() {
   return [
-    join24(homedir8(), ".claude", ".mcp.json"),
-    join24(process.cwd(), ".mcp.json"),
-    join24(process.cwd(), ".claude", ".mcp.json")
+    join28(homedir8(), ".claude", ".mcp.json"),
+    join28(process.cwd(), ".mcp.json"),
+    join28(process.cwd(), ".claude", ".mcp.json")
   ];
 }
 function loadUserMcpConfig() {
   const servers = {};
   for (const configPath of getMcpConfigPaths()) {
-    if (!existsSync25(configPath))
+    if (!existsSync29(configPath))
       continue;
     try {
-      const content = readFileSync25(configPath, "utf-8");
+      const content = readFileSync26(configPath, "utf-8");
       const config2 = parseJsonc(content);
       if (config2.mcpServers) {
         Object.assign(servers, config2.mcpServers);
@@ -28434,13 +28633,11 @@ async function gatherToolsSummary() {
     checkCommentChecker(),
     getGhCliInfo()
   ]);
-  const lspServers = getLspServersInfo();
-  const lspStats = getLspServerStats(lspServers);
+  const lspServers = getInstalledLspServers();
   const builtinMcp = getBuiltinMcpInfo();
   const userMcp = getUserMcpInfo();
   return {
-    lspInstalled: lspStats.installed,
-    lspTotal: lspStats.total,
+    lspServers,
     astGrepCli: astGrepCliInfo.installed,
     astGrepNapi: astGrepNapiInfo.installed,
     commentChecker: commentCheckerInfo.installed,
@@ -28473,7 +28670,7 @@ function buildToolIssues(summary) {
       affects: ["comment-checker hook"]
     });
   }
-  if (summary.lspInstalled === 0) {
+  if (summary.lspServers.length === 0) {
     issues.push({
       title: "No LSP servers detected",
       description: "LSP-dependent tools will be limited until at least one server is installed.",
@@ -28520,7 +28717,7 @@ async function checkTools() {
     details: [
       `AST-Grep: cli=${summary.astGrepCli ? "yes" : "no"}, napi=${summary.astGrepNapi ? "yes" : "no"}`,
       `Comment checker: ${summary.commentChecker ? "yes" : "no"}`,
-      `LSP: ${summary.lspInstalled}/${summary.lspTotal}`,
+      `LSP: ${summary.lspServers.length > 0 ? `${summary.lspServers.length} server(s)` : "none"}`,
       `GH CLI: ${summary.ghCli.installed ? "installed" : "missing"}${summary.ghCli.authenticated ? " (authenticated)" : ""}`,
       `MCP: builtin=${summary.mcpBuiltin.length}, user=${summary.mcpUser.length}`
     ],
@@ -28555,10 +28752,10 @@ function getAllCheckDefinitions() {
 }
 
 // src/cli/doctor/format-default.ts
-var import_picocolors19 = __toESM(require_picocolors(), 1);
+var import_picocolors18 = __toESM(require_picocolors(), 1);
 
 // src/cli/doctor/format-shared.ts
-var import_picocolors18 = __toESM(require_picocolors(), 1);
+var import_picocolors17 = __toESM(require_picocolors(), 1);
 function formatStatusSymbol(status) {
   const colorFn = STATUS_COLORS[status];
   switch (status) {
@@ -28573,23 +28770,23 @@ function formatStatusSymbol(status) {
   }
 }
 function formatStatusMark(available) {
-  return available ? import_picocolors18.default.green(SYMBOLS3.check) : import_picocolors18.default.red(SYMBOLS3.cross);
+  return available ? import_picocolors17.default.green(SYMBOLS3.check) : import_picocolors17.default.red(SYMBOLS3.cross);
 }
 function formatHeader() {
   return `
-${import_picocolors18.default.bgMagenta(import_picocolors18.default.white(" oMoMoMoMo Doctor "))}
+${import_picocolors17.default.bgMagenta(import_picocolors17.default.white(" oMoMoMoMo Doctor "))}
 `;
 }
 function formatIssue(issue2, index) {
   const lines = [];
-  const severityColor = issue2.severity === "error" ? import_picocolors18.default.red : import_picocolors18.default.yellow;
+  const severityColor = issue2.severity === "error" ? import_picocolors17.default.red : import_picocolors17.default.yellow;
   lines.push(`${index}. ${severityColor(issue2.title)}`);
-  lines.push(`   ${import_picocolors18.default.dim(issue2.description)}`);
+  lines.push(`   ${import_picocolors17.default.dim(issue2.description)}`);
   if (issue2.fix) {
-    lines.push(`   ${import_picocolors18.default.cyan("Fix:")} ${import_picocolors18.default.dim(issue2.fix)}`);
+    lines.push(`   ${import_picocolors17.default.cyan("Fix:")} ${import_picocolors17.default.dim(issue2.fix)}`);
   }
   if (issue2.affects && issue2.affects.length > 0) {
-    lines.push(`   ${import_picocolors18.default.cyan("Affects:")} ${import_picocolors18.default.dim(issue2.affects.join(", "))}`);
+    lines.push(`   ${import_picocolors17.default.cyan("Affects:")} ${import_picocolors17.default.dim(issue2.affects.join(", "))}`);
   }
   return lines.join(`
 `);
@@ -28603,12 +28800,12 @@ function formatDefault(result) {
   if (allIssues.length === 0) {
     const opencodeVer = result.systemInfo.opencodeVersion ?? "unknown";
     const pluginVer = result.systemInfo.pluginVersion ?? "unknown";
-    lines.push(` ${import_picocolors19.default.green(SYMBOLS3.check)} ${import_picocolors19.default.green(`System OK (opencode ${opencodeVer} \xB7 oh-my-opencode ${pluginVer})`)}`);
+    lines.push(` ${import_picocolors18.default.green(SYMBOLS3.check)} ${import_picocolors18.default.green(`System OK (opencode ${opencodeVer} \xB7 oh-my-opencode ${pluginVer})`)}`);
   } else {
     const issueCount = allIssues.filter((i2) => i2.severity === "error").length;
     const warnCount = allIssues.filter((i2) => i2.severity === "warning").length;
     const totalStr = `${issueCount + warnCount} ${issueCount + warnCount === 1 ? "issue" : "issues"}`;
-    lines.push(` ${import_picocolors19.default.yellow(SYMBOLS3.warn)} ${totalStr} found:
+    lines.push(` ${import_picocolors18.default.yellow(SYMBOLS3.warn)} ${totalStr} found:
 `);
     allIssues.forEach((issue2, index) => {
       lines.push(formatIssue(issue2, index + 1));
@@ -28620,7 +28817,7 @@ function formatDefault(result) {
 }
 
 // src/cli/doctor/format-status.ts
-var import_picocolors20 = __toESM(require_picocolors(), 1);
+var import_picocolors19 = __toESM(require_picocolors(), 1);
 function formatStatus(result) {
   const lines = [];
   lines.push(formatHeader());
@@ -28631,13 +28828,15 @@ function formatStatus(result) {
   const bunVer = systemInfo.bunVersion ?? "unknown";
   lines.push(` ${padding}System     ${opencodeVer} \xB7 ${pluginVer} \xB7 Bun ${bunVer}`);
   const configPath = systemInfo.configPath ?? "unknown";
-  const configStatus = systemInfo.configValid ? import_picocolors20.default.green("(valid)") : import_picocolors20.default.red("(invalid)");
+  const configStatus = systemInfo.configValid ? import_picocolors19.default.green("(valid)") : import_picocolors19.default.red("(invalid)");
   lines.push(` ${padding}Config     ${configPath} ${configStatus}`);
-  const lspText = `LSP ${tools.lspInstalled}/${tools.lspTotal}`;
+  const serverCount = tools.lspServers.length;
+  const lspMark = formatStatusMark(serverCount > 0);
+  const lspText = serverCount > 0 ? `${serverCount} server${serverCount === 1 ? "" : "s"}` : "none";
   const astGrepMark = formatStatusMark(tools.astGrepCli);
   const ghMark = formatStatusMark(tools.ghCli.installed && tools.ghCli.authenticated);
   const ghUser = tools.ghCli.username ?? "";
-  lines.push(` ${padding}Tools      ${lspText} \xB7 AST-Grep ${astGrepMark} \xB7 gh ${ghMark}${ghUser ? ` (${ghUser})` : ""}`);
+  lines.push(` ${padding}Tools      LSP ${lspMark} ${lspText} \xB7 AST-Grep ${astGrepMark} \xB7 gh ${ghMark}${ghUser ? ` (${ghUser})` : ""}`);
   const builtinCount = tools.mcpBuiltin.length;
   const userCount = tools.mcpUser.length;
   const builtinText = builtinCount > 0 ? tools.mcpBuiltin.join(" \xB7 ") : "none";
@@ -28648,13 +28847,13 @@ function formatStatus(result) {
 }
 
 // src/cli/doctor/format-verbose.ts
-var import_picocolors21 = __toESM(require_picocolors(), 1);
+var import_picocolors20 = __toESM(require_picocolors(), 1);
 function formatVerbose(result) {
   const lines = [];
   lines.push(formatHeader());
   const { systemInfo, tools, results, summary } = result;
-  lines.push(`${import_picocolors21.default.bold("System Information")}`);
-  lines.push(`${import_picocolors21.default.dim("\u2500".repeat(40))}`);
+  lines.push(`${import_picocolors20.default.bold("System Information")}`);
+  lines.push(`${import_picocolors20.default.dim("\u2500".repeat(40))}`);
   lines.push(`  ${formatStatusSymbol("pass")} opencode    ${systemInfo.opencodeVersion ?? "unknown"}`);
   lines.push(`  ${formatStatusSymbol("pass")} oh-my-opencode ${systemInfo.pluginVersion ?? "unknown"}`);
   if (systemInfo.loadedVersion) {
@@ -28665,54 +28864,73 @@ function formatVerbose(result) {
   }
   lines.push(`  ${formatStatusSymbol("pass")} path        ${systemInfo.opencodePath ?? "unknown"}`);
   if (systemInfo.isLocalDev) {
-    lines.push(`  ${import_picocolors21.default.yellow("*")} ${import_picocolors21.default.dim("(local development mode)")}`);
+    lines.push(`  ${import_picocolors20.default.yellow("*")} ${import_picocolors20.default.dim("(local development mode)")}`);
   }
   lines.push("");
-  lines.push(`${import_picocolors21.default.bold("Configuration")}`);
-  lines.push(`${import_picocolors21.default.dim("\u2500".repeat(40))}`);
-  const configStatus = systemInfo.configValid ? import_picocolors21.default.green("valid") : import_picocolors21.default.red("invalid");
+  lines.push(`${import_picocolors20.default.bold("Configuration")}`);
+  lines.push(`${import_picocolors20.default.dim("\u2500".repeat(40))}`);
+  const configStatus = systemInfo.configValid ? import_picocolors20.default.green("valid") : import_picocolors20.default.red("invalid");
   lines.push(`  ${formatStatusSymbol(systemInfo.configValid ? "pass" : "fail")} ${systemInfo.configPath ?? "unknown"} (${configStatus})`);
   lines.push("");
-  lines.push(`${import_picocolors21.default.bold("Tools")}`);
-  lines.push(`${import_picocolors21.default.dim("\u2500".repeat(40))}`);
-  lines.push(`  ${formatStatusSymbol("pass")} LSP         ${tools.lspInstalled}/${tools.lspTotal} installed`);
+  lines.push(`${import_picocolors20.default.bold("Tools")}`);
+  lines.push(`${import_picocolors20.default.dim("\u2500".repeat(40))}`);
+  if (tools.lspServers.length === 0) {
+    lines.push(`  ${formatStatusSymbol("warn")} LSP         none detected`);
+  } else {
+    const count = tools.lspServers.length;
+    lines.push(`  ${formatStatusSymbol("pass")} LSP         ${count} server${count === 1 ? "" : "s"}`);
+    for (const server2 of tools.lspServers) {
+      lines.push(`${" ".repeat(20)}${server2.id} (${server2.extensions.join(", ")})`);
+    }
+  }
   lines.push(`  ${formatStatusSymbol(tools.astGrepCli ? "pass" : "fail")} ast-grep CLI ${tools.astGrepCli ? "installed" : "not found"}`);
   lines.push(`  ${formatStatusSymbol(tools.astGrepNapi ? "pass" : "fail")} ast-grep napi ${tools.astGrepNapi ? "installed" : "not found"}`);
   lines.push(`  ${formatStatusSymbol(tools.commentChecker ? "pass" : "fail")} comment-checker ${tools.commentChecker ? "installed" : "not found"}`);
   lines.push(`  ${formatStatusSymbol(tools.ghCli.installed && tools.ghCli.authenticated ? "pass" : "fail")} gh CLI ${tools.ghCli.installed ? "installed" : "not found"}${tools.ghCli.authenticated && tools.ghCli.username ? ` (${tools.ghCli.username})` : ""}`);
   lines.push("");
-  lines.push(`${import_picocolors21.default.bold("MCPs")}`);
-  lines.push(`${import_picocolors21.default.dim("\u2500".repeat(40))}`);
+  lines.push(`${import_picocolors20.default.bold("MCPs")}`);
+  lines.push(`${import_picocolors20.default.dim("\u2500".repeat(40))}`);
   if (tools.mcpBuiltin.length === 0) {
-    lines.push(`  ${import_picocolors21.default.dim("No built-in MCPs")}`);
+    lines.push(`  ${import_picocolors20.default.dim("No built-in MCPs")}`);
   } else {
     for (const mcp of tools.mcpBuiltin) {
       lines.push(`  ${formatStatusSymbol("pass")} ${mcp}`);
     }
   }
   if (tools.mcpUser.length > 0) {
-    lines.push(`  ${import_picocolors21.default.cyan("+")} ${tools.mcpUser.length} user MCP(s):`);
+    lines.push(`  ${import_picocolors20.default.cyan("+")} ${tools.mcpUser.length} user MCP(s):`);
     for (const mcp of tools.mcpUser) {
       lines.push(`    ${formatStatusSymbol("pass")} ${mcp}`);
     }
   }
   lines.push("");
+  for (const check2 of results) {
+    if (!check2.details || check2.details.length === 0) {
+      continue;
+    }
+    lines.push(`${import_picocolors20.default.bold(check2.name)}`);
+    lines.push(`${import_picocolors20.default.dim("\u2500".repeat(40))}`);
+    for (const detail of check2.details) {
+      lines.push(detail);
+    }
+    lines.push("");
+  }
   const allIssues = results.flatMap((r2) => r2.issues);
   if (allIssues.length > 0) {
-    lines.push(`${import_picocolors21.default.bold("Issues")}`);
-    lines.push(`${import_picocolors21.default.dim("\u2500".repeat(40))}`);
+    lines.push(`${import_picocolors20.default.bold("Issues")}`);
+    lines.push(`${import_picocolors20.default.dim("\u2500".repeat(40))}`);
     allIssues.forEach((issue2, index) => {
       lines.push(formatIssue(issue2, index + 1));
       lines.push("");
     });
   }
-  lines.push(`${import_picocolors21.default.bold("Summary")}`);
-  lines.push(`${import_picocolors21.default.dim("\u2500".repeat(40))}`);
-  const passText = summary.passed > 0 ? import_picocolors21.default.green(`${summary.passed} passed`) : `${summary.passed} passed`;
-  const failText = summary.failed > 0 ? import_picocolors21.default.red(`${summary.failed} failed`) : `${summary.failed} failed`;
-  const warnText = summary.warnings > 0 ? import_picocolors21.default.yellow(`${summary.warnings} warnings`) : `${summary.warnings} warnings`;
+  lines.push(`${import_picocolors20.default.bold("Summary")}`);
+  lines.push(`${import_picocolors20.default.dim("\u2500".repeat(40))}`);
+  const passText = summary.passed > 0 ? import_picocolors20.default.green(`${summary.passed} passed`) : `${summary.passed} passed`;
+  const failText = summary.failed > 0 ? import_picocolors20.default.red(`${summary.failed} failed`) : `${summary.failed} failed`;
+  const warnText = summary.warnings > 0 ? import_picocolors20.default.yellow(`${summary.warnings} warnings`) : `${summary.warnings} warnings`;
   lines.push(`  ${passText}, ${failText}, ${warnText}`);
-  lines.push(`  ${import_picocolors21.default.dim(`Total: ${summary.total} checks in ${summary.duration}ms`)}`);
+  lines.push(`  ${import_picocolors20.default.dim(`Total: ${summary.total} checks in ${summary.duration}ms`)}`);
   return lines.join(`
 `);
 }
@@ -28796,11 +29014,11 @@ async function doctor(options = { mode: "default" }) {
 
 // src/features/mcp-oauth/storage.ts
 init_shared();
-import { chmodSync, existsSync as existsSync26, mkdirSync as mkdirSync6, readFileSync as readFileSync26, unlinkSync as unlinkSync2, writeFileSync as writeFileSync10 } from "fs";
-import { dirname as dirname7, join as join25 } from "path";
+import { chmodSync, existsSync as existsSync30, mkdirSync as mkdirSync6, readFileSync as readFileSync27, unlinkSync as unlinkSync4, writeFileSync as writeFileSync10 } from "fs";
+import { dirname as dirname7, join as join29 } from "path";
 var STORAGE_FILE_NAME = "mcp-oauth.json";
 function getMcpOauthStoragePath() {
-  return join25(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
+  return join29(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
 }
 function normalizeHost(serverHost) {
   let host = serverHost.trim();
@@ -28837,11 +29055,11 @@ function buildKey(serverHost, resource) {
 }
 function readStore() {
   const filePath = getMcpOauthStoragePath();
-  if (!existsSync26(filePath)) {
+  if (!existsSync30(filePath)) {
     return null;
   }
   try {
-    const content = readFileSync26(filePath, "utf-8");
+    const content = readFileSync27(filePath, "utf-8");
     return JSON.parse(content);
   } catch {
     return null;
@@ -28851,7 +29069,7 @@ function writeStore(store2) {
   const filePath = getMcpOauthStoragePath();
   try {
     const dir = dirname7(filePath);
-    if (!existsSync26(dir)) {
+    if (!existsSync30(dir)) {
       mkdirSync6(dir, { recursive: true });
     }
     writeFileSync10(filePath, JSON.stringify(store2, null, 2), { encoding: "utf-8", mode: 384 });
@@ -28886,8 +29104,8 @@ function deleteToken(serverHost, resource) {
   if (Object.keys(store2).length === 0) {
     try {
       const filePath = getMcpOauthStoragePath();
-      if (existsSync26(filePath)) {
-        unlinkSync2(filePath);
+      if (existsSync30(filePath)) {
+        unlinkSync4(filePath);
       }
       return true;
     } catch {
@@ -29420,7 +29638,7 @@ function createMcpOAuthCommand() {
 var VERSION2 = package_default.version;
 var program2 = new Command;
 program2.name("oh-my-opencode").description("The ultimate OpenCode plugin - multi-model orchestration, LSP tools, and more").version(VERSION2, "-v, --version", "Show version number").enablePositionalOptions();
-program2.command("install").description("Install and configure oh-my-opencode with interactive setup").option("--no-tui", "Run in non-interactive mode (requires all options)").option("--claude <value>", "Claude subscription: no, yes, max20").option("--openai <value>", "OpenAI/ChatGPT subscription: no, yes (default: no)").option("--gemini <value>", "Gemini integration: no, yes").option("--copilot <value>", "GitHub Copilot subscription: no, yes").option("--opencode-zen <value>", "OpenCode Zen access: no, yes (default: no)").option("--zai-coding-plan <value>", "Z.ai Coding Plan subscription: no, yes (default: no)").option("--kimi-for-coding <value>", "Kimi For Coding subscription: no, yes (default: no)").option("--skip-auth", "Skip authentication setup hints").addHelpText("after", `
+program2.command("install").description("Install and configure oh-my-opencode with interactive setup").option("--no-tui", "Run in non-interactive mode (requires all options)").option("--claude <value>", "Claude subscription: no, yes, max20").option("--openai <value>", "OpenAI/ChatGPT subscription: no, yes (default: no)").option("--gemini <value>", "Gemini integration: no, yes").option("--copilot <value>", "GitHub Copilot subscription: no, yes").option("--opencode-zen <value>", "OpenCode Zen access: no, yes (default: no)").option("--zai-coding-plan <value>", "Z.ai Coding Plan subscription: no, yes (default: no)").option("--kimi-for-coding <value>", "Kimi For Coding subscription: no, yes (default: no)").option("--opencode-go <value>", "OpenCode Go subscription: no, yes (default: no)").option("--skip-auth", "Skip authentication setup hints").addHelpText("after", `
 Examples:
   $ bunx oh-my-opencode install
   $ bunx oh-my-opencode install --no-tui --claude=max20 --openai=yes --gemini=yes --copilot=no
@@ -29444,12 +29662,13 @@ Model Providers (Priority: Native > Copilot > OpenCode Zen > Z.ai > Kimi):
     opencodeZen: options.opencodeZen,
     zaiCodingPlan: options.zaiCodingPlan,
     kimiForCoding: options.kimiForCoding,
+    opencodeGo: options.opencodeGo,
     skipAuth: options.skipAuth ?? false
   };
   const exitCode = await install(args);
   process.exit(exitCode);
 });
-program2.command("run <message>").allowUnknownOption().passThroughOptions().description("Run opencode with todo/background task completion enforcement").option("-a, --agent <name>", "Agent to use (default: from CLI/env/config, fallback: Sisyphus)").option("-d, --directory <path>", "Working directory").option("-p, --port <port>", "Server port (attaches if port already in use)", parseInt).option("--attach <url>", "Attach to existing opencode server URL").option("--on-complete <command>", "Shell command to run after completion").option("--json", "Output structured JSON result to stdout").option("--no-timestamp", "Disable timestamp prefix in run output").option("--verbose", "Show full event stream (default: messages/tools only)").option("--session-id <id>", "Resume existing session instead of creating new one").addHelpText("after", `
+program2.command("run <message>").allowUnknownOption().passThroughOptions().description("Run opencode with todo/background task completion enforcement").option("-a, --agent <name>", "Agent to use (default: from CLI/env/config, fallback: Sisyphus)").option("-m, --model <provider/model>", "Model override (e.g., anthropic/claude-sonnet-4)").option("-d, --directory <path>", "Working directory").option("-p, --port <port>", "Server port (attaches if port already in use)", parseInt).option("--attach <url>", "Attach to existing opencode server URL").option("--on-complete <command>", "Shell command to run after completion").option("--json", "Output structured JSON result to stdout").option("--no-timestamp", "Disable timestamp prefix in run output").option("--verbose", "Show full event stream (default: messages/tools only)").option("--session-id <id>", "Resume existing session instead of creating new one").addHelpText("after", `
 Examples:
   $ bunx oh-my-opencode run "Fix the bug in index.ts"
   $ bunx oh-my-opencode run --agent Sisyphus "Implement feature X"
@@ -29458,6 +29677,8 @@ Examples:
   $ bunx oh-my-opencode run --json "Fix the bug" | jq .sessionId
   $ bunx oh-my-opencode run --on-complete "notify-send Done" "Fix the bug"
   $ bunx oh-my-opencode run --session-id ses_abc123 "Continue the work"
+  $ bunx oh-my-opencode run --model anthropic/claude-sonnet-4 "Fix the bug"
+  $ bunx oh-my-opencode run --agent Sisyphus --model openai/gpt-5.4 "Implement feature X"
 
 Agent resolution order:
   1) --agent flag
@@ -29479,6 +29700,7 @@ Unlike 'opencode run', this command waits until:
   const runOptions = {
     message,
     agent: options.agent,
+    model: options.model,
     directory: options.directory,
     port: options.port,
     attach: options.attach,