@hiai-gg/hiai-opencode 0.1.6 → 0.1.7

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/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"] {
@@ -145,6 +151,19 @@ function deriveMcp(config: HiaiOpencodeConfig): HiaiOpencodeConfig["mcp"] {
         }
       }
 
+      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
 

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

@@ -17,6 +17,7 @@ const baseConfig: HiaiOpencodeConfig = {
     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" },
@@ -28,10 +29,13 @@ test("model slots derive canonical agents and categories", () => {
   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/coder")
-  expect(resolved.categories?.artistry?.model).toBe("openrouter/test/designer")
-  expect(resolved.categories?.ultrabrain?.model).toBe("openrouter/test/strategist")
-  expect(resolved.categories?.writing?.model).toBe("openrouter/test/brainstormer")
+  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", () => {
@@ -47,6 +51,20 @@ test("static MCP export includes marker metadata and servers", () => {
   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", () => {

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,6 +72,7 @@ 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(),

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,7 +23,6 @@ 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({
   stitch: z.string().optional(),
@@ -78,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,6 +146,7 @@ export interface CategoryConfig {
 export interface McpServerConfig {
   enabled: boolean;
   type?: "remote" | "local";
+  provider?: "exa" | "tavily";
   url?: string;
   headers?: Record<string, string>;
   command?: string[];

package/src/features/builtin-skills/skills/index.ts

@@ -6,3 +6,4 @@ export { devBrowserSkill } from "./dev-browser"
 export { reviewWorkSkill } from "./review-work"
 export { aiSlopRemoverSkill } from "./ai-slop-remover"
 export { hiaiOpencodeSetupSkill } from "./hiai-opencode-setup"
+export { websiteCopywritingSkill } from "./website-copywriting"

package/src/features/builtin-skills/skills/website-copywriting.ts

@@ -0,0 +1,41 @@
+import type { BuiltinSkill } from "../types"
+
+export const websiteCopywritingSkill: BuiltinSkill = {
+  name: "website-copywriting",
+  description:
+    "Writes sharp website/product copy: landing pages, hero sections, CTAs, feature blocks, positioning, naming, and tone of voice.",
+  template: `# Website Copywriting
+
+Use this skill for public-facing product and website text.
+
+## Inputs To Clarify
+
+- Audience: who reads this and what do they already know?
+- Goal: sign up, book demo, understand feature, trust product, recover from error, continue onboarding.
+- Tone: precise, playful, premium, technical, calm, bold, founder-led, enterprise, developer-first.
+- Proof: real features, constraints, metrics, customer pain, differentiators. Do not invent proof.
+
+## Output Shape
+
+Prefer copy that can be pasted into UI:
+
+- Hero: headline, subheadline, primary CTA, secondary CTA.
+- Feature block: title, one-sentence value, 2-4 proof bullets.
+- Section copy: heading, short intro, card titles, card bodies.
+- Microcopy: button labels, empty states, errors, onboarding hints.
+- Alternatives: 3-5 variants when tone or positioning is undecided.
+
+## Writing Rules
+
+- Specific beats clever. Concrete verbs beat vague hype.
+- Avoid generic AI language: seamless, unlock, supercharge, leverage, robust, cutting-edge, revolutionize, next-generation.
+- Keep claims tied to actual capabilities.
+- Use short lines for UI. Long paragraphs are usually wrong for websites.
+- Preserve product vocabulary from the codebase/docs when available.
+- If visual direction matters, pair with \`frontend-ui-ux\` or delegate visual work to Designer.
+
+## Delegation Hint
+
+Use \`task(subagent_type="brainstormer", load_skills=["website-copywriting"], ...)\` for copy-only work.
+Use \`category="writing"\` when a category is required. Writer/copywriter aliases map to Brainstormer.`,
+}

package/src/features/builtin-skills/skills.test.ts

@@ -0,0 +1,8 @@
+import { expect, test } from "bun:test"
+
+import { createBuiltinSkills } from "./skills"
+
+test("website-copywriting is available as a builtin skill", () => {
+  const skills = createBuiltinSkills()
+  expect(skills.some((skill) => skill.name === "website-copywriting")).toBe(true)
+})

package/src/features/builtin-skills/skills.ts

@@ -11,6 +11,7 @@ import {
   reviewWorkSkill,
   aiSlopRemoverSkill,
   hiaiOpencodeSetupSkill,
+  websiteCopywritingSkill,
 } from "./skills/index"
 
 export interface CreateBuiltinSkillsOptions {
@@ -38,6 +39,7 @@ export function createBuiltinSkills(options: CreateBuiltinSkillsOptions = {}): B
     devBrowserSkill,
     reviewWorkSkill,
     aiSlopRemoverSkill,
+    websiteCopywritingSkill,
   ]
 
   if (!disabledSkills) {

package/src/features/skill-mcp-manager/AGENTS.md

@@ -10,7 +10,7 @@
 
 | Tier | Manager | Scope |
 |------|---------|-------|
-| 1. Built-in | `createBuiltinMcps()` (src/mcp/) | Global, 3 remote HTTP |
+| 1. Platform defaults | `HIAI_MCP_REGISTRY` (src/mcp/registry.ts) | Global MCP defaults materialized from hiai-opencode.json |
 | 2. Claude Code | `claude-code-mcp-loader` (src/features/) | From `.mcp.json` |
 | 3. **Skill-embedded** | **`SkillMcpManager` (this module)** | **Per-session, from SKILL.md YAML** |
 

package/src/hooks/agent-usage-reminder/constants.ts

@@ -30,13 +30,13 @@ export const REMINDER_MESSAGE = `
 
 You called a search/fetch tool directly without leveraging specialized agents.
 
-RECOMMENDED: Use task with explore/librarian agents for better results:
+RECOMMENDED: Use task with researcher agents for better results:
 
 \`\`\`
 // Parallel exploration - fire multiple agents simultaneously
-task(subagent_type="explore", load_skills=[], prompt="Find all files matching pattern X")
-task(subagent_type="explore", load_skills=[], prompt="Search for implementation of Y")
-task(subagent_type="librarian", load_skills=[], prompt="Lookup documentation for Z")
+task(subagent_type="researcher", load_skills=[], prompt="Find all files matching pattern X")
+task(subagent_type="researcher", load_skills=[], prompt="Search for implementation of Y")
+task(subagent_type="researcher", load_skills=[], prompt="Lookup documentation for Z")
 
 // Then continue your work while they run in background
 // System will notify you when each completes

package/src/hooks/index.ts

@@ -28,8 +28,6 @@ export { createThinkingBlockValidatorHook } from "./thinking-block-validator";
 export { createToolPairValidatorHook } from "./tool-pair-validator";
 export { createCategorySkillReminderHook } from "./category-skill-reminder";
 export { createRalphLoopHook, type RalphLoopHook } from "./ralph-loop";
-export { createNoBobGptHook } from "./no-bob-gpt";
-export { createNoCoderNonGptHook } from "./no-coder-non-gpt";
 export { createAutoSlashCommandHook } from "./auto-slash-command";
 export { createEditErrorRecoveryHook } from "./edit-error-recovery";
 

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

@@ -95,50 +95,50 @@ TELL THE USER WHAT AGENTS YOU WILL LEVERAGE NOW TO SATISFY USER'S REQUEST.
 
 ## MANDATORY: PLAN AGENT INVOCATION (NON-NEGOTIABLE)
 
-**YOU MUST ALWAYS INVOKE THE PLAN AGENT FOR ANY NON-TRIVIAL TASK.**
+**YOU MUST ALWAYS INVOKE THE STRATEGIST AGENT FOR ANY NON-TRIVIAL TASK.**
 
 | 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>")
 \`\`\`
 
-**WHY PLAN AGENT IS MANDATORY:**
-- Plan agent analyzes dependencies and parallel execution opportunities
-- Plan agent outputs a **parallel task graph** with waves and dependencies
-- Plan agent provides structured TODO list with category + skills per task
+**WHY STRATEGIST AGENT IS MANDATORY:**
+- Strategist analyzes dependencies and parallel execution opportunities
+- Strategist outputs a **parallel task graph** with waves and dependencies
+- Strategist provides structured TODO list with category + skills per task
 - YOU are an orchestrator, NOT an implementer
 
-### 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")\` |
 
 **WHY SESSION_ID IS CRITICAL:**
-- Plan agent retains FULL conversation context
+- Strategist retains FULL conversation context
 - No repeated exploration or context gathering
 - Saves 70%+ tokens on follow-ups
 - Maintains interview continuity until plan is finalized
 
 \`\`\`
 // WRONG: Starting fresh loses all context
-task(subagent_type="plan", load_skills=[], run_in_background=false, prompt="Here's more info...")
+task(subagent_type="strategist", load_skills=[], run_in_background=false, prompt="Here's more info...")
 
 // CORRECT: Resume preserves everything
 task(session_id="ses_abc123", load_skills=[], run_in_background=false, prompt="Here's my answer to your question: ...")
 \`\`\`
 
-**FAILURE TO CALL PLAN AGENT = INCOMPLETE WORK.**
+**FAILURE TO CALL STRATEGIST AGENT = INCOMPLETE WORK.**
 
 ---
 
@@ -150,7 +150,7 @@ task(session_id="ses_abc123", load_skills=[], run_in_background=false, prompt="H
 |-----------|--------|-----|
 | 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="plan", load_skills=[], run_in_background=false) | Parallel task graph + structured TODO list |
+| 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, planning, complex logic |
 | Hard problem (review/debugging) | task(subagent_type="critic", load_skills=[], run_in_background=false) | Verification, debugging, high-risk review |
 | Hard problem (non-conventional) | task(category="artistry", load_skills=[...], run_in_background=true) | Different approach needed |