whale-code 6.5.5 → 6.5.7

package/dist/cli/services/session-persistence.js

@@ -4,96 +4,103 @@
  * Extracted from agent-loop.ts for single-responsibility.
  * All consumers should import from agent-loop.ts (re-export facade).
  */
+
 import { readFileSync, existsSync, mkdirSync, writeFileSync, readdirSync, appendFileSync } from "fs";
 import { join } from "path";
-import { homedir } from "os";
 import { getModel } from "./model-manager.js";
-const SESSIONS_DIR = join(homedir(), ".swagmanager", "sessions");
+import { SESSIONS_DIR, APP_DATA_DIR, ensureDataDir } from "./paths.js";
 function ensureSessionsDir() {
-    if (!existsSync(SESSIONS_DIR))
-        mkdirSync(SESSIONS_DIR, { recursive: true });
+  ensureDataDir();
+  if (!existsSync(SESSIONS_DIR)) mkdirSync(SESSIONS_DIR, {
+    recursive: true
+  });
 }
 export function saveSession(messages, sessionId) {
-    ensureSessionsDir();
-    const id = sessionId || `session-${Date.now()}`;
-    const meta = {
-        id,
-        title: extractSessionTitle(messages),
-        model: getModel(),
-        messageCount: messages.length,
-        createdAt: new Date().toISOString(),
-        updatedAt: new Date().toISOString(),
-        cwd: process.cwd(),
-    };
-    const data = JSON.stringify({ meta, messages }, null, 2);
-    writeFileSync(join(SESSIONS_DIR, `${id}.json`), data, "utf-8");
-    logSessionHistory(meta);
-    return id;
+  ensureSessionsDir();
+  const id = sessionId || `session-${Date.now()}`;
+  const meta = {
+    id,
+    title: extractSessionTitle(messages),
+    model: getModel(),
+    messageCount: messages.length,
+    createdAt: new Date().toISOString(),
+    updatedAt: new Date().toISOString(),
+    cwd: process.cwd()
+  };
+  const data = JSON.stringify({
+    meta,
+    messages
+  }, null, 2);
+  writeFileSync(join(SESSIONS_DIR, `${id}.json`), data, "utf-8");
+  logSessionHistory(meta);
+  return id;
 }
 export function loadSession(sessionId) {
-    const path = join(SESSIONS_DIR, `${sessionId}.json`);
-    if (!existsSync(path))
-        return null;
-    try {
-        return JSON.parse(readFileSync(path, "utf-8"));
-    }
-    catch {
-        return null;
-    }
+  const path = join(SESSIONS_DIR, `${sessionId}.json`);
+  if (!existsSync(path)) return null;
+  try {
+    return JSON.parse(readFileSync(path, "utf-8"));
+  } catch {
+    return null;
+  }
 }
 export function listSessions(limit = 20) {
-    ensureSessionsDir();
-    const files = readdirSync(SESSIONS_DIR)
-        .filter((f) => f.endsWith(".json"))
-        .sort()
-        .reverse()
-        .slice(0, limit);
-    const sessions = [];
-    for (const f of files) {
-        try {
-            const data = JSON.parse(readFileSync(join(SESSIONS_DIR, f), "utf-8"));
-            if (data.meta)
-                sessions.push(data.meta);
-        }
-        catch { /* skip corrupted */ }
-    }
-    return sessions;
+  ensureSessionsDir();
+  const files = readdirSync(SESSIONS_DIR).filter(f => f.endsWith(".json")).sort().reverse().slice(0, limit);
+  const sessions = [];
+  for (const f of files) {
+    try {
+      const data = JSON.parse(readFileSync(join(SESSIONS_DIR, f), "utf-8"));
+      if (data.meta) sessions.push(data.meta);
+    } catch {/* skip corrupted */}
+  }
+  return sessions;
 }
-const HISTORY_FILE = join(homedir(), ".swagmanager", "history.jsonl");
+const HISTORY_FILE = join(APP_DATA_DIR, "history.jsonl");
 function logSessionHistory(meta) {
-    try {
-        const dir = join(homedir(), ".swagmanager");
-        if (!existsSync(dir))
-            mkdirSync(dir, { recursive: true });
-        const entry = {
-            display: meta.title,
-            project: meta.cwd || process.cwd(),
-            timestamp: meta.updatedAt,
-            sessionId: meta.id,
-            model: meta.model,
-        };
-        appendFileSync(HISTORY_FILE, JSON.stringify(entry) + "\n");
-    }
-    catch { /* best effort */ }
+  try {
+    ensureDataDir();
+    const entry = {
+      display: meta.title,
+      project: meta.cwd || process.cwd(),
+      timestamp: meta.updatedAt,
+      sessionId: meta.id,
+      model: meta.model
+    };
+    appendFileSync(HISTORY_FILE, JSON.stringify(entry) + "\n");
+  } catch {/* best effort */}
 }
 export function findLatestSessionForCwd() {
-    const cwd = process.cwd();
-    const sessions = listSessions(100);
-    return sessions.find(s => s.cwd === cwd) || null;
+  const cwd = process.cwd();
+  const sessions = listSessions(100);
+  return sessions.find(s => s.cwd === cwd) || null;
+}
+export function updateSessionMeta(sessionId, updates) {
+  const path = join(SESSIONS_DIR, `${sessionId}.json`);
+  if (!existsSync(path)) return;
+  try {
+    const data = JSON.parse(readFileSync(path, "utf-8"));
+    if (data.meta) {
+      Object.assign(data.meta, updates);
+      data.meta.updatedAt = new Date().toISOString();
+      writeFileSync(path, JSON.stringify(data, null, 2), "utf-8");
+    }
+  } catch {/* best effort */}
 }
 function extractSessionTitle(messages) {
-    // Use first user message as title (truncated)
-    for (const m of messages) {
-        if (m.role === "user" && typeof m.content === "string") {
-            return m.content.slice(0, 60) + (m.content.length > 60 ? "..." : "");
-        }
-        if (m.role === "user" && Array.isArray(m.content)) {
-            for (const block of m.content) {
-                if ("text" in block && typeof block.text === "string") {
-                    return block.text.slice(0, 60) + (block.text.length > 60 ? "..." : "");
-                }
-            }
+  // Use first user message as title (truncated)
+  for (const m of messages) {
+    if (m.role === "user" && typeof m.content === "string") {
+      return m.content.slice(0, 60) + (m.content.length > 60 ? "..." : "");
+    }
+    if (m.role === "user" && Array.isArray(m.content)) {
+      for (const block of m.content) {
+        if ("text" in block && typeof block.text === "string") {
+          return block.text.slice(0, 60) + (block.text.length > 60 ? "..." : "");
         }
+      }
     }
-    return "Untitled session";
+  }
+  return "Untitled session";
 }
+//# sourceMappingURL=session-persistence.js.map

package/dist/cli/services/session-persistence.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-persistence.js","names":["readFileSync","existsSync","mkdirSync","writeFileSync","readdirSync","appendFileSync","join","getModel","SESSIONS_DIR","APP_DATA_DIR","ensureDataDir","ensureSessionsDir","recursive","saveSession","messages","sessionId","id","Date","now","meta","title","extractSessionTitle","model","messageCount","length","createdAt","toISOString","updatedAt","cwd","process","data","JSON","stringify","logSessionHistory","loadSession","path","parse","listSessions","limit","files","filter","f","endsWith","sort","reverse","slice","sessions","push","HISTORY_FILE","entry","display","project","timestamp","findLatestSessionForCwd","find","s","updateSessionMeta","updates","Object","assign","m","role","content","Array","isArray","block","text"],"sources":["../../../src/cli/services/session-persistence.ts"],"sourcesContent":["/**\n * Session Persistence — save/load conversations to disk\n *\n * Extracted from agent-loop.ts for single-responsibility.\n * All consumers should import from agent-loop.ts (re-export facade).\n */\n\nimport type Anthropic from \"@anthropic-ai/sdk\";\nimport { readFileSync, existsSync, mkdirSync, writeFileSync, readdirSync, appendFileSync } from \"fs\";\nimport { join } from \"path\";\nimport { getModel } from \"./model-manager.js\";\nimport { SESSIONS_DIR, APP_DATA_DIR, ensureDataDir } from \"./paths.js\";\n\nfunction ensureSessionsDir(): void {\n  ensureDataDir();\n  if (!existsSync(SESSIONS_DIR)) mkdirSync(SESSIONS_DIR, { recursive: true });\n}\n\nexport interface SessionMeta {\n  id: string;\n  title: string;\n  model: string;\n  messageCount: number;\n  createdAt: string;\n  updatedAt: string;\n  cwd?: string;\n  serverSessionId?: string;  // links to server session (unified session architecture)\n  synced?: boolean;          // true if persisted in DB via session API\n}\n\nexport function saveSession(\n  messages: Anthropic.MessageParam[],\n  sessionId?: string\n): string {\n  ensureSessionsDir();\n  const id = sessionId || `session-${Date.now()}`;\n  const meta: SessionMeta = {\n    id,\n    title: extractSessionTitle(messages),\n    model: getModel(),\n    messageCount: messages.length,\n    createdAt: new Date().toISOString(),\n    updatedAt: new Date().toISOString(),\n    cwd: process.cwd(),\n  };\n  const data = JSON.stringify({ meta, messages }, null, 2);\n  writeFileSync(join(SESSIONS_DIR, `${id}.json`), data, \"utf-8\");\n  logSessionHistory(meta);\n  return id;\n}\n\nexport function loadSession(sessionId: string): { meta: SessionMeta; messages: Anthropic.MessageParam[] } | null {\n  const path = join(SESSIONS_DIR, `${sessionId}.json`);\n  if (!existsSync(path)) return null;\n  try {\n    return JSON.parse(readFileSync(path, \"utf-8\"));\n  } catch { return null; }\n}\n\nexport function listSessions(limit = 20): SessionMeta[] {\n  ensureSessionsDir();\n  const files = readdirSync(SESSIONS_DIR)\n    .filter((f) => f.endsWith(\".json\"))\n    .sort()\n    .reverse()\n    .slice(0, limit);\n  const sessions: SessionMeta[] = [];\n  for (const f of files) {\n    try {\n      const data = JSON.parse(readFileSync(join(SESSIONS_DIR, f), \"utf-8\"));\n      if (data.meta) sessions.push(data.meta);\n    } catch { /* skip corrupted */ }\n  }\n  return sessions;\n}\n\nconst HISTORY_FILE = join(APP_DATA_DIR, \"history.jsonl\");\n\nfunction logSessionHistory(meta: SessionMeta): void {\n  try {\n    ensureDataDir();\n    const entry = {\n      display: meta.title,\n      project: meta.cwd || process.cwd(),\n      timestamp: meta.updatedAt,\n      sessionId: meta.id,\n      model: meta.model,\n    };\n    appendFileSync(HISTORY_FILE, JSON.stringify(entry) + \"\\n\");\n  } catch { /* best effort */ }\n}\n\nexport function findLatestSessionForCwd(): SessionMeta | null {\n  const cwd = process.cwd();\n  const sessions = listSessions(100);\n  return sessions.find(s => s.cwd === cwd) || null;\n}\n\nexport function updateSessionMeta(sessionId: string, updates: Partial<SessionMeta>): void {\n  const path = join(SESSIONS_DIR, `${sessionId}.json`);\n  if (!existsSync(path)) return;\n  try {\n    const data = JSON.parse(readFileSync(path, \"utf-8\"));\n    if (data.meta) {\n      Object.assign(data.meta, updates);\n      data.meta.updatedAt = new Date().toISOString();\n      writeFileSync(path, JSON.stringify(data, null, 2), \"utf-8\");\n    }\n  } catch { /* best effort */ }\n}\n\nfunction extractSessionTitle(messages: Anthropic.MessageParam[]): string {\n  // Use first user message as title (truncated)\n  for (const m of messages) {\n    if (m.role === \"user\" && typeof m.content === \"string\") {\n      return m.content.slice(0, 60) + (m.content.length > 60 ? \"...\" : \"\");\n    }\n    if (m.role === \"user\" && Array.isArray(m.content)) {\n      for (const block of m.content) {\n        if (\"text\" in block && typeof block.text === \"string\") {\n          return block.text.slice(0, 60) + (block.text.length > 60 ? \"...\" : \"\");\n        }\n      }\n    }\n  }\n  return \"Untitled session\";\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,12 @@
+/**
+ * Subagent Execution — Core execution loop for subagents
+ *
+ * Contains the main runSubagent function that orchestrates the agent loop:
+ * API calls, tool execution, compaction, and telemetry.
+ */
+import type { SubagentOptions, SubagentResult } from "./subagent-types.js";
+export declare function runSubagent(options: SubagentOptions): Promise<SubagentResult>;
+export declare function runSubagentBackground(options: SubagentOptions): Promise<{
+    agentId: string;
+    outputFile: string;
+}>;

package/dist/cli/services/subagent-loop-v2.d.ts

@@ -0,0 +1,36 @@
+/**
+ * SubagentLoop — AgentLoopBase subclass for subagent execution.
+ *
+ * Delegates to callAgentAPI for API calls and executeToolBlocks for tool dispatch.
+ * Overrides preCompactMessages for aggressive compaction (strip thinking, lower max chars).
+ * Handles abort via signal, state persistence, and turn-limit nudge warnings.
+ */
+import { AgentLoopBase, type AgentLoopConfig, type AgentLoopEvents, type TurnResult } from "../../shared/agent-loop-base.js";
+import { type CompactableMessage } from "../../shared/compaction.js";
+import type { ToolExecutor } from "../../shared/tool-dispatch.js";
+import { type AgentState, type SubagentType } from "./subagent-types.js";
+export interface SubagentLoopConfig extends AgentLoopConfig {
+    agentId: string;
+    subagentType: SubagentType;
+    agentState: AgentState;
+    signal?: AbortSignal;
+    maxRetries?: number;
+    thinkingEnabled?: boolean;
+    maxOutputTokens?: number;
+    turnCtx?: Record<string, unknown>;
+}
+export declare class SubagentLoop extends AgentLoopBase {
+    private subConfig;
+    constructor(config: SubagentLoopConfig, events?: AgentLoopEvents);
+    protected executeTurn(messages: CompactableMessage[], iteration: number): Promise<TurnResult>;
+    protected createToolExecutor(): ToolExecutor;
+    protected checkAbort(): boolean;
+    protected onAborted(): void;
+    protected preCompactMessages(msgs: CompactableMessage[]): CompactableMessage[];
+    protected onMessagesUpdated(_reason: "compaction" | "continuation" | "tool_results"): Promise<void>;
+    /**
+     * Override tool dispatch to use executeToolBlocks (subagent-specific tool routing)
+     * instead of the shared dispatchTools.
+     */
+    protected dispatchToolsAndAppend(turnResult: TurnResult): Promise<boolean>;
+}

package/dist/cli/services/subagent-loop-v2.js

@@ -0,0 +1,238 @@
+/**
+ * SubagentLoop — AgentLoopBase subclass for subagent execution.
+ *
+ * Delegates to callAgentAPI for API calls and executeToolBlocks for tool dispatch.
+ * Overrides preCompactMessages for aggressive compaction (strip thinking, lower max chars).
+ * Handles abort via signal, state persistence, and turn-limit nudge warnings.
+ */
+
+import { AgentLoopBase } from "../../shared/agent-loop-base.js";
+import { preCompact } from "../../shared/compaction.js";
+import { callAgentAPI, executeToolBlocks, extractTextBlocks, extractToolUseBlocks, getResponseText, yieldToEventLoop, yieldForRender } from "./agent-worker-base.js";
+import { saveAgentState } from "./subagent-types.js";
+import { getGlobalEmitter } from "./agent-events.js";
+
+// ============================================================================
+// TYPES
+// ============================================================================
+
+// ============================================================================
+// SUBAGENT LOOP
+// ============================================================================
+
+export class SubagentLoop extends AgentLoopBase {
+  constructor(config, events = {}) {
+    super(config, events);
+    this.subConfig = config;
+    // Use subagent's state messages instead of config messages
+    this.messages = config.agentState.messages;
+  }
+
+  // ============================================================================
+  // ABSTRACT IMPLEMENTATIONS
+  // ============================================================================
+
+  async executeTurn(messages, iteration) {
+    const {
+      agentId,
+      subagentType,
+      signal,
+      maxRetries = 2,
+      thinkingEnabled = true,
+      maxOutputTokens
+    } = this.subConfig;
+    const emitter = getGlobalEmitter();
+    emitter.emitSubagentProgress(agentId, subagentType, `turn ${iteration + 1}: calling API...`, iteration + 1);
+    await yieldForRender();
+
+    // Call API with retry
+    let response;
+    let lastError = null;
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      try {
+        response = await callAgentAPI({
+          modelId: this.config.model,
+          contextProfile: "subagent",
+          systemPrompt: this.config.systemPrompt,
+          messages: messages,
+          tools: [],
+          // Tools are injected by executeToolBlocks
+          thinkingEnabled,
+          maxOutputTokens: maxOutputTokens || this.config.maxTurns,
+          cacheLastTool: true,
+          abortSignal: signal
+        });
+        lastError = null;
+        break;
+      } catch (err) {
+        lastError = err;
+        if (attempt < maxRetries && (err.status === 429 || err.status === 500 || err.status === 529)) {
+          await new Promise(r => setTimeout(r, 1000 * Math.pow(2, attempt)));
+          continue;
+        }
+        throw err;
+      }
+    }
+    if (lastError) throw lastError;
+    await yieldToEventLoop();
+    const u = response.usage;
+    const textBlocks = extractTextBlocks(response.content);
+    const toolBlocks = extractToolUseBlocks(response.content);
+    const text = textBlocks.length ? getResponseText(response.content) : "";
+
+    // Extract compaction content if present
+    let compactionContent = null;
+    if (response.stop_reason === "compaction") {
+      const compactionBlock = response.content.find(b => b.type === "compaction");
+      if (compactionBlock) {
+        compactionContent = compactionBlock.content;
+      }
+    }
+
+    // Extract thinking blocks
+    const thinkingBlocks = response.content.filter(b => b.type === "thinking").map(b => ({
+      type: "thinking",
+      thinking: b.thinking,
+      signature: b.signature || ""
+    }));
+    return {
+      text,
+      toolUseBlocks: toolBlocks.map(b => ({
+        id: b.id,
+        name: b.name,
+        input: b.input
+      })),
+      thinkingBlocks,
+      compactionContent,
+      stopReason: response.stop_reason,
+      usage: {
+        inputTokens: u.input_tokens,
+        outputTokens: u.output_tokens,
+        cacheRead: u.cache_read_tokens,
+        cacheCreation: u.cache_creation_tokens
+      }
+    };
+  }
+  createToolExecutor() {
+    // SubagentLoop overrides dispatchToolsAndAppend entirely, so this is not used.
+    return async (_name, _input) => ({
+      success: false,
+      output: "Not implemented"
+    });
+  }
+
+  // ============================================================================
+  // OVERRIDES
+  // ============================================================================
+
+  checkAbort() {
+    return this.subConfig.signal?.aborted === true;
+  }
+  onAborted() {
+    const {
+      agentId,
+      subagentType
+    } = this.subConfig;
+    getGlobalEmitter().emitSubagentProgress(agentId, subagentType, "cancelled");
+  }
+  preCompactMessages(msgs) {
+    const {
+      messages: compacted
+    } = preCompact(msgs, {
+      maxToolResultChars: this.config.maxToolResultChars ?? 2048,
+      stripThinking: true
+    });
+    return compacted;
+  }
+  async onMessagesUpdated(_reason) {
+    // Sync messages back to agent state and persist
+    this.subConfig.agentState.messages = this.messages;
+    this.subConfig.agentState.updatedAt = new Date().toISOString();
+    saveAgentState(this.subConfig.agentState);
+  }
+
+  /**
+   * Override tool dispatch to use executeToolBlocks (subagent-specific tool routing)
+   * instead of the shared dispatchTools.
+   */
+  async dispatchToolsAndAppend(turnResult) {
+    const {
+      agentId,
+      subagentType,
+      signal,
+      agentState
+    } = this.subConfig;
+    const emitter = getGlobalEmitter();
+
+    // Record tool names
+    for (const tb of turnResult.toolUseBlocks) {
+      this.toolsUsed.add(tb.name);
+      this.toolCallCount++;
+    }
+    const toolNames = turnResult.toolUseBlocks.map(b => b.name).join(", ");
+    emitter.emitSubagentProgress(agentId, subagentType, `using: ${toolNames}`);
+    const {
+      toolResults,
+      toolsUsed: turnToolsUsed
+    } = await executeToolBlocks({
+      toolBlocks: turnResult.toolUseBlocks,
+      loopDetector: this.loopDetector,
+      signal,
+      callbacks: {
+        onToolStart: (toolName, input) => {
+          emitter.emitSubagentProgress(agentId, subagentType, `running ${toolName}`, undefined, toolName);
+          emitter.emitSubagentToolStart(agentId, toolName, input);
+          this.events.onToolStart?.(toolName, input);
+        },
+        onToolEnd: (toolName, success, durationMs) => {
+          emitter.emitSubagentToolEnd(agentId, toolName, success, durationMs);
+          this.events.onToolResult?.(toolName, success, "", durationMs);
+        }
+      }
+    });
+
+    // Record tools used in state
+    for (const tn of turnToolsUsed) {
+      if (!agentState.toolsUsed.includes(tn)) agentState.toolsUsed.push(tn);
+    }
+
+    // End-of-turn loop detector check
+    const bailCheck = this.loopDetector.endTurn();
+    if (bailCheck.shouldBail) {
+      this.events.onText?.(bailCheck.message || "\n[Consecutive failures detected. Stopping.]");
+      return false;
+    }
+
+    // Append messages
+    const assistantContent = this.buildAssistantContent(turnResult);
+    this.messages.push({
+      role: "assistant",
+      content: assistantContent
+    });
+    this.messages.push({
+      role: "user",
+      content: toolResults
+    });
+
+    // Turn limit nudge warning
+    const turnsRemaining = this.config.maxTurns - this.turnCount - 1;
+    const nudgeThreshold = Math.ceil(this.config.maxTurns * 0.25);
+    if (turnsRemaining === nudgeThreshold && turnsRemaining > 0) {
+      const editTools = ["write_file", "edit_file", "create_file", "notebook_edit"];
+      const hasEdited = agentState.toolsUsed.some(t => editTools.includes(t));
+      if (!hasEdited) {
+        this.messages.push({
+          role: "user",
+          content: [{
+            type: "text",
+            text: `\u26A0\uFE0F TURN LIMIT WARNING: You have ${turnsRemaining} turns remaining and have NOT made any file edits yet. Start producing output NOW.`
+          }]
+        });
+      }
+    }
+    await this.onMessagesUpdated("tool_results");
+    await yieldToEventLoop();
+    return true;
+  }
+}
+//# sourceMappingURL=subagent-loop-v2.js.map

package/dist/cli/services/subagent-loop-v2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subagent-loop-v2.js","names":["AgentLoopBase","preCompact","callAgentAPI","executeToolBlocks","extractTextBlocks","extractToolUseBlocks","getResponseText","yieldToEventLoop","yieldForRender","saveAgentState","getGlobalEmitter","SubagentLoop","constructor","config","events","subConfig","messages","agentState","executeTurn","iteration","agentId","subagentType","signal","maxRetries","thinkingEnabled","maxOutputTokens","emitter","emitSubagentProgress","response","lastError","attempt","modelId","model","contextProfile","systemPrompt","tools","maxTurns","cacheLastTool","abortSignal","err","status","Promise","r","setTimeout","Math","pow","u","usage","textBlocks","content","toolBlocks","text","length","compactionContent","stop_reason","compactionBlock","find","b","type","thinkingBlocks","filter","map","thinking","signature","toolUseBlocks","id","name","input","stopReason","inputTokens","input_tokens","outputTokens","output_tokens","cacheRead","cache_read_tokens","cacheCreation","cache_creation_tokens","createToolExecutor","_name","_input","success","output","checkAbort","aborted","onAborted","preCompactMessages","msgs","compacted","maxToolResultChars","stripThinking","onMessagesUpdated","_reason","updatedAt","Date","toISOString","dispatchToolsAndAppend","turnResult","tb","toolsUsed","add","toolCallCount","toolNames","join","toolResults","turnToolsUsed","loopDetector","callbacks","onToolStart","toolName","undefined","emitSubagentToolStart","onToolEnd","durationMs","emitSubagentToolEnd","onToolResult","tn","includes","push","bailCheck","endTurn","shouldBail","onText","message","assistantContent","buildAssistantContent","role","turnsRemaining","turnCount","nudgeThreshold","ceil","editTools","hasEdited","some","t"],"sources":["../../../src/cli/services/subagent-loop-v2.ts"],"sourcesContent":["/**\n * SubagentLoop — AgentLoopBase subclass for subagent execution.\n *\n * Delegates to callAgentAPI for API calls and executeToolBlocks for tool dispatch.\n * Overrides preCompactMessages for aggressive compaction (strip thinking, lower max chars).\n * Handles abort via signal, state persistence, and turn-limit nudge warnings.\n */\n\nimport { AgentLoopBase, type AgentLoopConfig, type AgentLoopEvents, type TurnResult } from \"../../shared/agent-loop-base.js\";\nimport { preCompact, type CompactableMessage } from \"../../shared/compaction.js\";\nimport { LoopDetector, AGENT_DEFAULTS } from \"../../shared/agent-core.js\";\nimport type { ToolExecutor } from \"../../shared/tool-dispatch.js\";\nimport type { ToolUseBlock, ToolResultMessage } from \"../../shared/types.js\";\nimport {\n  callAgentAPI,\n  executeToolBlocks,\n  extractTextBlocks,\n  extractToolUseBlocks,\n  getResponseText,\n  yieldToEventLoop,\n  yieldForRender,\n} from \"./agent-worker-base.js\";\nimport type { AgentAPIResponse } from \"./agent-worker-base.js\";\nimport { saveAgentState, type AgentState, type SubagentType } from \"./subagent-types.js\";\nimport { getGlobalEmitter } from \"./agent-events.js\";\nimport { logSpan, generateSpanId } from \"./telemetry.js\";\n\n// ============================================================================\n// TYPES\n// ============================================================================\n\nexport interface SubagentLoopConfig extends AgentLoopConfig {\n  agentId: string;\n  subagentType: SubagentType;\n  agentState: AgentState;\n  signal?: AbortSignal;\n  maxRetries?: number;\n  thinkingEnabled?: boolean;\n  maxOutputTokens?: number;\n  turnCtx?: Record<string, unknown>;\n}\n\n// ============================================================================\n// SUBAGENT LOOP\n// ============================================================================\n\nexport class SubagentLoop extends AgentLoopBase {\n  private subConfig: SubagentLoopConfig;\n\n  constructor(config: SubagentLoopConfig, events: AgentLoopEvents = {}) {\n    super(config, events);\n    this.subConfig = config;\n    // Use subagent's state messages instead of config messages\n    this.messages = config.agentState.messages as CompactableMessage[];\n  }\n\n  // ============================================================================\n  // ABSTRACT IMPLEMENTATIONS\n  // ============================================================================\n\n  protected async executeTurn(messages: CompactableMessage[], iteration: number): Promise<TurnResult> {\n    const { agentId, subagentType, signal, maxRetries = 2, thinkingEnabled = true, maxOutputTokens } = this.subConfig;\n    const emitter = getGlobalEmitter();\n\n    emitter.emitSubagentProgress(agentId, subagentType, `turn ${iteration + 1}: calling API...`, iteration + 1);\n    await yieldForRender();\n\n    // Call API with retry\n    let response!: AgentAPIResponse;\n    let lastError: Error | null = null;\n    for (let attempt = 0; attempt <= maxRetries; attempt++) {\n      try {\n        response = await callAgentAPI({\n          modelId: this.config.model,\n          contextProfile: \"subagent\",\n          systemPrompt: this.config.systemPrompt,\n          messages: messages as any,\n          tools: [], // Tools are injected by executeToolBlocks\n          thinkingEnabled,\n          maxOutputTokens: maxOutputTokens || this.config.maxTurns,\n          cacheLastTool: true,\n          abortSignal: signal,\n        });\n        lastError = null;\n        break;\n      } catch (err: any) {\n        lastError = err;\n        if (attempt < maxRetries && (err.status === 429 || err.status === 500 || err.status === 529)) {\n          await new Promise(r => setTimeout(r, 1000 * Math.pow(2, attempt)));\n          continue;\n        }\n        throw err;\n      }\n    }\n    if (lastError) throw lastError;\n\n    await yieldToEventLoop();\n\n    const u = response.usage;\n    const textBlocks = extractTextBlocks(response.content);\n    const toolBlocks = extractToolUseBlocks(response.content);\n    const text = textBlocks.length ? getResponseText(response.content) : \"\";\n\n    // Extract compaction content if present\n    let compactionContent: string | null = null;\n    if (response.stop_reason === \"compaction\") {\n      const compactionBlock = response.content.find((b: any) => b.type === \"compaction\") as any;\n      if (compactionBlock) {\n        compactionContent = compactionBlock.content;\n      }\n    }\n\n    // Extract thinking blocks\n    const thinkingBlocks = response.content\n      .filter((b: any) => b.type === \"thinking\")\n      .map((b: any) => ({ type: \"thinking\" as const, thinking: b.thinking, signature: b.signature || \"\" }));\n\n    return {\n      text,\n      toolUseBlocks: toolBlocks.map(b => ({ id: b.id, name: b.name, input: b.input as Record<string, unknown> })),\n      thinkingBlocks,\n      compactionContent,\n      stopReason: response.stop_reason,\n      usage: {\n        inputTokens: u.input_tokens,\n        outputTokens: u.output_tokens,\n        cacheRead: u.cache_read_tokens,\n        cacheCreation: u.cache_creation_tokens,\n      },\n    };\n  }\n\n  protected createToolExecutor(): ToolExecutor {\n    // SubagentLoop overrides dispatchToolsAndAppend entirely, so this is not used.\n    return async (_name, _input) => ({ success: false, output: \"Not implemented\" });\n  }\n\n  // ============================================================================\n  // OVERRIDES\n  // ============================================================================\n\n  protected checkAbort(): boolean {\n    return this.subConfig.signal?.aborted === true;\n  }\n\n  protected onAborted(): void {\n    const { agentId, subagentType } = this.subConfig;\n    getGlobalEmitter().emitSubagentProgress(agentId, subagentType, \"cancelled\");\n  }\n\n  protected preCompactMessages(msgs: CompactableMessage[]): CompactableMessage[] {\n    const { messages: compacted } = preCompact(msgs, {\n      maxToolResultChars: this.config.maxToolResultChars ?? 2048,\n      stripThinking: true,\n    });\n    return compacted;\n  }\n\n  protected async onMessagesUpdated(_reason: \"compaction\" | \"continuation\" | \"tool_results\"): Promise<void> {\n    // Sync messages back to agent state and persist\n    this.subConfig.agentState.messages = this.messages as any;\n    this.subConfig.agentState.updatedAt = new Date().toISOString();\n    saveAgentState(this.subConfig.agentState);\n  }\n\n  /**\n   * Override tool dispatch to use executeToolBlocks (subagent-specific tool routing)\n   * instead of the shared dispatchTools.\n   */\n  protected async dispatchToolsAndAppend(turnResult: TurnResult): Promise<boolean> {\n    const { agentId, subagentType, signal, agentState } = this.subConfig;\n    const emitter = getGlobalEmitter();\n\n    // Record tool names\n    for (const tb of turnResult.toolUseBlocks) {\n      this.toolsUsed.add(tb.name);\n      this.toolCallCount++;\n    }\n\n    const toolNames = turnResult.toolUseBlocks.map(b => b.name).join(\", \");\n    emitter.emitSubagentProgress(agentId, subagentType, `using: ${toolNames}`);\n\n    const { toolResults, toolsUsed: turnToolsUsed } = await executeToolBlocks({\n      toolBlocks: turnResult.toolUseBlocks as any,\n      loopDetector: this.loopDetector,\n      signal,\n      callbacks: {\n        onToolStart: (toolName, input) => {\n          emitter.emitSubagentProgress(agentId, subagentType, `running ${toolName}`, undefined, toolName);\n          emitter.emitSubagentToolStart(agentId, toolName, input);\n          this.events.onToolStart?.(toolName, input);\n        },\n        onToolEnd: (toolName, success, durationMs) => {\n          emitter.emitSubagentToolEnd(agentId, toolName, success, durationMs);\n          this.events.onToolResult?.(toolName, success, \"\", durationMs);\n        },\n      },\n    });\n\n    // Record tools used in state\n    for (const tn of turnToolsUsed) {\n      if (!agentState.toolsUsed.includes(tn)) agentState.toolsUsed.push(tn);\n    }\n\n    // End-of-turn loop detector check\n    const bailCheck = this.loopDetector.endTurn();\n    if (bailCheck.shouldBail) {\n      this.events.onText?.(bailCheck.message || \"\\n[Consecutive failures detected. Stopping.]\");\n      return false;\n    }\n\n    // Append messages\n    const assistantContent = this.buildAssistantContent(turnResult);\n    this.messages.push({ role: \"assistant\", content: assistantContent });\n    this.messages.push({ role: \"user\", content: toolResults as any });\n\n    // Turn limit nudge warning\n    const turnsRemaining = this.config.maxTurns - this.turnCount - 1;\n    const nudgeThreshold = Math.ceil(this.config.maxTurns * 0.25);\n    if (turnsRemaining === nudgeThreshold && turnsRemaining > 0) {\n      const editTools = [\"write_file\", \"edit_file\", \"create_file\", \"notebook_edit\"];\n      const hasEdited = agentState.toolsUsed.some(t => editTools.includes(t));\n      if (!hasEdited) {\n        this.messages.push({\n          role: \"user\",\n          content: [{ type: \"text\", text: `\\u26A0\\uFE0F TURN LIMIT WARNING: You have ${turnsRemaining} turns remaining and have NOT made any file edits yet. Start producing output NOW.` }] as any,\n        });\n      }\n    }\n\n    await this.onMessagesUpdated(\"tool_results\");\n    await yieldToEventLoop();\n    return true;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,10 @@
+/**
+ * Subagent tool filtering — restrict tools per agent type
+ *
+ * Extracted from subagent.ts for single-responsibility.
+ */
+import type Anthropic from "@anthropic-ai/sdk";
+import type { SubagentType } from "./subagent-types.js";
+export declare function getToolsForAgent(type: SubagentType | string): string[];
+export declare function getFilteredTools(type: SubagentType): Promise<Anthropic.Tool[]>;
+export declare const TASK_TOOL_DEFINITION: Anthropic.Tool;

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