Merge pull request #1551 from code-yeongyu/fix/plan-agent-dynamic-skills

fix(delegate-task): make plan agent categories/skills dynamic

Author: code-yeongyu

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

@@ -20,6 +20,7 @@ export interface AvailableSkill {
 export interface AvailableCategory {
   name: string
   description: string
+  model?: string
 }
 
 export function categorizeTools(toolNames: string[]): AvailableTool[] {

src/index.ts

@@ -56,8 +56,10 @@ import {
   discoverOpencodeProjectSkills,
   mergeSkills,
 } from "./features/opencode-skill-loader";
+import type { SkillScope } from "./features/opencode-skill-loader/types";
 import { createBuiltinSkills } from "./features/builtin-skills";
 import { getSystemMcpServerNames } from "./features/claude-code-mcp-loader";
+import type { AvailableSkill } from "./agents/dynamic-agent-prompt-builder";
 import {
   setMainSession,
   getMainSessionID,
@@ -84,6 +86,10 @@ import {
   createTaskList,
   createTaskUpdateTool,
 } from "./tools";
+import {
+  CATEGORY_DESCRIPTIONS,
+  DEFAULT_CATEGORIES,
+} from "./tools/delegate-task/constants";
 import { BackgroundManager } from "./features/background-agent";
 import { SkillMcpManager } from "./features/skill-mcp-manager";
 import { initTaskToastManager } from "./features/task-toast-manager";
@@ -394,6 +400,60 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
   const browserProvider =
     pluginConfig.browser_automation_engine?.provider ?? "playwright";
   const disabledSkills = new Set<string>(pluginConfig.disabled_skills ?? []);
+  const systemMcpNames = getSystemMcpServerNames();
+  const builtinSkills = createBuiltinSkills({ browserProvider, disabledSkills }).filter((skill) => {
+      if (skill.mcpConfig) {
+        for (const mcpName of Object.keys(skill.mcpConfig)) {
+          if (systemMcpNames.has(mcpName)) return false;
+        }
+      }
+      return true;
+    },
+  );
+  const includeClaudeSkills = pluginConfig.claude_code?.skills !== false;
+  const [userSkills, globalSkills, projectSkills, opencodeProjectSkills] =
+    await Promise.all([
+      includeClaudeSkills ? discoverUserClaudeSkills() : Promise.resolve([]),
+      discoverOpencodeGlobalSkills(),
+      includeClaudeSkills ? discoverProjectClaudeSkills() : Promise.resolve([]),
+      discoverOpencodeProjectSkills(),
+    ]);
+  const mergedSkills = mergeSkills(
+    builtinSkills,
+    pluginConfig.skills,
+    userSkills,
+    globalSkills,
+    projectSkills,
+    opencodeProjectSkills,
+  );
+
+  function mapScopeToLocation(scope: SkillScope): AvailableSkill["location"] {
+    if (scope === "user" || scope === "opencode") return "user";
+    if (scope === "project" || scope === "opencode-project") return "project";
+    return "plugin";
+  }
+
+  const availableSkills: AvailableSkill[] = mergedSkills.map((skill) => ({
+    name: skill.name,
+    description: skill.definition.description ?? "",
+    location: mapScopeToLocation(skill.scope),
+  }));
+
+  const mergedCategories = pluginConfig.categories
+    ? { ...DEFAULT_CATEGORIES, ...pluginConfig.categories }
+    : DEFAULT_CATEGORIES;
+
+  const availableCategories = Object.entries(mergedCategories).map(
+    ([name, categoryConfig]) => ({
+      name,
+      description:
+        pluginConfig.categories?.[name]?.description
+          ?? CATEGORY_DESCRIPTIONS[name]
+          ?? "General tasks",
+      model: categoryConfig.model,
+    }),
+  );
+
   const delegateTask = createDelegateTask({
     manager: backgroundManager,
     client: ctx.client,
@@ -403,6 +463,8 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
     sisyphusJuniorModel: pluginConfig.agents?.["sisyphus-junior"]?.model,
     browserProvider,
     disabledSkills,
+    availableCategories,
+    availableSkills,
     onSyncSessionCreated: async (event) => {
       log("[index] onSyncSessionCreated callback", {
         sessionID: event.sessionID,
@@ -421,32 +483,6 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
       });
     },
   });
-  const systemMcpNames = getSystemMcpServerNames();
-  const builtinSkills = createBuiltinSkills({ browserProvider, disabledSkills }).filter((skill) => {
-      if (skill.mcpConfig) {
-        for (const mcpName of Object.keys(skill.mcpConfig)) {
-          if (systemMcpNames.has(mcpName)) return false;
-        }
-      }
-      return true;
-    },
-  );
-  const includeClaudeSkills = pluginConfig.claude_code?.skills !== false;
-  const [userSkills, globalSkills, projectSkills, opencodeProjectSkills] =
-    await Promise.all([
-      includeClaudeSkills ? discoverUserClaudeSkills() : Promise.resolve([]),
-      discoverOpencodeGlobalSkills(),
-      includeClaudeSkills ? discoverProjectClaudeSkills() : Promise.resolve([]),
-      discoverOpencodeProjectSkills(),
-    ]);
-  const mergedSkills = mergeSkills(
-    builtinSkills,
-    pluginConfig.skills,
-    userSkills,
-    globalSkills,
-    projectSkills,
-    opencodeProjectSkills,
-  );
   const skillMcpManager = new SkillMcpManager();
   const getSessionIDForMcp = () => getMainSessionID() || "";
   const skillTool = createSkillTool({

src/tools/delegate-task/constants.ts

@@ -1,4 +1,8 @@
 import type { CategoryConfig } from "../../config/schema"
+import type {
+  AvailableCategory,
+  AvailableSkill,
+} from "../../agents/dynamic-agent-prompt-builder"
 
 export const VISUAL_CATEGORY_PROMPT_APPEND = `<Category_Context>
 You are working on VISUAL/UI tasks.
@@ -231,7 +235,7 @@ export const CATEGORY_DESCRIPTIONS: Record<string, string> = {
  * then summarize user requirements and clarify uncertainties before proceeding.
  * Also MANDATES dependency graphs, parallel execution analysis, and category+skill recommendations.
  */
-export const PLAN_AGENT_SYSTEM_PREPEND = `<system>
+export const PLAN_AGENT_SYSTEM_PREPEND_STATIC_BEFORE_SKILLS = `<system>
 BEFORE you begin planning, you MUST first understand the user's request deeply.
 
 MANDATORY CONTEXT GATHERING PROTOCOL:
@@ -337,39 +341,9 @@ WHY THIS MATTERS:
 FOR EVERY TASK, YOU MUST RECOMMEND:
 1. Which CATEGORY to use for delegation
 2. Which SKILLS to load for the delegated agent
+`
 
-### AVAILABLE CATEGORIES
-
-| Category | Best For | Model |
-|----------|----------|-------|
-| \`visual-engineering\` | Frontend, UI/UX, design, styling, animation | google/gemini-3-pro |
-| \`ultrabrain\` | Complex architecture, deep logical reasoning | openai/gpt-5.3-codex |
-| \`artistry\` | Highly creative/artistic tasks, novel ideas | google/gemini-3-pro |
-| \`quick\` | Trivial tasks - single file, typo fixes | anthropic/claude-haiku-4-5 |
-| \`unspecified-low\` | Moderate effort, doesn't fit other categories | anthropic/claude-sonnet-4-5 |
-| \`unspecified-high\` | High effort, doesn't fit other categories | anthropic/claude-opus-4-6 |
-| \`writing\` | Documentation, prose, technical writing | google/gemini-3-flash |
-
-### AVAILABLE SKILLS (ALWAYS EVALUATE ALL)
-
-Skills inject specialized expertise into the delegated agent.
-YOU MUST evaluate EVERY skill and justify inclusions/omissions.
-
-| Skill | Domain |
-|-------|--------|
-| \`agent-browser\` | Browser automation, web testing |
-| \`frontend-ui-ux\` | Stunning UI/UX design |
-| \`git-master\` | Atomic commits, git operations |
-| \`dev-browser\` | Persistent browser state automation |
-| \`typescript-programmer\` | Production TypeScript code |
-| \`python-programmer\` | Production Python code |
-| \`svelte-programmer\` | Svelte components |
-| \`golang-tui-programmer\` | Go TUI with Charmbracelet |
-| \`python-debugger\` | Interactive Python debugging |
-| \`data-scientist\` | DuckDB/Polars data processing |
-| \`prompt-engineer\` | AI prompt optimization |
-
-### REQUIRED OUTPUT FORMAT
+export const PLAN_AGENT_SYSTEM_PREPEND_STATIC_AFTER_SKILLS = `### REQUIRED OUTPUT FORMAT
 
 For EACH task, include a recommendation block:
 
@@ -508,6 +482,58 @@ WHY THIS FORMAT IS MANDATORY:
 
 `
 
+function renderPlanAgentCategoryRows(categories: AvailableCategory[]): string[] {
+  const sorted = [...categories].sort((a, b) => a.name.localeCompare(b.name))
+  return sorted.map((category) => {
+    const bestFor = category.description || category.name
+    const model = category.model || ""
+    return `| \`${category.name}\` | ${bestFor} | ${model} |`
+  })
+}
+
+function renderPlanAgentSkillRows(skills: AvailableSkill[]): string[] {
+  const sorted = [...skills].sort((a, b) => a.name.localeCompare(b.name))
+  return sorted.map((skill) => {
+    const firstSentence = skill.description.split(".")[0] || skill.description
+    const domain = firstSentence.trim() || skill.name
+    return `| \`${skill.name}\` | ${domain} |`
+  })
+}
+
+export function buildPlanAgentSkillsSection(
+  categories: AvailableCategory[] = [],
+  skills: AvailableSkill[] = []
+): string {
+  const categoryRows = renderPlanAgentCategoryRows(categories)
+  const skillRows = renderPlanAgentSkillRows(skills)
+
+  return `### AVAILABLE CATEGORIES
+
+| Category | Best For | Model |
+|----------|----------|-------|
+${categoryRows.join("\n")}
+
+### AVAILABLE SKILLS (ALWAYS EVALUATE ALL)
+
+Skills inject specialized expertise into the delegated agent.
+YOU MUST evaluate EVERY skill and justify inclusions/omissions.
+
+| Skill | Domain |
+|-------|--------|
+${skillRows.join("\n")}`
+}
+
+export function buildPlanAgentSystemPrepend(
+  categories: AvailableCategory[] = [],
+  skills: AvailableSkill[] = []
+): string {
+  return [
+    PLAN_AGENT_SYSTEM_PREPEND_STATIC_BEFORE_SKILLS,
+    buildPlanAgentSkillsSection(categories, skills),
+    PLAN_AGENT_SYSTEM_PREPEND_STATIC_AFTER_SKILLS,
+  ].join("\n\n")
+}
+
 /**
  * List of agent names that should be treated as plan agents.
  * Case-insensitive matching is used.
@@ -524,4 +550,3 @@ export function isPlanAgent(agentName: string | undefined): boolean {
   const lowerName = agentName.toLowerCase().trim()
   return PLAN_AGENT_NAMES.some(name => lowerName === name || lowerName.includes(name))
 }
-

src/tools/delegate-task/prompt-builder.ts

@@ -1,14 +1,22 @@
-import { PLAN_AGENT_SYSTEM_PREPEND, isPlanAgent } from "./constants"
 import type { BuildSystemContentInput } from "./types"
+import { buildPlanAgentSystemPrepend, isPlanAgent } from "./constants"
 
 /**
  * Build the system content to inject into the agent prompt.
  * Combines skill content, category prompt append, and plan agent system prepend.
  */
 export function buildSystemContent(input: BuildSystemContentInput): string | undefined {
-  const { skillContent, categoryPromptAppend, agentName } = input
-
-  const planAgentPrepend = isPlanAgent(agentName) ? PLAN_AGENT_SYSTEM_PREPEND : ""
+  const {
+    skillContent,
+    categoryPromptAppend,
+    agentName,
+    availableCategories,
+    availableSkills,
+  } = input
+
+  const planAgentPrepend = isPlanAgent(agentName)
+    ? buildPlanAgentSystemPrepend(availableCategories, availableSkills)
+    : ""
 
   if (!skillContent && !categoryPromptAppend && !planAgentPrepend) {
     return undefined