@hiai-gg/hiai-opencode 0.1.2 → 0.1.4

package/dist/index.js

@@ -146,9 +146,9 @@ var init_agent_names = __esm(() => {
     subagent: "coder",
     sub: "coder",
     designer: "designer",
-    ui: "ui",
-    vision: "ui",
-    multimodal: "ui"
+    ui: "multimodal",
+    vision: "multimodal",
+    multimodal: "multimodal"
   };
   BUILTIN_AGENT_NAMES = new Set([
     "bob",
@@ -157,7 +157,7 @@ var init_agent_names = __esm(() => {
     "critic",
     "designer",
     "researcher",
-    "ui",
+    "multimodal",
     "platform-manager",
     "guard"
   ]);
@@ -20778,8 +20778,8 @@ var require_resolve = __commonJS((exports) => {
     }
     return count;
   }
-  function getFullPath(resolver, id = "", normalize3) {
-    if (normalize3 !== false)
+  function getFullPath(resolver, id = "", normalize4) {
+    if (normalize4 !== false)
       id = normalizeId(id);
     const p = resolver.parse(id);
     return _getFullPath(resolver, p);
@@ -22066,7 +22066,7 @@ var require_schemes = __commonJS((exports, module) => {
 var require_fast_uri = __commonJS((exports, module) => {
   var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizeComponentEncoding, isIPv4, nonSimpleDomain } = require_utils2();
   var { SCHEMES, getSchemeHandler } = require_schemes();
-  function normalize3(uri, options) {
+  function normalize4(uri, options) {
     if (typeof uri === "string") {
       uri = serialize(parse11(uri, options), options);
     } else if (typeof uri === "object") {
@@ -22301,7 +22301,7 @@ var require_fast_uri = __commonJS((exports, module) => {
   }
   var fastUri = {
     SCHEMES,
-    normalize: normalize3,
+    normalize: normalize4,
     resolve: resolve22,
     resolveComponent,
     equal,
@@ -33808,8 +33808,8 @@ class EventEmitter {
 // node_modules/bun-pty/src/terminal.ts
 import { dlopen, FFIType, ptr } from "bun:ffi";
 import { Buffer as Buffer2 } from "buffer";
-import { join as join103, dirname as dirname30, basename as basename16 } from "path";
-import { existsSync as existsSync89 } from "fs";
+import { join as join104, dirname as dirname31, basename as basename16 } from "path";
+import { existsSync as existsSync91 } from "fs";
 function shQuote(s) {
   if (s.length === 0)
     return "''";
@@ -33817,7 +33817,7 @@ function shQuote(s) {
 }
 function resolveLibPath() {
   const env = process.env.BUN_PTY_LIB;
-  if (env && existsSync89(env))
+  if (env && existsSync91(env))
     return env;
   try {
     const embeddedPath = __require(`../rust-pty/target/release/${process.platform === "win32" ? "rust_pty.dll" : process.platform === "darwin" ? process.arch === "arm64" ? "librust_pty_arm64.dylib" : "librust_pty.dylib" : process.arch === "arm64" ? "librust_pty_arm64.so" : "librust_pty.so"}`);
@@ -33828,22 +33828,22 @@ function resolveLibPath() {
   const arch = process.arch;
   const filenames = platform2 === "darwin" ? arch === "arm64" ? ["librust_pty_arm64.dylib", "librust_pty.dylib"] : ["librust_pty.dylib"] : platform2 === "win32" ? ["rust_pty.dll"] : arch === "arm64" ? ["librust_pty_arm64.so", "librust_pty.so"] : ["librust_pty.so"];
   const base = Bun.fileURLToPath(import.meta.url);
-  const fileDir = dirname30(base);
+  const fileDir = dirname31(base);
   const dirName = basename16(fileDir);
-  const here = dirName === "src" || dirName === "dist" ? dirname30(fileDir) : fileDir;
+  const here = dirName === "src" || dirName === "dist" ? dirname31(fileDir) : fileDir;
   const basePaths = [
-    join103(here, "rust-pty", "target", "release"),
-    join103(here, "..", "bun-pty", "rust-pty", "target", "release"),
-    join103(process.cwd(), "node_modules", "bun-pty", "rust-pty", "target", "release")
+    join104(here, "rust-pty", "target", "release"),
+    join104(here, "..", "bun-pty", "rust-pty", "target", "release"),
+    join104(process.cwd(), "node_modules", "bun-pty", "rust-pty", "target", "release")
   ];
   const fallbackPaths = [];
   for (const basePath of basePaths) {
     for (const filename of filenames) {
-      fallbackPaths.push(join103(basePath, filename));
+      fallbackPaths.push(join104(basePath, filename));
     }
   }
   for (const path10 of fallbackPaths) {
-    if (existsSync89(path10))
+    if (existsSync91(path10))
       return path10;
   }
   throw new Error(`librust_pty shared library not found.
@@ -35060,8 +35060,8 @@ var init_plugin = __esm(() => {
 });
 
 // src/index.ts
-import { existsSync as existsSync90 } from "fs";
-import { join as join104 } from "path";
+import { existsSync as existsSync92 } from "fs";
+import { join as join105 } from "path";
 
 // src/hooks/todo-continuation-enforcer/index.ts
 init_logger();
@@ -110591,6 +110591,11 @@ async function loadGlobalAgentsSkills() {
   const skills = await loadSkillsFromDir({ skillsDir: agentsGlobalDir, scope: "user" });
   return skillsToCommandDefinitionRecord(skills);
 }
+async function loadManagedPluginSkills() {
+  const skillsDir = join60(getOpenCodeConfigDir({ binary: "opencode" }), ".hiai", "skills", "plugin");
+  const skills = await loadSkillsFromDir({ skillsDir, scope: "builtin" });
+  return skillsToCommandDefinitionRecord(skills);
+}
 async function discoverAllSkills(directory) {
   const [opencodeProjectSkills, opencodeGlobalSkills, projectSkills, userSkills, agentsProjectSkills, agentsGlobalSkills] = await Promise.all([
     discoverOpencodeProjectSkills(directory),
@@ -110661,6 +110666,10 @@ async function discoverGlobalAgentsSkills() {
   const agentsGlobalDir = join60(getAgentsConfigDir(), "skills");
   return loadSkillsFromDir({ skillsDir: agentsGlobalDir, scope: "user" });
 }
+async function discoverManagedPluginSkills() {
+  const skillsDir = join60(getOpenCodeConfigDir({ binary: "opencode" }), ".hiai", "skills", "plugin");
+  return loadSkillsFromDir({ skillsDir, scope: "builtin" });
+}
 // src/features/opencode-skill-loader/merger/builtin-skill-converter.ts
 function builtinToLoadedSkill(builtin) {
   const definition = {
@@ -110893,11 +110902,33 @@ var playwrightSkill = {
   description: "MUST USE for any browser-related tasks. Browser automation via Playwright MCP - verification, browsing, information gathering, web scraping, testing, screenshots, and all browser interactions.",
   template: `# Playwright Browser Automation
 
-This skill provides browser automation capabilities via the Playwright MCP server.`,
+This skill provides browser automation capabilities via the Playwright MCP server.
+
+## Required workflow
+
+1. Load this skill before calling \`skill_mcp\`.
+2. Use \`skill_mcp\` with \`mcp_name="playwright"\` for browser navigation, interaction, screenshots, and visual verification.
+3. If the host says \`MCP server "playwright" not found\`, do not conclude that Playwright is impossible. First report that the skill was not loaded or the Playwright MCP server was not registered in this session.
+4. If Chromium starts but fails with missing Linux libraries such as \`libnspr4\`, \`libnss3\`, \`libatk-bridge\`, \`libgtk-3\`, or similar, distinguish browser OS dependencies from MCP availability.
+
+## Linux dependency fallback
+
+Playwright has two dependency layers:
+
+- Browser binary: installable without sudo with \`npx playwright install chromium\` or by setting \`HIAI_PLAYWRIGHT_INSTALL_BROWSERS=1\` before OpenCode starts.
+- System libraries: on minimal Linux images these usually require admin rights via \`sudo npx playwright install-deps chromium\` or OS package manager equivalents.
+
+If sudo is unavailable, try these alternatives before falling back to curl-only checks:
+
+- Use an already installed Chrome/Chromium/Edge by adding Playwright MCP args in \`hiai-opencode.json\`, for example \`--browser chrome\` or \`--browser msedge\`.
+- Use a remote/browser service or CDP-backed browser when available.
+- Switch the browser automation provider to \`agent-browser\` or \`playwright-cli\` if the workspace has those tools installed.
+
+Only use \`curl\` as a final degraded check. Clearly say that HTTP checks do not replace interactive browser verification.`,
   mcpConfig: {
     playwright: {
       command: "npx",
-      args: ["@playwright/mcp@latest"]
+      args: ["-y", "@playwright/mcp@latest"]
     }
   }
 };
@@ -113926,6 +113957,8 @@ var AgentOverridesSchema = exports_external.object({
   general: AgentOverrideConfigSchema.optional(),
   zoe: AgentOverrideConfigSchema.optional(),
   "pre-plan": AgentOverrideConfigSchema.optional(),
+  manager: AgentOverrideConfigSchema.optional(),
+  vision: AgentOverrideConfigSchema.optional(),
   logician: AgentOverrideConfigSchema.optional(),
   librarian: AgentOverrideConfigSchema.optional(),
   explore: AgentOverrideConfigSchema.optional(),
@@ -114022,7 +114055,8 @@ var BuiltinCommandNameSchema = exports_external.enum([
   "refactor",
   "start-work",
   "stop-continuation",
-  "remove-ai-slops"
+  "remove-ai-slops",
+  "mcp-status"
 ]);
 // src/config/schema/comment-checker.ts
 var CommentCheckerConfigSchema = exports_external.object({
@@ -114077,8 +114111,8 @@ var ExperimentalConfigSchema = exports_external.object({
 // src/config/schema/fast-apply.ts
 var FastApplyConfigSchema = exports_external.object({
   enabled: exports_external.boolean().optional().default(false),
-  ollama_url: exports_external.string().optional().default("http://localhost:11434"),
-  model: exports_external.string().optional().default("qwen3.5:9b"),
+  ollama_url: exports_external.string().optional().default(""),
+  model: exports_external.string().optional().default(""),
   timeout: exports_external.number().int().positive().optional().default(30000)
 });
 // src/config/schema/git-env-prefix.ts
@@ -114171,7 +114205,17 @@ var NotificationConfigSchema = exports_external.object({
   force_enable: exports_external.boolean().optional()
 });
 // src/mcp/types.ts
-var McpNameSchema = exports_external.enum(["websearch", "context7", "grep_app"]);
+var McpNameSchema = exports_external.enum([
+  "playwright",
+  "stitch",
+  "sequential-thinking",
+  "firecrawl",
+  "rag",
+  "context7",
+  "mempalace",
+  "websearch",
+  "grep_app"
+]);
 var AnyMcpNameSchema = exports_external.string().min(1);
 
 // src/config/schema/ralph-loop.ts
@@ -114225,6 +114269,17 @@ var SkillsConfigSchema = exports_external.union([
   }).catchall(SkillEntrySchema)
 ]);
 
+// src/config/schema/skill-discovery.ts
+var SkillDiscoveryConfigSchema = exports_external.object({
+  config_sources: exports_external.boolean().default(true),
+  project_opencode: exports_external.boolean().default(true),
+  global_opencode: exports_external.boolean().default(false),
+  project_claude: exports_external.boolean().default(false),
+  global_claude: exports_external.boolean().default(false),
+  project_agents: exports_external.boolean().default(false),
+  global_agents: exports_external.boolean().default(false)
+});
+
 // src/config/schema/bob.ts
 var BobTasksConfigSchema = exports_external.object({
   storage_path: exports_external.string().optional(),
@@ -114283,7 +114338,8 @@ var AuthConfigSchema = exports_external.object({
   openai: exports_external.string().optional(),
   openrouter: exports_external.string().optional(),
   stitch: exports_external.string().optional(),
-  firecrawl: exports_external.string().optional()
+  firecrawl: exports_external.string().optional(),
+  context7: exports_external.string().optional()
 }).optional();
 var HiaiOpenCodeConfigSchema = exports_external.object({
   $schema: exports_external.string().optional(),
@@ -114307,6 +114363,7 @@ var HiaiOpenCodeConfigSchema = exports_external.object({
   experimental: ExperimentalConfigSchema.optional(),
   auto_update: exports_external.boolean().optional(),
   skills: SkillsConfigSchema.optional(),
+  skill_discovery: SkillDiscoveryConfigSchema.optional(),
   ralph_loop: RalphLoopConfigSchema.optional(),
   runtime_fallback: exports_external.union([exports_external.boolean(), RuntimeFallbackConfigSchema]).optional(),
   background_task: BackgroundTaskConfigSchema.optional(),
@@ -115994,6 +116051,44 @@ If any issues are found during critical review:
 - ALWAYS preserve test coverage
 - If uncertain about a change, err on the side of keeping the original code`;
 
+// src/features/builtin-commands/templates/mcp-status.ts
+var MCP_STATUS_TEMPLATE = `# MCP Status Command
+
+## Purpose
+
+Use /mcp-status to show the effective hiai-opencode MCP setup without relying on OpenCode's mcp list output.
+
+## Execute
+
+Run:
+
+\`\`\`bash
+hiai-opencode mcp-status
+\`\`\`
+
+If the binary is not on PATH, try the package-local fallback:
+
+\`\`\`bash
+node ./node_modules/@hiai-gg/hiai-opencode/assets/cli/hiai-opencode.mjs mcp-status
+\`\`\`
+
+## Report
+
+Summarize the output in a compact status table:
+
+- MCP server name
+- status: ok, warning, error, disabled
+- cause or next action
+
+Rules:
+
+- Do not print API key values.
+- If a key is missing, name the env var only.
+- If a runtime is missing, give the exact install hint from the command output or the shortest safe next command.
+- Do not edit config unless the user explicitly asks.
+- Do not run package installs unless the user explicitly asks.
+`;
+
 // src/features/builtin-commands/commands.ts
 function resolveStartWorkAgent(options) {
   if (options?.useRegisteredAgents) {
@@ -116097,6 +116192,12 @@ Timestamp: $TIMESTAMP
 $ARGUMENTS
 </user-request>`,
       argumentHint: "[goal]"
+    },
+    "mcp-status": {
+      description: "(builtin) Show hiai-opencode MCP server status, missing keys, and local runtime availability",
+      template: `<command-instruction>
+${MCP_STATUS_TEMPLATE}
+</command-instruction>`
     }
   };
 }
@@ -120433,7 +120534,7 @@ import * as fs12 from "fs";
 import * as path6 from "path";
 
 // src/config/loader.ts
-import { existsSync as existsSync56, readFileSync as readFileSync42 } from "fs";
+import { existsSync as existsSync57, readFileSync as readFileSync43 } from "fs";
 import { join as join66 } from "path";
 
 // src/config/platform-schema.ts
@@ -120471,6 +120572,7 @@ var McpServerConfigSchema = exports_external.object({
   enabled: exports_external.boolean().default(true),
   type: exports_external.enum(["remote", "local"]).optional(),
   url: exports_external.string().optional(),
+  headers: exports_external.record(exports_external.string(), exports_external.string()).optional(),
   command: exports_external.array(exports_external.string()).optional(),
   timeout: exports_external.number().optional(),
   environment: exports_external.record(exports_external.string(), exports_external.string()).optional()
@@ -120488,6 +120590,15 @@ var SkillsConfigSchema2 = exports_external.object({
   enabled: exports_external.boolean().optional(),
   disabled: exports_external.array(exports_external.string()).optional()
 });
+var SkillDiscoveryConfigSchema2 = exports_external.object({
+  config_sources: exports_external.boolean().optional(),
+  project_opencode: exports_external.boolean().optional(),
+  global_opencode: exports_external.boolean().optional(),
+  project_claude: exports_external.boolean().optional(),
+  global_claude: exports_external.boolean().optional(),
+  project_agents: exports_external.boolean().optional(),
+  global_agents: exports_external.boolean().optional()
+});
 var PermissionsConfigSchema = exports_external.object({
   read: exports_external.record(exports_external.string(), exports_external.string()).optional(),
   edit: exports_external.record(exports_external.string(), exports_external.string()).optional(),
@@ -120519,8 +120630,8 @@ var AuthKeysSchema = exports_external.object({
 });
 var OllamaConfigSchema = exports_external.object({
   enabled: exports_external.boolean().default(false),
-  model: exports_external.string().default("qwen3.5:4b"),
-  baseUrl: exports_external.string().default("http://localhost:11434"),
+  model: exports_external.string().default(""),
+  baseUrl: exports_external.string().default(""),
   purpose: exports_external.enum(["verification", "helper", "fallback"]).default("helper")
 });
 var ModelFamilySchema = exports_external.object({
@@ -120549,6 +120660,8 @@ var AgentsConfigSchema = exports_external.object({
   zoe: AgentConfigSchema.optional(),
   build: AgentConfigSchema.optional(),
   "pre-plan": AgentConfigSchema.optional(),
+  manager: AgentConfigSchema.optional(),
+  vision: AgentConfigSchema.optional(),
   logician: AgentConfigSchema.optional(),
   librarian: AgentConfigSchema.optional(),
   explore: AgentConfigSchema.optional(),
@@ -120578,6 +120691,8 @@ var AgentRequirementsConfigSchema = exports_external.object({
   zoe: ModelRequirementSchema.optional(),
   build: ModelRequirementSchema.optional(),
   "pre-plan": ModelRequirementSchema.optional(),
+  manager: ModelRequirementSchema.optional(),
+  vision: ModelRequirementSchema.optional(),
   logician: ModelRequirementSchema.optional(),
   librarian: ModelRequirementSchema.optional(),
   explore: ModelRequirementSchema.optional(),
@@ -120600,158 +120715,54 @@ var HiaiOpencodeConfigSchema = exports_external.object({
   lsp: exports_external.record(exports_external.string(), LspServerConfigSchema).optional(),
   subtask2: Subtask2ConfigSchema.optional(),
   skills: SkillsConfigSchema2.optional(),
+  skill_discovery: SkillDiscoveryConfigSchema2.optional(),
   permissions: PermissionsConfigSchema.optional(),
   auth: AuthKeysSchema.optional(),
   ollama: OllamaConfigSchema.optional()
 });
 
 // src/config/defaults.ts
-import { join as join65 } from "path";
-
-// src/config/models.ts
-var MODEL_PRESETS = {
-  fast: "openrouter/google/gemini-2.0-flash",
-  mid: "openrouter/anthropic/claude-3.5-sonnet",
-  high: "openrouter/anthropic/claude-3.5-opus",
-  ultrahigh: "openrouter/openai/gpt-4o",
-  vision: "openrouter/google/gemini-2.0-pro-exp-02-05",
-  reasoning: "openrouter/openai/o1",
-  strategist: "openrouter/z-ai/glm-5.1",
-  critic: "openrouter/qwen/qwen2.5-72b-instruct",
-  writing: "openrouter/kimi/kimi-latest"
-};
-
-// src/config/defaults.ts
-function resolveAssetScript(...segments) {
-  return join65(import.meta.dirname, "..", "assets", ...segments);
-}
-function createNpmPackageCommand(pkg, ...args) {
-  return ["node", resolveAssetScript("runtime", "npm-package-runner.mjs"), pkg, ...args];
-}
-function createUpstreamNpxCommand(pkg, ...args) {
-  if (process.platform === "win32") {
-    return ["cmd", "/c", "npx", "-y", pkg, ...args];
-  }
-  return ["npx", "-y", pkg, ...args];
-}
-var defaultConfig = {
-  agents: {
-    bob: { model: MODEL_PRESETS.high },
-    guard: { model: MODEL_PRESETS.ultrahigh },
-    strategist: { model: MODEL_PRESETS.strategist },
-    critic: { model: MODEL_PRESETS.critic },
-    coder: { model: MODEL_PRESETS.mid },
-    designer: {
-      model: "openrouter/google/gemini-3.1-pro",
-      description: "Creative visual problem-solver for high-touch UI, interaction, and brand-level interface direction. Best used when the task needs taste, composition, and design judgment rather than plain implementation. (Designer - HiaiOpenCode)"
-    },
-    sub: { model: MODEL_PRESETS.fast },
-    researcher: { model: MODEL_PRESETS.fast },
-    multimodal: { model: MODEL_PRESETS.vision },
-    "quality-guardian": { model: MODEL_PRESETS.mid },
-    "platform-manager": { model: MODEL_PRESETS.fast },
-    brainstormer: { model: MODEL_PRESETS.fast },
-    "agent-skills": { model: MODEL_PRESETS.fast }
-  },
-  agentRequirements: {},
-  categories: {
-    "visual-engineering": { model: MODEL_PRESETS.vision, variant: "high" },
-    artistry: { model: MODEL_PRESETS.vision, variant: "high" },
-    ultrabrain: { model: MODEL_PRESETS.ultrahigh, variant: "xhigh" },
-    deep: { model: MODEL_PRESETS.reasoning, variant: "medium" },
-    quick: { model: MODEL_PRESETS.fast },
-    writing: { model: MODEL_PRESETS.writing },
-    git: { model: MODEL_PRESETS.fast },
-    "unspecified-low": { model: MODEL_PRESETS.mid },
-    "unspecified-high": { model: MODEL_PRESETS.high, variant: "max" }
-  },
-  categoryRequirements: {},
-  mcp: {
-    playwright: {
-      enabled: true,
-      command: createNpmPackageCommand("@playwright/mcp@latest"),
-      timeout: 600000
-    },
-    stitch: {
-      enabled: true,
-      type: "remote",
-      url: "https://stitch.googleapis.com/mcp",
-      headers: { "X-Goog-Api-Key": "{env:STITCH_AI_API_KEY}" },
-      timeout: 600000
-    },
-    "sequential-thinking": {
-      enabled: true,
-      command: createUpstreamNpxCommand("@modelcontextprotocol/server-sequential-thinking"),
-      timeout: 600000
-    },
-    firecrawl: {
-      enabled: true,
-      command: createUpstreamNpxCommand("firecrawl-mcp"),
-      timeout: 600000,
-      environment: { FIRECRAWL_API_KEY: "{env:FIRECRAWL_API_KEY}" }
-    },
-    rag: {
-      enabled: true,
-      type: "remote",
-      url: "http://localhost:9002",
-      timeout: 600000
-    },
-    context7: {
-      enabled: true,
-      type: "remote",
-      url: "https://mcp.context7.com/mcp",
-      headers: { "X-API-KEY": "{env:CONTEXT7_API_KEY}" },
-      timeout: 600000
-    },
-    mempalace: {
-      enabled: true,
-      command: ["node", resolveAssetScript("mcp", "mempalace.mjs"), "--palace", "./.opencode/palace"],
-      timeout: 600000
-    }
-  },
-  lsp: {
-    typescript: {
-      command: ["typescript-language-server", "--stdio"],
-      extensions: [".ts", ".tsx", ".mts", ".cts"]
-    },
-    svelte: {
-      command: ["svelteserver", "--stdio"],
-      extensions: [".svelte"]
-    },
-    eslint: {
-      command: createNpmPackageCommand("eslint-lsp", "--stdio"),
-      extensions: [".js", ".jsx", ".ts", ".tsx", ".mjs", ".cjs", ".svelte"]
-    },
-    bash: {
-      command: createNpmPackageCommand("bash-language-server", "start"),
-      extensions: [".sh", ".bash"]
-    },
-    pyright: {
-      command: ["pyright-langserver", "--stdio"],
-      extensions: [".py"]
+import { existsSync as existsSync56, readFileSync as readFileSync42 } from "fs";
+import { dirname as dirname18, join as join65, normalize as normalize2 } from "path";
+function findPluginRoot() {
+  const candidates = [
+    join65(import.meta.dirname, "..", ".."),
+    join65(import.meta.dirname, ".."),
+    join65(import.meta.dirname, "..", ".."),
+    dirname18(process.argv[1] ?? ""),
+    process.cwd()
+  ];
+  for (const candidate of candidates) {
+    const root = normalize2(candidate);
+    if (existsSync56(join65(root, "hiai-opencode.json"))) {
+      return root;
     }
-  },
-  subtask2: {
-    replace_generic: true,
-    generic_return: null
-  },
-  skills: {
-    enabled: true,
-    disabled: []
-  },
-  permissions: {
-    read: { "*": "allow", "*.env": "deny", "*.env.*": "deny", "*.env.example": "allow" },
-    edit: { "*": "allow" },
-    bash: { "*": "allow" },
-    deny_paths: ["**/backup/**", "**/secrets.*", "**/.env", "**/.env.*"]
-  },
-  ollama: {
-    enabled: false,
-    model: "{env:OLLAMA_MODEL:-qwen3.5:4b}",
-    baseUrl: "http://localhost:11434",
-    purpose: "helper"
   }
-};
+  throw new Error("[hiai-opencode] Cannot find bundled hiai-opencode.json. The package is incomplete.");
+}
+function expandPluginRootPlaceholders(value, pluginRoot) {
+  if (typeof value === "string") {
+    return value.replaceAll("{pluginRoot}", pluginRoot);
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => expandPluginRootPlaceholders(item, pluginRoot));
+  }
+  if (value && typeof value === "object") {
+    return Object.fromEntries(Object.entries(value).map(([key, entry]) => [
+      key,
+      expandPluginRootPlaceholders(entry, pluginRoot)
+    ]));
+  }
+  return value;
+}
+function loadBundledDefaultConfig() {
+  const pluginRoot = findPluginRoot();
+  const configPath = join65(pluginRoot, "hiai-opencode.json");
+  const raw = readFileSync42(configPath, "utf-8");
+  const parsed = JSON.parse(raw);
+  return expandPluginRootPlaceholders(parsed, pluginRoot);
+}
+var defaultConfig = loadBundledDefaultConfig();
 
 // src/config/types.ts
 var LEGACY_AGENT_ALIAS_TO_CANONICAL2 = {
@@ -120759,6 +120770,8 @@ var LEGACY_AGENT_ALIAS_TO_CANONICAL2 = {
   zoe: "bob",
   build: "bob",
   "pre-plan": "strategist",
+  manager: "platform-manager",
+  vision: "multimodal",
   logician: "strategist",
   librarian: "researcher",
   explore: "researcher",
@@ -120797,7 +120810,7 @@ function findConfigFile(searchDirs) {
   for (const dir of searchDirs) {
     for (const filename of CONFIG_FILENAMES) {
       const candidate = join66(dir, filename);
-      if (existsSync56(candidate))
+      if (existsSync57(candidate))
         return candidate;
     }
   }
@@ -120875,7 +120888,7 @@ function loadConfig(projectDir) {
   const configPath = findConfigFile(searchDirs);
   if (!configPath)
     return BASE_CONFIG;
-  const raw = readFileSync42(configPath, "utf-8");
+  const raw = readFileSync43(configPath, "utf-8");
   const parsed = parse2(raw);
   const normalizedParsed = normalizeCompactLspConfig(parsed);
   const validated = HiaiOpencodeConfigSchema.parse(normalizedParsed);
@@ -120883,15 +120896,18 @@ function loadConfig(projectDir) {
   return deepMerge2(BASE_CONFIG, normalized);
 }
 function resolveEnvVars(value) {
-  return value.replace(/\{env:([^}]+)\}/g, (_, key) => process.env[key] || "");
+  return value.replace(/\{env:([^}]+)\}/g, (_, expression) => {
+    const [key, fallback] = String(expression).split(":-", 2);
+    return process.env[key] || fallback || "";
+  });
 }
 // src/shared/migrate-legacy-config-file.ts
 init_logger();
 init_plugin_identity();
-import { existsSync as existsSync57, readFileSync as readFileSync43, renameSync as renameSync3, rmSync as rmSync2 } from "fs";
-import { join as join67, dirname as dirname18, basename as basename9 } from "path";
+import { existsSync as existsSync58, readFileSync as readFileSync44, renameSync as renameSync3, rmSync as rmSync2 } from "fs";
+import { join as join67, dirname as dirname19, basename as basename9 } from "path";
 function buildCanonicalPath(legacyPath) {
-  const dir = dirname18(legacyPath);
+  const dir = dirname19(legacyPath);
   const ext = basename9(legacyPath).includes(".jsonc") ? ".jsonc" : ".json";
   return join67(dir, `${CONFIG_BASENAME}${ext}`);
 }
@@ -120925,15 +120941,15 @@ function archiveLegacyConfigFile(legacyPath) {
   }
 }
 function migrateLegacyConfigFile(legacyPath) {
-  if (!existsSync57(legacyPath))
+  if (!existsSync58(legacyPath))
     return false;
   if (!basename9(legacyPath).startsWith(LEGACY_CONFIG_BASENAME))
     return false;
   const canonicalPath = buildCanonicalPath(legacyPath);
-  if (existsSync57(canonicalPath))
+  if (existsSync58(canonicalPath))
     return false;
   try {
-    const content = readFileSync43(legacyPath, "utf-8");
+    const content = readFileSync44(legacyPath, "utf-8");
     writeFileAtomically(canonicalPath, content);
     const archivedLegacyConfig = archiveLegacyConfigFile(legacyPath);
     log("[migrateLegacyConfigFile] Migrated legacy config to canonical path", {
@@ -122453,11 +122469,11 @@ function createRuntimeFallbackHook(ctx, options) {
   };
 }
 // src/hooks/write-existing-file-guard/hook.ts
-import { existsSync as existsSync60, realpathSync as realpathSync6 } from "fs";
-import { basename as basename11, dirname as dirname20, isAbsolute as isAbsolute11, join as join69, normalize as normalize2, relative as relative8, resolve as resolve14 } from "path";
+import { existsSync as existsSync61, realpathSync as realpathSync6 } from "fs";
+import { basename as basename11, dirname as dirname21, isAbsolute as isAbsolute11, join as join69, normalize as normalize3, relative as relative8, resolve as resolve14 } from "path";
 
 // src/hooks/write-existing-file-guard/tool-execute-before-handler.ts
-import { existsSync as existsSync59 } from "fs";
+import { existsSync as existsSync60 } from "fs";
 
 // src/hooks/write-existing-file-guard/session-read-permissions.ts
 function touchSession(sessionLastAccess, sessionID) {
@@ -122545,7 +122561,7 @@ async function handleWriteExistingFileGuardToolExecuteBefore(params) {
     return;
   }
   if (toolName === "read") {
-    if (!existsSync59(resolvedPath) || !input.sessionID) {
+    if (!existsSync60(resolvedPath) || !input.sessionID) {
       return;
     }
     registerReadPermission({
@@ -122561,7 +122577,7 @@ async function handleWriteExistingFileGuardToolExecuteBefore(params) {
   if (argsRecord && "overwrite" in argsRecord) {
     delete argsRecord.overwrite;
   }
-  if (!existsSync59(resolvedPath)) {
+  if (!existsSync60(resolvedPath)) {
     return;
   }
   const isBobPath2 = canonicalPath.includes("/.bob/");
@@ -122612,7 +122628,7 @@ function getPathFromArgs(args) {
   return args?.filePath ?? args?.path ?? args?.file_path;
 }
 function resolveInputPath(ctx, inputPath) {
-  return normalize2(isAbsolute11(inputPath) ? inputPath : resolve14(ctx.directory, inputPath));
+  return normalize3(isAbsolute11(inputPath) ? inputPath : resolve14(ctx.directory, inputPath));
 }
 function isPathInsideDirectory(pathToCheck, directory) {
   const relativePath = relative8(directory, pathToCheck);
@@ -122620,18 +122636,18 @@ function isPathInsideDirectory(pathToCheck, directory) {
 }
 function toCanonicalPath2(absolutePath) {
   let canonicalPath = absolutePath;
-  if (existsSync60(absolutePath)) {
+  if (existsSync61(absolutePath)) {
     try {
       canonicalPath = realpathSync6.native(absolutePath);
     } catch {
       canonicalPath = absolutePath;
     }
   } else {
-    const absoluteDir = dirname20(absolutePath);
-    const resolvedDir = existsSync60(absoluteDir) ? realpathSync6.native(absoluteDir) : absoluteDir;
+    const absoluteDir = dirname21(absolutePath);
+    const resolvedDir = existsSync61(absoluteDir) ? realpathSync6.native(absoluteDir) : absoluteDir;
     canonicalPath = join69(resolvedDir, basename11(absolutePath));
   }
-  return normalize2(canonicalPath);
+  return normalize3(canonicalPath);
 }
 function isOverwriteEnabled(value) {
   if (value === true) {
@@ -123905,23 +123921,23 @@ init_logger();
 init_plugin_identity();
 
 // src/hooks/legacy-plugin-toast/auto-migrate.ts
-import { existsSync as existsSync61, readFileSync as readFileSync45 } from "fs";
+import { existsSync as existsSync62, readFileSync as readFileSync46 } from "fs";
 import { join as join70 } from "path";
 init_plugin_identity();
 function detectOpenCodeConfigPath(overrideConfigDir) {
   if (overrideConfigDir) {
     const jsoncPath = join70(overrideConfigDir, "opencode.jsonc");
     const jsonPath = join70(overrideConfigDir, "opencode.json");
-    if (existsSync61(jsoncPath))
+    if (existsSync62(jsoncPath))
       return jsoncPath;
-    if (existsSync61(jsonPath))
+    if (existsSync62(jsonPath))
       return jsonPath;
     return null;
   }
   const paths = getOpenCodeConfigPaths({ binary: "opencode", version: null });
-  if (existsSync61(paths.configJsonc))
+  if (existsSync62(paths.configJsonc))
     return paths.configJsonc;
-  if (existsSync61(paths.configJson))
+  if (existsSync62(paths.configJson))
     return paths.configJson;
   return null;
 }
@@ -123930,7 +123946,7 @@ function autoMigrateLegacyPluginEntry(overrideConfigDir) {
   if (!configPath)
     return { migrated: false, from: null, to: null, configPath: null };
   try {
-    const content = readFileSync45(configPath, "utf-8");
+    const content = readFileSync46(configPath, "utf-8");
     const parseResult = parseJsoncSafe(content);
     if (!parseResult.data?.plugin)
       return { migrated: false, from: null, to: null, configPath };
@@ -124048,7 +124064,7 @@ async function queryOllama(args) {
 }
 
 // src/hooks/fast-apply/tool-execute-before-handler.ts
-import { existsSync as existsSync62, readFileSync as readFileSync46 } from "fs";
+import { existsSync as existsSync63, readFileSync as readFileSync47 } from "fs";
 async function handleFastApplyToolExecuteBefore(args) {
   const { input, output, config: config2 } = args;
   const normalizedTool = input.tool.toLowerCase();
@@ -124067,7 +124083,7 @@ async function handleFastApplyToolExecuteBefore(args) {
     });
     return;
   }
-  if (!existsSync62(filePath)) {
+  if (!existsSync63(filePath)) {
     log("[fast-apply] Skipping: file does not exist (new file)", {
       sessionID: input.sessionID,
       callID: input.callID,
@@ -124077,7 +124093,7 @@ async function handleFastApplyToolExecuteBefore(args) {
   }
   let originalContent;
   try {
-    originalContent = readFileSync46(filePath, "utf-8");
+    originalContent = readFileSync47(filePath, "utf-8");
   } catch (err) {
     log("[fast-apply] Failed to read file, falling back to default", {
       sessionID: input.sessionID,
@@ -124456,13 +124472,13 @@ var DEFAULT_MAX_SYMBOLS = 200;
 var DEFAULT_MAX_DIAGNOSTICS = 200;
 var DEFAULT_MAX_DIRECTORY_FILES = 50;
 // src/tools/lsp/server-config-loader.ts
-import { existsSync as existsSync63, readFileSync as readFileSync47 } from "fs";
+import { existsSync as existsSync64, readFileSync as readFileSync48 } from "fs";
 import { join as join71 } from "path";
 function loadJsonFile(path7) {
-  if (!existsSync63(path7))
+  if (!existsSync64(path7))
     return null;
   try {
-    return parseJsonc(readFileSync47(path7, "utf-8"));
+    return parseJsonc(readFileSync48(path7, "utf-8"));
   } catch {
     return null;
   }
@@ -124542,7 +124558,7 @@ function getMergedServers() {
 }
 
 // src/tools/lsp/server-installation.ts
-import { existsSync as existsSync64 } from "fs";
+import { existsSync as existsSync65 } from "fs";
 import { delimiter, join as join73 } from "path";
 
 // src/tools/lsp/server-path-bases.ts
@@ -124565,7 +124581,7 @@ function isServerInstalled(command) {
     return false;
   const cmd = command[0];
   if (cmd.includes("/") || cmd.includes("\\")) {
-    if (existsSync64(cmd))
+    if (existsSync65(cmd))
       return true;
   }
   const isWindows2 = process.platform === "win32";
@@ -124586,14 +124602,14 @@ function isServerInstalled(command) {
   const paths = pathEnv.split(delimiter);
   for (const p of paths) {
     for (const suffix of exts) {
-      if (existsSync64(join73(p, cmd + suffix))) {
+      if (existsSync65(join73(p, cmd + suffix))) {
         return true;
       }
     }
   }
   for (const base of getLspServerAdditionalPathBases(process.cwd())) {
     for (const suffix of exts) {
-      if (existsSync64(join73(base, cmd + suffix))) {
+      if (existsSync65(join73(base, cmd + suffix))) {
         return true;
       }
     }
@@ -124651,13 +124667,13 @@ function getLanguageId(ext) {
 init_logger();
 var {spawn: bunSpawn2 } = globalThis.Bun;
 import { spawn as nodeSpawn2 } from "child_process";
-import { existsSync as existsSync65, statSync as statSync7 } from "fs";
+import { existsSync as existsSync66, statSync as statSync7 } from "fs";
 function shouldUseNodeSpawn() {
   return process.platform === "win32";
 }
 function validateCwd(cwd) {
   try {
-    if (!existsSync65(cwd)) {
+    if (!existsSync66(cwd)) {
       return { valid: false, error: `Working directory does not exist: ${cwd}` };
     }
     const stats = statSync7(cwd);
@@ -124789,7 +124805,7 @@ function spawnProcess(command, options) {
   return proc;
 }
 // src/tools/lsp/lsp-client.ts
-import { readFileSync as readFileSync48 } from "fs";
+import { readFileSync as readFileSync49 } from "fs";
 import { extname as extname4, resolve as resolve15 } from "path";
 import { pathToFileURL as pathToFileURL2 } from "url";
 
@@ -125061,7 +125077,7 @@ class LSPClient extends LSPClientConnection {
   async openFile(filePath) {
     const absPath = resolve15(filePath);
     const uri = pathToFileURL2(absPath).href;
-    const text = readFileSync48(absPath, "utf-8");
+    const text = readFileSync49(absPath, "utf-8");
     if (!this.openedFiles.has(absPath)) {
       const ext = extname4(absPath);
       const languageId = getLanguageId(ext);
@@ -125419,10 +125435,10 @@ var lspManager = LSPServerManager.getInstance();
 // src/tools/lsp/lsp-client-wrapper.ts
 import { extname as extname5, resolve as resolve16 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { existsSync as existsSync66, statSync as statSync8 } from "fs";
+import { existsSync as existsSync67, statSync as statSync8 } from "fs";
 init_plugin_identity();
 function isDirectoryPath(filePath) {
-  if (!existsSync66(filePath)) {
+  if (!existsSync67(filePath)) {
     return false;
   }
   return statSync8(filePath).isDirectory();
@@ -125432,14 +125448,14 @@ function uriToPath(uri) {
 }
 function findWorkspaceRoot(filePath) {
   let dir = resolve16(filePath);
-  if (!existsSync66(dir) || !isDirectoryPath(dir)) {
+  if (!existsSync67(dir) || !isDirectoryPath(dir)) {
     dir = __require("path").dirname(dir);
   }
   const markers = [".git", "package.json", "pyproject.toml", "Cargo.toml", "go.mod", "pom.xml", "build.gradle"];
   let prevDir = "";
   while (dir !== prevDir) {
     for (const marker of markers) {
-      if (existsSync66(__require("path").join(dir, marker))) {
+      if (existsSync67(__require("path").join(dir, marker))) {
         return dir;
       }
     }
@@ -125614,10 +125630,10 @@ function formatApplyResult(result) {
 `);
 }
 // src/tools/lsp/workspace-edit.ts
-import { readFileSync as readFileSync49, writeFileSync as writeFileSync17 } from "fs";
+import { readFileSync as readFileSync50, writeFileSync as writeFileSync17 } from "fs";
 function applyTextEditsToFile(filePath, edits) {
   try {
-    let content = readFileSync49(filePath, "utf-8");
+    let content = readFileSync50(filePath, "utf-8");
     const lines = content.split(`
 `);
     const sortedEdits = [...edits].sort((a, b) => {
@@ -125683,7 +125699,7 @@ function applyWorkspaceEdit(edit) {
           try {
             const oldPath = uriToPath(change.oldUri);
             const newPath = uriToPath(change.newUri);
-            const content = readFileSync49(oldPath, "utf-8");
+            const content = readFileSync50(oldPath, "utf-8");
             writeFileSync17(newPath, content, "utf-8");
             __require("fs").unlinkSync(oldPath);
             result.filesModified.push(newPath);
@@ -125849,7 +125865,7 @@ init_tool();
 import { resolve as resolve18 } from "path";
 
 // src/tools/lsp/directory-diagnostics.ts
-import { existsSync as existsSync67, lstatSync as lstatSync2, readdirSync as readdirSync19 } from "fs";
+import { existsSync as existsSync68, lstatSync as lstatSync2, readdirSync as readdirSync19 } from "fs";
 import { extname as extname6, join as join74, resolve as resolve17 } from "path";
 var SKIP_DIRECTORIES = new Set(["node_modules", ".git", "dist", "build", ".next", "out"]);
 function collectFilesWithExtension(dir, extension, maxFiles) {
@@ -125895,7 +125911,7 @@ async function aggregateDiagnosticsForDirectory(directory, extension, severity,
     throw new Error(`Extension must start with a dot (e.g., ".ts", not "${extension}"). ` + `Use ".${extension}" instead.`);
   }
   const absDir = resolve17(directory);
-  if (!existsSync67(absDir)) {
+  if (!existsSync68(absDir)) {
     throw new Error(`Directory does not exist: ${absDir}`);
   }
   const serverResult = findServerForExtension(extension);
@@ -126156,11 +126172,11 @@ var DEFAULT_MAX_MATCHES = 500;
 
 // src/tools/ast-grep/sg-cli-path.ts
 import { createRequire as createRequire4 } from "module";
-import { dirname as dirname21, join as join77 } from "path";
-import { existsSync as existsSync69, statSync as statSync9 } from "fs";
+import { dirname as dirname22, join as join77 } from "path";
+import { existsSync as existsSync70, statSync as statSync9 } from "fs";
 
 // src/tools/ast-grep/downloader.ts
-import { existsSync as existsSync68 } from "fs";
+import { existsSync as existsSync69 } from "fs";
 import { join as join76 } from "path";
 import { homedir as homedir14 } from "os";
 import { createRequire as createRequire3 } from "module";
@@ -126212,7 +126228,7 @@ async function downloadAstGrep(version3 = DEFAULT_VERSION) {
   const cacheDir = getCacheDir3();
   const binaryName = getBinaryName3();
   const binaryPath = join76(cacheDir, binaryName);
-  if (existsSync68(binaryPath)) {
+  if (existsSync69(binaryPath)) {
     return binaryPath;
   }
   const { arch, os: os4 } = platformInfo;
@@ -126273,9 +126289,9 @@ function findSgCliPathSync() {
   try {
     const require2 = createRequire4(import.meta.url);
     const cliPackageJsonPath = require2.resolve("@ast-grep/cli/package.json");
-    const cliDirectory = dirname21(cliPackageJsonPath);
+    const cliDirectory = dirname22(cliPackageJsonPath);
     const sgPath = join77(cliDirectory, binaryName);
-    if (existsSync69(sgPath) && isValidBinary(sgPath)) {
+    if (existsSync70(sgPath) && isValidBinary(sgPath)) {
       return sgPath;
     }
   } catch {}
@@ -126284,10 +126300,10 @@ function findSgCliPathSync() {
     try {
       const require2 = createRequire4(import.meta.url);
       const packageJsonPath = require2.resolve(`${platformPackage}/package.json`);
-      const packageDirectory = dirname21(packageJsonPath);
+      const packageDirectory = dirname22(packageJsonPath);
       const astGrepBinaryName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
       const binaryPath = join77(packageDirectory, astGrepBinaryName);
-      if (existsSync69(binaryPath) && isValidBinary(binaryPath)) {
+      if (existsSync70(binaryPath) && isValidBinary(binaryPath)) {
         return binaryPath;
       }
     } catch {}
@@ -126295,7 +126311,7 @@ function findSgCliPathSync() {
   if (process.platform === "darwin") {
     const homebrewPaths = ["/opt/homebrew/bin/sg", "/usr/local/bin/sg"];
     for (const path7 of homebrewPaths) {
-      if (existsSync69(path7) && isValidBinary(path7)) {
+      if (existsSync70(path7) && isValidBinary(path7)) {
         return path7;
       }
     }
@@ -126319,14 +126335,14 @@ function setSgCliPath(path7) {
 }
 // src/tools/ast-grep/cli.ts
 var {spawn: spawn17 } = globalThis.Bun;
-import { existsSync as existsSync71 } from "fs";
+import { existsSync as existsSync72 } from "fs";
 
 // src/tools/ast-grep/cli-binary-path-resolution.ts
-import { existsSync as existsSync70 } from "fs";
+import { existsSync as existsSync71 } from "fs";
 var resolvedCliPath3 = null;
 var initPromise3 = null;
 async function getAstGrepPath() {
-  if (resolvedCliPath3 !== null && existsSync70(resolvedCliPath3)) {
+  if (resolvedCliPath3 !== null && existsSync71(resolvedCliPath3)) {
     return resolvedCliPath3;
   }
   if (initPromise3) {
@@ -126334,7 +126350,7 @@ async function getAstGrepPath() {
   }
   initPromise3 = (async () => {
     const syncPath = findSgCliPathSync();
-    if (syncPath && existsSync70(syncPath)) {
+    if (syncPath && existsSync71(syncPath)) {
       resolvedCliPath3 = syncPath;
       setSgCliPath(syncPath);
       return syncPath;
@@ -126433,7 +126449,7 @@ async function runSg(options) {
   const paths = options.paths && options.paths.length > 0 ? options.paths : ["."];
   args.push(...paths);
   let cliPath = getSgCliPath();
-  if (!cliPath || !existsSync71(cliPath)) {
+  if (!cliPath || !existsSync72(cliPath)) {
     const downloadedPath = await getAstGrepPath();
     if (downloadedPath) {
       cliPath = downloadedPath;
@@ -126688,12 +126704,12 @@ import { resolve as resolve19 } from "path";
 var {spawn: spawn18 } = globalThis.Bun;
 
 // src/tools/grep/constants.ts
-import { existsSync as existsSync73 } from "fs";
-import { join as join79, dirname as dirname22 } from "path";
+import { existsSync as existsSync74 } from "fs";
+import { join as join79, dirname as dirname23 } from "path";
 import { spawnSync as spawnSync4 } from "child_process";
 
 // src/tools/grep/downloader.ts
-import { existsSync as existsSync72, readdirSync as readdirSync21 } from "fs";
+import { existsSync as existsSync73, readdirSync as readdirSync21 } from "fs";
 import { join as join78 } from "path";
 init_plugin_identity();
 function findFileRecursive(dir, filename) {
@@ -126758,7 +126774,7 @@ async function downloadAndInstallRipgrep() {
   }
   const installDir = getInstallDir();
   const rgPath = getRgPath();
-  if (existsSync72(rgPath)) {
+  if (existsSync73(rgPath)) {
     return rgPath;
   }
   ensureCacheDir(installDir);
@@ -126773,7 +126789,7 @@ async function downloadAndInstallRipgrep() {
       await extractZip2(archivePath, installDir);
     }
     ensureExecutable(rgPath);
-    if (!existsSync72(rgPath)) {
+    if (!existsSync73(rgPath)) {
       throw new Error("ripgrep binary not found after extraction");
     }
     return rgPath;
@@ -126785,7 +126801,7 @@ async function downloadAndInstallRipgrep() {
 }
 function getInstalledRipgrepPath() {
   const rgPath = getRgPath();
-  return existsSync72(rgPath) ? rgPath : null;
+  return existsSync73(rgPath) ? rgPath : null;
 }
 
 // src/tools/grep/constants.ts
@@ -126807,7 +126823,7 @@ function findExecutable(name) {
 }
 function getOpenCodeBundledRg() {
   const execPath = process.execPath;
-  const execDir = dirname22(execPath);
+  const execDir = dirname23(execPath);
   const isWindows2 = process.platform === "win32";
   const rgName = isWindows2 ? "rg.exe" : "rg";
   const candidates = [
@@ -126818,7 +126834,7 @@ function getOpenCodeBundledRg() {
     join79(execDir, "..", "libexec", rgName)
   ];
   for (const candidate of candidates) {
-    if (existsSync73(candidate)) {
+    if (existsSync74(candidate)) {
       return candidate;
     }
   }
@@ -127470,10 +127486,10 @@ Use this when a task matches an available skill's or command's description.
 `;
 // src/tools/skill/tools.ts
 init_dist();
-import { dirname as dirname24 } from "path";
+import { dirname as dirname25 } from "path";
 
 // src/tools/slashcommand/command-output-formatter.ts
-import { dirname as dirname23 } from "path";
+import { dirname as dirname24 } from "path";
 async function formatLoadedCommand(command, userMessage) {
   const sections = [];
   sections.push(`# /${command.name} Command
@@ -127512,7 +127528,7 @@ async function formatLoadedCommand(command, userMessage) {
   if (!content && command.lazyContentLoader) {
     content = await command.lazyContentLoader.load();
   }
-  const commandDir = command.path ? dirname23(command.path) : process.cwd();
+  const commandDir = command.path ? dirname24(command.path) : process.cwd();
   const withFileReferences = await resolveFileReferencesInText(content, commandDir);
   const resolvedContent = await resolveCommandsInText(withFileReferences);
   let finalContent = resolvedContent.trim();
@@ -127902,7 +127918,7 @@ function createSkillTool(options = {}) {
         if (matchedSkill.name === "git-master") {
           body = injectGitMasterConfig(body, options.gitMasterConfig);
         }
-        const dir = matchedSkill.path ? dirname24(matchedSkill.path) : matchedSkill.resolvedPath || process.cwd();
+        const dir = matchedSkill.path ? dirname25(matchedSkill.path) : matchedSkill.resolvedPath || process.cwd();
         const output = [
           `## Skill: ${matchedSkill.name}`,
           "",
@@ -128020,11 +128036,11 @@ Has Todos: Yes (12 items, 8 completed)
 Has Transcript: Yes (234 entries)`;
 
 // src/tools/session-manager/file-storage.ts
-import { existsSync as existsSync74 } from "fs";
+import { existsSync as existsSync75 } from "fs";
 import { readdir, readFile } from "fs/promises";
 import { join as join81 } from "path";
 async function getFileMainSessions(directory) {
-  if (!existsSync74(SESSION_STORAGE))
+  if (!existsSync75(SESSION_STORAGE))
     return [];
   const sessions = [];
   try {
@@ -128056,7 +128072,7 @@ async function getFileMainSessions(directory) {
   return sessions.sort((a, b) => b.time.updated - a.time.updated);
 }
 async function getFileAllSessions() {
-  if (!existsSync74(MESSAGE_STORAGE))
+  if (!existsSync75(MESSAGE_STORAGE))
     return [];
   const sessions = [];
   async function scanDirectory(dir) {
@@ -128085,7 +128101,7 @@ async function fileSessionExists(sessionID) {
 }
 async function getFileSessionMessages(sessionID) {
   const messageDir = getMessageDir(sessionID);
-  if (!messageDir || !existsSync74(messageDir))
+  if (!messageDir || !existsSync75(messageDir))
     return [];
   const messages = [];
   try {
@@ -128121,7 +128137,7 @@ async function getFileSessionMessages(sessionID) {
 }
 async function readParts2(messageID) {
   const partDir = join81(PART_STORAGE, messageID);
-  if (!existsSync74(partDir))
+  if (!existsSync75(partDir))
     return [];
   const parts = [];
   try {
@@ -128142,7 +128158,7 @@ async function readParts2(messageID) {
   return parts.sort((a, b) => a.id.localeCompare(b.id));
 }
 async function getFileSessionTodos(sessionID) {
-  if (!existsSync74(TODO_DIR2))
+  if (!existsSync75(TODO_DIR2))
     return [];
   try {
     const allFiles = await readdir(TODO_DIR2);
@@ -128169,10 +128185,10 @@ async function getFileSessionTodos(sessionID) {
   return [];
 }
 async function getFileSessionTranscript(sessionID) {
-  if (!existsSync74(TRANSCRIPT_DIR2))
+  if (!existsSync75(TRANSCRIPT_DIR2))
     return 0;
   const transcriptFile = join81(TRANSCRIPT_DIR2, `${sessionID}.jsonl`);
-  if (!existsSync74(transcriptFile))
+  if (!existsSync75(transcriptFile))
     return 0;
   try {
     const content = await readFile(transcriptFile, "utf-8");
@@ -130552,9 +130568,9 @@ async function resolveMultimodalLookerAgentMetadata(ctx) {
 
 // src/tools/look-at/image-converter.ts
 import * as childProcess from "child_process";
-import { existsSync as existsSync75, mkdtempSync, readFileSync as readFileSync50, rmSync as rmSync3, unlinkSync as unlinkSync10, writeFileSync as writeFileSync18 } from "fs";
+import { existsSync as existsSync76, mkdtempSync, readFileSync as readFileSync51, rmSync as rmSync3, unlinkSync as unlinkSync10, writeFileSync as writeFileSync18 } from "fs";
 import { tmpdir as tmpdir7 } from "os";
-import { dirname as dirname25, join as join82 } from "path";
+import { dirname as dirname26, join as join82 } from "path";
 var SUPPORTED_FORMATS = new Set([
   "image/jpeg",
   "image/png",
@@ -130592,7 +130608,7 @@ function needsConversion(mimeType) {
   return mimeType.startsWith("image/");
 }
 function convertImageToJpeg(inputPath, mimeType) {
-  if (!existsSync75(inputPath)) {
+  if (!existsSync76(inputPath)) {
     throw new Error(`File not found: ${inputPath}`);
   }
   const tempDir = mkdtempSync(join82(tmpdir7(), "opencode-img-"));
@@ -130606,7 +130622,7 @@ function convertImageToJpeg(inputPath, mimeType) {
           encoding: "utf-8",
           timeout: CONVERSION_TIMEOUT_MS
         });
-        if (existsSync75(outputPath)) {
+        if (existsSync76(outputPath)) {
           log(`[image-converter] Converted using sips: ${outputPath}`);
           return outputPath;
         }
@@ -130621,7 +130637,7 @@ function convertImageToJpeg(inputPath, mimeType) {
         encoding: "utf-8",
         timeout: CONVERSION_TIMEOUT_MS
       });
-      if (existsSync75(outputPath)) {
+      if (existsSync76(outputPath)) {
         log(`[image-converter] Converted using ImageMagick: ${outputPath}`);
         return outputPath;
       }
@@ -130634,7 +130650,7 @@ function convertImageToJpeg(inputPath, mimeType) {
 ` + `  RHEL/CentOS: sudo yum install ImageMagick`);
   } catch (error92) {
     try {
-      if (existsSync75(outputPath)) {
+      if (existsSync76(outputPath)) {
         unlinkSync10(outputPath);
       }
     } catch {}
@@ -130647,12 +130663,12 @@ function convertImageToJpeg(inputPath, mimeType) {
 }
 function cleanupConvertedImage(filePath) {
   try {
-    const tempDirectory = dirname25(filePath);
-    if (existsSync75(filePath)) {
+    const tempDirectory = dirname26(filePath);
+    if (existsSync76(filePath)) {
       unlinkSync10(filePath);
       log(`[image-converter] Cleaned up temporary file: ${filePath}`);
     }
-    if (existsSync75(tempDirectory)) {
+    if (existsSync76(tempDirectory)) {
       rmSync3(tempDirectory, { recursive: true, force: true });
       log(`[image-converter] Cleaned up temporary directory: ${tempDirectory}`);
     }
@@ -130672,14 +130688,14 @@ function convertBase64ImageToJpeg(base64Data, mimeType) {
     log(`[image-converter] Converting Base64 ${mimeType} to JPEG`);
     const outputPath = convertImageToJpeg(inputPath, mimeType);
     tempFiles.push(outputPath);
-    const convertedBuffer = readFileSync50(outputPath);
+    const convertedBuffer = readFileSync51(outputPath);
     const convertedBase64 = convertedBuffer.toString("base64");
     log(`[image-converter] Base64 conversion successful`);
     return { base64: convertedBase64, tempFiles };
   } catch (error92) {
     tempFiles.forEach((file3) => {
       try {
-        if (existsSync75(file3))
+        if (existsSync76(file3))
           unlinkSync10(file3);
       } catch {}
     });
@@ -132860,22 +132876,22 @@ function applyFallbackEntrySettings(input) {
 // src/tools/delegate-task/subagent-discovery.ts
 init_agent_display_names();
 // src/features/claude-code-agent-loader/loader.ts
-import { existsSync as existsSync78, readdirSync as readdirSync22 } from "fs";
+import { existsSync as existsSync79, readdirSync as readdirSync22 } from "fs";
 import { join as join83 } from "path";
 
 // src/features/claude-code-agent-loader/agent-definitions-loader.ts
-import { existsSync as existsSync77, readFileSync as readFileSync52 } from "fs";
+import { existsSync as existsSync78, readFileSync as readFileSync53 } from "fs";
 import { basename as basename13, extname as extname8 } from "path";
 init_logger();
 
 // src/features/claude-code-agent-loader/json-agent-loader.ts
-import { existsSync as existsSync76, readFileSync as readFileSync51 } from "fs";
+import { existsSync as existsSync77, readFileSync as readFileSync52 } from "fs";
 function parseJsonAgentFile(filePath, scope) {
   try {
-    if (!existsSync76(filePath)) {
+    if (!existsSync77(filePath)) {
       return null;
     }
-    const content = readFileSync51(filePath, "utf-8");
+    const content = readFileSync52(filePath, "utf-8");
     const { data } = parseJsoncSafe(content);
     if (!data) {
       return null;
@@ -132911,10 +132927,10 @@ function parseJsonAgentFile(filePath, scope) {
 // src/features/claude-code-agent-loader/agent-definitions-loader.ts
 function parseMarkdownAgentFile(filePath, scope) {
   try {
-    if (!existsSync77(filePath)) {
+    if (!existsSync78(filePath)) {
       return null;
     }
-    const content = readFileSync52(filePath, "utf-8");
+    const content = readFileSync53(filePath, "utf-8");
     const { data, body } = parseFrontmatter(content);
     const fileName = basename13(filePath);
     const agentName = fileName.replace(/\.md$/i, "");
@@ -132946,7 +132962,7 @@ function parseMarkdownAgentFile(filePath, scope) {
 function loadAgentDefinitions(paths, scope) {
   const result = Object.create(null);
   for (const filePath of paths) {
-    if (!existsSync77(filePath)) {
+    if (!existsSync78(filePath)) {
       log(`[agent-definitions-loader] File not found, skipping: ${filePath}`);
       continue;
     }
@@ -132971,7 +132987,7 @@ function loadAgentDefinitions(paths, scope) {
 
 // src/features/claude-code-agent-loader/loader.ts
 function loadAgentsFromDir(agentsDir, scope) {
-  if (!existsSync78(agentsDir)) {
+  if (!existsSync79(agentsDir)) {
     return [];
   }
   const entries = readdirSync22(agentsDir, { withFileTypes: true });
@@ -133613,8 +133629,8 @@ var TaskDeleteInputSchema = exports_external.object({
 });
 
 // src/features/claude-tasks/storage.ts
-import { join as join85, dirname as dirname27, basename as basename14, isAbsolute as isAbsolute12 } from "path";
-import { existsSync as existsSync80, mkdirSync as mkdirSync16, readFileSync as readFileSync54, writeFileSync as writeFileSync19, renameSync as renameSync4, unlinkSync as unlinkSync11, readdirSync as readdirSync23 } from "fs";
+import { join as join85, dirname as dirname28, basename as basename14, isAbsolute as isAbsolute12 } from "path";
+import { existsSync as existsSync81, mkdirSync as mkdirSync16, readFileSync as readFileSync55, writeFileSync as writeFileSync19, renameSync as renameSync4, unlinkSync as unlinkSync11, readdirSync as readdirSync23 } from "fs";
 import { randomUUID as randomUUID2 } from "crypto";
 function getTaskDir(config4 = {}) {
   const tasksConfig = config4.bob?.tasks;
@@ -133642,16 +133658,16 @@ function resolveTaskListId(config4 = {}) {
   return sanitizePathSegment(basename14(process.cwd()));
 }
 function ensureDir(dirPath) {
-  if (!existsSync80(dirPath)) {
+  if (!existsSync81(dirPath)) {
     mkdirSync16(dirPath, { recursive: true });
   }
 }
 function readJsonSafe(filePath, schema2) {
   try {
-    if (!existsSync80(filePath)) {
+    if (!existsSync81(filePath)) {
       return null;
     }
-    const content = readFileSync54(filePath, "utf-8");
+    const content = readFileSync55(filePath, "utf-8");
     const parsed = JSON.parse(content);
     const result = schema2.safeParse(parsed);
     if (!result.success) {
@@ -133663,7 +133679,7 @@ function readJsonSafe(filePath, schema2) {
   }
 }
 function writeJsonAtomic(filePath, data) {
-  const dir = dirname27(filePath);
+  const dir = dirname28(filePath);
   ensureDir(dir);
   const tempPath = `${filePath}.tmp.${Date.now()}`;
   try {
@@ -133671,7 +133687,7 @@ function writeJsonAtomic(filePath, data) {
     renameSync4(tempPath, filePath);
   } catch (error92) {
     try {
-      if (existsSync80(tempPath)) {
+      if (existsSync81(tempPath)) {
         unlinkSync11(tempPath);
       }
     } catch {}
@@ -133693,7 +133709,7 @@ function acquireLock(dirPath) {
   };
   const isStale = () => {
     try {
-      const lockContent = readFileSync54(lockPath, "utf-8");
+      const lockContent = readFileSync55(lockPath, "utf-8");
       const lockData = JSON.parse(lockContent);
       const lockAge = Date.now() - lockData.timestamp;
       return lockAge > STALE_LOCK_THRESHOLD_MS;
@@ -133731,9 +133747,9 @@ function acquireLock(dirPath) {
     acquired: true,
     release: () => {
       try {
-        if (!existsSync80(lockPath))
+        if (!existsSync81(lockPath))
           return;
-        const lockContent = readFileSync54(lockPath, "utf-8");
+        const lockContent = readFileSync55(lockPath, "utf-8");
         const lockData = JSON.parse(lockContent);
         if (lockData.id !== lockId)
           return;
@@ -133959,7 +133975,7 @@ Returns null if the task does not exist or the file is invalid.`,
 // src/tools/task/task-list.ts
 init_tool();
 import { join as join88 } from "path";
-import { existsSync as existsSync81, readdirSync as readdirSync24 } from "fs";
+import { existsSync as existsSync82, readdirSync as readdirSync24 } from "fs";
 function createTaskList(config4) {
   return tool({
     description: `List all active tasks with summary information.
@@ -133970,7 +133986,7 @@ Returns summary format: id, subject, status, owner, blockedBy (not full descript
     args: {},
     execute: async () => {
       const taskDir = getTaskDir(config4);
-      if (!existsSync81(taskDir)) {
+      if (!existsSync82(taskDir)) {
         return JSON.stringify({ tasks: [] });
       }
       const files = readdirSync24(taskDir).filter((f) => f.endsWith(".json") && f.startsWith("T-")).map((f) => f.replace(".json", ""));
@@ -136273,7 +136289,7 @@ function createToolGuardHooks(args) {
   const readImageResizer = isHookEnabled("read-image-resizer") ? safeHook("read-image-resizer", () => createReadImageResizerHook(ctx)) : null;
   const todoDescriptionOverride = isHookEnabled("todo-description-override") ? safeHook("todo-description-override", () => createTodoDescriptionOverrideHook()) : null;
   const webfetchRedirectGuard = isHookEnabled("webfetch-redirect-guard") ? safeHook("webfetch-redirect-guard", () => createWebFetchRedirectGuardHook(ctx)) : null;
-  const fastApply = isHookEnabled("fast-apply") ? safeHook("fast-apply", () => createFastApplyHook(pluginConfig.fast_apply ?? { enabled: false, ollama_url: "http://localhost:11434", model: "qwen3.5:9b", timeout: 30000 })) : null;
+  const fastApply = isHookEnabled("fast-apply") ? safeHook("fast-apply", () => createFastApplyHook(pluginConfig.fast_apply ?? { enabled: false, ollama_url: "", model: "", timeout: 30000 })) : null;
   return {
     commentChecker,
     toolOutputTruncator,
@@ -137186,7 +137202,7 @@ function unregisterManagerForCleanup(manager) {
 }
 
 // src/features/background-agent/compaction-aware-message-resolver.ts
-import { readdirSync as readdirSync25, readFileSync as readFileSync55 } from "fs";
+import { readdirSync as readdirSync25, readFileSync as readFileSync56 } from "fs";
 import { join as join91 } from "path";
 function hasFullAgentAndModel(message) {
   return !!message.agent && !isCompactionAgent(message.agent) && !!message.model?.providerID && !!message.model?.modelID;
@@ -137266,7 +137282,7 @@ function findNearestMessageExcludingCompaction(messageDir, sessionID) {
     const messages = [];
     for (const file3 of files) {
       try {
-        const content = readFileSync55(join91(messageDir, file3), "utf-8");
+        const content = readFileSync56(join91(messageDir, file3), "utf-8");
         const parsed = JSON.parse(content);
         if (hasCompactionPartInStorage(parsed.id) || isCompactionAgent(parsed.agent)) {
           continue;
@@ -139363,8 +139379,8 @@ ${originalText}`;
   }
 }
 // src/features/mcp-oauth/storage.ts
-import { chmodSync as chmodSync2, existsSync as existsSync82, mkdirSync as mkdirSync17, readFileSync as readFileSync56, renameSync as renameSync5, unlinkSync as unlinkSync12, writeFileSync as writeFileSync20 } from "fs";
-import { dirname as dirname28, join as join93 } from "path";
+import { chmodSync as chmodSync2, existsSync as existsSync83, mkdirSync as mkdirSync17, readFileSync as readFileSync57, renameSync as renameSync5, unlinkSync as unlinkSync12, writeFileSync as writeFileSync20 } from "fs";
+import { dirname as dirname29, join as join93 } from "path";
 var STORAGE_FILE_NAME = "mcp-oauth.json";
 function getMcpOauthStoragePath() {
   return join93(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
@@ -139404,11 +139420,11 @@ function buildKey(serverHost, resource) {
 }
 function readStore() {
   const filePath = getMcpOauthStoragePath();
-  if (!existsSync82(filePath)) {
+  if (!existsSync83(filePath)) {
     return null;
   }
   try {
-    const content = readFileSync56(filePath, "utf-8");
+    const content = readFileSync57(filePath, "utf-8");
     return JSON.parse(content);
   } catch {
     return null;
@@ -139417,8 +139433,8 @@ function readStore() {
 function writeStore(store2) {
   const filePath = getMcpOauthStoragePath();
   try {
-    const dir = dirname28(filePath);
-    if (!existsSync82(dir)) {
+    const dir = dirname29(filePath);
+    if (!existsSync83(dir)) {
       mkdirSync17(dir, { recursive: true });
     }
     const tempPath = `${filePath}.tmp.${Date.now()}`;
@@ -146065,7 +146081,7 @@ class TmuxSessionManager {
 var SESSION_TIMEOUT_MS3 = 10 * 60 * 1000;
 var MIN_STABILITY_TIME_MS4 = 10 * 1000;
 // src/features/claude-code-mcp-loader/loader.ts
-import { existsSync as existsSync83, readFileSync as readFileSync57 } from "fs";
+import { existsSync as existsSync84, readFileSync as readFileSync58 } from "fs";
 import { join as join94 } from "path";
 import { homedir as homedir15 } from "os";
 init_logger();
@@ -146088,7 +146104,7 @@ function getMcpConfigPaths() {
   });
 }
 async function loadMcpConfigFile(filePath) {
-  if (!existsSync83(filePath)) {
+  if (!existsSync84(filePath)) {
     return null;
   }
   try {
@@ -146104,10 +146120,10 @@ function getSystemMcpServerNames() {
   const paths = getMcpConfigPaths();
   const cwd = process.cwd();
   for (const { path: path9 } of paths) {
-    if (!existsSync83(path9))
+    if (!existsSync84(path9))
       continue;
     try {
-      const content = readFileSync57(path9, "utf-8");
+      const content = readFileSync58(path9, "utf-8");
       const config4 = JSON.parse(content);
       if (!config4?.mcpServers)
         continue;
@@ -150452,7 +150468,7 @@ var researcherPromptMetadata = {
 };
 
 // src/agents/builtin-agents/resolve-file-uri.ts
-import { existsSync as existsSync84, readFileSync as readFileSync58 } from "fs";
+import { existsSync as existsSync85, readFileSync as readFileSync59 } from "fs";
 import { homedir as homedir16 } from "os";
 import { isAbsolute as isAbsolute13, resolve as resolve22 } from "path";
 init_logger();
@@ -150477,11 +150493,11 @@ function resolvePromptAppend(promptAppend, configDir) {
     });
     return `[WARNING: Path rejected: ${promptAppend}]`;
   }
-  if (!existsSync84(filePath)) {
+  if (!existsSync85(filePath)) {
     return `[WARNING: Could not resolve file URI: ${promptAppend}]`;
   }
   try {
-    return readFileSync58(filePath, "utf8");
+    return readFileSync59(filePath, "utf8");
   } catch {
     return `[WARNING: Could not read file: ${promptAppend}]`;
   }
@@ -154115,6 +154131,28 @@ async function buildStrategistAgentConfig(params) {
   return merged;
 }
 
+// src/plugin/skill-discovery-config.ts
+var DEFAULT_SKILL_DISCOVERY = {
+  config_sources: true,
+  project_opencode: true,
+  global_opencode: false,
+  project_claude: false,
+  global_claude: false,
+  project_agents: false,
+  global_agents: false
+};
+function resolveSkillDiscoveryConfig(pluginConfig) {
+  const resolved = {
+    ...DEFAULT_SKILL_DISCOVERY,
+    ...pluginConfig.skill_discovery ?? {}
+  };
+  if (pluginConfig.claude_code?.skills === false) {
+    resolved.project_claude = false;
+    resolved.global_claude = false;
+  }
+  return resolved;
+}
+
 // src/plugin-handlers/agent-config-handler.ts
 var CANONICAL_VISIBLE_AGENT_NAMES = [
   "Bob",
@@ -154177,8 +154215,9 @@ async function applyAgentConfig(params) {
   const migratedDisabledAgents = (params.pluginConfig.disabled_agents ?? []).map((agent) => {
     return AGENT_NAME_MAP[agent.toLowerCase()] ?? AGENT_NAME_MAP[agent] ?? agent;
   });
-  const includeClaudeSkillsForAwareness = params.pluginConfig.claude_code?.skills ?? true;
+  const discovery2 = resolveSkillDiscoveryConfig(params.pluginConfig);
   const [
+    discoveredManagedPluginSkills,
     discoveredConfigSourceSkills,
     discoveredUserSkills,
     discoveredProjectSkills,
@@ -154187,18 +154226,20 @@ async function applyAgentConfig(params) {
     discoveredOpencodeProjectSkills,
     discoveredGlobalAgentsSkills
   ] = await Promise.all([
-    discoverConfigSourceSkills({
+    discoverManagedPluginSkills(),
+    discovery2.config_sources ? discoverConfigSourceSkills({
       config: params.pluginConfig.skills,
       configDir: params.ctx.directory
-    }),
-    includeClaudeSkillsForAwareness ? discoverUserClaudeSkills() : Promise.resolve([]),
-    includeClaudeSkillsForAwareness ? discoverProjectClaudeSkills(params.ctx.directory) : Promise.resolve([]),
-    includeClaudeSkillsForAwareness ? discoverProjectAgentsSkills(params.ctx.directory) : Promise.resolve([]),
-    discoverOpencodeGlobalSkills(),
-    discoverOpencodeProjectSkills(params.ctx.directory),
-    includeClaudeSkillsForAwareness ? discoverGlobalAgentsSkills() : Promise.resolve([])
+    }) : Promise.resolve([]),
+    discovery2.global_claude ? discoverUserClaudeSkills() : Promise.resolve([]),
+    discovery2.project_claude ? discoverProjectClaudeSkills(params.ctx.directory) : Promise.resolve([]),
+    discovery2.project_agents ? discoverProjectAgentsSkills(params.ctx.directory) : Promise.resolve([]),
+    discovery2.global_opencode ? discoverOpencodeGlobalSkills() : Promise.resolve([]),
+    discovery2.project_opencode ? discoverOpencodeProjectSkills(params.ctx.directory) : Promise.resolve([]),
+    discovery2.global_agents ? discoverGlobalAgentsSkills() : Promise.resolve([])
   ]);
   const allDiscoveredSkills = [
+    ...discoveredManagedPluginSkills,
     ...discoveredConfigSourceSkills,
     ...discoveredOpencodeProjectSkills,
     ...discoveredProjectSkills,
@@ -154531,9 +154572,9 @@ async function applyCommandConfig(params) {
   });
   const systemCommands = params.config.command ?? {};
   const includeClaudeCommands = params.pluginConfig.claude_code?.commands ?? true;
-  const includeClaudeSkills = params.pluginConfig.claude_code?.skills ?? true;
+  const discovery2 = resolveSkillDiscoveryConfig(params.pluginConfig);
   const externalSkillPlugin = detectExternalSkillPlugin(params.ctx.directory);
-  if (includeClaudeSkills && externalSkillPlugin.detected) {
+  if ((discovery2.project_claude || discovery2.global_claude || discovery2.global_opencode) && externalSkillPlugin.detected) {
     log(getSkillPluginConflictWarning(externalSkillPlugin.pluginName));
   }
   const [
@@ -154542,6 +154583,7 @@ async function applyCommandConfig(params) {
     projectCommands,
     opencodeGlobalCommands,
     opencodeProjectCommands,
+    managedPluginSkills,
     userSkills,
     globalAgentsSkills,
     projectSkills,
@@ -154549,23 +154591,25 @@ async function applyCommandConfig(params) {
     opencodeGlobalSkills,
     opencodeProjectSkills
   ] = await Promise.all([
-    discoverConfigSourceSkills({
+    discovery2.config_sources ? discoverConfigSourceSkills({
       config: params.pluginConfig.skills,
       configDir: params.ctx.directory
-    }),
+    }) : Promise.resolve([]),
     includeClaudeCommands ? loadUserCommands() : Promise.resolve({}),
     includeClaudeCommands ? loadProjectCommands(params.ctx.directory) : Promise.resolve({}),
     loadOpencodeGlobalCommands(),
     loadOpencodeProjectCommands(params.ctx.directory),
-    includeClaudeSkills ? loadUserSkills() : Promise.resolve({}),
-    includeClaudeSkills ? loadGlobalAgentsSkills() : Promise.resolve({}),
-    includeClaudeSkills ? loadProjectSkills(params.ctx.directory) : Promise.resolve({}),
-    includeClaudeSkills ? loadProjectAgentsSkills(params.ctx.directory) : Promise.resolve({}),
-    loadOpencodeGlobalSkills(),
-    loadOpencodeProjectSkills(params.ctx.directory)
+    loadManagedPluginSkills(),
+    discovery2.global_claude ? loadUserSkills() : Promise.resolve({}),
+    discovery2.global_agents ? loadGlobalAgentsSkills() : Promise.resolve({}),
+    discovery2.project_claude ? loadProjectSkills(params.ctx.directory) : Promise.resolve({}),
+    discovery2.project_agents ? loadProjectAgentsSkills(params.ctx.directory) : Promise.resolve({}),
+    discovery2.global_opencode ? loadOpencodeGlobalSkills() : Promise.resolve({}),
+    discovery2.project_opencode ? loadOpencodeProjectSkills(params.ctx.directory) : Promise.resolve({})
   ]);
   params.config.command = {
     ...builtinCommands,
+    ...managedPluginSkills,
     ...skillsToCommandDefinitionRecord(configSourceSkills),
     ...userCommands,
     ...userSkills,
@@ -154593,7 +154637,7 @@ function remapCommandAgentFields(commands2) {
 
 // src/plugin-handlers/mcp-config-handler.ts
 import { spawnSync as spawnSync5 } from "child_process";
-import { existsSync as existsSync85 } from "fs";
+import { existsSync as existsSync86 } from "fs";
 
 // src/mcp/websearch.ts
 init_logger();
@@ -154625,15 +154669,6 @@ function createWebsearchConfig(config4) {
 }
 var websearch = createWebsearchConfig();
 
-// src/mcp/context7.ts
-var context7 = {
-  type: "remote",
-  url: "https://mcp.context7.com/mcp",
-  enabled: true,
-  headers: process.env.CONTEXT7_API_KEY ? { Authorization: `Bearer ${process.env.CONTEXT7_API_KEY}` } : undefined,
-  oauth: false
-};
-
 // src/mcp/grep-app.ts
 var grep_app = {
   type: "remote",
@@ -154651,19 +154686,11 @@ function createBuiltinMcps(disabledMcps = [], config4) {
       mcps.websearch = websearchConfig;
     }
   }
-  if (!disabledMcps.includes("context7")) {
-    mcps.context7 = context7;
-  }
   if (!disabledMcps.includes("grep_app")) {
     mcps.grep_app = grep_app;
   }
   return mcps;
 }
-// src/mcp/index.ts
-import { join as join96 } from "path";
-var __dirname = "C:\\hiai\\hiai-opencode-public\\src\\mcp";
-var ASSETS_DIR = join96(import.meta.dirname || __dirname, "..", "assets", "mcp");
-
 // src/shared/runtime-plugin-config.ts
 function mergeRecords(base, override) {
   if (!base && !override)
@@ -154763,7 +154790,7 @@ function hasUsableLocalMcpRuntime(name, entry) {
     return false;
   }
   if (binary2 === "node" && typeof args[0] === "string" && args[0].endsWith(".mjs")) {
-    if (!existsSync85(args[0])) {
+    if (!existsSync86(args[0])) {
       return false;
     }
     const probe2 = spawnSync5(binary2, ["--version"], {
@@ -155237,19 +155264,30 @@ async function createSkillContext(args) {
     }
     return true;
   });
-  const includeClaudeSkills = pluginConfig.claude_code?.skills !== false;
-  const [configSourceSkills, userSkills, globalSkills, projectSkills, opencodeProjectSkills, agentsProjectSkills, agentsGlobalSkills] = await Promise.all([
-    discoverConfigSourceSkills({
+  const discovery2 = resolveSkillDiscoveryConfig(pluginConfig);
+  const [
+    managedPluginSkills,
+    configSourceSkills,
+    userSkills,
+    globalSkills,
+    projectSkills,
+    opencodeProjectSkills,
+    agentsProjectSkills,
+    agentsGlobalSkills
+  ] = await Promise.all([
+    discoverManagedPluginSkills(),
+    discovery2.config_sources ? discoverConfigSourceSkills({
       config: pluginConfig.skills,
       configDir: directory
-    }),
-    includeClaudeSkills ? discoverUserClaudeSkills() : Promise.resolve([]),
-    discoverOpencodeGlobalSkills(),
-    includeClaudeSkills ? discoverProjectClaudeSkills(directory) : Promise.resolve([]),
-    discoverOpencodeProjectSkills(directory),
-    discoverProjectAgentsSkills(directory),
-    discoverGlobalAgentsSkills()
+    }) : Promise.resolve([]),
+    discovery2.global_claude ? discoverUserClaudeSkills() : Promise.resolve([]),
+    discovery2.global_opencode ? discoverOpencodeGlobalSkills() : Promise.resolve([]),
+    discovery2.project_claude ? discoverProjectClaudeSkills(directory) : Promise.resolve([]),
+    discovery2.project_opencode ? discoverOpencodeProjectSkills(directory) : Promise.resolve([]),
+    discovery2.project_agents ? discoverProjectAgentsSkills(directory) : Promise.resolve([]),
+    discovery2.global_agents ? discoverGlobalAgentsSkills() : Promise.resolve([])
   ]);
+  const filteredManagedPluginSkills = filterProviderGatedSkills(managedPluginSkills, browserProvider);
   const filteredConfigSourceSkills = filterProviderGatedSkills(configSourceSkills, browserProvider);
   const filteredUserSkills = filterProviderGatedSkills(userSkills, browserProvider);
   const filteredGlobalSkills = filterProviderGatedSkills(globalSkills, browserProvider);
@@ -155257,7 +155295,7 @@ async function createSkillContext(args) {
   const filteredOpencodeProjectSkills = filterProviderGatedSkills(opencodeProjectSkills, browserProvider);
   const filteredAgentsProjectSkills = filterProviderGatedSkills(agentsProjectSkills, browserProvider);
   const filteredAgentsGlobalSkills = filterProviderGatedSkills(agentsGlobalSkills, browserProvider);
-  const mergedSkills = mergeSkills(builtinSkills, pluginConfig.skills, filteredConfigSourceSkills, [...filteredUserSkills, ...filteredAgentsGlobalSkills], filteredGlobalSkills, [...filteredProjectSkills, ...filteredAgentsProjectSkills], filteredOpencodeProjectSkills, { configDir: directory });
+  const mergedSkills = mergeSkills(builtinSkills, pluginConfig.skills, [...filteredManagedPluginSkills, ...filteredConfigSourceSkills], [...filteredUserSkills, ...filteredAgentsGlobalSkills], filteredGlobalSkills, [...filteredProjectSkills, ...filteredAgentsProjectSkills], filteredOpencodeProjectSkills, { configDir: directory });
   const availableSkills = mergedSkills.map((skill2) => ({
     name: skill2.name,
     description: skill2.definition.description ?? "",
@@ -155747,10 +155785,10 @@ init_agent_display_names();
 
 // src/plugin/ultrawork-db-model-override.ts
 import { Database } from "bun:sqlite";
-import { join as join97 } from "path";
-import { existsSync as existsSync86 } from "fs";
+import { join as join96 } from "path";
+import { existsSync as existsSync87 } from "fs";
 function getDbPath() {
-  return join97(getDataDir(), "opencode", "opencode.db");
+  return join96(getDataDir(), "opencode", "opencode.db");
 }
 var MAX_MICROTASK_RETRIES = 10;
 function tryUpdateMessageModel(db, messageId, targetModel, variant) {
@@ -155827,7 +155865,7 @@ function retryViaMicrotask(db, messageId, targetModel, variant, attempt) {
 function scheduleDeferredModelOverride(messageId, targetModel, variant) {
   queueMicrotask(() => {
     const dbPath = getDbPath();
-    if (!existsSync86(dbPath)) {
+    if (!existsSync87(dbPath)) {
       log("[ultrawork-db-override] DB not found, skipping deferred override");
       return;
     }
@@ -157169,6 +157207,163 @@ function createFirstMessageVariantGate() {
 // src/index.ts
 init_plugin_identity();
 
+// src/shared/startup-diagnostics.ts
+import { existsSync as existsSync88, readFileSync as readFileSync60 } from "fs";
+import { join as join98 } from "path";
+
+// src/mcp/registry.ts
+import { join as join97 } from "path";
+function resolveAssetScript(...segments) {
+  return join97(import.meta.dirname, "..", "assets", ...segments);
+}
+function createNpmPackageCommand(pkg, ...args) {
+  return ["node", resolveAssetScript("runtime", "npm-package-runner.mjs"), pkg, ...args];
+}
+var HIAI_MCP_REGISTRY = {
+  playwright: {
+    name: "playwright",
+    enabledByDefault: true,
+    install: "npm",
+    optionalEnv: ["HIAI_PLAYWRIGHT_INSTALL_BROWSERS"],
+    config: {
+      enabled: true,
+      command: ["node", resolveAssetScript("mcp", "playwright.mjs")],
+      timeout: 600000
+    }
+  },
+  stitch: {
+    name: "stitch",
+    enabledByDefault: true,
+    install: "remote",
+    requiredEnv: ["STITCH_AI_API_KEY"],
+    config: {
+      enabled: true,
+      type: "remote",
+      url: "https://stitch.googleapis.com/mcp",
+      headers: { "X-Goog-Api-Key": "{env:STITCH_AI_API_KEY}" },
+      timeout: 600000
+    }
+  },
+  "sequential-thinking": {
+    name: "sequential-thinking",
+    enabledByDefault: true,
+    install: "npm",
+    config: {
+      enabled: true,
+      command: createNpmPackageCommand("@modelcontextprotocol/server-sequential-thinking"),
+      timeout: 600000
+    }
+  },
+  firecrawl: {
+    name: "firecrawl",
+    enabledByDefault: true,
+    install: "npm",
+    requiredEnv: ["FIRECRAWL_API_KEY"],
+    config: {
+      enabled: true,
+      command: createNpmPackageCommand("firecrawl-mcp"),
+      timeout: 600000,
+      environment: { FIRECRAWL_API_KEY: "{env:FIRECRAWL_API_KEY}" }
+    }
+  },
+  rag: {
+    name: "rag",
+    enabledByDefault: true,
+    install: "user-service",
+    optionalEnv: ["OPENCODE_RAG_URL"],
+    config: {
+      enabled: true,
+      type: "local",
+      command: ["node", resolveAssetScript("mcp", "rag.mjs")],
+      environment: {
+        OPENCODE_RAG_URL: "{env:OPENCODE_RAG_URL:-http://localhost:9002/tools/search}"
+      },
+      timeout: 600000
+    }
+  },
+  context7: {
+    name: "context7",
+    enabledByDefault: true,
+    install: "remote",
+    optionalEnv: ["CONTEXT7_API_KEY"],
+    config: {
+      enabled: true,
+      type: "remote",
+      url: "https://mcp.context7.com/mcp",
+      headers: { "X-API-KEY": "{env:CONTEXT7_API_KEY}" },
+      timeout: 600000
+    }
+  },
+  mempalace: {
+    name: "mempalace",
+    enabledByDefault: true,
+    install: "python",
+    optionalEnv: ["MEMPALACE_PYTHON", "MEMPALACE_PALACE_PATH", "HIAI_MCP_AUTO_INSTALL"],
+    config: {
+      enabled: true,
+      type: "local",
+      command: ["node", resolveAssetScript("mcp", "mempalace.mjs"), "--palace", "./.opencode/palace"],
+      timeout: 600000
+    }
+  }
+};
+
+// src/shared/startup-diagnostics.ts
+init_plugin_identity();
+function readPlugins(configPath) {
+  if (!existsSync88(configPath))
+    return [];
+  try {
+    const content = readFileSync60(configPath, "utf-8");
+    const parsed = parseJsoncSafe(content);
+    return (parsed.data?.plugin ?? []).map((entry) => typeof entry === "string" ? entry : Array.isArray(entry) ? entry[0] : "").filter((entry) => typeof entry === "string" && entry.trim().length > 0);
+  } catch {
+    return [];
+  }
+}
+function warnIfListPluginEntry(directory) {
+  const globalPaths = getOpenCodeConfigPaths({ binary: "opencode", version: null });
+  const candidates = [
+    join98(directory, ".opencode", "opencode.json"),
+    join98(directory, ".opencode", "opencode.jsonc"),
+    globalPaths.configJson,
+    globalPaths.configJsonc
+  ];
+  for (const configPath of candidates) {
+    const plugins = readPlugins(configPath);
+    if (!plugins.includes("list"))
+      continue;
+    console.warn(`[hiai-opencode] WARNING: ${configPath} contains plugin: ["list"].`);
+    console.warn("[hiai-opencode] This can prevent hiai-opencode MCP servers from loading from that config scope.");
+    console.warn(`[hiai-opencode] Update it to: plugin: ["${PLUGIN_NAME}"]`);
+  }
+}
+function hasConfigAuthFallback(pluginConfig, envName) {
+  if (envName === "FIRECRAWL_API_KEY")
+    return !!pluginConfig.auth?.firecrawl?.trim();
+  if (envName === "STITCH_AI_API_KEY")
+    return !!pluginConfig.auth?.stitch?.trim();
+  if (envName === "CONTEXT7_API_KEY")
+    return !!pluginConfig.auth?.context7?.trim();
+  return false;
+}
+function warnMissingRequiredMcpEnv(args) {
+  const disabled = new Set(args.pluginConfig.disabled_mcps ?? []);
+  const mcpConfig = args.platformConfig.mcp ?? {};
+  for (const [name, entry] of Object.entries(HIAI_MCP_REGISTRY)) {
+    if (disabled.has(name))
+      continue;
+    if (mcpConfig[name]?.enabled === false)
+      continue;
+    if (!entry.requiredEnv || entry.requiredEnv.length === 0)
+      continue;
+    const missing = entry.requiredEnv.filter((envName) => !process.env[envName]?.trim() && !hasConfigAuthFallback(args.pluginConfig, envName));
+    if (missing.length === 0)
+      continue;
+    console.warn(`[hiai-opencode] MCP "${name}" is enabled but missing required env: ${missing.join(", ")}.` + " The plugin will continue to load; set the key or disable this MCP in hiai-opencode.json.");
+  }
+}
+
 // src/internals/plugins/subtask2/core/state.ts
 var configs = {};
 var pluginConfig = { replace_generic: true };
@@ -157484,7 +157679,7 @@ function resolveResultReferences(text, sessionID) {
 
 // src/internals/plugins/subtask2/utils/config.ts
 import { mkdirSync as mkdirSync18 } from "fs";
-import { dirname as dirname29, join as join98 } from "path";
+import { dirname as dirname30, join as join99 } from "path";
 
 // src/internals/plugins/subtask2/utils/prompts.ts
 var DEFAULT_RETURN_PROMPT = "Review, challenge and verify the task tool output above against the codebase. Then validate or revise it, before continuing with the next logical step.";
@@ -157550,15 +157745,15 @@ async function getAutoWorkflowPrompt() {
 var AUTO_WORKFLOW_PROMPT = AUTO_WORKFLOW_PROMPT_TEMPLATE.replace(README_PLACEHOLDER, "[Use getAutoWorkflowPrompt() to get full documentation]");
 
 // src/internals/plugins/subtask2/utils/config.ts
-var CONFIG_PATH = join98(getOpenCodeConfigDir({ binary: "opencode" }), "subtask2.jsonc");
+var CONFIG_PATH = join99(getOpenCodeConfigDir({ binary: "opencode" }), "subtask2.jsonc");
 var cachedReadmeContent = null;
 async function loadReadmeContent() {
   if (cachedReadmeContent !== null) {
     return cachedReadmeContent;
   }
   try {
-    const pluginRoot = join98(dirname29(import.meta.path), "..", "..");
-    const readmePath = join98(pluginRoot, "README.md");
+    const pluginRoot = join99(dirname30(import.meta.path), "..", "..");
+    const readmePath = join99(pluginRoot, "README.md");
     const file3 = Bun.file(readmePath);
     if (await file3.exists()) {
       cachedReadmeContent = await file3.text();
@@ -157593,7 +157788,7 @@ async function loadConfig2() {
       }
     }
   } catch {}
-  mkdirSync18(dirname29(CONFIG_PATH), { recursive: true });
+  mkdirSync18(dirname30(CONFIG_PATH), { recursive: true });
   await Bun.write(CONFIG_PATH, `{
   // Replace OpenCode's generic "Summarize..." prompt when no return is specified
   "replace_generic": true,
@@ -157665,7 +157860,7 @@ function clearLog() {
 }
 
 // src/internals/plugins/subtask2/commands/manifest.ts
-import { join as join100 } from "path";
+import { join as join101 } from "path";
 
 // src/internals/plugins/subtask2/parsing/frontmatter.ts
 var import_yaml = __toESM(require_dist2(), 1);
@@ -157921,8 +158116,8 @@ function parseAutoWorkflowOutput(text) {
 async function buildManifest() {
   const manifest = {};
   const dirs = [
-    join100(getOpenCodeConfigDir({ binary: "opencode" }), "command"),
-    join100(Bun.env.PWD ?? ".", ".opencode", "command")
+    join101(getOpenCodeConfigDir({ binary: "opencode" }), "command"),
+    join101(Bun.env.PWD ?? ".", ".opencode", "command")
   ];
   for (const dir of dirs) {
     try {
@@ -158085,11 +158280,11 @@ async function resolveTurnReferences(text, sessionID) {
 }
 
 // src/internals/plugins/subtask2/commands/loader.ts
-import { join as join101 } from "path";
+import { join as join102 } from "path";
 async function loadCommandFile(name) {
   const dirs = [
-    join101(getOpenCodeConfigDir({ binary: "opencode" }), "command"),
-    join101(Bun.env.PWD ?? ".", ".opencode", "command")
+    join102(getOpenCodeConfigDir({ binary: "opencode" }), "command"),
+    join102(Bun.env.PWD ?? ".", ".opencode", "command")
   ];
   for (const dir of dirs) {
     const directPath = `${dir}/${name}.md`;
@@ -159369,14 +159564,14 @@ init_websearch_cited();
 // src/features/builtin-skills/materialize.ts
 import {
   cpSync,
-  existsSync as existsSync88,
+  existsSync as existsSync90,
   mkdirSync as mkdirSync20,
   readdirSync as readdirSync26,
-  readFileSync as readFileSync59,
+  readFileSync as readFileSync61,
   rmSync as rmSync4,
   writeFileSync as writeFileSync22
 } from "fs";
-import { join as join102 } from "path";
+import { join as join103 } from "path";
 var GENERATED_MARKER = "<!-- Generated by hiai-opencode builtin skill materializer. -->";
 var MANAGED_SKILL_METADATA = ".hiai-skill.json";
 var LEGACY_MANAGED_DIR_MARKER = ".hiai-plugin-skill";
@@ -159403,10 +159598,10 @@ function buildSkillFrontmatter(skill2) {
 `);
 }
 function shouldWriteSkillFile(skillFilePath) {
-  if (!existsSync88(skillFilePath))
+  if (!existsSync90(skillFilePath))
     return true;
   try {
-    const existing = readFileSync59(skillFilePath, "utf-8");
+    const existing = readFileSync61(skillFilePath, "utf-8");
     return existing.includes(GENERATED_MARKER);
   } catch {
     return false;
@@ -159414,10 +159609,10 @@ function shouldWriteSkillFile(skillFilePath) {
 }
 function getSkillLayout() {
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
-  const assembledSkillsDir = join102(configDir, "skills");
-  const sourceRootDir = join102(configDir, ".hiai", "skills");
-  const builtinSourceDir = join102(sourceRootDir, "builtin");
-  const pluginSourceDir = join102(sourceRootDir, "plugin");
+  const assembledSkillsDir = join103(configDir, "skills");
+  const sourceRootDir = join103(configDir, ".hiai", "skills");
+  const builtinSourceDir = join103(sourceRootDir, "builtin");
+  const pluginSourceDir = join103(sourceRootDir, "plugin");
   mkdirSync20(assembledSkillsDir, { recursive: true });
   mkdirSync20(builtinSourceDir, { recursive: true });
   mkdirSync20(pluginSourceDir, { recursive: true });
@@ -159430,31 +159625,31 @@ function getSkillLayout() {
   };
 }
 function writeManagedSkillMetadata(targetDir, metadata) {
-  writeFileSync22(join102(targetDir, MANAGED_SKILL_METADATA), `${JSON.stringify(metadata, null, 2)}
+  writeFileSync22(join103(targetDir, MANAGED_SKILL_METADATA), `${JSON.stringify(metadata, null, 2)}
 `, "utf-8");
 }
 function readManagedSkillMetadata(targetDir) {
-  const metadataPath = join102(targetDir, MANAGED_SKILL_METADATA);
-  if (!existsSync88(metadataPath)) {
+  const metadataPath = join103(targetDir, MANAGED_SKILL_METADATA);
+  if (!existsSync90(metadataPath)) {
     return null;
   }
   try {
-    return JSON.parse(readFileSync59(metadataPath, "utf-8"));
+    return JSON.parse(readFileSync61(metadataPath, "utf-8"));
   } catch {
     return null;
   }
 }
 function isLegacyManagedSkillDir(targetDir, origin) {
-  if (origin === "plugin" && existsSync88(join102(targetDir, LEGACY_MANAGED_DIR_MARKER))) {
+  if (origin === "plugin" && existsSync90(join103(targetDir, LEGACY_MANAGED_DIR_MARKER))) {
     return true;
   }
   if (origin === "builtin") {
-    const skillFilePath = join102(targetDir, "SKILL.md");
-    if (!existsSync88(skillFilePath)) {
+    const skillFilePath = join103(targetDir, "SKILL.md");
+    if (!existsSync90(skillFilePath)) {
       return false;
     }
     try {
-      return readFileSync59(skillFilePath, "utf-8").includes(GENERATED_MARKER);
+      return readFileSync61(skillFilePath, "utf-8").includes(GENERATED_MARKER);
     } catch {
       return false;
     }
@@ -159462,7 +159657,7 @@ function isLegacyManagedSkillDir(targetDir, origin) {
   return false;
 }
 function shouldSyncManagedSkillDir(targetDir, origin) {
-  if (!existsSync88(targetDir))
+  if (!existsSync90(targetDir))
     return true;
   const metadata = readManagedSkillMetadata(targetDir);
   if (metadata?.generatedBy === "hiai-opencode" && metadata.origin === origin) {
@@ -159478,7 +159673,7 @@ function shouldCleanupManagedSkillDir(targetDir, origin) {
   return isLegacyManagedSkillDir(targetDir, origin);
 }
 function cleanupRemovedManagedSkillDirs(rootDir, origin, expectedSkillNames) {
-  if (!existsSync88(rootDir)) {
+  if (!existsSync90(rootDir)) {
     return;
   }
   for (const entry of readdirSync26(rootDir, { withFileTypes: true })) {
@@ -159486,15 +159681,15 @@ function cleanupRemovedManagedSkillDirs(rootDir, origin, expectedSkillNames) {
       continue;
     if (expectedSkillNames.has(entry.name))
       continue;
-    const targetDir = join102(rootDir, entry.name);
+    const targetDir = join103(rootDir, entry.name);
     if (shouldCleanupManagedSkillDir(targetDir, origin)) {
       rmSync4(targetDir, { recursive: true, force: true });
     }
   }
 }
 function writeSkillRegistry(configDir, entries) {
-  const registryDir = join102(configDir, ".hiai");
-  const assembledSkillsDir = join102(configDir, "skills");
+  const registryDir = join103(configDir, ".hiai");
+  const assembledSkillsDir = join103(configDir, "skills");
   mkdirSync20(registryDir, { recursive: true });
   mkdirSync20(assembledSkillsDir, { recursive: true });
   const sortedEntries = [...entries].sort((left, right) => left.name.localeCompare(right.name));
@@ -159508,12 +159703,12 @@ function writeSkillRegistry(configDir, entries) {
     },
     layout: {
       assembledSkillsDir,
-      builtinSourceDir: join102(registryDir, "skills", "builtin"),
-      pluginSourceDir: join102(registryDir, "skills", "plugin")
+      builtinSourceDir: join103(registryDir, "skills", "builtin"),
+      pluginSourceDir: join103(registryDir, "skills", "plugin")
     },
     entries: sortedEntries
   };
-  writeFileSync22(join102(registryDir, "skill-registry.json"), `${JSON.stringify(payload, null, 2)}
+  writeFileSync22(join103(registryDir, "skill-registry.json"), `${JSON.stringify(payload, null, 2)}
 `, "utf-8");
   const readme = [
     "# Hiai Skill Layout",
@@ -159528,16 +159723,16 @@ function writeSkillRegistry(configDir, entries) {
     ""
   ].join(`
 `);
-  writeFileSync22(join102(assembledSkillsDir, "README.md"), readme, "utf-8");
+  writeFileSync22(join103(assembledSkillsDir, "README.md"), readme, "utf-8");
 }
 function materializeBuiltinSkills(skills) {
   const { assembledSkillsDir, builtinSourceDir } = getSkillLayout();
   const expectedSkillNames = new Set(skills.map((skill2) => skill2.name));
   for (const skill2 of skills) {
-    const sourceSkillDir = join102(builtinSourceDir, skill2.name);
-    const sourceSkillFilePath = join102(sourceSkillDir, "SKILL.md");
-    const assembledSkillDir = join102(assembledSkillsDir, skill2.name);
-    const assembledSkillFilePath = join102(assembledSkillDir, "SKILL.md");
+    const sourceSkillDir = join103(builtinSourceDir, skill2.name);
+    const sourceSkillFilePath = join103(sourceSkillDir, "SKILL.md");
+    const assembledSkillDir = join103(assembledSkillsDir, skill2.name);
+    const assembledSkillFilePath = join103(assembledSkillDir, "SKILL.md");
     const content = buildSkillFrontmatter(skill2);
     mkdirSync20(sourceSkillDir, { recursive: true });
     mkdirSync20(assembledSkillDir, { recursive: true });
@@ -159565,8 +159760,8 @@ function materializeBuiltinSkills(skills) {
   cleanupRemovedManagedSkillDirs(assembledSkillsDir, "builtin", expectedSkillNames);
 }
 function materializePluginSkillDirectories(pluginRootDir) {
-  const sourceSkillsDir = join102(pluginRootDir, "skills");
-  if (!existsSync88(sourceSkillsDir)) {
+  const sourceSkillsDir = join103(pluginRootDir, "skills");
+  if (!existsSync90(sourceSkillsDir)) {
     return;
   }
   const { assembledSkillsDir, pluginSourceDir, configDir } = getSkillLayout();
@@ -159578,9 +159773,9 @@ function materializePluginSkillDirectories(pluginRootDir) {
     if (entry.name === "tmp")
       continue;
     expectedSkillNames.add(entry.name);
-    const sourceDir = join102(sourceSkillsDir, entry.name);
-    const mirroredSourceDir = join102(pluginSourceDir, entry.name);
-    const assembledDir = join102(assembledSkillsDir, entry.name);
+    const sourceDir = join103(sourceSkillsDir, entry.name);
+    const mirroredSourceDir = join103(pluginSourceDir, entry.name);
+    const assembledDir = join103(assembledSkillsDir, entry.name);
     if (!shouldSyncManagedSkillDir(mirroredSourceDir, "plugin") || !shouldSyncManagedSkillDir(assembledDir, "plugin")) {
       continue;
     }
@@ -159614,7 +159809,7 @@ function materializePluginSkillDirectories(pluginRootDir) {
   for (const builtinEntry of readdirSync26(assembledSkillsDir, { withFileTypes: true })) {
     if (!builtinEntry.isDirectory())
       continue;
-    const assembledDir = join102(assembledSkillsDir, builtinEntry.name);
+    const assembledDir = join103(assembledSkillsDir, builtinEntry.name);
     const metadata = readManagedSkillMetadata(assembledDir);
     if (metadata?.generatedBy !== "hiai-opencode" || metadata.origin !== "builtin") {
       continue;
@@ -159637,10 +159832,11 @@ function configureBundledBunPtyLibrary() {
   }
   const libraryName = process.platform === "win32" ? "rust_pty.dll" : process.platform === "darwin" ? process.arch === "arm64" ? "librust_pty_arm64.dylib" : "librust_pty.dylib" : process.arch === "arm64" ? "librust_pty_arm64.so" : "librust_pty.so";
   const candidates = [
-    join104(import.meta.dirname, "..", "node_modules", "bun-pty", "rust-pty", "target", "release", libraryName),
-    join104(import.meta.dirname, "..", "..", "bun-pty", "rust-pty", "target", "release", libraryName)
+    join105(import.meta.dirname, "..", "node_modules", "bun-pty", "rust-pty", "target", "release", libraryName),
+    join105(import.meta.dirname, "..", "..", "bun-pty", "rust-pty", "target", "release", libraryName),
+    join105(import.meta.dirname, "..", "..", "..", "bun-pty", "rust-pty", "target", "release", libraryName)
   ];
-  const resolved = candidates.find((candidate) => existsSync90(candidate));
+  const resolved = candidates.find((candidate) => existsSync92(candidate));
   if (resolved) {
     process.env.BUN_PTY_LIB = resolved;
   }
@@ -159649,6 +159845,7 @@ var HiaiOpenCodePlugin = async (ctx) => {
   log("[HiaiOpenCodePlugin] ENTRY - plugin loading", {
     directory: ctx.directory
   });
+  warnIfListPluginEntry(ctx.directory);
   const skillPluginCheck = detectExternalSkillPlugin(ctx.directory);
   if (skillPluginCheck.detected && skillPluginCheck.pluginName) {
     console.warn(getSkillPluginConflictWarning(skillPluginCheck.pluginName));
@@ -159657,11 +159854,15 @@ var HiaiOpenCodePlugin = async (ctx) => {
   await activePluginDispose?.();
   const internalConfig = loadConfig(ctx.directory);
   const pluginConfig2 = hydratePluginConfigWithPlatformDefaults(loadPluginConfig(ctx.directory, ctx), internalConfig);
+  warnMissingRequiredMcpEnv({
+    pluginConfig: pluginConfig2,
+    platformConfig: internalConfig
+  });
   materializeBuiltinSkills(createBuiltinSkills({
     browserProvider: pluginConfig2.browser_automation_engine?.provider ?? "playwright",
     disabledSkills: new Set(pluginConfig2.disabled_skills ?? [])
   }));
-  materializePluginSkillDirectories(join104(import.meta.dirname, ".."));
+  materializePluginSkillDirectories(join105(import.meta.dirname, ".."));
   const { initializeModelRequirements: initializeModelRequirements2 } = await Promise.resolve().then(() => (init_model_requirements(), exports_model_requirements));
   initializeModelRequirements2(internalConfig);
   const { initializeModelHeuristics: initializeModelHeuristics2 } = await Promise.resolve().then(() => (init_model_capability_heuristics(), exports_model_capability_heuristics));
@@ -159761,30 +159962,25 @@ var HiaiOpenCodePlugin = async (ctx) => {
     auth: {
       provider: "hiai-opencode",
       methods: [
-        { type: "api", label: "Google API key" },
-        { type: "api", label: "OpenAI API key" },
-        { type: "api", label: "OpenRouter API key" }
+        { type: "api", label: "Google Search API key" }
       ],
       loader: async (getAuth) => {
         const authData = await getAuth();
         const { registerGetAuth: registerGetAuth2, GOOGLE_PROVIDER_ID: GOOGLE_PROVIDER_ID2, OPENAI_PROVIDER_ID: OPENAI_PROVIDER_ID2, OPENROUTER_PROVIDER_ID: OPENROUTER_PROVIDER_ID2 } = await Promise.resolve().then(() => (init_websearch_cited(), exports_websearch_cited));
-        const getKey = (label, configKey) => {
-          const fromAuth = authData[label];
-          if (fromAuth)
-            return fromAuth;
+        const getConfiguredKey = (configKey) => {
           if (configKey)
             return resolveEnvVars(configKey);
           return;
         };
-        const googleKey = getKey("Google API key", internalConfig.auth?.googleSearch);
-        const openaiKey = getKey("OpenAI API key", internalConfig.auth?.openai);
-        const openRouterKey = getKey("OpenRouter API key", internalConfig.auth?.openrouter);
+        const googleKey = authData["Google Search API key"] || getConfiguredKey(internalConfig.auth?.googleSearch);
+        const openaiKey = getConfiguredKey(internalConfig.auth?.openai);
+        const openRouterKey = getConfiguredKey(internalConfig.auth?.openrouter);
         if (googleKey)
-          registerGetAuth2(GOOGLE_PROVIDER_ID2, () => Promise.resolve(googleKey));
+          registerGetAuth2(GOOGLE_PROVIDER_ID2, () => Promise.resolve({ type: "api", key: googleKey }));
         if (openaiKey)
-          registerGetAuth2(OPENAI_PROVIDER_ID2, () => Promise.resolve(openaiKey));
+          registerGetAuth2(OPENAI_PROVIDER_ID2, () => Promise.resolve({ type: "api", key: openaiKey }));
         if (openRouterKey)
-          registerGetAuth2(OPENROUTER_PROVIDER_ID2, () => Promise.resolve(openRouterKey));
+          registerGetAuth2(OPENROUTER_PROVIDER_ID2, () => Promise.resolve({ type: "api", key: openRouterKey }));
         return {};
       }
     },