@hiai-gg/hiai-opencode 0.1.5 → 0.1.7

package/src/agents/coder/gpt-pro.ts

@@ -1,4 +1,5 @@
 /**
+ * PROMPT_VERSION: 2026-04-26
  * GPT-Pro optimized Coder prompt - entropy-reduced rewrite.
  *
  * Design principles (aligned with OpenAI GPT-Pro prompting guidance):
@@ -51,6 +52,7 @@ export function buildCoderPrompt(
     availableAgents,
     availableTools,
     availableSkills,
+    { includeIntegrationPrimer: true },
   );
   const researcherSection = buildResearcherSection(availableAgents);
   const categorySkillsGuide = buildCategorySkillsDelegationGuide(
@@ -72,7 +74,7 @@ You build context by examining the codebase first without assumptions. You think
 
 You are autonomous. When you see work to do, do it - run tests, fix issues, make decisions. Course-correct only on concrete failure. State assumptions in your final message, not as questions along the way. If you commit to doing something ("I'll fix X"), execute it before ending your turn. When a user's question implies action, answer briefly and do the implied work in the same turn. If you find something, act on it - do not explain findings without acting on them. Plans are starting lines, not finish lines - if you wrote a plan, execute it before ending your turn.
 
-When blocked: try a different approach, decompose the problem, challenge your assumptions, explore how others solved it. Asking the user is a last resort after exhausting creative alternatives. If you need context, fire explore/librarian agents in background immediately and continue only with non-overlapping work while they search. Continue only with non-overlapping work after launching background agents. If you notice a potential issue along the way, fix it or note it in your final message - do not ask for permission.
+When blocked: try a different approach, decompose the problem, challenge your assumptions, explore how others solved it. Asking the user is a last resort after exhausting creative alternatives. If you need context, fire researcher agents in background immediately and continue only with non-overlapping work while they search. Continue only with non-overlapping work after launching background agents. If you notice a potential issue along the way, fix it or note it in your final message - do not ask for permission.
 
 You handle multi-step sub-tasks of a single goal. What you receive is one goal that may require multiple steps - this is your primary use case. Only flag when given genuinely independent goals in one request.
 </identity>`;
@@ -157,7 +159,7 @@ Prefer tools over guessing whenever you need specific data (files, configs, patt
 Parallelize aggressively - this is where you gain the most speed and accuracy. Every independent operation should run simultaneously, not sequentially:
 - Multiple file reads: read 5 files at once, not one by one
 - Grep + file reads: search and read in the same turn
-- Multiple explore/librarian agents: fire 3-5 agents in parallel for different angles on the same question
+- Multiple researcher agents: fire 3-5 agents in parallel for different angles on the same question
 - Agent fires + direct tool calls: launch background agents AND do direct reads simultaneously
 
 Fire 2-5 researcher agents in parallel for any non-trivial codebase question. Researcher agents always run in background (\`run_in_background=true\`). Never use \`run_in_background=false\` for researcher. After launching, continue only with non-overlapping work. Continue only with non-overlapping work after launching background agents. If nothing independent remains, end your response and wait for the completion notification.

package/src/agents/coder/gpt.ts

@@ -1,4 +1,5 @@
-/** Generic GPT Coder prompt - fallback for GPT models without a model-specific variant */
+/** PROMPT_VERSION: 2026-04-26
+ * Generic GPT Coder prompt - fallback for GPT models without a model-specific variant */
 
 import { GPT_APPLY_PATCH_GUIDANCE } from "../gpt-apply-patch-guard"
 import type {
@@ -32,6 +33,7 @@ export function buildCoderPrompt(
     availableAgents,
     availableTools,
     availableSkills,
+    { includeIntegrationPrimer: true },
   );
   const researcherSection = buildResearcherSection(availableAgents);
   const categorySkillsGuide = buildCategorySkillsDelegationGuide(

package/src/agents/critic/agent.ts

@@ -1,3 +1,4 @@
+// PROMPT_VERSION: 2026-04-26
 import type { AgentConfig } from "@opencode-ai/sdk";
 import type { AgentMode, AgentPromptMetadata } from "../types";
 

package/src/agents/designer.ts

@@ -0,0 +1,70 @@
+// PROMPT_VERSION: 2026-04-26
+import type { AgentConfig } from "@opencode-ai/sdk";
+import type { AgentMode, AgentPromptMetadata } from "./types";
+import { createAgentToolRestrictions } from "../shared/permission-compat";
+
+const MODE: AgentMode = "subagent";
+
+const DESIGNER_PROMPT = `
+<identity>
+You are Designer, the visual and UX specialist for HiaiOpenCode.
+Your goal is crafting stunning UI/UX, design systems, and visual direction.
+</identity>
+
+<responsibilities>
+- Visual direction: concept, art direction, layout, branding, design-system guidance
+- UI feel: interaction patterns, hierarchy, visual coherence, polish beyond functional implementation
+- Design-system work: tokens, typography, color, spacing, component patterns
+- Frontend aesthetics review: taste, hierarchy, visual coherence
+</responsibilities>
+
+<instructions>
+- Ask about target audience, product context, desired emotional tone when missing.
+- Generate multiple visual directions with tradeoffs, then recommend one.
+- Consider accessibility, brand consistency, and technical feasibility.
+- When reviewing UI, focus on what makes it feel premium vs generic.
+</instructions>
+`;
+
+export function createDesignerAgent(model: string): AgentConfig {
+  const restrictions = createAgentToolRestrictions([
+    "apply_patch",
+    "task",
+  ]);
+
+  return {
+    description: "Visual direction, UI/UX design, design systems, and frontend aesthetics. (Designer - HiaiOpenCode)",
+    mode: MODE,
+    model,
+    temperature: 0.7,
+    ...restrictions,
+    prompt: DESIGNER_PROMPT,
+  } as AgentConfig;
+}
+createDesignerAgent.mode = MODE;
+
+export const designerPromptMetadata: AgentPromptMetadata = {
+  category: "specialist",
+  cost: "EXPENSIVE",
+  promptAlias: "Designer",
+  keyTrigger: "Visual direction, product UI feel, layout, branding, or design-system work → use designer/visual-engineering.",
+  triggers: [
+    {
+      domain: "Visual direction",
+      trigger: "Need UI concept, art direction, layout, branding, or design-system guidance",
+    },
+    {
+      domain: "Frontend aesthetics",
+      trigger: "Need polished interface design beyond functional implementation",
+    },
+  ],
+  useWhen: [
+    "Defining visual direction, layout, interaction feel, or design-system choices",
+    "Reviewing UI for taste, hierarchy, and visual coherence",
+  ],
+  avoidWhen: [
+    "Website copy or wording only (use Brainstormer/Writer)",
+    "Backend or infrastructure implementation",
+    "Pure file/media extraction (use Vision)",
+  ],
+};

package/src/agents/dynamic-agent-category-skills-guide.ts

@@ -18,6 +18,8 @@ function buildSkillsSection(skills: AvailableSkill[]): string {
   if (customSkills.length > 0 && builtinSkills.length > 0) {
     return `#### Available Skills (via \`skill\` tool)
 
+Skills are instruction packs, not agents. Do not look for \`strategist\`, \`critic\`, \`manager\`, or \`researcher\` here; call agents with \`task(subagent_type="...")\`.
+
 **Built-in**: ${builtinNames}
 **⚡ YOUR SKILLS (PRIORITY)**: ${customNames}
 
@@ -28,6 +30,8 @@ function buildSkillsSection(skills: AvailableSkill[]): string {
   if (customSkills.length > 0) {
     return `#### Available Skills (via \`skill\` tool)
 
+Skills are instruction packs, not agents. Do not look for \`strategist\`, \`critic\`, \`manager\`, or \`researcher\` here; call agents with \`task(subagent_type="...")\`.
+
 **⚡ YOUR SKILLS (PRIORITY)**: ${customNames}
 
 > User-installed skills OVERRIDE built-in defaults. ALWAYS prefer YOUR SKILLS when domain matches.
@@ -37,6 +41,8 @@ function buildSkillsSection(skills: AvailableSkill[]): string {
   if (builtinSkills.length > 0) {
     return `#### Available Skills (via \`skill\` tool)
 
+Skills are instruction packs, not agents. Do not look for \`strategist\`, \`critic\`, \`manager\`, or \`researcher\` here; call agents with \`task(subagent_type="...")\`.
+
 **Built-in**: ${builtinNames}
 
 > Full skill descriptions → use the \`skill\` tool to check before EVERY delegation.`

package/src/agents/dynamic-agent-core-sections.ts

@@ -45,6 +45,7 @@ export function buildToolSelectionTable(
   agents: AvailableAgent[],
   tools: AvailableTool[] = [],
   _skills: AvailableSkill[] = [],
+  options: { includeIntegrationPrimer?: boolean } = {},
 ): string {
   const rows: string[] = ["### Tool & Agent Selection:", ""]
 
@@ -72,10 +73,45 @@ export function buildToolSelectionTable(
   rows.push(
     "**Default flow**: researcher (background) + tools → strategist (if required) → critic (high-risk gate)",
   )
+  if (options.includeIntegrationPrimer) {
+    rows.push("")
+    rows.push(buildHiaiIntegrationPrimerSection())
+  }
 
   return rows.join("\n")
 }
 
+export function buildHiaiIntegrationPrimerSection(): string {
+  return `<hiai-opencode-integration-primer>
+## hiai-opencode Architecture And Integration Rules
+
+This workspace may use hiai-opencode, an OpenCode plugin that wires agents, skills, MCP launchers, LSP, diagnostics, and compatibility helpers around external upstream tools.
+
+Core rules:
+- OpenCode plugins are not MCP servers. Keep \`@hiai-gg/hiai-opencode\` and optional \`@tarquinen/opencode-dcp\` in the OpenCode plugin list; never add MCP packages such as \`firecrawl-mcp\`, \`@playwright/mcp\`, or \`@modelcontextprotocol/server-sequential-thinking\` to the plugin list.
+- User-facing config lives in \`hiai-opencode.json\` or \`.opencode/hiai-opencode.json\`: 10 model slots, MCP enable flags, LSP enable flags, service auth placeholders, and skill discovery switches.
+- Model provider credentials are configured through OpenCode Connect. Do not ask for \`OPENROUTER_API_KEY\`, \`OPENAI_API_KEY\`, or \`ANTHROPIC_API_KEY\` for normal model usage.
+- Service keys are separate: \`FIRECRAWL_API_KEY\`, \`STITCH_AI_API_KEY\`, \`CONTEXT7_API_KEY\`, and \`OPENCODE_RAG_URL\` when those services are enabled.
+
+MCP usage:
+- Run \`hiai-opencode doctor\` or \`hiai-opencode mcp-status\` for effective runtime MCP status.
+- \`opencode mcp list\` often reads only static \`.mcp.json\`; plugin runtime MCP may work even when that list is empty.
+- The plugin auto-exports \`.mcp.json\` when missing. Run \`hiai-opencode export-mcp .mcp.json\` to refresh static visibility.
+- \`skill_mcp\` can call skill-embedded MCP and enabled hiai-opencode MCP. If an MCP is "not found", check whether the skill was loaded, whether \`hiai-opencode.json\` enables it, and whether static export is needed.
+
+Memory and retrieval:
+- MemPalace MCP is external. If enabled, use \`mempalace_status\` first, search before answering about remembered people/projects/past decisions, and write diary entries when appropriate. Never invent memories.
+- RAG MCP is external/local. Use it for project knowledge search when \`OPENCODE_RAG_URL\` is configured or the default \`http://localhost:9002/tools/search\` is reachable.
+- Sequential Thinking MCP is for complex planning/revision/branching, not for trivial edits.
+- Firecrawl/Stitch/Context7 are external web/docs/research services; missing service keys should be reported by env var name only.
+
+Installation/debugging:
+- Use \`/doctor\` or \`hiai-opencode doctor\` before changing config.
+- Prefer user-level or project-local installs. Do not use sudo/admin rights unless explicitly requested.
+- If DCP is requested, install it separately with \`opencode plugin @tarquinen/opencode-dcp@latest --global\`.
+</hiai-opencode-integration-primer>`
+}
+
 export function buildResearcherSection(agents: AvailableAgent[]): string {
   const researcherAgent = agents.find((agent) => agent.name === "researcher")
   if (!researcherAgent) {

package/src/agents/dynamic-agent-prompt-builder.ts

@@ -13,6 +13,7 @@ export {
   buildToolSelectionTable,
   buildResearcherSection,
   buildDelegationTable,
+  buildHiaiIntegrationPrimerSection,
   buildStrategistAndCriticSection,
   buildNonClaudePlannerSection,
   buildParallelDelegationSection,

package/src/agents/guard/default.ts

@@ -1,3 +1,4 @@
+// PROMPT_VERSION: 2026-04-26
 import { buildGuardPrompt } from "./shared-prompt"
 import {
   DEFAULT_ATLAS_INTRO,

package/src/agents/guard/gemini.ts

@@ -1,3 +1,4 @@
+// PROMPT_VERSION: 2026-04-26
 import { buildGuardPrompt } from "./shared-prompt"
 import {
   GEMINI_ATLAS_INTRO,

package/src/agents/guard/gpt.ts

@@ -1,3 +1,4 @@
+// PROMPT_VERSION: 2026-04-26
 import { buildGuardPrompt } from "./shared-prompt"
 import {
   GPT_ATLAS_INTRO,

package/src/agents/platform-manager.ts

@@ -1,3 +1,4 @@
+// PROMPT_VERSION: 2026-04-26
 import type { AgentConfig } from "@opencode-ai/sdk";
 import type { AgentMode, AgentPromptMetadata } from "./types";
 import { createAgentToolRestrictions } from "../shared/permission-compat";
@@ -15,7 +16,7 @@ export function createPlatformManagerAgent(model: string): AgentConfig {
 
   return {
     description:
-      "Unified platform management agent for session continuity, project initialization, and mindmodel orchestration. (Manager - HiaiOpenCode)",
+      "Project memory steward for MemPalace, RAG handoff notes, TODO hygiene, session continuity, project initialization, and mindmodel orchestration. (Manager - HiaiOpenCode)",
     mode: MODE,
     model,
     temperature: 0.2,
@@ -31,6 +32,18 @@ export const platformManagerPromptMetadata: AgentPromptMetadata = {
   cost: "CHEAP",
   promptAlias: "Manager",
   triggers: [
+    {
+      domain: "Memory maintenance",
+      trigger: "Need to write durable decisions to MemPalace, avoid duplicates, or update project memory",
+    },
+    {
+      domain: "Architecture knowledge sync",
+      trigger: "Architecture decisions changed and MemPalace/RAG state should be updated",
+    },
+    {
+      domain: "TODO hygiene",
+      trigger: "Need completed items marked, stale tasks collapsed, or handoff state cleaned",
+    },
     {
       domain: "Session management",
       trigger: "Need to preserve session state or create continuity ledgers",
@@ -47,6 +60,9 @@ export const platformManagerPromptMetadata: AgentPromptMetadata = {
   useWhen: [
     "At beginning of session for project initialization",
     "At end of session for ledger creation",
+    "After durable architecture, product, or workflow decisions",
+    "When TODO/task lists need cleanup or completion status reconciliation",
+    "When MemPalace or RAG state must be checked or refreshed",
     "When mindmodel update is requested",
     "For rapid codebase discovery during bootstrapping",
   ],

package/src/agents/prompt-library/platform.ts

@@ -13,6 +13,40 @@ You are the Unified Platform Manager, responsible for orchestration, session con
 You consolidate the capabilities of the Ledger Creator, Bootstrapper, Project Initializer, and Mindmodel Orchestrator.
 </Platform_Manager_Identity>
 
+<Memory_And_Knowledge_Stewardship>
+## Mode: Memory, RAG, and Task Hygiene
+
+You are the durable project memory steward. Your job is to keep only decision-grade knowledge current, not to dump transcripts.
+
+### MemPalace protocol
+- Start memory work with \`mempalace_status\` when the MemPalace MCP is available.
+- Search before writing: use \`mempalace_search\` or related read tools to avoid duplicates.
+- Write only durable facts: architectural decisions, accepted tradeoffs, project conventions, long-lived TODO ownership, release decisions, and important user preferences.
+- Do not write noise: transient debugging attempts, failed commands without lasting lesson, repeated summaries, raw chat logs, or obvious file diffs.
+- When facts change, invalidate or update old knowledge instead of appending conflicting facts.
+- Prefer AAAK-style concise entries: actor, artifact, action, knowledge, timestamp/context.
+- Use diary entries for session summaries only when they contain decisions or handoff-relevant state.
+
+### RAG protocol
+- Treat the bundled RAG MCP as retrieval-first unless its configured endpoint exposes write/upsert tools.
+- When architecture decisions change, first store the durable decision in MemPalace.
+- If a RAG write/upsert capability is available, sync the same decision-level summary there.
+- If RAG is search-only, report "RAG sync pending/search-only" rather than pretending it was updated.
+
+### TODO and task hygiene
+- Verify active TODO/task lists before closure.
+- Mark completed items as completed; do not leave finished work as pending.
+- Preserve unfinished work with owner, next action, and blocker.
+- Remove or collapse stale duplicate TODOs.
+- Before final response, provide a short ledger: memory updated, RAG updated or pending, TODO state clean or remaining.
+
+### When to run Manager
+- Session start: load current memory and identify stale/important project state.
+- After architecture/design decisions: update MemPalace and, when possible, RAG.
+- Before handoff/final closure: clean TODO state and write a concise memory checkpoint.
+- During long work: periodically consolidate only durable decisions.
+</Memory_And_Knowledge_Stewardship>
+
 <Capability_Ledger>
 ## Mode: Session Continuity (Ledger)
 ${ledger}

package/src/agents/researcher.ts

@@ -1,3 +1,4 @@
+// PROMPT_VERSION: 2026-04-26
 import type { AgentConfig } from "@opencode-ai/sdk";
 import type { AgentMode, AgentPromptMetadata } from "./types";
 import { createAgentToolRestrictions } from "../shared/permission-compat";

package/src/agents/strategist/gemini.ts

@@ -1,4 +1,5 @@
 /**
+ * PROMPT_VERSION: 2026-04-26
  * Gemini-optimized Strategist System Prompt
  *
  * Key differences from Claude/GPT variants:

package/src/agents/strategist/gpt.ts

@@ -1,4 +1,5 @@
 /**
+ * PROMPT_VERSION: 2026-04-26
  * GPT-5.4 Optimized Strategist System Prompt
  *
  * Tuned for GPT-5.4 system prompt design principles:

package/src/agents/types.ts

@@ -66,8 +66,11 @@ export interface AgentPromptMetadata {
   /** Nickname/alias used in prompt (e.g., "Logician" instead of "logician") */
   promptAlias?: string;
 
-  /** Key triggers that should appear in Phase 0 (e.g., "External library mentioned → fire librarian") */
+  /** Key triggers that should appear in Phase 0 (e.g., "External library mentioned → fire researcher") */
   keyTrigger?: string;
+
+  /** Prompt version for snapshot tracking (format: YYYY-MM-DD) */
+  promptVersion?: string;
 }
 
 function extractModelName(model: string): string {

package/src/agents/ui.ts

@@ -1,3 +1,4 @@
+// PROMPT_VERSION: 2026-04-26
 import type { AgentConfig } from "@opencode-ai/sdk"
 import type { AgentMode, AgentPromptMetadata } from "./types"
 import { createAgentToolAllowlist } from "../shared/permission-compat"

package/src/config/defaults.ts

@@ -20,6 +20,7 @@ const REQUIRED_MODEL_SLOTS = [
   "manager",
   "brainstormer",
   "vision",
+  "sub",
 ] as const
 
 type ModelSlot = (typeof REQUIRED_MODEL_SLOTS)[number]
@@ -109,24 +110,29 @@ function deriveAgents(models: Record<ModelSlot, string>): HiaiOpencodeConfig["ag
     "platform-manager": { model: models.manager },
     brainstormer: { model: models.brainstormer },
     multimodal: { model: models.vision },
-    sub: { model: models.coder },
+    sub: { model: models.sub },
     "quality-guardian": { model: models.critic },
     "agent-skills": { model: models.manager },
   }
 }
 
-function deriveCategories(models: Record<ModelSlot, string>): HiaiOpencodeConfig["categories"] {
-  return {
-    "visual-engineering": { model: models.designer, variant: "high" },
-    artistry: { model: models.designer, variant: "high" },
-    ultrabrain: { model: models.strategist, variant: "xhigh" },
-    deep: { model: models.coder, variant: "medium" },
-    quick: { model: models.researcher },
-    writing: { model: models.brainstormer },
-    git: { model: models.manager },
-    "unspecified-low": { model: models.coder },
-    "unspecified-high": { model: models.bob, variant: "max" },
+function deriveCategories(models: Record<ModelSlot, string>): Record<string, import("./types").CategoryConfig> {
+  const categories: Record<string, import("./types").CategoryConfig> = {}
+  const entries: [string, Record<string, unknown>][] = [
+    ["visual-engineering", { variant: "high" }],
+    ["artistry", { variant: "high" }],
+    ["ultrabrain", { variant: "xhigh" }],
+    ["deep", { variant: "medium" }],
+    ["quick", {}],
+    ["writing", {}],
+    ["git", {}],
+    ["unspecified-low", {}],
+    ["unspecified-high", { variant: "max" }],
+  ]
+  for (const [name, cfg] of entries) {
+    categories[name] = cfg as import("./types").CategoryConfig
   }
+  return categories
 }
 
 function deriveMcp(config: HiaiOpencodeConfig): HiaiOpencodeConfig["mcp"] {
@@ -135,7 +141,33 @@ function deriveMcp(config: HiaiOpencodeConfig): HiaiOpencodeConfig["mcp"] {
   return Object.fromEntries(
     Object.entries(defaults).map(([name, entry]) => {
       const override = userMcp[name] ?? {}
-      return [name, { ...entry, ...override }]
+      const merged = { ...entry, ...override }
+
+      if (name === "mempalace" && typeof merged.pythonPath === "string" && merged.pythonPath.trim()) {
+        merged.environment = {
+          ...(entry.environment ?? {}),
+          ...(merged.environment ?? {}),
+          MEMPALACE_PYTHON: merged.pythonPath.trim(),
+        }
+      }
+
+      if (name === "websearch") {
+        const provider = merged.provider === "tavily" ? "tavily" : "exa"
+        merged.provider = provider
+        merged.type = "remote"
+        if (provider === "tavily") {
+          merged.url = "https://mcp.tavily.com/mcp/"
+          merged.headers = { Authorization: "Bearer {env:TAVILY_API_KEY}" }
+        } else {
+          merged.url = "https://mcp.exa.ai/mcp?tools=web_search_exa"
+          merged.headers = { "x-api-key": "{env:EXA_API_KEY}" }
+        }
+      }
+
+      // Internal launcher hint; do not leak unknown keys into final OpenCode MCP server config.
+      delete merged.pythonPath
+
+      return [name, merged]
     }),
   )
 }

package/src/config/index.ts

@@ -62,5 +62,4 @@ export type { RalphLoopConfig } from "./schema/ralph-loop.js";
 export type { DynamicContextPruningConfig } from "./schema/dynamic-context-pruning.js";
 export type { GitMasterConfig } from "./schema/git-master.js";
 export type { ModelCapabilitiesConfig } from "./schema/model-capabilities.js";
-export type { WebsearchConfig, WebsearchProvider } from "./schema/websearch.js";
 export type { FastApplyConfig } from "./schema/fast-apply.js";

package/src/config/model-slots-and-export.test.ts

@@ -0,0 +1,73 @@
+import { expect, test } from "bun:test"
+
+import { applyModelSlots } from "./defaults"
+import type { HiaiOpencodeConfig } from "./types"
+import { buildStaticMcpJson, MCP_EXPORT_MARKER } from "../shared/mcp-static-export"
+import { buildHiaiIntegrationPrimerSection } from "../agents/dynamic-agent-core-sections"
+
+const baseConfig: HiaiOpencodeConfig = {
+  models: {
+    bob: { model: "openrouter/test/bob", recommended: "xhigh" },
+    coder: { model: "openrouter/test/coder", recommended: "high" },
+    strategist: { model: "openrouter/test/strategist", recommended: "high" },
+    guard: { model: "openrouter/test/guard", recommended: "middle" },
+    critic: { model: "openrouter/test/critic", recommended: "high" },
+    designer: { model: "openrouter/test/designer", recommended: "design" },
+    researcher: { model: "openrouter/test/researcher", recommended: "fast" },
+    manager: { model: "openrouter/test/manager", recommended: "fast" },
+    brainstormer: { model: "openrouter/test/brainstormer", recommended: "writing" },
+    vision: { model: "openrouter/test/vision", recommended: "vision" },
+    sub: { model: "openrouter/test/sub", recommended: "fast" },
+  },
+  mcp: {
+    mempalace: { enabled: true, pythonPath: "/opt/venv/bin/python" },
+  },
+}
+
+test("model slots derive canonical agents and categories", () => {
+  const resolved = applyModelSlots(baseConfig)
+  expect(resolved.agents?.bob?.model).toBe("openrouter/test/bob")
+  expect(resolved.agents?.coder?.model).toBe("openrouter/test/coder")
+  expect(resolved.agents?.["platform-manager"]?.model).toBe("openrouter/test/manager")
+  expect(resolved.agents?.sub?.model).toBe("openrouter/test/sub")
+  expect(resolved.categories?.artistry?.variant).toBe("high")
+  expect(resolved.categories?.ultrabrain?.variant).toBe("xhigh")
+  expect(resolved.categories?.deep?.variant).toBe("medium")
+  expect(resolved.categories?.quick).toBeDefined()
+  expect(resolved.categories?.writing).toBeDefined()
+  expect(resolved.categories?.git).toBeDefined()
+})
+
+test("compact MCP mempalace pythonPath is materialized into environment", () => {
+  const resolved = applyModelSlots(baseConfig)
+  expect(resolved.mcp?.mempalace?.environment?.MEMPALACE_PYTHON).toBe("/opt/venv/bin/python")
+})
+
+test("static MCP export includes marker metadata and servers", () => {
+  const resolved = applyModelSlots(baseConfig)
+  const exported = buildStaticMcpJson(resolved)
+
+  expect(exported._meta?.generatedBy).toBe(MCP_EXPORT_MARKER)
+  expect(exported._meta?.version).toBe(1)
+  expect(exported.mcpServers.playwright).toBeDefined()
+  expect(exported.mcpServers.mempalace).toBeDefined()
+  expect(exported.mcpServers.websearch).toBeDefined()
+  expect(exported.mcpServers.grep_app).toBeDefined()
+})
+
+test("websearch MCP provider is selected from the MCP switchboard", () => {
+  const resolved = applyModelSlots({
+    ...baseConfig,
+    mcp: {
+      websearch: { enabled: true, provider: "tavily" },
+    },
+  })
+
+  expect(resolved.mcp?.websearch?.url).toBe("https://mcp.tavily.com/mcp/")
+  expect(resolved.mcp?.websearch?.headers?.Authorization).toBe("Bearer {env:TAVILY_API_KEY}")
+})
+
+test("integration primer does not request model provider API keys", () => {
+  const primer = buildHiaiIntegrationPrimerSection()
+  expect(primer).toContain("Do not ask for `OPENROUTER_API_KEY`, `OPENAI_API_KEY`, or `ANTHROPIC_API_KEY`")
+})

package/src/config/platform-schema.ts

@@ -37,6 +37,7 @@ export const ModelSlotsConfigSchema = z.object({
   manager: ModelSlotConfigSchema.optional(),
   brainstormer: ModelSlotConfigSchema.optional(),
   vision: ModelSlotConfigSchema.optional(),
+  sub: ModelSlotConfigSchema.optional(),
 });
 
 export const FallbackEntrySchema = z.object({
@@ -71,11 +72,13 @@ export const CategoryConfigSchema = z.object({
 export const McpServerConfigSchema = z.object({
   enabled: z.boolean().default(true),
   type: z.enum(["remote", "local"]).optional(),
+  provider: z.enum(["exa", "tavily"]).optional(),
   url: z.string().optional(),
   headers: z.record(z.string(), z.string()).optional(),
   command: z.array(z.string()).optional(),
   timeout: z.number().optional(),
   environment: z.record(z.string(), z.string()).optional(),
+  pythonPath: z.string().optional(),
 });
 
 export const LspServerConfigSchema = z.object({
@@ -129,9 +132,6 @@ export const PermissionsConfigSchema = z.object({
 });
 
 export const AuthKeysSchema = z.object({
-  googleSearch: z.string().optional(),
-  openai: z.string().optional(),
-  openrouter: z.string().optional(),
   stitch: z.string().optional(),
   firecrawl: z.string().optional(),
   context7: z.string().optional(),

package/src/config/schema/commands.ts

@@ -10,6 +10,7 @@ export const BuiltinCommandNameSchema = z.enum([
   "stop-continuation",
   "remove-ai-slops",
   "mcp-status",
+  "doctor",
 ])
 
 export type BuiltinCommandName = z.infer<typeof BuiltinCommandNameSchema>

package/src/config/schema/hooks.ts

@@ -38,8 +38,6 @@ export const HookNameSchema = z.enum([
   "delegate-task-retry",
   "strategist-md-only",
   "sub-notepad",
-  "no-bob-gpt",
-  "no-coder-non-gpt",
   "start-work",
   "guard",
   "unstable-agent-babysitter",

package/src/config/schema/index.ts

@@ -50,5 +50,3 @@ export { StartWorkConfigSchema } from "./start-work"
 export type { StartWorkConfig } from "./start-work"
 export { TmuxConfigSchema, TmuxLayoutSchema, TmuxIsolationSchema } from "./tmux"
 export type { TmuxConfig, TmuxLayout, TmuxIsolation } from "./tmux"
-export { WebsearchConfigSchema } from "./websearch"
-export type { WebsearchConfig, WebsearchProvider } from "./websearch"

package/src/config/schema/oh-my-opencode-config.ts

@@ -23,12 +23,8 @@ import { BobAgentConfigSchema } from "./bob-agent"
 import { TmuxConfigSchema } from "./tmux"
 import { StartWorkConfigSchema } from "./start-work"
 import { FastApplyConfigSchema } from "./fast-apply"
-import { WebsearchConfigSchema } from "./websearch"
 
 const AuthConfigSchema = z.object({
-  googleSearch: z.string().optional(),
-  openai: z.string().optional(),
-  openrouter: z.string().optional(),
   stitch: z.string().optional(),
   firecrawl: z.string().optional(),
   context7: z.string().optional(),
@@ -81,7 +77,6 @@ export const HiaiOpenCodeConfigSchema = z.object({
     git_env_prefix: "GIT_MASTER=1",
   }),
   browser_automation_engine: BrowserAutomationConfigSchema.optional(),
-  websearch: WebsearchConfigSchema.optional(),
   tmux: TmuxConfigSchema.optional(),
   "bob": BobConfigSchema.optional(),
   start_work: StartWorkConfigSchema.optional(),

package/src/config/types.ts

@@ -34,6 +34,7 @@ export interface ModelSlotsConfig {
   manager?: ModelSlotConfig;
   brainstormer?: ModelSlotConfig;
   vision?: ModelSlotConfig;
+  sub?: ModelSlotConfig;
 }
 
 // Canonical 12-agent model exposed by schema/default config.
@@ -136,7 +137,7 @@ export interface HeuristicModelFamilyDefinition {
 }
 
 export interface CategoryConfig {
-  model: string;
+  model?: string;
   variant?: string;
   description?: string;
   fallbackChain?: FallbackEntry[];
@@ -145,11 +146,13 @@ export interface CategoryConfig {
 export interface McpServerConfig {
   enabled: boolean;
   type?: "remote" | "local";
+  provider?: "exa" | "tavily";
   url?: string;
   headers?: Record<string, string>;
   command?: string[];
   timeout?: number;
   environment?: Record<string, string>;
+  pythonPath?: string;
 }
 
 export interface LspServerConfig {
@@ -187,9 +190,6 @@ export interface PermissionsConfig {
 }
 
 export interface AuthKeys {
-  googleSearch?: string;
-  openai?: string;
-  openrouter?: string;
   stitch?: string;
   firecrawl?: string;
   context7?: string;