@hiai-gg/hiai-opencode 0.1.6 → 0.1.7

package/src/hooks/keyword-detector/ultrawork/gemini.ts

@@ -66,9 +66,9 @@ Where TYPE is one of: research | implementation | investigation | evaluation | f
 **IF YOU ARE NOT 100% CERTAIN:**
 
 1. **THINK DEEPLY** - What is the user's TRUE intent? What problem are they REALLY trying to solve?
-2. **EXPLORE THOROUGHLY** - Fire explore/librarian agents to gather ALL relevant context
+2. **EXPLORE THOROUGHLY** - Fire researcher agents (multiple parallel) to gather ALL relevant context
 3. **CONSULT SPECIALISTS** - For hard/complex tasks, DO NOT struggle alone. Delegate:
-   - **Logician**: Conventional problems - architecture, debugging, complex logic
+   - **Strategist**: Conventional problems - architecture, debugging, complex logic
    - **Artistry**: Non-conventional problems - different approach needed, unusual constraints
 4. **ASK THE USER** - If ambiguity remains after exploration, ASK. Don't guess.
 
@@ -81,9 +81,9 @@ Where TYPE is one of: research | implementation | investigation | evaluation | f
 
 **WHEN IN DOUBT:**
 \`\`\`
-task(subagent_type="explore", load_skills=[], prompt="I'm implementing [TASK DESCRIPTION] and need to understand [SPECIFIC KNOWLEDGE GAP]. Find [X] patterns in the codebase - show file paths, implementation approach, and conventions used. I'll use this to [HOW RESULTS WILL BE USED]. Focus on src/ directories, skip test files unless test patterns are specifically needed. Return concrete file paths with brief descriptions of what each file does.", run_in_background=true)
-task(subagent_type="librarian", load_skills=[], prompt="I'm working with [LIBRARY/TECHNOLOGY] and need [SPECIFIC INFORMATION]. Find official documentation and production-quality examples for [Y] - specifically: API reference, configuration options, recommended patterns, and common pitfalls. Skip beginner tutorials. I'll use this to [DECISION THIS WILL INFORM].", run_in_background=true)
-task(subagent_type="logician", load_skills=[], prompt="I need architectural review of my approach to [TASK]. Here's my plan: [DESCRIBE PLAN WITH SPECIFIC FILES AND CHANGES]. My concerns are: [LIST SPECIFIC UNCERTAINTIES]. Please evaluate: correctness of approach, potential issues I'm missing, and whether a better alternative exists.", run_in_background=false)
+task(subagent_type="researcher", load_skills=[], prompt="I'm implementing [TASK DESCRIPTION] and need to understand [SPECIFIC KNOWLEDGE GAP]. Find [X] patterns in the codebase - show file paths, implementation approach, and conventions used. I'll use this to [HOW RESULTS WILL BE USED]. Focus on src/ directories, skip test files unless test patterns are specifically needed. Return concrete file paths with brief descriptions of what each file does.", run_in_background=true)
+task(subagent_type="researcher", load_skills=[], prompt="I'm working with [LIBRARY/TECHNOLOGY] and need [SPECIFIC INFORMATION]. Find official documentation and production-quality examples for [Y] - specifically: API reference, configuration options, recommended patterns, and common pitfalls. Skip beginner tutorials. I'll use this to [DECISION THIS WILL INFORM].", run_in_background=true)
+task(subagent_type="strategist", load_skills=[], prompt="I need architectural review of my approach to [TASK]. Here's my plan: [DESCRIBE PLAN WITH SPECIFIC FILES AND CHANGES]. My concerns are: [LIST SPECIFIC UNCERTAINTIES]. Please evaluate: correctness of approach, potential issues I'm missing, and whether a better alternative exists.", run_in_background=false)
 \`\`\`
 
 **ONLY AFTER YOU HAVE:**
@@ -118,7 +118,7 @@ task(subagent_type="logician", load_skills=[], prompt="I need architectural revi
 **IF YOU ENCOUNTER A BLOCKER:**
 1. **DO NOT** give up
 2. **DO NOT** deliver a compromised version
-3. **DO** consult specialists (logician for conventional, artistry for non-conventional)
+3. **DO** consult specialists (strategist for conventional, artistry for non-conventional)
 4. **DO** ask the user for guidance
 5. **DO** explore alternative approaches
 
@@ -150,26 +150,26 @@ TELL THE USER WHAT AGENTS YOU WILL LEVERAGE NOW TO SATISFY USER'S REQUEST.
 
 | Condition | Action |
 |-----------|--------|
-| Task has 2+ steps | MUST call plan agent |
-| Task scope unclear | MUST call plan agent |
-| Implementation required | MUST call plan agent |
-| Architecture decision needed | MUST call plan agent |
+| Task has 2+ steps | MUST call strategist agent |
+| Task scope unclear | MUST call strategist agent |
+| Implementation required | MUST call strategist agent |
+| Architecture decision needed | MUST call strategist agent |
 
 \`\`\`
-task(subagent_type="plan", load_skills=[], run_in_background=false, prompt="<gathered context + user request>")
+task(subagent_type="strategist", load_skills=[], run_in_background=false, prompt="<gathered context + user request>")
 \`\`\`
 
-### SESSION CONTINUITY WITH PLAN AGENT (CRITICAL)
+### SESSION CONTINUITY WITH STRATEGIST AGENT (CRITICAL)
 
-**Plan agent returns a session_id. USE IT for follow-up interactions.**
+**Strategist agent returns a session_id. USE IT for follow-up interactions.**
 
 | Scenario | Action |
 |----------|--------|
-| Plan agent asks clarifying questions | \`task(session_id="{returned_session_id}", load_skills=[], run_in_background=false, prompt="<your answer>")\` |
+| Strategist asks clarifying questions | \`task(session_id="{returned_session_id}", load_skills=[], run_in_background=false, prompt="<your answer>")\` |
 | Need to refine the plan | \`task(session_id="{returned_session_id}", load_skills=[], run_in_background=false, prompt="Please adjust: <feedback>")\` |
-| Plan needs more detail | \`task(session_id="{returned_session_id}", load_skills=[], run_in_background=false, prompt="Add more detail to Task N")\` |
+| Strategist needs more detail | \`task(session_id="{returned_session_id}", load_skills=[], run_in_background=false, prompt="Add more detail to Task N")\` |
 
-**FAILURE TO CALL PLAN AGENT = INCOMPLETE WORK.**
+**FAILURE TO CALL STRATEGIST AGENT = INCOMPLETE WORK.**
 
 ---
 
@@ -181,10 +181,10 @@ task(subagent_type="plan", load_skills=[], run_in_background=false, prompt="<gat
 
 | Task Type | Action | Why |
 |-----------|--------|-----|
-| Codebase exploration | task(subagent_type="explore", load_skills=[], run_in_background=true) | Parallel, context-efficient |
-| Documentation lookup | task(subagent_type="librarian", load_skills=[], run_in_background=true) | Specialized knowledge |
-| Planning | task(subagent_type="plan", load_skills=[], run_in_background=false) | Parallel task graph + structured TODO list |
-| Hard problem (conventional) | task(subagent_type="logician", load_skills=[], run_in_background=false) | Architecture, debugging, complex logic |
+| Codebase exploration | task(subagent_type="researcher", load_skills=[], run_in_background=true) | Parallel, context-efficient |
+| Documentation lookup | task(subagent_type="researcher", load_skills=[], run_in_background=true) | Specialized knowledge |
+| Planning | task(subagent_type="strategist", load_skills=[], run_in_background=false) | Parallel task graph + structured TODO list |
+| Hard problem (conventional) | task(subagent_type="strategist", load_skills=[], run_in_background=false) | Architecture, debugging, complex logic |
 | Hard problem (non-conventional) | task(category="artistry", load_skills=[...], run_in_background=true) | Different approach needed |
 | Implementation | task(category="...", load_skills=[...], run_in_background=true) | Domain-optimized models |
 
@@ -206,7 +206,7 @@ task(subagent_type="plan", load_skills=[], run_in_background=false, prompt="<gat
 
 ## WORKFLOW
 1. **CLASSIFY INTENT** (MANDATORY - see GEMINI_INTENT_GATE above)
-2. Spawn exploration/librarian agents via task(run_in_background=true) in PARALLEL
+2. Spawn researcher agents via task(run_in_background=true) in PARALLEL
 3. Use Plan agent with gathered context to create detailed work breakdown
 4. Execute with continuous verification against original requirements
 

package/src/hooks/keyword-detector/ultrawork/gpt.ts

@@ -69,15 +69,13 @@ Use these when they provide clear value based on the decision framework above:
 
 | Resource | When to Use | How to Use |
 |----------|-------------|------------|
-| explore agent | Need codebase patterns you don't have | \`task(subagent_type="explore", load_skills=[], run_in_background=true, ...)\` |
-| librarian agent | External library docs, OSS examples | \`task(subagent_type="librarian", load_skills=[], run_in_background=true, ...)\` |
-| logician agent | Stuck on architecture/debugging after 2+ attempts | \`task(subagent_type="logician", load_skills=[], run_in_background=false, ...)\` |
-| plan agent | Complex multi-step with dependencies (5+ steps) | \`task(subagent_type="plan", load_skills=[], run_in_background=false, ...)\` |
+| researcher agent | Need codebase patterns or external docs | \`task(subagent_type="researcher", load_skills=[], run_in_background=true, ...)\` |
+| strategist agent | Complex multi-step (5+ steps) or architecture decisions | \`task(subagent_type="strategist", load_skills=[], run_in_background=false, ...)\` |
 | task category | Specialized work matching a category | \`task(category="...", load_skills=[...], run_in_background=true)\` |
 
 <tool_usage_rules>
 - Prefer tools over internal knowledge for fresh or user-specific data
-- Parallelize independent reads (read_file, grep, explore, librarian) to reduce latency
+- Parallelize independent reads (read_file, grep, researcher) to reduce latency
 - After any write/update, briefly restate: What changed, Where (path), Follow-up needed
 </tool_usage_rules>
 
@@ -88,13 +86,13 @@ Use these when they provide clear value based on the decision framework above:
 | Track | Tools | Speed | Purpose |
 |-------|-------|-------|---------|
 | **Direct** | Grep, Read, LSP, AST-grep | Instant | Quick wins, known locations |
-| **Background** | explore, librarian agents | Async | Deep search, external docs |
+| **Background** | researcher agents | Async | Deep search, external docs |
 
 **ALWAYS run both tracks in parallel:**
 \`\`\`
 // Fire background agents for deep exploration
-task(subagent_type="explore", load_skills=[], prompt="I'm implementing [TASK] and need to understand [KNOWLEDGE GAP]. Find [X] patterns in the codebase - file paths, implementation approach, conventions used, and how modules connect. I'll use this to [DOWNSTREAM DECISION]. Focus on production code in src/. Return file paths with brief descriptions.", run_in_background=true)
-task(subagent_type="librarian", load_skills=[], prompt="I'm working with [TECHNOLOGY] and need [SPECIFIC INFO]. Find official docs and production examples for [Y] - API reference, configuration, recommended patterns, and pitfalls. Skip tutorials. I'll use this to [DECISION THIS INFORMS].", run_in_background=true)
+task(subagent_type="researcher", load_skills=[], prompt="I'm implementing [TASK] and need to understand [KNOWLEDGE GAP]. Find [X] patterns in the codebase - file paths, implementation approach, conventions used, and how modules connect. I'll use this to [DOWNSTREAM DECISION]. Focus on production code in src/. Return file paths with brief descriptions.", run_in_background=true)
+task(subagent_type="researcher", load_skills=[], prompt="I'm working with [TECHNOLOGY] and need [SPECIFIC INFO]. Find official docs and production examples for [Y] - API reference, configuration, recommended patterns, and pitfalls. Skip tutorials. I'll use this to [DECISION THIS INFORMS].", run_in_background=true)
 
 // WHILE THEY RUN - use direct tools for immediate context
 grep(pattern="relevant_pattern", path="src/")

package/src/hooks/keyword-detector/ultrawork/planner.ts

@@ -33,14 +33,14 @@ REFUSE. Say: "I'm a planner. I create work plans, not implementations. Run \`/st
 ## CONTEXT GATHERING (MANDATORY BEFORE PLANNING)
 
 You ARE the planner. Your job: create bulletproof work plans.
-**Before drafting ANY plan, gather context via explore/librarian agents.**
+**Before drafting ANY plan, gather context via researcher agents.**
 
 ### Research Protocol
 1. **Fire parallel background agents** for comprehensive context:
    \`\`\`
-   task(subagent_type="explore", load_skills=[], prompt="Find existing patterns for [topic] in codebase", run_in_background=true)
-   task(subagent_type="explore", load_skills=[], prompt="Find test infrastructure and conventions", run_in_background=true)
-   task(subagent_type="librarian", load_skills=[], prompt="Find official docs and best practices for [technology]", run_in_background=true)
+   task(subagent_type="researcher", load_skills=[], prompt="Find existing patterns for [topic] in codebase", run_in_background=true)
+   task(subagent_type="researcher", load_skills=[], prompt="Find test infrastructure and conventions", run_in_background=true)
+   task(subagent_type="researcher", load_skills=[], prompt="Find official docs and best practices for [technology]", run_in_background=true)
    \`\`\`
 2. **Wait for results** before planning - rushed plans fail
 3. **Synthesize findings** into informed requirements
@@ -49,7 +49,7 @@ You ARE the planner. Your job: create bulletproof work plans.
 - Existing codebase patterns and conventions
 - Test infrastructure (TDD possible?)
 - External library APIs and constraints
-- Similar implementations in OSS (via librarian)
+- Similar implementations in OSS (via researcher)
 
 **NEVER plan blind. Context first, plan second.**
 

package/src/index.ts

@@ -14,12 +14,13 @@ import { createPluginDispose, type PluginDispose } from "./plugin-dispose"
 import { loadPluginConfig } from "./plugin-config"
 import { createModelCacheState } from "./plugin-state"
 import { createFirstMessageVariantGate } from "./shared/first-message-variant"
-import { injectServerAuthIntoClient, log } from "./shared"
+import { injectServerAuthIntoClient, log, logWarn, logError } from "./shared"
 import { hydratePluginConfigWithPlatformDefaults } from "./shared/runtime-plugin-config"
 import { detectExternalSkillPlugin, getSkillPluginConflictWarning } from "./shared/external-plugin-detector"
 import { PLUGIN_NAME } from "./shared/plugin-identity"
 import { autoExportStaticMcpJson } from "./shared/mcp-static-export"
 import { warnIfListPluginEntry, warnMissingRequiredMcpEnv } from "./shared/startup-diagnostics"
+import { lintModeAgentCapabilities } from "./plugin/startup-diagnostics"
 import { startBackgroundCheck as startTmuxCheck } from "./tools/interactive-bash"
 import { lspManager } from "./tools/lsp/client"
 
@@ -71,7 +72,7 @@ const HiaiOpenCodePlugin: Plugin = async (ctx) => {
 
   const skillPluginCheck = detectExternalSkillPlugin(ctx.directory)
   if (skillPluginCheck.detected && skillPluginCheck.pluginName) {
-    console.warn(getSkillPluginConflictWarning(skillPluginCheck.pluginName))
+    logWarn(getSkillPluginConflictWarning(skillPluginCheck.pluginName))
   }
 
   injectServerAuthIntoClient(ctx.client)
@@ -86,6 +87,7 @@ const HiaiOpenCodePlugin: Plugin = async (ctx) => {
     pluginConfig,
     platformConfig: internalConfig,
   })
+  lintModeAgentCapabilities()
   autoExportStaticMcpJson(ctx.directory, internalConfig)
 
   materializeBuiltinSkills(
@@ -166,7 +168,7 @@ const HiaiOpenCodePlugin: Plugin = async (ctx) => {
     const mod = await import("./internals/plugins/pty/plugin");
     ptyResult = await mod.PTYPlugin(ctx);
   } catch (err) {
-    console.error("[hiai-opencode] PTYPlugin failed to load:", err);
+    logError("PTYPlugin failed to load:", err)
   }
   const combinedResult = {
     name: PLUGIN_NAME,

package/src/internals/plugins/subtask2/commands/manifest.ts

@@ -3,11 +3,7 @@
 import { join } from "path";
 import { getOpenCodeConfigDir } from "../../../../shared/opencode-config-dir";
 import type { CommandConfig } from "../types";
-import {
-  parseFrontmatter,
-  getTemplateBody,
-  parseParallelConfig,
-} from "../parsing";
+import { parseFrontmatter, getTemplateBody, parseParallelConfig, parseLoopConfig } from "../parsing";
 
 /**
  * Commands: Manifest building
@@ -43,7 +39,7 @@ export async function buildManifest(): Promise<Record<string, CommandConfig>> {
           agent: fm.agent as string | undefined,
           description: fm.description as string | undefined,
           template: getTemplateBody(content),
-          loop: fm.loop as any,
+          loop: parseLoopConfig(fm.loop),
           model: fm.model as string | undefined,
           auto: fm.subtask2 === "auto",
         };

package/src/internals/plugins/subtask2/hooks/command-hooks.ts

@@ -261,11 +261,11 @@ export async function commandExecuteBefore(
       log(
         `cmd.before: registered parent for prompt (${part.prompt.length} chars)`
       );
-      if ((part as any).as) {
+      if ("as" in part && part.as) {
         registerPendingResultCaptureByPrompt(
           part.prompt,
           input.sessionID,
-          (part as any).as
+          String(part.as)
         );
       }
     }

package/src/internals/plugins/subtask2/hooks/message-hooks.ts

@@ -177,7 +177,7 @@ export async function chatMessagesTransform(input: any, output: any) {
       if (msg.info?.role !== "user") continue;
 
       // Track processed messages by ID to avoid infinite loop
-      const msgId = (msg.info as any)?.id;
+      const msgId = msg.info?.id;
       if (msgId && hasProcessedS2Message(msgId)) continue;
 
       for (const part of msg.parts) {

package/src/internals/plugins/subtask2/parsing/parallel.ts

@@ -27,11 +27,14 @@ export function parseLoopConfig(loop: unknown): LoopConfig | undefined {
 }
 
 // Parse a parallel item - handles "/cmd {model:...} args" syntax, plain "cmd", or {command, arguments} object
+function isParallelCommandLike(p: unknown): p is { command: unknown; arguments?: unknown; prompt?: unknown; model?: unknown; agent?: unknown; loop?: unknown; as?: unknown; inline?: unknown } {
+  return typeof p === "object" && p !== null && "command" in p
+}
+
 export function parseParallelItem(p: unknown): ParallelCommand | null {
   if (typeof p === "string") {
     const trimmed = p.trim();
     if (trimmed.startsWith("/")) {
-      // Parse /command {overrides} args syntax
       const parsed = parseCommandWithOverrides(trimmed);
       if (parsed.isInlineSubtask) {
         return {
@@ -55,16 +58,16 @@ export function parseParallelItem(p: unknown): ParallelCommand | null {
     }
     return { command: trimmed };
   }
-  if (typeof p === "object" && p !== null && (p as any).command) {
+  if (isParallelCommandLike(p)) {
     return {
-      command: (p as any).command,
-      arguments: (p as any).arguments,
-      prompt: (p as any).prompt,
-      model: (p as any).model,
-      agent: (p as any).agent,
-      loop: (p as any).loop,
-      as: (p as any).as,
-      inline: (p as any).inline,
+      command: String(p.command),
+      arguments: p.arguments !== undefined ? String(p.arguments) : undefined,
+      prompt: p.prompt !== undefined ? String(p.prompt) : undefined,
+      model: p.model !== undefined ? String(p.model) : undefined,
+      agent: p.agent !== undefined ? String(p.agent) : undefined,
+      loop: p.loop !== undefined ? parseLoopConfig(p.loop) : undefined,
+      as: p.as !== undefined ? String(p.as) : undefined,
+      inline: p.inline !== undefined ? Boolean(p.inline) : undefined,
     };
   }
   return null;

package/src/mcp/index.ts

@@ -1,4 +1,3 @@
-export { createBuiltinMcps } from "./omo-mcp-index"
 export { McpNameSchema, type McpName, type AnyMcpName } from "./types"
 
 import type { McpServerConfig } from "../config/types.js";

package/src/mcp/registry.ts

@@ -10,6 +10,8 @@ export type HiaiMcpName =
   | "rag"
   | "context7"
   | "mempalace"
+  | "websearch"
+  | "grep_app"
 
 export type HiaiMcpInstallKind = "bundled" | "npm" | "python" | "remote" | "user-service"
 
@@ -121,6 +123,31 @@ export const HIAI_MCP_REGISTRY: Record<HiaiMcpName, HiaiMcpRegistryEntry> = {
       timeout: 600000,
     },
   },
+  websearch: {
+    name: "websearch",
+    enabledByDefault: true,
+    install: "remote",
+    optionalEnv: ["EXA_API_KEY", "TAVILY_API_KEY"],
+    config: {
+      enabled: true,
+      type: "remote",
+      url: "https://mcp.exa.ai/mcp?tools=web_search_exa",
+      headers: { "x-api-key": "{env:EXA_API_KEY}" },
+      timeout: 600000,
+      provider: "exa",
+    },
+  },
+  grep_app: {
+    name: "grep_app",
+    enabledByDefault: true,
+    install: "remote",
+    config: {
+      enabled: true,
+      type: "remote",
+      url: "https://mcp.grep.app",
+      timeout: 600000,
+    },
+  },
 }
 
 export function createDefaultMcpConfig(): Record<HiaiMcpName, McpServerConfig> {

package/src/plugin/chat-message.ts

@@ -236,8 +236,6 @@ export function createChatMessageHandler(args: {
     await hooks.thinkMode?.["chat.message"]?.(input, output)
     await hooks.claudeCodeHooks?.["chat.message"]?.(input, output)
     await hooks.autoSlashCommand?.["chat.message"]?.(input, output)
-    await hooks.noBobGpt?.["chat.message"]?.(input, output)
-    await hooks.noCoderNonGpt?.["chat.message"]?.(input, output)
     if (hooks.startWork && isStartWorkHookOutput(output)) {
       const promptText = extractPromptText(output.parts)
       if (isStartWorkFallbackTemplate(promptText)) {

package/src/plugin/hooks/create-session-hooks.ts

@@ -19,8 +19,6 @@ import {
   createStartWorkHook,
   createStrategistMdOnlyHook,
   createBobJuniorNotepadHook,
-  createNoBobGptHook,
-  createNoCoderNonGptHook,
   createQuestionLabelTruncatorHook,
   createPreemptiveCompactionHook,
   createRuntimeFallbackHook,
@@ -54,8 +52,6 @@ export type SessionHooks = {
   startWork: ReturnType<typeof createStartWorkHook> | null
   strategistMdOnly: ReturnType<typeof createStrategistMdOnlyHook> | null
   bobJuniorNotepad: ReturnType<typeof createBobJuniorNotepadHook> | null
-  noBobGpt: ReturnType<typeof createNoBobGptHook> | null
-  noCoderNonGpt: ReturnType<typeof createNoCoderNonGptHook> | null
   questionLabelTruncator: ReturnType<typeof createQuestionLabelTruncatorHook> | null
   taskResumeInfo: ReturnType<typeof createTaskResumeInfoHook> | null
   anthropicEffort: ReturnType<typeof createAnthropicEffortHook> | null
@@ -219,17 +215,6 @@ export function createSessionHooks(args: {
     ? safeHook("sub-notepad", () => createBobJuniorNotepadHook(ctx))
     : null
 
-  const noBobGpt = isHookEnabled("no-bob-gpt")
-    ? safeHook("no-bob-gpt", () => createNoBobGptHook(ctx))
-    : null
-
-  const noCoderNonGpt = isHookEnabled("no-coder-non-gpt")
-    ? safeHook("no-coder-non-gpt", () =>
-      createNoCoderNonGptHook(ctx, {
-        allowNonGptModel: pluginConfig.agents?.coder?.allow_non_gpt_model,
-      }))
-    : null
-
   const questionLabelTruncator = isHookEnabled("question-label-truncator")
     ? safeHook("question-label-truncator", () => createQuestionLabelTruncatorHook())
     : null
@@ -275,8 +260,6 @@ export function createSessionHooks(args: {
     startWork,
     strategistMdOnly,
     bobJuniorNotepad,
-    noBobGpt,
-    noCoderNonGpt,
     questionLabelTruncator,
     taskResumeInfo,
     anthropicEffort,

package/src/plugin/startup-diagnostics.ts

@@ -0,0 +1,27 @@
+import { MODE_TO_AGENT } from "../shared/mode-routing"
+
+const WRITE_CAPABLE_AGENTS = new Set(["coder", "sub", "designer", "brainstormer"])
+
+const WRITE_MODES = new Set([
+  "quick",
+  "bounded",
+  "deep",
+  "cross-module",
+  "visual-engineering",
+  "artistry",
+  "writing",
+])
+
+const READONLY_MODES = new Set(["ultrabrain", "git", "git-ops"])
+
+export function lintModeAgentCapabilities(): void {
+  for (const [mode, agent] of Object.entries(MODE_TO_AGENT)) {
+    if (WRITE_MODES.has(mode) && !WRITE_CAPABLE_AGENTS.has(agent)) {
+      console.warn(`[startup-lint] Mode "${mode}" targets agent "${agent}" which cannot write/edit. Tasks using this mode may fail when attempting file operations.`)
+    }
+
+    if (READONLY_MODES.has(mode) && WRITE_CAPABLE_AGENTS.has(agent)) {
+      console.warn(`[startup-lint] Mode "${mode}" targets agent "${agent}" which can write. Consider verifying this is intentional.`)
+    }
+  }
+}

package/src/plugin-handlers/agent-config-handler.ts

@@ -81,7 +81,7 @@ const RUNTIME_AGENT_DESCRIPTIONS: Partial<Record<string, string>> = {
     "Compatibility wrapper for review functions now folded into Critic. (Quality Guardian - HiaiOpenCode)",
 };
 
-function forceVisiblePrimaryAgent(agent: unknown, name: string): unknown {
+function forceVisiblePrimaryAgent(agent: unknown, name: string, forceMode?: "primary" | "all"): unknown {
   if (typeof agent !== "object" || agent === null) {
     return agent;
   }
@@ -91,7 +91,7 @@ function forceVisiblePrimaryAgent(agent: unknown, name: string): unknown {
     ...base,
     name,
     hidden: false,
-    mode: "primary",
+    mode: forceMode ?? "all",
     ...(typeof base.description === "string" && base.description.trim().length > 0
       ? {}
       : { description: RUNTIME_AGENT_DESCRIPTIONS[name] }),
@@ -475,6 +475,7 @@ export async function applyAgentConfig(params: {
         normalizedAgents[name] = forceVisiblePrimaryAgent(
           normalizedAgents[name],
           name,
+          name === "Bob" ? "primary" : "all",
         );
       }
     }

package/src/plugin-handlers/mcp-config-handler.test.ts

@@ -0,0 +1,63 @@
+import { expect, test } from "bun:test"
+
+import { applyMcpConfig } from "./mcp-config-handler"
+
+const emptyPluginComponents = {
+  commands: {},
+  skills: {},
+  agents: {},
+  mcpServers: {},
+  hooksConfigs: [],
+  plugins: [],
+  errors: [],
+}
+
+test("context7 auth fallback from hiai-opencode config is used when env placeholder is empty", async () => {
+  const config: Record<string, unknown> = {}
+
+  await applyMcpConfig({
+    config,
+    pluginConfig: {
+      auth: { context7: "ctx-test-key" },
+      claude_code: { mcp: false },
+      __platformDefaults: {
+        mcp: {
+          context7: {
+            enabled: true,
+            type: "remote",
+            url: "https://mcp.context7.com/mcp",
+            headers: { "X-API-KEY": "{env:CONTEXT7_API_KEY}" },
+          },
+        },
+      },
+    } as any,
+    pluginComponents: emptyPluginComponents,
+  })
+
+  expect((config.mcp as any).context7.headers).toEqual({ "X-API-KEY": "ctx-test-key" })
+})
+
+test("firecrawl auth fallback from hiai-opencode config is used when env placeholder is empty", async () => {
+  const config: Record<string, unknown> = {}
+
+  await applyMcpConfig({
+    config,
+    pluginConfig: {
+      auth: { firecrawl: "fc-test-key" },
+      claude_code: { mcp: false },
+      __platformDefaults: {
+        mcp: {
+          firecrawl: {
+            enabled: true,
+            type: "remote",
+            url: "http://localhost/firecrawl",
+            environment: { FIRECRAWL_API_KEY: "{env:FIRECRAWL_API_KEY}" },
+          },
+        },
+      },
+    } as any,
+    pluginComponents: emptyPluginComponents,
+  })
+
+  expect((config.mcp as any).firecrawl.environment).toEqual({ FIRECRAWL_API_KEY: "fc-test-key" })
+})

package/src/plugin-handlers/mcp-config-handler.ts

@@ -2,7 +2,6 @@ import type { HiaiOpenCodeConfig } from "../config";
 import { spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import { loadMcpConfigs } from "../features/claude-code-mcp-loader";
-import { createBuiltinMcps } from "../mcp";
 import type { PluginComponents } from "./plugin-components-loader";
 import { log } from "../shared";
 import { getPlatformMcpDefaults } from "../shared/runtime-plugin-config";
@@ -14,8 +13,20 @@ function resolveHeaderAuthFallback(
   pluginConfig: HiaiOpenCodeConfig,
   name: string,
 ): Record<string, string> | undefined {
-  if (name === "stitch" && pluginConfig.auth?.stitch?.trim()) {
-    return { "X-Goog-Api-Key": pluginConfig.auth.stitch.trim() };
+  const resolveAuth = (value: string | undefined): string | undefined => {
+    if (!value?.trim()) return undefined;
+    const resolved = resolveEnvVars(value).trim();
+    return resolved.length > 0 ? resolved : undefined;
+  };
+
+  if (name === "stitch") {
+    const key = resolveAuth(pluginConfig.auth?.stitch);
+    return key ? { "X-Goog-Api-Key": key } : undefined;
+  }
+
+  if (name === "context7") {
+    const key = resolveAuth(pluginConfig.auth?.context7);
+    return key ? { "X-API-KEY": key } : undefined;
   }
 
   return undefined;
@@ -25,8 +36,9 @@ function resolveEnvironmentAuthFallback(
   pluginConfig: HiaiOpenCodeConfig,
   name: string,
 ): Record<string, string> | undefined {
-  if (name === "firecrawl" && pluginConfig.auth?.firecrawl?.trim()) {
-    return { FIRECRAWL_API_KEY: pluginConfig.auth.firecrawl.trim() };
+  if (name === "firecrawl") {
+    const key = pluginConfig.auth?.firecrawl ? resolveEnvVars(pluginConfig.auth.firecrawl).trim() : "";
+    return key ? { FIRECRAWL_API_KEY: key } : undefined;
   }
 
   return undefined;
@@ -122,18 +134,20 @@ function normalizePlatformMcpDefaults(
     );
     const headerFallback = resolveHeaderAuthFallback(pluginConfig, name);
     const environmentFallback = resolveEnvironmentAuthFallback(pluginConfig, name);
+    const usableHeaders = headers && !hasMissingResolvedValue(headers) ? headers : undefined;
+    const usableEnvironment = environment && !hasMissingResolvedValue(environment) ? environment : undefined;
     const headersWithFallback =
-      headers && headerFallback
-        ? { ...headerFallback, ...headers }
-        : headers ?? headerFallback;
+      usableHeaders && headerFallback
+        ? { ...headerFallback, ...usableHeaders }
+        : usableHeaders ?? headerFallback;
     const environmentWithFallback =
-      environment && environmentFallback
-        ? { ...environmentFallback, ...environment }
-        : environment ?? environmentFallback;
+      usableEnvironment && environmentFallback
+        ? { ...environmentFallback, ...usableEnvironment }
+        : usableEnvironment ?? environmentFallback;
 
     const missingResolvedValues =
-      hasMissingResolvedValue(headersWithFallback) ||
-      hasMissingResolvedValue(environmentWithFallback);
+      (!!headers && !usableHeaders && !headerFallback) ||
+      (!!environment && !usableEnvironment && !environmentFallback);
 
     if (missingResolvedValues) {
       log(`MCP server "${name}" is missing environment-backed auth; keeping it visible in config`);
@@ -152,6 +166,8 @@ function normalizePlatformMcpDefaults(
       nextEntry.environment = environmentWithFallback;
     }
 
+    delete nextEntry.provider;
+
     normalized[name] = nextEntry;
   }
 
@@ -184,7 +200,6 @@ export async function applyMcpConfig(params: {
       getPlatformMcpDefaults(params.pluginConfig) as unknown as Record<string, unknown>,
       params.pluginConfig,
     ),
-    ...createBuiltinMcps(disabledMcps, params.pluginConfig),
     ...mcpResult.servers,
     ...(userMcp ?? {}),
     ...params.pluginComponents.mcpServers,

package/src/plugin-handlers/strategist-agent-config-builder.ts

@@ -98,7 +98,7 @@ export async function buildStrategistAgentConfig(params: {
   const base: Record<string, unknown> = {
     ...(resolvedModel ? { model: resolvedModel } : {}),
     ...(variantToUse ? { variant: variantToUse } : {}),
-    mode: "primary",
+    mode: "all",
     prompt: getStrategistPrompt(resolvedModel, params.disabledTools) + "\n\n" + CLOSURE_SCHEMA_PROMPT,
     permission: PROMETHEUS_PERMISSION,
     description: `${(params.configAgentPlan?.description as string) ?? "Plan agent"} (Strategist - HiaiOpenCode)`,

package/src/shared/agent-display-names.test.ts

@@ -0,0 +1,9 @@
+import { expect, test } from "bun:test"
+
+import { getAgentConfigKey } from "./agent-display-names"
+
+test("writer aliases resolve to brainstormer", () => {
+  expect(getAgentConfigKey("writer")).toBe("brainstormer")
+  expect(getAgentConfigKey("copywriter")).toBe("brainstormer")
+  expect(getAgentConfigKey("content-writer")).toBe("brainstormer")
+})

package/src/shared/agent-display-names.ts

@@ -110,6 +110,11 @@ const LEGACY_DISPLAY_NAMES: Record<string, string> = {
   "platform manager (utility)": "platform-manager",
   "platform manager - utility": "platform-manager",
   "brainstormer - idea explorer": "brainstormer",
+  "writer": "brainstormer",
+  "copywriter": "brainstormer",
+  "content-writer": "brainstormer",
+  "content writer": "brainstormer",
+  "website-writer": "brainstormer",
   "agent skills - skill composer": "agent-skills",
   "subagent": "sub",
   "ui": "multimodal",