oh-my-opencode 3.2.2 → 3.2.3

package/README.ja.md

@@ -121,16 +121,6 @@
   - [アンインストール](#アンインストール)
   - [機能](#機能)
   - [設定](#設定)
-    - [JSONC のサポート](#jsonc-のサポート)
-    - [Google Auth](#google-auth)
-    - [Agents](#agents)
-      - [Permission オプション](#permission-オプション)
-    - [Sisyphus Agent](#sisyphus-agent)
-    - [Background Tasks](#background-tasks)
-    - [Hooks](#hooks)
-    - [MCPs](#mcps)
-    - [LSP](#lsp)
-    - [Experimental](#experimental)
   - [作者のノート](#作者のノート)
   - [注意](#注意)
   - [こちらの企業の専門家にご愛用いただいています](#こちらの企業の専門家にご愛用いただいています)

package/README.ko.md

@@ -123,20 +123,6 @@
   - [제거](#제거)
    - [기능](#기능)
    - [구성](#구성)
-    - [JSONC 지원](#jsonc-지원)
-    - [Google 인증](#google-인증)
-    - [에이전트](#에이전트)
-      - [권한 옵션](#권한-옵션)
-    - [내장 스킬](#내장-스킬)
-    - [Git Master](#git-master)
-    - [Sisyphus 에이전트](#sisyphus-에이전트)
-    - [백그라운드 작업](#백그라운드-작업)
-    - [카테고리](#카테고리)
-    - [훅](#훅)
-    - [MCP](#mcp)
-    - [LSP](#lsp)
-    - [실험적 기능](#실험적-기능)
-    - [환경 변수](#환경-변수)
   - [작성자의 메모](#작성자의-메모)
   - [경고](#경고)
   - [다음 기업 전문가들이 사랑합니다](#다음-기업-전문가들이-사랑합니다)

package/README.md

@@ -121,21 +121,7 @@ Yes, technically possible. But I cannot recommend using it.
     - [For LLM Agents](#for-llm-agents)
   - [Uninstallation](#uninstallation)
   - [Features](#features)
-   - [Configuration](#configuration)
-    - [JSONC Support](#jsonc-support)
-    - [Google Auth](#google-auth)
-    - [Agents](#agents)
-      - [Permission Options](#permission-options)
-    - [Built-in Skills](#built-in-skills)
-    - [Git Master](#git-master)
-    - [Sisyphus Agent](#sisyphus-agent)
-    - [Background Tasks](#background-tasks)
-    - [Categories](#categories)
-    - [Hooks](#hooks)
-    - [MCPs](#mcps)
-    - [LSP](#lsp)
-    - [Experimental](#experimental)
-    - [Environment Variables](#environment-variables)
+  - [Configuration](#configuration)
   - [Author's Note](#authors-note)
   - [Warnings](#warnings)
   - [Loved by professionals at](#loved-by-professionals-at)

package/README.zh-cn.md

@@ -122,20 +122,6 @@
   - [卸载](#卸载)
   - [功能特性](#功能特性)
   - [配置](#配置)
-    - [JSONC 支持](#jsonc-支持)
-    - [Google 认证](#google-认证)
-    - [智能体](#智能体)
-      - [权限选项](#权限选项)
-    - [内置技能](#内置技能)
-    - [Git Master](#git-master)
-    - [Sisyphus 智能体](#sisyphus-智能体)
-    - [后台任务](#后台任务)
-    - [类别](#类别)
-    - [钩子](#钩子)
-    - [MCP](#mcp)
-    - [LSP](#lsp)
-    - [实验性功能](#实验性功能)
-    - [环境变量](#环境变量)
   - [作者札记](#作者札记)
   - [警告](#警告)
   - [受到以下专业人士的喜爱](#受到以下专业人士的喜爱)

package/dist/agents/utils.d.ts

@@ -4,7 +4,7 @@ import type { CategoriesConfig, GitMasterConfig } from "../config/schema";
 import type { LoadedSkill } from "../features/opencode-skill-loader/types";
 import type { BrowserAutomationProvider } from "../config/schema";
 type AgentSource = AgentFactory | AgentConfig;
-export declare function buildAgent(source: AgentSource, model: string, categories?: CategoriesConfig, gitMasterConfig?: GitMasterConfig, browserProvider?: BrowserAutomationProvider): AgentConfig;
+export declare function buildAgent(source: AgentSource, model: string, categories?: CategoriesConfig, gitMasterConfig?: GitMasterConfig, browserProvider?: BrowserAutomationProvider, disabledSkills?: Set<string>): AgentConfig;
 /**
  * Creates OmO-specific environment context (time, timezone, locale).
  * Note: Working directory, platform, and date are already provided by OpenCode's system.ts,
@@ -12,5 +12,5 @@ export declare function buildAgent(source: AgentSource, model: string, categorie
  * See: https://github.com/code-yeongyu/oh-my-opencode/issues/379
  */
 export declare function createEnvContext(): string;
-export declare function createBuiltinAgents(disabledAgents?: string[], agentOverrides?: AgentOverrides, directory?: string, systemDefaultModel?: string, categories?: CategoriesConfig, gitMasterConfig?: GitMasterConfig, discoveredSkills?: LoadedSkill[], client?: any, browserProvider?: BrowserAutomationProvider, uiSelectedModel?: string): Promise<Record<string, AgentConfig>>;
+export declare function createBuiltinAgents(disabledAgents?: string[], agentOverrides?: AgentOverrides, directory?: string, systemDefaultModel?: string, categories?: CategoriesConfig, gitMasterConfig?: GitMasterConfig, discoveredSkills?: LoadedSkill[], client?: any, browserProvider?: BrowserAutomationProvider, uiSelectedModel?: string, disabledSkills?: Set<string>): Promise<Record<string, AgentConfig>>;
 export {};

package/dist/cli/doctor/checks/model-resolution.d.ts

@@ -21,9 +21,12 @@ export interface ModelResolutionInfo {
 interface OmoConfig {
     agents?: Record<string, {
         model?: string;
+        variant?: string;
+        category?: string;
     }>;
     categories?: Record<string, {
         model?: string;
+        variant?: string;
     }>;
 }
 export declare function getModelResolutionInfo(): ModelResolutionInfo;

package/dist/cli/index.js

@@ -6132,7 +6132,7 @@ var init_model_requirements = __esm(() => {
     oracle: {
       fallbackChain: [
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "high" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "max" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-5", variant: "max" }
       ]
     },
@@ -6176,14 +6176,14 @@ var init_model_requirements = __esm(() => {
         { providers: ["kimi-for-coding"], model: "k2p5" },
         { providers: ["opencode"], model: "kimi-k2.5-free" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "high" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "max" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" }
       ]
     },
     momus: {
       fallbackChain: [
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "medium" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-5", variant: "max" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "max" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" }
       ]
     },
     atlas: {
@@ -6207,7 +6207,7 @@ var init_model_requirements = __esm(() => {
     ultrabrain: {
       fallbackChain: [
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2-codex", variant: "xhigh" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "max" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-5", variant: "max" }
       ]
     },
@@ -6215,13 +6215,13 @@ var init_model_requirements = __esm(() => {
       fallbackChain: [
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2-codex", variant: "medium" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-5", variant: "max" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "max" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" }
       ],
       requiresModel: "gpt-5.2-codex"
     },
     artistry: {
       fallbackChain: [
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "max" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-5", variant: "max" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2" }
       ],
@@ -6448,7 +6448,6 @@ var init_tmux = __esm(() => {
 var init_model_suggestion_retry = __esm(() => {
   init_logger();
 });
-
 // src/shared/index.ts
 var init_shared = __esm(() => {
   init_model_resolution_pipeline();
@@ -8314,7 +8313,7 @@ var import_picocolors2 = __toESM(require_picocolors(), 1);
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "3.2.2",
+  version: "3.2.3",
   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",
@@ -8388,13 +8387,13 @@ var package_default = {
     typescript: "^5.7.3"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "3.2.2",
-    "oh-my-opencode-darwin-x64": "3.2.2",
-    "oh-my-opencode-linux-arm64": "3.2.2",
-    "oh-my-opencode-linux-arm64-musl": "3.2.2",
-    "oh-my-opencode-linux-x64": "3.2.2",
-    "oh-my-opencode-linux-x64-musl": "3.2.2",
-    "oh-my-opencode-windows-x64": "3.2.2"
+    "oh-my-opencode-darwin-arm64": "3.2.3",
+    "oh-my-opencode-darwin-x64": "3.2.3",
+    "oh-my-opencode-linux-arm64": "3.2.3",
+    "oh-my-opencode-linux-arm64-musl": "3.2.3",
+    "oh-my-opencode-linux-x64": "3.2.3",
+    "oh-my-opencode-linux-x64-musl": "3.2.3",
+    "oh-my-opencode-windows-x64": "3.2.3"
   },
   trustedDependencies: [
     "@ast-grep/cli",
@@ -24387,6 +24386,10 @@ var BrowserAutomationProviderSchema = exports_external.enum(["playwright", "agen
 var BrowserAutomationConfigSchema = exports_external.object({
   provider: BrowserAutomationProviderSchema.default("playwright")
 });
+var WebsearchProviderSchema = exports_external.enum(["exa", "tavily"]);
+var WebsearchConfigSchema = exports_external.object({
+  provider: WebsearchProviderSchema.optional()
+});
 var TmuxLayoutSchema = exports_external.enum([
   "main-horizontal",
   "main-vertical",
@@ -24432,6 +24435,7 @@ var OhMyOpenCodeConfigSchema = exports_external.object({
   babysitting: BabysittingConfigSchema.optional(),
   git_master: GitMasterConfigSchema.optional(),
   browser_automation_engine: BrowserAutomationConfigSchema.optional(),
+  websearch: WebsearchConfigSchema.optional(),
   tmux: TmuxConfigSchema.optional(),
   sisyphus: SisyphusConfigSchema.optional()
 });
@@ -25423,11 +25427,36 @@ function getModelResolutionInfoWithOverrides(config2) {
 function formatModelWithVariant(model, variant) {
   return variant ? `${model} (${variant})` : model;
 }
-function getEffectiveVariant(requirement) {
+function getAgentOverride(agentName, config2) {
+  const agentOverrides = config2.agents;
+  if (!agentOverrides)
+    return;
+  return agentOverrides[agentName] ?? Object.entries(agentOverrides).find(([key]) => key.toLowerCase() === agentName.toLowerCase())?.[1];
+}
+function getEffectiveVariant(name, requirement, config2) {
+  const agentOverride = getAgentOverride(name, config2);
+  if (agentOverride?.variant) {
+    return agentOverride.variant;
+  }
+  const categoryName = agentOverride?.category;
+  if (categoryName) {
+    const categoryVariant = config2.categories?.[categoryName]?.variant;
+    if (categoryVariant) {
+      return categoryVariant;
+    }
+  }
+  const firstEntry = requirement.fallbackChain[0];
+  return firstEntry?.variant ?? requirement.variant;
+}
+function getCategoryEffectiveVariant(categoryName, requirement, config2) {
+  const categoryVariant = config2.categories?.[categoryName]?.variant;
+  if (categoryVariant) {
+    return categoryVariant;
+  }
   const firstEntry = requirement.fallbackChain[0];
   return firstEntry?.variant ?? requirement.variant;
 }
-function buildDetailsArray(info, available) {
+function buildDetailsArray(info, available, config2) {
   const details = [];
   details.push("\u2550\u2550\u2550 Available Models (from cache) \u2550\u2550\u2550");
   details.push("");
@@ -25447,14 +25476,14 @@ function buildDetailsArray(info, available) {
   details.push("Agents:");
   for (const agent of info.agents) {
     const marker = agent.userOverride ? "\u25CF" : "\u25CB";
-    const display = formatModelWithVariant(agent.effectiveModel, getEffectiveVariant(agent.requirement));
+    const display = formatModelWithVariant(agent.effectiveModel, getEffectiveVariant(agent.name, agent.requirement, config2));
     details.push(`  ${marker} ${agent.name}: ${display}`);
   }
   details.push("");
   details.push("Categories:");
   for (const category of info.categories) {
     const marker = category.userOverride ? "\u25CF" : "\u25CB";
-    const display = formatModelWithVariant(category.effectiveModel, getEffectiveVariant(category.requirement));
+    const display = formatModelWithVariant(category.effectiveModel, getCategoryEffectiveVariant(category.name, category.requirement, config2));
     details.push(`  ${marker} ${category.name}: ${display}`);
   }
   details.push("");
@@ -25476,7 +25505,7 @@ async function checkModelResolution() {
     name: CHECK_NAMES[CHECK_IDS.MODEL_RESOLUTION],
     status: available.cacheExists ? "pass" : "warn",
     message: `${agentCount} agents, ${categoryCount} categories${overrideNote}${cacheNote}`,
-    details: buildDetailsArray(info, available)
+    details: buildDetailsArray(info, available, config2)
   };
 }
 function getModelResolutionCheckDefinition() {

package/dist/config/schema.d.ts

@@ -1372,6 +1372,16 @@ export declare const BrowserAutomationConfigSchema: z.ZodObject<{
         "dev-browser": "dev-browser";
     }>>;
 }, z.core.$strip>;
+export declare const WebsearchProviderSchema: z.ZodEnum<{
+    exa: "exa";
+    tavily: "tavily";
+}>;
+export declare const WebsearchConfigSchema: z.ZodObject<{
+    provider: z.ZodOptional<z.ZodEnum<{
+        exa: "exa";
+        tavily: "tavily";
+    }>>;
+}, z.core.$strip>;
 export declare const TmuxLayoutSchema: z.ZodEnum<{
     "main-horizontal": "main-horizontal";
     "main-vertical": "main-vertical";
@@ -2581,6 +2591,12 @@ export declare const OhMyOpenCodeConfigSchema: z.ZodObject<{
             "dev-browser": "dev-browser";
         }>>;
     }, z.core.$strip>>;
+    websearch: z.ZodOptional<z.ZodObject<{
+        provider: z.ZodOptional<z.ZodEnum<{
+            exa: "exa";
+            tavily: "tavily";
+        }>>;
+    }, z.core.$strip>>;
     tmux: z.ZodOptional<z.ZodObject<{
         enabled: z.ZodDefault<z.ZodBoolean>;
         layout: z.ZodDefault<z.ZodEnum<{
@@ -2624,6 +2640,8 @@ export type BuiltinCategoryName = z.infer<typeof BuiltinCategoryNameSchema>;
 export type GitMasterConfig = z.infer<typeof GitMasterConfigSchema>;
 export type BrowserAutomationProvider = z.infer<typeof BrowserAutomationProviderSchema>;
 export type BrowserAutomationConfig = z.infer<typeof BrowserAutomationConfigSchema>;
+export type WebsearchProvider = z.infer<typeof WebsearchProviderSchema>;
+export type WebsearchConfig = z.infer<typeof WebsearchConfigSchema>;
 export type TmuxConfig = z.infer<typeof TmuxConfigSchema>;
 export type TmuxLayout = z.infer<typeof TmuxLayoutSchema>;
 export type SisyphusTasksConfig = z.infer<typeof SisyphusTasksConfigSchema>;

package/dist/features/builtin-skills/skills.d.ts

@@ -2,5 +2,6 @@ import type { BuiltinSkill } from "./types";
 import type { BrowserAutomationProvider } from "../../config/schema";
 export interface CreateBuiltinSkillsOptions {
     browserProvider?: BrowserAutomationProvider;
+    disabledSkills?: Set<string>;
 }
 export declare function createBuiltinSkills(options?: CreateBuiltinSkillsOptions): BuiltinSkill[];

package/dist/features/opencode-skill-loader/skill-content.d.ts

@@ -3,6 +3,7 @@ import type { GitMasterConfig, BrowserAutomationProvider } from "../../config/sc
 export interface SkillResolutionOptions {
     gitMasterConfig?: GitMasterConfig;
     browserProvider?: BrowserAutomationProvider;
+    disabledSkills?: Set<string>;
 }
 declare function clearSkillCache(): void;
 declare function getAllSkills(options?: SkillResolutionOptions): Promise<LoadedSkill[]>;

package/dist/index.js

@@ -4901,7 +4901,7 @@ var init_model_requirements = __esm(() => {
     oracle: {
       fallbackChain: [
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "high" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "max" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-5", variant: "max" }
       ]
     },
@@ -4945,14 +4945,14 @@ var init_model_requirements = __esm(() => {
         { providers: ["kimi-for-coding"], model: "k2p5" },
         { providers: ["opencode"], model: "kimi-k2.5-free" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "high" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "max" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" }
       ]
     },
     momus: {
       fallbackChain: [
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "medium" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-5", variant: "max" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "max" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" }
       ]
     },
     atlas: {
@@ -4976,7 +4976,7 @@ var init_model_requirements = __esm(() => {
     ultrabrain: {
       fallbackChain: [
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2-codex", variant: "xhigh" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "max" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-5", variant: "max" }
       ]
     },
@@ -4984,13 +4984,13 @@ var init_model_requirements = __esm(() => {
       fallbackChain: [
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2-codex", variant: "medium" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-5", variant: "max" },
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "max" }
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" }
       ],
       requiresModel: "gpt-5.2-codex"
     },
     artistry: {
       fallbackChain: [
-        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "max" },
+        { providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro", variant: "high" },
         { providers: ["anthropic", "github-copilot", "opencode"], model: "claude-opus-4-5", variant: "max" },
         { providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2" }
       ],
@@ -5206,6 +5206,18 @@ var init_agent_tool_restrictions = __esm(() => {
       task: false,
       delegate_task: false
     },
+    metis: {
+      write: false,
+      edit: false,
+      task: false,
+      delegate_task: false
+    },
+    momus: {
+      write: false,
+      edit: false,
+      task: false,
+      delegate_task: false
+    },
     "multimodal-looker": {
       read: true
     },
@@ -5382,6 +5394,15 @@ function fuzzyMatchModel(target, available, providers) {
     log("[fuzzyMatchModel] exact match found", { exactMatch });
     return exactMatch;
   }
+  const exactModelIdMatches = matches.filter((model) => {
+    const modelId = model.split("/").slice(1).join("/");
+    return normalizeModelName(modelId) === targetNormalized;
+  });
+  if (exactModelIdMatches.length > 0) {
+    const result2 = exactModelIdMatches.reduce((shortest, current) => current.length < shortest.length ? current : shortest);
+    log("[fuzzyMatchModel] exact model ID match found", { result: result2, candidateCount: exactModelIdMatches.length });
+    return result2;
+  }
   const result = matches.reduce((shortest, current) => current.length < shortest.length ? current : shortest);
   log("[fuzzyMatchModel] shortest match", { result });
   return result;
@@ -6076,6 +6097,40 @@ var init_model_suggestion_retry = __esm(() => {
   init_logger();
 });
 
+// src/shared/opencode-server-auth.ts
+function getServerBasicAuthHeader() {
+  const password = process.env.OPENCODE_SERVER_PASSWORD;
+  if (!password) {
+    return;
+  }
+  const username = process.env.OPENCODE_SERVER_USERNAME ?? "opencode";
+  const token = Buffer.from(`${username}:${password}`, "utf8").toString("base64");
+  return `Basic ${token}`;
+}
+function injectServerAuthIntoClient(client) {
+  const auth = getServerBasicAuthHeader();
+  if (!auth) {
+    return;
+  }
+  try {
+    if (typeof client !== "object" || client === null || !("_client" in client) || typeof client._client !== "object" || client._client === null) {
+      throw new Error("[opencode-server-auth] OPENCODE_SERVER_PASSWORD is set but SDK client structure is incompatible. " + "This may indicate an OpenCode SDK version mismatch.");
+    }
+    const internal = client._client;
+    if (typeof internal.setConfig !== "function") {
+      throw new Error("[opencode-server-auth] OPENCODE_SERVER_PASSWORD is set but SDK client._client.setConfig is not a function. " + "This may indicate an OpenCode SDK version mismatch.");
+    }
+    internal.setConfig({
+      headers: {
+        Authorization: auth
+      }
+    });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.warn(`[opencode-server-auth] Failed to inject server auth: ${message}`);
+  }
+}
+
 // src/shared/index.ts
 var init_shared = __esm(() => {
   init_model_resolution_pipeline();
@@ -11884,7 +11939,7 @@ var init_constants4 = __esm(() => {
     "visual-engineering": { model: "google/gemini-3-pro" },
     ultrabrain: { model: "openai/gpt-5.2-codex", variant: "xhigh" },
     deep: { model: "openai/gpt-5.2-codex", variant: "medium" },
-    artistry: { model: "google/gemini-3-pro", variant: "max" },
+    artistry: { model: "google/gemini-3-pro", variant: "high" },
     quick: { model: "anthropic/claude-haiku-4-5" },
     "unspecified-low": { model: "anthropic/claude-sonnet-4-5" },
     "unspecified-high": { model: "anthropic/claude-opus-4-5", variant: "max" },
@@ -21919,7 +21974,7 @@ function getClaudeSettingsPaths(customPath) {
   if (customPath && existsSync20(customPath)) {
     paths.unshift(customPath);
   }
-  return paths;
+  return [...new Set(paths)];
 }
 function mergeHooksConfig(base, override) {
   const result = { ...base };
@@ -24247,7 +24302,7 @@ function createKeywordDetectorHook(ctx, collector) {
       const currentAgent = getSessionAgent(input.sessionID) ?? input.agent;
       const cleanText = removeSystemReminders(promptText);
       const modelID = input.model?.modelID;
-      let detectedKeywords = detectKeywordsWithType(removeCodeBlocks2(cleanText), currentAgent, modelID);
+      let detectedKeywords = detectKeywordsWithType(cleanText, currentAgent, modelID);
       if (isPlannerAgent(currentAgent)) {
         detectedKeywords = detectedKeywords.filter((k) => k.type !== "ultrawork");
       }
@@ -24398,8 +24453,7 @@ function createNonInteractiveEnvHook(_ctx) {
       if (!isGitCommand) {
         return;
       }
-      const shellType = "unix";
-      const envPrefix = buildEnvPrefix(NON_INTERACTIVE_ENV, shellType);
+      const envPrefix = buildEnvPrefix(NON_INTERACTIVE_ENV, "unix");
       output.args.command = `${envPrefix} ${command}`;
       log(`[${HOOK_NAME2}] Prepended non-interactive env vars to git command`, {
         sessionID: input.sessionID,
@@ -25264,7 +25318,7 @@ var EXCLUDED_COMMANDS = new Set([
 
 // src/hooks/auto-slash-command/detector.ts
 var CODE_BLOCK_PATTERN3 = /```[\s\S]*?```/g;
-function removeCodeBlocks3(text) {
+function removeCodeBlocks4(text) {
   return text.replace(CODE_BLOCK_PATTERN3, "");
 }
 function parseSlashCommand(text) {
@@ -25287,7 +25341,7 @@ function isExcludedCommand(command) {
   return EXCLUDED_COMMANDS.has(command.toLowerCase());
 }
 function detectSlashCommand(text) {
-  const textWithoutCodeBlocks = removeCodeBlocks3(text);
+  const textWithoutCodeBlocks = removeCodeBlocks4(text);
   const trimmed = textWithoutCodeBlocks.trim();
   if (!trimmed.startsWith("/")) {
     return null;
@@ -26514,14 +26568,15 @@ function parseAllowedTools(allowedTools) {
   }
   return allowedTools.split(/\s+/).filter(Boolean);
 }
-async function loadSkillFromPath(skillPath, resolvedPath, defaultName, scope) {
+async function loadSkillFromPath(skillPath, resolvedPath, defaultName, scope, namePrefix = "") {
   try {
     const content = await fs9.readFile(skillPath, "utf-8");
     const { data, body } = parseFrontmatter(content);
     const frontmatterMcp = parseSkillMcpConfigFromFrontmatter(content);
     const mcpJsonMcp = await loadMcpJsonFromDir(resolvedPath);
     const mcpConfig = mcpJsonMcp || frontmatterMcp;
-    const skillName = data.name || defaultName;
+    const baseName = data.name || defaultName;
+    const skillName = namePrefix ? `${namePrefix}/${baseName}` : baseName;
     const originalDescription = data.description || "";
     const isOpencodeSource = scope === "opencode" || scope === "opencode-project";
     const formattedDescription = `(${scope} - Skill) ${originalDescription}`;
@@ -26566,42 +26621,52 @@ $ARGUMENTS
     return null;
   }
 }
-async function loadSkillsFromDir(skillsDir, scope) {
+async function loadSkillsFromDir(skillsDir, scope, namePrefix = "", depth = 0, maxDepth = 2) {
   const entries = await fs9.readdir(skillsDir, { withFileTypes: true }).catch(() => []);
-  const skills = [];
-  for (const entry of entries) {
-    if (entry.name.startsWith("."))
-      continue;
+  const skillMap = new Map;
+  const directories = entries.filter((e) => !e.name.startsWith(".") && (e.isDirectory() || e.isSymbolicLink()));
+  const files = entries.filter((e) => !e.name.startsWith(".") && !e.isDirectory() && !e.isSymbolicLink() && isMarkdownFile(e));
+  for (const entry of directories) {
     const entryPath = join41(skillsDir, entry.name);
-    if (entry.isDirectory() || entry.isSymbolicLink()) {
-      const resolvedPath = await resolveSymlinkAsync(entryPath);
-      const dirName = entry.name;
-      const skillMdPath = join41(resolvedPath, "SKILL.md");
-      try {
-        await fs9.access(skillMdPath);
-        const skill = await loadSkillFromPath(skillMdPath, resolvedPath, dirName, scope);
-        if (skill)
-          skills.push(skill);
-        continue;
-      } catch {}
-      const namedSkillMdPath = join41(resolvedPath, `${dirName}.md`);
-      try {
-        await fs9.access(namedSkillMdPath);
-        const skill = await loadSkillFromPath(namedSkillMdPath, resolvedPath, dirName, scope);
-        if (skill)
-          skills.push(skill);
-        continue;
-      } catch {}
+    const resolvedPath = await resolveSymlinkAsync(entryPath);
+    const dirName = entry.name;
+    const skillMdPath = join41(resolvedPath, "SKILL.md");
+    try {
+      await fs9.access(skillMdPath);
+      const skill = await loadSkillFromPath(skillMdPath, resolvedPath, dirName, scope, namePrefix);
+      if (skill && !skillMap.has(skill.name)) {
+        skillMap.set(skill.name, skill);
+      }
       continue;
+    } catch {}
+    const namedSkillMdPath = join41(resolvedPath, `${dirName}.md`);
+    try {
+      await fs9.access(namedSkillMdPath);
+      const skill = await loadSkillFromPath(namedSkillMdPath, resolvedPath, dirName, scope, namePrefix);
+      if (skill && !skillMap.has(skill.name)) {
+        skillMap.set(skill.name, skill);
+      }
+      continue;
+    } catch {}
+    if (depth < maxDepth) {
+      const newPrefix = namePrefix ? `${namePrefix}/${dirName}` : dirName;
+      const nestedSkills = await loadSkillsFromDir(resolvedPath, scope, newPrefix, depth + 1, maxDepth);
+      for (const nestedSkill of nestedSkills) {
+        if (!skillMap.has(nestedSkill.name)) {
+          skillMap.set(nestedSkill.name, nestedSkill);
+        }
+      }
     }
-    if (isMarkdownFile(entry)) {
-      const skillName = basename(entry.name, ".md");
-      const skill = await loadSkillFromPath(entryPath, skillsDir, skillName, scope);
-      if (skill)
-        skills.push(skill);
+  }
+  for (const entry of files) {
+    const entryPath = join41(skillsDir, entry.name);
+    const baseName = basename(entry.name, ".md");
+    const skill = await loadSkillFromPath(entryPath, skillsDir, baseName, scope, namePrefix);
+    if (skill && !skillMap.has(skill.name)) {
+      skillMap.set(skill.name, skill);
     }
   }
-  return skills;
+  return Array.from(skillMap.values());
 }
 function skillsToRecord(skills) {
   const result = {};
@@ -28600,9 +28665,13 @@ EOF
 };
 // src/features/builtin-skills/skills.ts
 function createBuiltinSkills(options = {}) {
-  const { browserProvider = "playwright" } = options;
+  const { browserProvider = "playwright", disabledSkills } = options;
   const browserSkill = browserProvider === "agent-browser" ? agentBrowserSkill : playwrightSkill;
-  return [browserSkill, frontendUiUxSkill, gitMasterSkill, devBrowserSkill];
+  const skills = [browserSkill, frontendUiUxSkill, gitMasterSkill, devBrowserSkill];
+  if (!disabledSkills) {
+    return skills;
+  }
+  return skills.filter((skill) => !disabledSkills.has(skill.name));
 }
 
 // src/features/opencode-skill-loader/skill-content.ts
@@ -28611,12 +28680,18 @@ import { readFileSync as readFileSync21 } from "fs";
 var cachedSkillsByProvider = new Map;
 async function getAllSkills(options) {
   const cacheKey = options?.browserProvider ?? "playwright";
-  const cached = cachedSkillsByProvider.get(cacheKey);
-  if (cached)
-    return cached;
+  const hasDisabledSkills = options?.disabledSkills && options.disabledSkills.size > 0;
+  if (!hasDisabledSkills) {
+    const cached = cachedSkillsByProvider.get(cacheKey);
+    if (cached)
+      return cached;
+  }
   const [discoveredSkills, builtinSkillDefs] = await Promise.all([
     discoverSkills({ includeClaudeCodePaths: true }),
-    Promise.resolve(createBuiltinSkills({ browserProvider: options?.browserProvider }))
+    Promise.resolve(createBuiltinSkills({
+      browserProvider: options?.browserProvider,
+      disabledSkills: options?.disabledSkills
+    }))
   ]);
   const builtinSkillsAsLoaded = builtinSkillDefs.map((skill) => ({
     name: skill.name,
@@ -28637,8 +28712,12 @@ async function getAllSkills(options) {
   }));
   const discoveredNames = new Set(discoveredSkills.map((s) => s.name));
   const uniqueBuiltins = builtinSkillsAsLoaded.filter((s) => !discoveredNames.has(s.name));
-  const allSkills = [...discoveredSkills, ...uniqueBuiltins];
-  cachedSkillsByProvider.set(cacheKey, allSkills);
+  let allSkills = [...discoveredSkills, ...uniqueBuiltins];
+  if (hasDisabledSkills) {
+    allSkills = allSkills.filter((s) => !options.disabledSkills.has(s.name));
+  } else {
+    cachedSkillsByProvider.set(cacheKey, allSkills);
+  }
   return allSkills;
 }
 async function extractSkillTemplate(skill) {
@@ -28702,7 +28781,10 @@ function injectGitMasterConfig(template, config) {
 ` + injection;
 }
 function resolveMultipleSkills(skillNames, options) {
-  const skills = createBuiltinSkills({ browserProvider: options?.browserProvider });
+  const skills = createBuiltinSkills({
+    browserProvider: options?.browserProvider,
+    disabledSkills: options?.disabledSkills
+  });
   const skillMap = new Map(skills.map((s) => [s.name, s.template]));
   const resolved = new Map;
   const notFound = [];
@@ -29067,7 +29149,7 @@ function getAgentDisplayName(configKey) {
 var HOOK_NAME4 = "prometheus-md-only";
 var PROMETHEUS_AGENT = "prometheus";
 var ALLOWED_EXTENSIONS = [".md"];
-var BLOCKED_TOOLS = ["Write", "Edit", "write", "edit"];
+var BLOCKED_TOOLS = ["Write", "Edit", "write", "edit", "bash"];
 var PLANNING_CONSULT_WARNING = `
 
 ---
@@ -29198,6 +29280,14 @@ function createPrometheusMdOnlyHook(ctx) {
       if (!BLOCKED_TOOLS.includes(toolName)) {
         return;
       }
+      if (toolName === "bash") {
+        log(`[${HOOK_NAME4}] Blocked: Prometheus cannot execute bash commands`, {
+          sessionID: input.sessionID,
+          tool: toolName,
+          agent: agentName
+        });
+        throw new Error(`[${HOOK_NAME4}] ${getAgentDisplayName("prometheus")} cannot execute bash commands. ` + `${getAgentDisplayName("prometheus")} is a READ-ONLY planner. Use /start-work to execute the plan. ` + `APOLOGIZE TO THE USER, REMIND OF YOUR PLAN WRITING PROCESSES, TELL USER WHAT YOU WILL GOING TO DO AS THE PROCESS, WRITE THE PLAN`);
+      }
       const filePath = output.args.filePath ?? output.args.path ?? output.args.file;
       if (!filePath) {
         return;
@@ -31906,6 +31996,8 @@ class LSPClient {
   proc = null;
   connection = null;
   openedFiles = new Set;
+  documentVersions = new Map;
+  lastSyncedText = new Map;
   stderrBuffer = [];
   processExited = false;
   diagnosticsStore = new Map;
@@ -32110,21 +32202,41 @@ recent stderr: ${stderr}` : "")));
   }
   async openFile(filePath) {
     const absPath = resolve8(filePath);
-    if (this.openedFiles.has(absPath))
-      return;
+    const uri = pathToFileURL(absPath).href;
     const text = readFileSync26(absPath, "utf-8");
-    const ext = extname(absPath);
-    const languageId = getLanguageId(ext);
-    this.sendNotification("textDocument/didOpen", {
-      textDocument: {
-        uri: pathToFileURL(absPath).href,
-        languageId,
-        version: 1,
-        text
-      }
+    if (!this.openedFiles.has(absPath)) {
+      const ext = extname(absPath);
+      const languageId = getLanguageId(ext);
+      const version = 1;
+      this.sendNotification("textDocument/didOpen", {
+        textDocument: {
+          uri,
+          languageId,
+          version,
+          text
+        }
+      });
+      this.openedFiles.add(absPath);
+      this.documentVersions.set(uri, version);
+      this.lastSyncedText.set(uri, text);
+      await new Promise((r) => setTimeout(r, 1000));
+      return;
+    }
+    const prevText = this.lastSyncedText.get(uri);
+    if (prevText === text) {
+      return;
+    }
+    const nextVersion = (this.documentVersions.get(uri) ?? 1) + 1;
+    this.documentVersions.set(uri, nextVersion);
+    this.lastSyncedText.set(uri, text);
+    this.sendNotification("textDocument/didChange", {
+      textDocument: { uri, version: nextVersion },
+      contentChanges: [{ text }]
+    });
+    this.sendNotification("textDocument/didSave", {
+      textDocument: { uri },
+      text
     });
-    this.openedFiles.add(absPath);
-    await new Promise((r) => setTimeout(r, 1000));
   }
   async definition(filePath, line, character) {
     const absPath = resolve8(filePath);
@@ -45924,10 +46036,11 @@ var grep = tool({
     include: tool.schema.string().optional().describe('File pattern to include in the search (e.g. "*.js", "*.{ts,tsx}")'),
     path: tool.schema.string().optional().describe("The directory to search in. Defaults to the current working directory.")
   },
-  execute: async (args) => {
+  execute: async (args, ctx) => {
     try {
       const globs = args.include ? [args.include] : undefined;
-      const paths = args.path ? [args.path] : undefined;
+      const searchPath = args.path ?? ctx.directory;
+      const paths = [searchPath];
       const result = await runRg({
         pattern: args.pattern,
         paths,
@@ -46121,10 +46234,11 @@ var glob = tool({
     pattern: tool.schema.string().describe("The glob pattern to match files against"),
     path: tool.schema.string().optional().describe("The directory to search in. If not specified, the current working directory will be used. " + 'IMPORTANT: Omit this field to use the default directory. DO NOT enter "undefined" or "null" - ' + "simply omit it for the default behavior. Must be a valid directory path if provided.")
   },
-  execute: async (args) => {
+  execute: async (args, ctx) => {
     try {
       const cli = await resolveGrepCliWithAutoInstall();
-      const paths = args.path ? [args.path] : undefined;
+      const searchPath = args.path ?? ctx.directory;
+      const paths = [searchPath];
       const result = await runRgFiles({
         pattern: args.pattern,
         paths
@@ -47190,7 +47304,7 @@ function createSkillTool(options = {}) {
       return options.skills;
     if (cachedSkills)
       return cachedSkills;
-    cachedSkills = await getAllSkills();
+    cachedSkills = await getAllSkills({ disabledSkills: options?.disabledSkills });
     return cachedSkills;
   };
   const getDescription = async () => {
@@ -47345,7 +47459,7 @@ function createSkillMcpTool(options) {
       tool_name: tool.schema.string().optional().describe("MCP tool to call"),
       resource_name: tool.schema.string().optional().describe("MCP resource URI to read"),
       prompt_name: tool.schema.string().optional().describe("MCP prompt to get"),
-      arguments: tool.schema.union([tool.schema.string(), tool.schema.record(tool.schema.string(), tool.schema.unknown())]).optional().describe("JSON string or object of arguments"),
+      arguments: tool.schema.union([tool.schema.string(), tool.schema.object({})]).optional().describe("JSON string or object of arguments"),
       grep: tool.schema.string().optional().describe("Regex pattern to filter output lines (only matching lines returned)")
     },
     async execute(args) {
@@ -49332,15 +49446,16 @@ async function resolveCategoryExecution(args, executorCtx, inheritedModel, syste
   let modelInfo;
   let categoryModel;
   const overrideModel = sisyphusJuniorModel;
+  const explicitCategoryModel = userCategories?.[args.category]?.model;
   if (!requirement) {
-    actualModel = overrideModel ?? resolved.model;
+    actualModel = explicitCategoryModel ?? overrideModel ?? resolved.model;
     if (actualModel) {
-      modelInfo = overrideModel ? { model: actualModel, type: "user-defined", source: "override" } : { model: actualModel, type: "system-default", source: "system-default" };
+      modelInfo = explicitCategoryModel || overrideModel ? { model: actualModel, type: "user-defined", source: "override" } : { model: actualModel, type: "system-default", source: "system-default" };
     }
   } else {
     const resolution = resolveModelPipeline({
       intent: {
-        userModel: overrideModel ?? userCategories?.[args.category]?.model,
+        userModel: explicitCategoryModel ?? overrideModel,
         categoryDefaultModel: resolved.model
       },
       constraints: { availableModels },
@@ -49532,7 +49647,8 @@ Prompts MUST be in English.`;
       const runInBackground = args.run_in_background === true;
       const { content: skillContent, error: skillError } = await resolveSkillContent(args.load_skills, {
         gitMasterConfig: options.gitMasterConfig,
-        browserProvider: options.browserProvider
+        browserProvider: options.browserProvider,
+        disabledSkills: options.disabledSkills
       });
       if (skillError) {
         return skillError;
@@ -64017,6 +64133,9 @@ class BackgroundManager {
           this.concurrencyManager.release(existingTask.concurrencyKey);
           existingTask.concurrencyKey = undefined;
         }
+        this.client.session.abort({
+          path: { id: sessionID }
+        }).catch(() => {});
         this.markForNotification(existingTask);
         this.notifyParentSession(existingTask).catch((err) => {
           log("[background-agent] Failed to notify on error:", err);
@@ -64206,6 +64325,11 @@ class BackgroundManager {
         this.concurrencyManager.release(existingTask.concurrencyKey);
         existingTask.concurrencyKey = undefined;
       }
+      if (existingTask.sessionID) {
+        this.client.session.abort({
+          path: { id: existingTask.sessionID }
+        }).catch(() => {});
+      }
       this.markForNotification(existingTask);
       this.notifyParentSession(existingTask).catch((err) => {
         log("[background-agent] Failed to notify on resume error:", err);
@@ -70918,6 +71042,10 @@ var BrowserAutomationProviderSchema = exports_external2.enum(["playwright", "age
 var BrowserAutomationConfigSchema = exports_external2.object({
   provider: BrowserAutomationProviderSchema.default("playwright")
 });
+var WebsearchProviderSchema = exports_external2.enum(["exa", "tavily"]);
+var WebsearchConfigSchema = exports_external2.object({
+  provider: WebsearchProviderSchema.optional()
+});
 var TmuxLayoutSchema = exports_external2.enum([
   "main-horizontal",
   "main-vertical",
@@ -70963,6 +71091,7 @@ var OhMyOpenCodeConfigSchema = exports_external2.object({
   babysitting: BabysittingConfigSchema.optional(),
   git_master: GitMasterConfigSchema.optional(),
   browser_automation_engine: BrowserAutomationConfigSchema.optional(),
+  websearch: WebsearchConfigSchema.optional(),
   tmux: TmuxConfigSchema.optional(),
   sisyphus: SisyphusConfigSchema.optional()
 });
@@ -74416,7 +74545,7 @@ function createHephaestusAgent(model, availableAgents, availableToolNames, avail
     model,
     maxTokens: 32000,
     prompt,
-    color: "#FF4500",
+    color: "#D97706",
     permission: { question: "allow", call_omo_agent: "deny" },
     reasoningEffort: "medium"
   };
@@ -74449,7 +74578,7 @@ var agentMetadata = {
 function isFactory(source) {
   return typeof source === "function";
 }
-function buildAgent(source, model, categories, gitMasterConfig, browserProvider) {
+function buildAgent(source, model, categories, gitMasterConfig, browserProvider, disabledSkills) {
   const base = isFactory(source) ? source(model) : source;
   const categoryConfigs = categories ? { ...DEFAULT_CATEGORIES, ...categories } : DEFAULT_CATEGORIES;
   const agentWithCategory = base;
@@ -74468,7 +74597,7 @@ function buildAgent(source, model, categories, gitMasterConfig, browserProvider)
     }
   }
   if (agentWithCategory.skills?.length) {
-    const { resolved } = resolveMultipleSkills(agentWithCategory.skills, { gitMasterConfig, browserProvider });
+    const { resolved } = resolveMultipleSkills(agentWithCategory.skills, { gitMasterConfig, browserProvider, disabledSkills });
     if (resolved.size > 0) {
       const skillContent = Array.from(resolved.values()).join(`
 
@@ -74563,7 +74692,8 @@ function applyOverrides(config4, override, mergedCategories) {
   return result;
 }
 function mergeAgentConfig(base, override) {
-  const { prompt_append, ...rest } = override;
+  const migratedOverride = migrateAgentConfig(override);
+  const { prompt_append, ...rest } = migratedOverride;
   const merged = deepMerge(base, rest);
   if (prompt_append && merged.prompt) {
     merged.prompt = merged.prompt + `
@@ -74578,7 +74708,7 @@ function mapScopeToLocation(scope) {
     return "project";
   return "plugin";
 }
-async function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, directory, systemDefaultModel, categories, gitMasterConfig, discoveredSkills = [], client2, browserProvider, uiSelectedModel) {
+async function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, directory, systemDefaultModel, categories, gitMasterConfig, discoveredSkills = [], client2, browserProvider, uiSelectedModel, disabledSkills) {
   const connectedProviders = readConnectedProvidersCache();
   const availableModels = await fetchAvailableModels(undefined, {
     connectedProviders: connectedProviders ?? undefined
@@ -74591,7 +74721,7 @@ async function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, dir
     name,
     description: categories?.[name]?.description ?? CATEGORY_DESCRIPTIONS[name] ?? "General tasks"
   }));
-  const builtinSkills = createBuiltinSkills({ browserProvider });
+  const builtinSkills = createBuiltinSkills({ browserProvider, disabledSkills });
   const builtinSkillNames = new Set(builtinSkills.map((s) => s.name));
   const builtinAvailable = builtinSkills.map((skill2) => ({
     name: skill2.name,
@@ -74633,7 +74763,7 @@ async function createBuiltinAgents(disabledAgents = [], agentOverrides = {}, dir
     if (!resolution)
       continue;
     const { model, variant: resolvedVariant } = resolution;
-    let config4 = buildAgent(source, model, mergedCategories, gitMasterConfig, browserProvider);
+    let config4 = buildAgent(source, model, mergedCategories, gitMasterConfig, browserProvider, disabledSkills);
     if (resolvedVariant) {
       config4 = { ...config4, variant: resolvedVariant };
     }
@@ -76966,13 +77096,32 @@ async function loadAllPluginComponents(options) {
   };
 }
 // src/mcp/websearch.ts
-var websearch = {
-  type: "remote",
-  url: "https://mcp.exa.ai/mcp?tools=web_search_exa",
-  enabled: true,
-  headers: process.env.EXA_API_KEY ? { "x-api-key": process.env.EXA_API_KEY } : undefined,
-  oauth: false
-};
+function createWebsearchConfig(config4) {
+  const provider = config4?.provider || "exa";
+  if (provider === "tavily") {
+    const tavilyKey = process.env.TAVILY_API_KEY;
+    if (!tavilyKey) {
+      throw new Error("TAVILY_API_KEY environment variable is required for Tavily provider");
+    }
+    return {
+      type: "remote",
+      url: "https://mcp.tavily.com/mcp/",
+      enabled: true,
+      headers: {
+        Authorization: `Bearer ${tavilyKey}`
+      },
+      oauth: false
+    };
+  }
+  return {
+    type: "remote",
+    url: "https://mcp.exa.ai/mcp?tools=web_search_exa",
+    enabled: true,
+    headers: process.env.EXA_API_KEY ? { "x-api-key": process.env.EXA_API_KEY } : undefined,
+    oauth: false
+  };
+}
+var websearch = createWebsearchConfig();
 
 // src/mcp/context7.ts
 var context7 = {
@@ -76992,17 +77141,16 @@ var grep_app = {
 };
 
 // src/mcp/index.ts
-var allBuiltinMcps = {
-  websearch,
-  context7,
-  grep_app
-};
-function createBuiltinMcps(disabledMcps = []) {
+function createBuiltinMcps(disabledMcps = [], config4) {
   const mcps = {};
-  for (const [name, config4] of Object.entries(allBuiltinMcps)) {
-    if (!disabledMcps.includes(name)) {
-      mcps[name] = config4;
-    }
+  if (!disabledMcps.includes("websearch")) {
+    mcps.websearch = createWebsearchConfig(config4?.websearch);
+  }
+  if (!disabledMcps.includes("context7")) {
+    mcps.context7 = context7;
+  }
+  if (!disabledMcps.includes("grep_app")) {
+    mcps.grep_app = grep_app;
   }
   return mcps;
 }
@@ -77093,7 +77241,8 @@ function createConfigHandler(deps) {
     ];
     const browserProvider = pluginConfig.browser_automation_engine?.provider ?? "playwright";
     const currentModel = config4.model;
-    const builtinAgents = await createBuiltinAgents(migratedDisabledAgents, pluginConfig.agents, ctx.directory, undefined, pluginConfig.categories, pluginConfig.git_master, allDiscoveredSkills, ctx.client, browserProvider, currentModel);
+    const disabledSkills = new Set(pluginConfig.disabled_skills ?? []);
+    const builtinAgents = await createBuiltinAgents(migratedDisabledAgents, pluginConfig.agents, ctx.directory, undefined, pluginConfig.categories, pluginConfig.git_master, allDiscoveredSkills, ctx.client, browserProvider, currentModel, disabledSkills);
     const userAgents = pluginConfig.claude_code?.agents ?? true ? loadUserAgents() : {};
     const projectAgents = pluginConfig.claude_code?.agents ?? true ? loadProjectAgents() : {};
     const rawPluginAgents = pluginComponents.agents;
@@ -77159,7 +77308,7 @@ function createConfigHandler(deps) {
           prompt: PROMETHEUS_SYSTEM_PROMPT,
           permission: PROMETHEUS_PERMISSION,
           description: `${configAgent?.plan?.description ?? "Plan agent"} (Prometheus - OhMyOpenCode)`,
-          color: configAgent?.plan?.color ?? "#9D4EDD",
+          color: configAgent?.plan?.color ?? "#FF5722",
           ...temperatureToUse !== undefined ? { temperature: temperatureToUse } : {},
           ...topPToUse !== undefined ? { top_p: topPToUse } : {},
           ...maxTokensToUse !== undefined ? { maxTokens: maxTokensToUse } : {},
@@ -77193,7 +77342,9 @@ function createConfigHandler(deps) {
         value ? migrateAgentConfig(value) : value
       ])) : {};
       const migratedBuild = configAgent?.build ? migrateAgentConfig(configAgent.build) : {};
-      const planDemoteConfig = shouldDemotePlan ? { mode: "subagent" } : undefined;
+      const planDemoteConfig = shouldDemotePlan ? {
+        mode: "subagent"
+      } : undefined;
       config4.agent = {
         ...agentConfig,
         ...Object.fromEntries(Object.entries(builtinAgents).filter(([k]) => k !== "sisyphus")),
@@ -77265,7 +77416,7 @@ function createConfigHandler(deps) {
     };
     const mcpResult = pluginConfig.claude_code?.mcp ?? true ? await loadMcpConfigs() : { servers: {} };
     config4.mcp = {
-      ...createBuiltinMcps(pluginConfig.disabled_mcps),
+      ...createBuiltinMcps(pluginConfig.disabled_mcps, pluginConfig),
       ...config4.mcp,
       ...mcpResult.servers,
       ...pluginComponents.mcpServers
@@ -77314,6 +77465,7 @@ var OhMyOpenCodePlugin = async (ctx) => {
   log("[OhMyOpenCodePlugin] ENTRY - plugin loading", {
     directory: ctx.directory
   });
+  injectServerAuthIntoClient(ctx.client);
   startBackgroundCheck2();
   const pluginConfig = loadPluginConfig(ctx.directory, ctx);
   const disabledHooks = new Set(pluginConfig.disabled_hooks ?? []);
@@ -77469,6 +77621,7 @@ var OhMyOpenCodePlugin = async (ctx) => {
   const isMultimodalLookerEnabled = !(pluginConfig.disabled_agents ?? []).some((agent) => agent.toLowerCase() === "multimodal-looker");
   const lookAt = isMultimodalLookerEnabled ? createLookAt(ctx) : null;
   const browserProvider = pluginConfig.browser_automation_engine?.provider ?? "playwright";
+  const disabledSkills = new Set(pluginConfig.disabled_skills ?? []);
   const delegateTask = createDelegateTask({
     manager: backgroundManager,
     client: ctx.client,
@@ -77477,6 +77630,7 @@ var OhMyOpenCodePlugin = async (ctx) => {
     gitMasterConfig: pluginConfig.git_master,
     sisyphusJuniorModel: pluginConfig.agents?.["sisyphus-junior"]?.model,
     browserProvider,
+    disabledSkills,
     onSyncSessionCreated: async (event) => {
       log("[index] onSyncSessionCreated callback", {
         sessionID: event.sessionID,
@@ -77495,11 +77649,8 @@ var OhMyOpenCodePlugin = async (ctx) => {
       });
     }
   });
-  const disabledSkills = new Set(pluginConfig.disabled_skills ?? []);
   const systemMcpNames = getSystemMcpServerNames();
-  const builtinSkills = createBuiltinSkills({ browserProvider }).filter((skill2) => {
-    if (disabledSkills.has(skill2.name))
-      return false;
+  const builtinSkills = createBuiltinSkills({ browserProvider, disabledSkills }).filter((skill2) => {
     if (skill2.mcpConfig) {
       for (const mcpName of Object.keys(skill2.mcpConfig)) {
         if (systemMcpNames.has(mcpName))
@@ -77522,7 +77673,8 @@ var OhMyOpenCodePlugin = async (ctx) => {
     skills: mergedSkills,
     mcpManager: skillMcpManager,
     getSessionID: getSessionIDForMcp,
-    gitMasterConfig: pluginConfig.git_master
+    gitMasterConfig: pluginConfig.git_master,
+    disabledSkills
   });
   const skillMcpTool = createSkillMcpTool({
     manager: skillMcpManager,

package/dist/mcp/index.d.ts

@@ -1,3 +1,4 @@
+import type { OhMyOpenCodeConfig } from "../config/schema";
 export { McpNameSchema, type McpName } from "./types";
 type RemoteMcpConfig = {
     type: "remote";
@@ -6,4 +7,4 @@ type RemoteMcpConfig = {
     headers?: Record<string, string>;
     oauth?: false;
 };
-export declare function createBuiltinMcps(disabledMcps?: string[]): Record<string, RemoteMcpConfig>;
+export declare function createBuiltinMcps(disabledMcps?: string[], config?: OhMyOpenCodeConfig): Record<string, RemoteMcpConfig>;

package/dist/mcp/websearch.d.ts

@@ -1,9 +1,11 @@
-export declare const websearch: {
+import type { WebsearchConfig } from "../config/schema";
+type RemoteMcpConfig = {
     type: "remote";
     url: string;
     enabled: boolean;
-    headers: {
-        "x-api-key": string;
-    } | undefined;
-    oauth: false;
+    headers?: Record<string, string>;
+    oauth?: false;
 };
+export declare function createWebsearchConfig(config?: WebsearchConfig): RemoteMcpConfig;
+export declare const websearch: RemoteMcpConfig;
+export {};

package/dist/shared/index.d.ts

@@ -34,3 +34,4 @@ export * from "./connected-providers-cache";
 export * from "./session-utils";
 export * from "./tmux";
 export * from "./model-suggestion-retry";
+export * from "./opencode-server-auth";

package/dist/shared/opencode-server-auth.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Builds HTTP Basic Auth header from environment variables.
+ *
+ * @returns Basic Auth header string, or undefined if OPENCODE_SERVER_PASSWORD is not set
+ */
+export declare function getServerBasicAuthHeader(): string | undefined;
+/**
+ * Injects HTTP Basic Auth header into the OpenCode SDK client.
+ *
+ * This function accesses the SDK's internal `_client.setConfig()` method.
+ * While `_client` has an underscore prefix (suggesting internal use), this is actually
+ * a stable public API from `@hey-api/openapi-ts` generated client:
+ * - `setConfig()` MERGES headers (does not replace existing ones)
+ * - This is the documented way to update client config at runtime
+ *
+ * @see https://github.com/sst/opencode/blob/main/packages/sdk/js/src/gen/client/client.gen.ts
+ * @throws {Error} If OPENCODE_SERVER_PASSWORD is set but client structure is incompatible
+ */
+export declare function injectServerAuthIntoClient(client: unknown): void;

package/dist/tools/delegate-task/executor.d.ts

@@ -29,6 +29,7 @@ export interface ParentContext {
 export declare function resolveSkillContent(skills: string[], options: {
     gitMasterConfig?: GitMasterConfig;
     browserProvider?: BrowserAutomationProvider;
+    disabledSkills?: Set<string>;
 }): Promise<{
     content: string | undefined;
     error: string | null;

package/dist/tools/delegate-task/types.d.ts

@@ -39,6 +39,7 @@ export interface DelegateTaskToolOptions {
     gitMasterConfig?: GitMasterConfig;
     sisyphusJuniorModel?: string;
     browserProvider?: BrowserAutomationProvider;
+    disabledSkills?: Set<string>;
     onSyncSessionCreated?: (event: SyncSessionCreatedEvent) => Promise<void>;
 }
 export interface BuildSystemContentInput {

package/dist/tools/lsp/client.d.ts

@@ -24,6 +24,8 @@ export declare class LSPClient {
     private proc;
     private connection;
     private openedFiles;
+    private documentVersions;
+    private lastSyncedText;
     private stderrBuffer;
     private processExited;
     private diagnosticsStore;

package/dist/tools/skill/types.d.ts

@@ -25,4 +25,5 @@ export interface SkillLoadOptions {
     getSessionID?: () => string;
     /** Git master configuration for watermark/co-author settings */
     gitMasterConfig?: GitMasterConfig;
+    disabledSkills?: Set<string>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "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",
@@ -74,13 +74,13 @@
     "typescript": "^5.7.3"
   },
   "optionalDependencies": {
-    "oh-my-opencode-darwin-arm64": "3.2.2",
-    "oh-my-opencode-darwin-x64": "3.2.2",
-    "oh-my-opencode-linux-arm64": "3.2.2",
-    "oh-my-opencode-linux-arm64-musl": "3.2.2",
-    "oh-my-opencode-linux-x64": "3.2.2",
-    "oh-my-opencode-linux-x64-musl": "3.2.2",
-    "oh-my-opencode-windows-x64": "3.2.2"
+    "oh-my-opencode-darwin-arm64": "3.2.3",
+    "oh-my-opencode-darwin-x64": "3.2.3",
+    "oh-my-opencode-linux-arm64": "3.2.3",
+    "oh-my-opencode-linux-arm64-musl": "3.2.3",
+    "oh-my-opencode-linux-x64": "3.2.3",
+    "oh-my-opencode-linux-x64-musl": "3.2.3",
+    "oh-my-opencode-windows-x64": "3.2.3"
   },
   "trustedDependencies": [
     "@ast-grep/cli",