whale-code 6.5.6 → 6.5.7

package/dist/cli/services/subagent-tools.js

@@ -0,0 +1,96 @@
+/**
+ * Subagent tool filtering — restrict tools per agent type
+ *
+ * Extracted from subagent.ts for single-responsibility.
+ */
+
+import { LOCAL_TOOL_DEFINITIONS } from "./local-tools.js";
+import { loadServerToolDefinitions } from "./server-tools.js";
+import { deduplicateTools } from "./agent-worker-base.js";
+import { getAgentDefinition } from "./agent-definitions.js";
+// ============================================================================
+// TOOL FILTERING — restrict tools per agent type
+// ============================================================================
+
+export function getToolsForAgent(type) {
+  // Check for custom agent definition with explicit tools
+  const custom = getAgentDefinition(type);
+  if (custom?.tools && custom.tools.length > 0) return custom.tools;
+  switch (type) {
+    case "explore":
+      return ["glob", "grep", "read_file", "list_directory", "search_files", "search_content"];
+    case "plan":
+      return ["glob", "grep", "read_file", "list_directory", "search_files", "search_content"];
+    case "research":
+      return ["web_fetch", "web_search", "read_file", "grep", "glob"];
+    case "general-purpose":
+      // All tools EXCEPT delegation — "Subagents cannot spawn other subagents" (Claude Code parity)
+      return ["read_file", "write_file", "edit_file", "list_directory", "search_files", "search_content", "run_command", "glob", "grep", "notebook_edit", "web_fetch"];
+    default:
+      return ["read_file", "glob", "grep"];
+  }
+}
+export async function getFilteredTools(type) {
+  const allowedNames = new Set(getToolsForAgent(type));
+
+  // Local tools
+  const localTools = LOCAL_TOOL_DEFINITIONS.filter(t => allowedNames.has(t.name)).map(t => ({
+    name: t.name,
+    description: t.description,
+    input_schema: t.input_schema
+  }));
+
+  // Add server tools if available, filtering by allowed names
+  try {
+    const serverTools = await loadServerToolDefinitions();
+    const allowedServerTools = serverTools.filter(t => allowedNames.has(t.name));
+    localTools.push(...allowedServerTools);
+  } catch {/* server tools unavailable */}
+
+  // Deduplicate: local tools take priority over server tools with same name
+  return deduplicateTools(localTools);
+}
+
+// ============================================================================
+// TOOL DEFINITION — for integration with main agent loop
+// ============================================================================
+
+export const TASK_TOOL_DEFINITION = {
+  name: "task",
+  description: `Launch a subagent in isolated context. Subagents have full tool access and batch multiple tool calls per turn (glob + grep + read_file in parallel). Launch multiple task calls in one response for parallel execution.
+
+Use for any work requiring 3+ tool calls or touching multiple parts of the codebase.
+
+Agent types:
+- explore: Find specific files/code (2-4 turns, uses batch glob+grep)
+- plan: Create implementation plan (3-5 turns)
+- general-purpose: Complete a specific task (4-8 turns, full tool access)
+- research: Look up specific info (2-4 turns)
+
+Each agent completes autonomously and returns results.`,
+  input_schema: {
+    type: "object",
+    properties: {
+      prompt: {
+        type: "string",
+        description: "Specific task with clear completion criteria. Include: what to find/do, where to look, what to return."
+      },
+      subagent_type: {
+        type: "string",
+        enum: ["explore", "plan", "general-purpose", "research"],
+        description: "Agent type: explore=find, plan=design, general-purpose=do, research=lookup."
+      },
+      model: {
+        type: "string",
+        enum: ["sonnet", "haiku"],
+        description: "Optional model. haiku (default) for fast tasks, sonnet for complex reasoning."
+      },
+      resume: {
+        type: "string",
+        description: "Agent ID to resume (rarely needed)."
+      }
+    },
+    required: ["prompt", "subagent_type"]
+  }
+};
+//# sourceMappingURL=subagent-tools.js.map

package/dist/cli/services/subagent-tools.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subagent-tools.js","names":["LOCAL_TOOL_DEFINITIONS","loadServerToolDefinitions","deduplicateTools","getAgentDefinition","getToolsForAgent","type","custom","tools","length","getFilteredTools","allowedNames","Set","localTools","filter","t","has","name","map","description","input_schema","serverTools","allowedServerTools","push","TASK_TOOL_DEFINITION","properties","prompt","subagent_type","enum","model","resume","required"],"sources":["../../../src/cli/services/subagent-tools.ts"],"sourcesContent":["/**\n * Subagent tool filtering — restrict tools per agent type\n *\n * Extracted from subagent.ts for single-responsibility.\n */\n\nimport type Anthropic from \"@anthropic-ai/sdk\";\nimport { LOCAL_TOOL_DEFINITIONS } from \"./local-tools.js\";\nimport { loadServerToolDefinitions } from \"./server-tools.js\";\nimport { deduplicateTools } from \"./agent-worker-base.js\";\nimport { getAgentDefinition } from \"./agent-definitions.js\";\nimport type { SubagentType } from \"./subagent-types.js\";\n\n// ============================================================================\n// TOOL FILTERING — restrict tools per agent type\n// ============================================================================\n\nexport function getToolsForAgent(type: SubagentType | string): string[] {\n  // Check for custom agent definition with explicit tools\n  const custom = getAgentDefinition(type);\n  if (custom?.tools && custom.tools.length > 0) return custom.tools;\n\n  switch (type) {\n    case \"explore\":\n      return [\"glob\", \"grep\", \"read_file\", \"list_directory\", \"search_files\", \"search_content\"];\n    case \"plan\":\n      return [\"glob\", \"grep\", \"read_file\", \"list_directory\", \"search_files\", \"search_content\"];\n    case \"research\":\n      return [\"web_fetch\", \"web_search\", \"read_file\", \"grep\", \"glob\"];\n    case \"general-purpose\":\n      // All tools EXCEPT delegation — \"Subagents cannot spawn other subagents\" (Claude Code parity)\n      return [\n        \"read_file\", \"write_file\", \"edit_file\", \"list_directory\",\n        \"search_files\", \"search_content\", \"run_command\",\n        \"glob\", \"grep\", \"notebook_edit\", \"web_fetch\",\n      ];\n    default:\n      return [\"read_file\", \"glob\", \"grep\"];\n  }\n}\n\nexport async function getFilteredTools(type: SubagentType): Promise<Anthropic.Tool[]> {\n  const allowedNames = new Set(getToolsForAgent(type));\n\n  // Local tools\n  const localTools: Anthropic.Tool[] = LOCAL_TOOL_DEFINITIONS\n    .filter((t) => allowedNames.has(t.name))\n    .map((t) => ({\n      name: t.name,\n      description: t.description,\n      input_schema: t.input_schema as Anthropic.Tool[\"input_schema\"],\n    }));\n\n  // Add server tools if available, filtering by allowed names\n  try {\n    const serverTools = await loadServerToolDefinitions();\n    const allowedServerTools = serverTools.filter(t => allowedNames.has(t.name));\n    localTools.push(...allowedServerTools);\n  } catch { /* server tools unavailable */ }\n\n  // Deduplicate: local tools take priority over server tools with same name\n  return deduplicateTools(localTools);\n}\n\n// ============================================================================\n// TOOL DEFINITION — for integration with main agent loop\n// ============================================================================\n\nexport const TASK_TOOL_DEFINITION: Anthropic.Tool = {\n  name: \"task\",\n  description: `Launch a subagent in isolated context. Subagents have full tool access and batch multiple tool calls per turn (glob + grep + read_file in parallel). Launch multiple task calls in one response for parallel execution.\n\nUse for any work requiring 3+ tool calls or touching multiple parts of the codebase.\n\nAgent types:\n- explore: Find specific files/code (2-4 turns, uses batch glob+grep)\n- plan: Create implementation plan (3-5 turns)\n- general-purpose: Complete a specific task (4-8 turns, full tool access)\n- research: Look up specific info (2-4 turns)\n\nEach agent completes autonomously and returns results.`,\n  input_schema: {\n    type: \"object\",\n    properties: {\n      prompt: {\n        type: \"string\",\n        description: \"Specific task with clear completion criteria. Include: what to find/do, where to look, what to return.\",\n      },\n      subagent_type: {\n        type: \"string\",\n        enum: [\"explore\", \"plan\", \"general-purpose\", \"research\"],\n        description: \"Agent type: explore=find, plan=design, general-purpose=do, research=lookup.\",\n      },\n      model: {\n        type: \"string\",\n        enum: [\"sonnet\", \"haiku\"],\n        description: \"Optional model. haiku (default) for fast tasks, sonnet for complex reasoning.\",\n      },\n      resume: {\n        type: \"string\",\n        description: \"Agent ID to resume (rarely needed).\",\n      },\n    },\n    required: [\"prompt\", \"subagent_type\"],\n  },\n};\n"],"mappings":"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","ignoreList":[]}

package/dist/cli/services/subagent-types.d.ts

@@ -0,0 +1,57 @@
+/**
+ * Subagent types, constants, prompts, and state persistence
+ *
+ * Extracted from subagent.ts for single-responsibility.
+ */
+import type Anthropic from "@anthropic-ai/sdk";
+export type BuiltinSubagentType = "explore" | "plan" | "general-purpose" | "research";
+export type SubagentType = BuiltinSubagentType | (string & {});
+export interface ParentTraceContext {
+    traceId: string;
+    spanId: string;
+    conversationId?: string;
+    turnNumber: number;
+    userId?: string;
+    userEmail?: string;
+}
+export interface SubagentOptions {
+    prompt: string;
+    subagent_type: SubagentType;
+    model?: "sonnet" | "opus" | "haiku";
+    resume?: string;
+    run_in_background?: boolean;
+    max_turns?: number;
+    name?: string;
+    parentContext?: string;
+    parentTraceContext?: ParentTraceContext;
+    taskContext?: string;
+    signal?: AbortSignal;
+}
+export interface SubagentResult {
+    success: boolean;
+    output: string;
+    agentId: string;
+    tokensUsed: {
+        input: number;
+        output: number;
+    };
+    toolsUsed: string[];
+}
+export interface AgentState {
+    id: string;
+    type: SubagentType;
+    model: string;
+    messages: Anthropic.MessageParam[];
+    toolsUsed: string[];
+    continuations?: number;
+    compactionCount?: number;
+    createdAt: string;
+    updatedAt: string;
+}
+export declare const AGENTS_DIR: string;
+export declare function getAgentIcon(type: SubagentType): string;
+export declare function getAgentColor(type: SubagentType): string;
+export declare function saveAgentState(state: AgentState): void;
+export declare function loadAgentState(agentId: string): AgentState | null;
+export declare function generateAgentId(): string;
+export declare function buildAgentPrompt(type: SubagentType | string, cwd: string): string;

package/dist/cli/services/subagent-types.js

@@ -0,0 +1,218 @@
+/**
+ * Subagent types, constants, prompts, and state persistence
+ *
+ * Extracted from subagent.ts for single-responsibility.
+ */
+
+import { existsSync, writeFileSync, readFileSync, mkdirSync } from "fs";
+import { join } from "path";
+import { homedir } from "os";
+import { getAgentDefinition } from "./agent-definitions.js";
+
+// ============================================================================
+// TYPES
+// ============================================================================
+
+// ============================================================================
+// CONSTANTS
+// ============================================================================
+
+export const AGENTS_DIR = join(homedir(), ".whale", "agents");
+
+// ============================================================================
+// DISPLAY HELPERS
+// ============================================================================
+
+export function getAgentIcon(type) {
+  const icons = {
+    explore: "\uD83D\uDD0D",
+    plan: "\uD83D\uDCCB",
+    "general-purpose": "\uD83E\uDD16",
+    research: "\uD83D\uDCDA"
+  };
+  return icons[type] || "\u2699\uFE0F";
+}
+export function getAgentColor(type) {
+  const colors = {
+    explore: "#3B82F6",
+    plan: "#8B5CF6",
+    "general-purpose": "#10B981",
+    research: "#F59E0B"
+  };
+  return colors[type] || "#6B7280";
+}
+
+// ============================================================================
+// AGENT STATE PERSISTENCE
+// ============================================================================
+
+function ensureAgentsDir() {
+  if (!existsSync(AGENTS_DIR)) mkdirSync(AGENTS_DIR, {
+    recursive: true
+  });
+}
+export function saveAgentState(state) {
+  ensureAgentsDir();
+  const path = join(AGENTS_DIR, `${state.id}.json`);
+  writeFileSync(path, JSON.stringify(state, null, 2), "utf-8");
+}
+export function loadAgentState(agentId) {
+  const path = join(AGENTS_DIR, `${agentId}.json`);
+  if (!existsSync(path)) return null;
+  try {
+    return JSON.parse(readFileSync(path, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+export function generateAgentId() {
+  return `agent-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+}
+
+// ============================================================================
+// AGENT PROMPTS
+// ============================================================================
+
+export function buildAgentPrompt(type, cwd) {
+  const cwdContext = `
+## Working Directory
+You are working in: ${cwd}
+All file paths should be relative to or absolute from this directory.
+IMPORTANT: Focus ONLY on files within this directory. Do not get confused by other projects.
+`;
+  const custom = getAgentDefinition(type);
+  if (custom) return custom.prompt + cwdContext;
+  const prompts = {
+    explore: `You are an exploration agent. Your ONLY job is to quickly find specific information in the codebase, then STOP.
+
+Tools available:
+- glob: Find files by pattern (e.g., "**/*.ts")
+- grep: Search file contents with regex
+- read_file: Read file contents
+- list_directory: List directory contents
+${cwdContext}
+## STOP CONDITIONS — You MUST stop when ANY of these are met:
+1. You found the specific information requested
+2. You've searched 3+ patterns without finding anything new
+3. You've read the key files that answer the question
+4. You've exhausted reasonable search patterns
+
+## Guidelines:
+- Call multiple tools per turn — batch glob + grep + read_file in a single response
+- Read only the necessary files to answer the question
+- DO NOT continue exploring after you have the answer
+- DO NOT read files that aren't directly relevant
+
+## Output Format:
+Return a concise summary with:
+- File paths and line numbers for relevant code
+- Key code snippets (brief)
+- Direct answer to the question asked
+
+IMPORTANT: Complete in 2-4 turns. If you haven't found it by turn 4, summarize what you found and STOP.`,
+    plan: `You are a planning agent. Your ONLY job is to analyze the codebase and create an implementation plan, then STOP.
+
+Tools available:
+- glob: Find files by pattern
+- grep: Search file contents
+- read_file: Read file contents
+- list_directory: List directory contents
+${cwdContext}
+## STOP CONDITIONS — You MUST stop when:
+1. You've identified the files that need changes
+2. You've understood the existing patterns/architecture
+3. You've created a concrete plan with specific steps
+
+## Guidelines:
+- FIRST: Quick search to find relevant files
+- Read only files needed to understand the architecture
+- DO NOT read every file — focus on entry points and key modules
+- Create the plan as soon as you understand the structure
+
+## Output Format — Return EXACTLY this structure:
+### Summary
+[1-2 sentences on the approach]
+
+### Files to Modify
+- path/to/file.ts: [what changes]
+
+### Implementation Steps
+1. [Specific step]
+2. [Specific step]
+
+### Risks
+- [Any considerations]
+
+IMPORTANT: Complete in 3-5 turns. If you haven't finished by turn 5, output your best plan and STOP.`,
+    "general-purpose": `You are an autonomous agent for discrete tasks. Complete the task, then STOP.
+
+Tools available:
+- File operations: read_file, write_file, edit_file, glob, grep
+- Shell: run_command
+- Search: search_files, search_content
+- Web: web_fetch
+${cwdContext}
+## STOP CONDITIONS — You MUST stop when:
+1. The specific task is complete
+2. You've verified the changes work (if applicable)
+3. You encounter a blocker you cannot resolve
+
+## Guidelines:
+- Understand what exists before making changes
+- Make targeted changes — don't over-engineer
+- Verify your changes if possible (run tests, check syntax)
+- If blocked, explain the blocker and STOP
+
+## Output Format:
+### What I Did
+[Brief summary of actions taken]
+
+### Files Modified
+- path/to/file.ts: [change description]
+
+### Verification
+[How you verified it works, or N/A]
+
+### Issues (if any)
+[Any problems encountered]
+
+IMPORTANT: This is a discrete task. Complete it in 4-6 turns maximum. Do not loop.`,
+    research: `You are a research agent. Find the specific information requested, then STOP.
+
+Tools available:
+- web_fetch: Fetch and parse web content
+- web_search: Search the web
+- read_file: Read local files
+- grep: Search local file contents
+${cwdContext}
+## STOP CONDITIONS — You MUST stop when:
+1. You found the answer to the question
+2. You've checked 2-3 authoritative sources
+3. You've gathered enough information to answer
+
+## Guidelines:
+- Search for official documentation first
+- Check 2-3 sources, not 10
+- DO NOT keep searching after you have the answer
+- Summarize findings immediately when you have enough
+
+## Output Format:
+### Answer
+[Direct answer to the question]
+
+### Key Points
+- [Important detail 1]
+- [Important detail 2]
+
+### Sources
+- [URL 1]: [what it says]
+- [URL 2]: [what it says]
+
+### Caveats
+[Any version requirements or limitations]
+
+IMPORTANT: Complete in 2-4 turns. Stop as soon as you have a good answer.`
+  };
+  return prompts[type] || prompts["general-purpose"];
+}
+//# sourceMappingURL=subagent-types.js.map

package/dist/cli/services/subagent-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subagent-types.js","names":["existsSync","writeFileSync","readFileSync","mkdirSync","join","homedir","getAgentDefinition","AGENTS_DIR","getAgentIcon","type","icons","explore","plan","research","getAgentColor","colors","ensureAgentsDir","recursive","saveAgentState","state","path","id","JSON","stringify","loadAgentState","agentId","parse","generateAgentId","Date","now","Math","random","toString","slice","buildAgentPrompt","cwd","cwdContext","custom","prompt","prompts"],"sources":["../../../src/cli/services/subagent-types.ts"],"sourcesContent":["/**\n * Subagent types, constants, prompts, and state persistence\n *\n * Extracted from subagent.ts for single-responsibility.\n */\n\nimport type Anthropic from \"@anthropic-ai/sdk\";\nimport { existsSync, writeFileSync, readFileSync, mkdirSync } from \"fs\";\nimport { join } from \"path\";\nimport { homedir } from \"os\";\nimport { getAgentDefinition } from \"./agent-definitions.js\";\n\n// ============================================================================\n// TYPES\n// ============================================================================\n\nexport type BuiltinSubagentType =\n  | \"explore\"\n  | \"plan\"\n  | \"general-purpose\"\n  | \"research\";\n\nexport type SubagentType = BuiltinSubagentType | (string & {});\n\nexport interface ParentTraceContext {\n  traceId: string;\n  spanId: string;\n  conversationId?: string;\n  turnNumber: number;\n  userId?: string;\n  userEmail?: string;\n}\n\nexport interface SubagentOptions {\n  prompt: string;\n  subagent_type: SubagentType;\n  model?: \"sonnet\" | \"opus\" | \"haiku\";\n  resume?: string;\n  run_in_background?: boolean;\n  max_turns?: number;\n  name?: string;\n  parentContext?: string;\n  parentTraceContext?: ParentTraceContext;\n  taskContext?: string;\n  signal?: AbortSignal;\n}\n\nexport interface SubagentResult {\n  success: boolean;\n  output: string;\n  agentId: string;\n  tokensUsed: { input: number; output: number };\n  toolsUsed: string[];\n}\n\nexport interface AgentState {\n  id: string;\n  type: SubagentType;\n  model: string;\n  messages: Anthropic.MessageParam[];\n  toolsUsed: string[];\n  continuations?: number;\n  compactionCount?: number;\n  createdAt: string;\n  updatedAt: string;\n}\n\n// ============================================================================\n// CONSTANTS\n// ============================================================================\n\nexport const AGENTS_DIR = join(homedir(), \".whale\", \"agents\");\n\n// ============================================================================\n// DISPLAY HELPERS\n// ============================================================================\n\nexport function getAgentIcon(type: SubagentType): string {\n  const icons: Record<SubagentType, string> = {\n    explore: \"\\uD83D\\uDD0D\",\n    plan: \"\\uD83D\\uDCCB\",\n    \"general-purpose\": \"\\uD83E\\uDD16\",\n    research: \"\\uD83D\\uDCDA\",\n  };\n  return icons[type] || \"\\u2699\\uFE0F\";\n}\n\nexport function getAgentColor(type: SubagentType): string {\n  const colors: Record<SubagentType, string> = {\n    explore: \"#3B82F6\",\n    plan: \"#8B5CF6\",\n    \"general-purpose\": \"#10B981\",\n    research: \"#F59E0B\",\n  };\n  return colors[type] || \"#6B7280\";\n}\n\n// ============================================================================\n// AGENT STATE PERSISTENCE\n// ============================================================================\n\nfunction ensureAgentsDir(): void {\n  if (!existsSync(AGENTS_DIR)) mkdirSync(AGENTS_DIR, { recursive: true });\n}\n\nexport function saveAgentState(state: AgentState): void {\n  ensureAgentsDir();\n  const path = join(AGENTS_DIR, `${state.id}.json`);\n  writeFileSync(path, JSON.stringify(state, null, 2), \"utf-8\");\n}\n\nexport function loadAgentState(agentId: string): AgentState | null {\n  const path = join(AGENTS_DIR, `${agentId}.json`);\n  if (!existsSync(path)) return null;\n  try {\n    return JSON.parse(readFileSync(path, \"utf-8\"));\n  } catch {\n    return null;\n  }\n}\n\nexport function generateAgentId(): string {\n  return `agent-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;\n}\n\n// ============================================================================\n// AGENT PROMPTS\n// ============================================================================\n\nexport function buildAgentPrompt(type: SubagentType | string, cwd: string): string {\n  const cwdContext = `\n## Working Directory\nYou are working in: ${cwd}\nAll file paths should be relative to or absolute from this directory.\nIMPORTANT: Focus ONLY on files within this directory. Do not get confused by other projects.\n`;\n\n  const custom = getAgentDefinition(type);\n  if (custom) return custom.prompt + cwdContext;\n\n  const prompts: Record<SubagentType, string> = {\n    explore: `You are an exploration agent. Your ONLY job is to quickly find specific information in the codebase, then STOP.\n\nTools available:\n- glob: Find files by pattern (e.g., \"**/*.ts\")\n- grep: Search file contents with regex\n- read_file: Read file contents\n- list_directory: List directory contents\n${cwdContext}\n## STOP CONDITIONS — You MUST stop when ANY of these are met:\n1. You found the specific information requested\n2. You've searched 3+ patterns without finding anything new\n3. You've read the key files that answer the question\n4. You've exhausted reasonable search patterns\n\n## Guidelines:\n- Call multiple tools per turn — batch glob + grep + read_file in a single response\n- Read only the necessary files to answer the question\n- DO NOT continue exploring after you have the answer\n- DO NOT read files that aren't directly relevant\n\n## Output Format:\nReturn a concise summary with:\n- File paths and line numbers for relevant code\n- Key code snippets (brief)\n- Direct answer to the question asked\n\nIMPORTANT: Complete in 2-4 turns. If you haven't found it by turn 4, summarize what you found and STOP.`,\n\n    plan: `You are a planning agent. Your ONLY job is to analyze the codebase and create an implementation plan, then STOP.\n\nTools available:\n- glob: Find files by pattern\n- grep: Search file contents\n- read_file: Read file contents\n- list_directory: List directory contents\n${cwdContext}\n## STOP CONDITIONS — You MUST stop when:\n1. You've identified the files that need changes\n2. You've understood the existing patterns/architecture\n3. You've created a concrete plan with specific steps\n\n## Guidelines:\n- FIRST: Quick search to find relevant files\n- Read only files needed to understand the architecture\n- DO NOT read every file — focus on entry points and key modules\n- Create the plan as soon as you understand the structure\n\n## Output Format — Return EXACTLY this structure:\n### Summary\n[1-2 sentences on the approach]\n\n### Files to Modify\n- path/to/file.ts: [what changes]\n\n### Implementation Steps\n1. [Specific step]\n2. [Specific step]\n\n### Risks\n- [Any considerations]\n\nIMPORTANT: Complete in 3-5 turns. If you haven't finished by turn 5, output your best plan and STOP.`,\n\n    \"general-purpose\": `You are an autonomous agent for discrete tasks. Complete the task, then STOP.\n\nTools available:\n- File operations: read_file, write_file, edit_file, glob, grep\n- Shell: run_command\n- Search: search_files, search_content\n- Web: web_fetch\n${cwdContext}\n## STOP CONDITIONS — You MUST stop when:\n1. The specific task is complete\n2. You've verified the changes work (if applicable)\n3. You encounter a blocker you cannot resolve\n\n## Guidelines:\n- Understand what exists before making changes\n- Make targeted changes — don't over-engineer\n- Verify your changes if possible (run tests, check syntax)\n- If blocked, explain the blocker and STOP\n\n## Output Format:\n### What I Did\n[Brief summary of actions taken]\n\n### Files Modified\n- path/to/file.ts: [change description]\n\n### Verification\n[How you verified it works, or N/A]\n\n### Issues (if any)\n[Any problems encountered]\n\nIMPORTANT: This is a discrete task. Complete it in 4-6 turns maximum. Do not loop.`,\n\n    research: `You are a research agent. Find the specific information requested, then STOP.\n\nTools available:\n- web_fetch: Fetch and parse web content\n- web_search: Search the web\n- read_file: Read local files\n- grep: Search local file contents\n${cwdContext}\n## STOP CONDITIONS — You MUST stop when:\n1. You found the answer to the question\n2. You've checked 2-3 authoritative sources\n3. You've gathered enough information to answer\n\n## Guidelines:\n- Search for official documentation first\n- Check 2-3 sources, not 10\n- DO NOT keep searching after you have the answer\n- Summarize findings immediately when you have enough\n\n## Output Format:\n### Answer\n[Direct answer to the question]\n\n### Key Points\n- [Important detail 1]\n- [Important detail 2]\n\n### Sources\n- [URL 1]: [what it says]\n- [URL 2]: [what it says]\n\n### Caveats\n[Any version requirements or limitations]\n\nIMPORTANT: Complete in 2-4 turns. Stop as soon as you have a good answer.`,\n  };\n\n  return prompts[type] || prompts[\"general-purpose\"];\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAGA,SAASA,UAAU,EAAEC,aAAa,EAAEC,YAAY,EAAEC,SAAS,QAAQ,IAAI;AACvE,SAASC,IAAI,QAAQ,MAAM;AAC3B,SAASC,OAAO,QAAQ,IAAI;AAC5B,SAASC,kBAAkB,QAAQ,wBAAwB;;AAE3D;AACA;AACA;;AAqDA;AACA;AACA;;AAEA,OAAO,MAAMC,UAAU,GAAGH,IAAI,CAACC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC;;AAE7D;AACA;AACA;;AAEA,OAAO,SAASG,YAAYA,CAACC,IAAkB,EAAU;EACvD,MAAMC,KAAmC,GAAG;IAC1CC,OAAO,EAAE,cAAc;IACvBC,IAAI,EAAE,cAAc;IACpB,iBAAiB,EAAE,cAAc;IACjCC,QAAQ,EAAE;EACZ,CAAC;EACD,OAAOH,KAAK,CAACD,IAAI,CAAC,IAAI,cAAc;AACtC;AAEA,OAAO,SAASK,aAAaA,CAACL,IAAkB,EAAU;EACxD,MAAMM,MAAoC,GAAG;IAC3CJ,OAAO,EAAE,SAAS;IAClBC,IAAI,EAAE,SAAS;IACf,iBAAiB,EAAE,SAAS;IAC5BC,QAAQ,EAAE;EACZ,CAAC;EACD,OAAOE,MAAM,CAACN,IAAI,CAAC,IAAI,SAAS;AAClC;;AAEA;AACA;AACA;;AAEA,SAASO,eAAeA,CAAA,EAAS;EAC/B,IAAI,CAAChB,UAAU,CAACO,UAAU,CAAC,EAAEJ,SAAS,CAACI,UAAU,EAAE;IAAEU,SAAS,EAAE;EAAK,CAAC,CAAC;AACzE;AAEA,OAAO,SAASC,cAAcA,CAACC,KAAiB,EAAQ;EACtDH,eAAe,CAAC,CAAC;EACjB,MAAMI,IAAI,GAAGhB,IAAI,CAACG,UAAU,EAAE,GAAGY,KAAK,CAACE,EAAE,OAAO,CAAC;EACjDpB,aAAa,CAACmB,IAAI,EAAEE,IAAI,CAACC,SAAS,CAACJ,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC;AAC9D;AAEA,OAAO,SAASK,cAAcA,CAACC,OAAe,EAAqB;EACjE,MAAML,IAAI,GAAGhB,IAAI,CAACG,UAAU,EAAE,GAAGkB,OAAO,OAAO,CAAC;EAChD,IAAI,CAACzB,UAAU,CAACoB,IAAI,CAAC,EAAE,OAAO,IAAI;EAClC,IAAI;IACF,OAAOE,IAAI,CAACI,KAAK,CAACxB,YAAY,CAACkB,IAAI,EAAE,OAAO,CAAC,CAAC;EAChD,CAAC,CAAC,MAAM;IACN,OAAO,IAAI;EACb;AACF;AAEA,OAAO,SAASO,eAAeA,CAAA,EAAW;EACxC,OAAO,SAASC,IAAI,CAACC,GAAG,CAAC,CAAC,IAAIC,IAAI,CAACC,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,EAAE,CAAC,CAACC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;AACxE;;AAEA;AACA;AACA;;AAEA,OAAO,SAASC,gBAAgBA,CAACzB,IAA2B,EAAE0B,GAAW,EAAU;EACjF,MAAMC,UAAU,GAAG;AACrB;AACA,sBAAsBD,GAAG;AACzB;AACA;AACA,CAAC;EAEC,MAAME,MAAM,GAAG/B,kBAAkB,CAACG,IAAI,CAAC;EACvC,IAAI4B,MAAM,EAAE,OAAOA,MAAM,CAACC,MAAM,GAAGF,UAAU;EAE7C,MAAMG,OAAqC,GAAG;IAC5C5B,OAAO,EAAE;AACb;AACA;AACA;AACA;AACA;AACA;AACA,EAAEyB,UAAU;AACZ;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,wGAAwG;IAEpGxB,IAAI,EAAE;AACV;AACA;AACA;AACA;AACA;AACA;AACA,EAAEwB,UAAU;AACZ;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,qGAAqG;IAEjG,iBAAiB,EAAE;AACvB;AACA;AACA;AACA;AACA;AACA;AACA,EAAEA,UAAU;AACZ;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,mFAAmF;IAE/EvB,QAAQ,EAAE;AACd;AACA;AACA;AACA;AACA;AACA;AACA,EAAEuB,UAAU;AACZ;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,CAAC;EAED,OAAOG,OAAO,CAAC9B,IAAI,CAAC,IAAI8B,OAAO,CAAC,iBAAiB,CAAC;AACpD","ignoreList":[]}

package/dist/cli/services/subagent.js

@@ -755,12 +755,13 @@ export async function runSubagentBackground(options) {
 
   // Import background process tracker (dynamic to avoid circular deps)
   const bgModule = await import("./background-processes.js");
-  bgModule.registerBackgroundAgent(agentId, options.subagent_type, outputFile);
+  const abortController = bgModule.registerBackgroundAgent(agentId, options.subagent_type, outputFile);
 
   // Start agent in detached async — don't await
   runSubagent({
     ...options,
-    resume: undefined
+    resume: undefined,
+    signal: abortController.signal
   }).then(result => {
     appendFileSync(outputFile, `\n---DONE---\n${JSON.stringify({
       success: result.success,