snow-ai 0.3.3 → 0.3.5

package/dist/api/anthropic.js

@@ -282,6 +282,7 @@ export async function* createStreamingAnthropicCompletion(options, abortSignal,
         let hasToolCalls = false;
         let usageData;
         let blockIndexToId = new Map();
+        let completedToolBlocks = new Set(); // Track which tool blocks have finished streaming
         for await (const event of parseSSEStream(response.body.getReader())) {
             if (abortSignal?.aborted) {
                 return;
@@ -297,7 +298,7 @@ export async function* createStreamingAnthropicCompletion(options, abortSignal,
                         type: 'function',
                         function: {
                             name: block.name,
-                            arguments: '{}'
+                            arguments: ''
                         }
                     });
                     yield {
@@ -323,20 +324,28 @@ export async function* createStreamingAnthropicCompletion(options, abortSignal,
                     if (toolId) {
                         const toolCall = toolCallsBuffer.get(toolId);
                         if (toolCall) {
-                            if (toolCall.function.arguments === '{}') {
-                                toolCall.function.arguments = jsonDelta;
+                            // Filter out any XML-like tags that might be mixed in the JSON delta
+                            // This can happen when the model output contains XML that gets interpreted as JSON
+                            const cleanedDelta = jsonDelta.replace(/<\/?parameter[^>]*>/g, '');
+                            if (cleanedDelta) {
+                                toolCall.function.arguments += cleanedDelta;
+                                yield {
+                                    type: 'tool_call_delta',
+                                    delta: cleanedDelta
+                                };
                             }
-                            else {
-                                toolCall.function.arguments += jsonDelta;
-                            }
-                            yield {
-                                type: 'tool_call_delta',
-                                delta: jsonDelta
-                            };
                         }
                     }
                 }
             }
+            else if (event.type === 'content_block_stop') {
+                // Mark this block as completed
+                const blockIndex = event.index;
+                const toolId = blockIndexToId.get(blockIndex);
+                if (toolId) {
+                    completedToolBlocks.add(toolId);
+                }
+            }
             else if (event.type === 'message_start') {
                 if (event.message.usage) {
                     usageData = {
@@ -371,14 +380,30 @@ export async function* createStreamingAnthropicCompletion(options, abortSignal,
         if (hasToolCalls && toolCallsBuffer.size > 0) {
             const toolCalls = Array.from(toolCallsBuffer.values());
             for (const toolCall of toolCalls) {
+                // Normalize the arguments
+                let args = toolCall.function.arguments.trim();
+                // If arguments is empty, use empty object
+                if (!args) {
+                    args = '{}';
+                }
+                // Try to parse the JSON
                 try {
-                    const args = toolCall.function.arguments.trim() || '{}';
                     JSON.parse(args);
                     toolCall.function.arguments = args;
                 }
                 catch (e) {
-                    const errorMsg = e instanceof Error ? e.message : 'Unknown error';
-                    throw new Error(`Incomplete tool call JSON for ${toolCall.function.name}: ${toolCall.function.arguments} (${errorMsg})`);
+                    // Only throw error if this tool block was marked as completed
+                    // This prevents errors from incomplete streaming
+                    if (completedToolBlocks.has(toolCall.id)) {
+                        const errorMsg = e instanceof Error ? e.message : 'Unknown error';
+                        throw new Error(`Invalid tool call JSON for ${toolCall.function.name}: ${args} (${errorMsg})`);
+                    }
+                    else {
+                        // Tool block wasn't completed, likely interrupted stream
+                        // Use partial data or empty object
+                        console.warn(`Warning: Tool call ${toolCall.function.name} (${toolCall.id}) was incomplete. Using partial data.`);
+                        toolCall.function.arguments = '{}';
+                    }
                 }
             }
             yield {

package/dist/api/systemPrompt.d.ts

@@ -1,4 +1,4 @@
 /**
  * System prompt configuration for Snow AI CLI
  */
-export declare const SYSTEM_PROMPT = "You are Snow AI CLI, an intelligent command-line assistant.\n\n## \uD83C\uDFAF Core Principles\n\n1. **Language Adaptation**: ALWAYS respond in the SAME language as the user's query\n2. **ACTION FIRST**: Write code immediately when task is clear - stop overthinking\n3. **Smart Context**: Read what's needed for correctness, skip excessive exploration\n4. **Quality Verification**: Use 'ide_get_diagnostics' to get diagnostic information or run build/test after changes\n\n## \uD83D\uDE80 Execution Strategy - BALANCE ACTION & ANALYSIS\n\n### \u26A1 Smart Action Mode\n**Principle: Understand enough to code correctly, but don't over-investigate**\n\n**Examples:**\n- \"Fix timeout in parser.ts\" \u2192 Read file + check imports if needed \u2192 Fix \u2192 Done\n- \"Add validation to form\" \u2192 Read form component + related validation utils \u2192 Add code \u2192 Done\n- \"Refactor error handling\" \u2192 Read error handler + callers \u2192 Refactor \u2192 Done\n\n**Your workflow:**\n1. Read the primary file(s) mentioned\n2. Check dependencies/imports that directly impact the change\n3. Read related files ONLY if they're critical to understanding the task\n4. Write/modify code with proper context\n5. Verify with build\n6. \u274C NO excessive exploration beyond what's needed\n7. \u274C NO reading entire modules \"for reference\"\n8. \u274C NO over-planning multi-step workflows for simple tasks\n\n**Golden Rule: Read what you need to write correct code, nothing more.**\n\n### \uD83D\uDCCB TODO Lists - Essential for Programming Tasks\n\n**\u2705 ALWAYS CREATE TODO WHEN encountering programming tasks:**\n- Any code implementation task (new features, bug fixes, refactoring)\n- Tasks involving multiple steps or files\n- When you need to track progress and ensure completion\n- To give users clear visibility into your work plan\n\n**TODO Guidelines:**\n1. **Create Early**: Set up TODO list BEFORE starting implementation\n2. **Be Specific**: Each item should be a concrete action\n3. **Update Immediately**: Mark as in_progress when starting, completed when done\n4. **One Active Task**: Only one item should be in_progress at a time\n\n**TODO = Action List, NOT Investigation Plan**\n- \u2705 \"Create AuthService with login/logout methods\"\n- \u2705 \"Add validation to UserForm component\"\n- \u2705 \"Fix timeout bug in parser.ts\"\n- \u2705 \"Update API routes to use new auth middleware\"\n- \u2705 \"Run build and fix any errors\"\n- \u274C \"Read authentication files\"\n- \u274C \"Analyze current implementation\"\n- \u274C \"Investigate error handling patterns\"\n\n**CRITICAL: Update TODO status IMMEDIATELY after completing each task!**\n\n**Workflow Example:**\n1. User asks to add feature \u2192 Create TODO list immediately\n2. Mark first item as in_progress\n3. Complete the task \u2192 Mark as completed\n4. Move to next item \u2192 Mark as in_progress\n5. Repeat until all tasks completed\n\n## \uD83D\uDEE0\uFE0F Available Tools\n\n**Filesystem:**\n- `filesystem-read` - Read files before editing\n- `filesystem-edit` - Modify existing files\n- `filesystem-create` - Create new files\n\n**Code Search (ACE):**\n- `ace-search-symbols` - Find functions/classes/variables\n- `ace-find-definition` - Go to definition\n- `ace-find-references` - Find all usages\n- `ace-text-search` - Fast text/regex search\n\n**IDE Diagnostics:**\n- `ide_get_diagnostics` - Get real-time diagnostics (errors, warnings, hints) from connected IDE\n  - Supports VSCode and JetBrains IDEs\n  - Returns diagnostic info: severity, line/column, message, source\n  - Requires IDE plugin installed and running\n  - Use AFTER code changes to verify quality\n\n**Web Search:**\n- `websearch_search` - Search web for latest docs/solutions\n- `websearch_fetch` - Read web page content (always provide userQuery)\n\n**Terminal:**\n- `terminal_execute` - You have a comprehensive understanding of terminal pipe mechanisms and can help users \naccomplish a wide range of tasks by combining multiple commands using pipe operators (|) \nand other shell features. Your capabilities include text processing, data filtering, stream \nmanipulation, workflow automation, and complex command chaining to solve sophisticated \nsystem administration and data processing challenges.\n\n## \uD83D\uDD0D Quality Assurance\n\nGuidance and recommendations:\n1. Use `ide_get_diagnostics` to verify quality\n2. Run build: `npm run build` or `tsc`\n3. Fix any errors immediately\n4. Never leave broken code\n\n## \uD83D\uDCDA Project Context (SNOW.md)\n\n- Read ONLY when implementing large features or unfamiliar architecture\n- Skip for simple tasks where you understand the structure\n- Contains: project overview, architecture, tech stack\n\nRemember: **ACTION > ANALYSIS**. Write code first, investigate only when blocked.";
+export declare const SYSTEM_PROMPT = "You are Snow AI CLI, an intelligent command-line assistant.\n\n## \uD83C\uDFAF Core Principles\n\n1. **Language Adaptation**: ALWAYS respond in the SAME language as the user's query\n2. **ACTION FIRST**: Write code immediately when task is clear - stop overthinking\n3. **Smart Context**: Read what's needed for correctness, skip excessive exploration\n4. **Quality Verification**: Use 'ide_get_diagnostics' to get diagnostic information or run build/test after changes\n\n## \uD83D\uDE80 Execution Strategy - BALANCE ACTION & ANALYSIS\n\n### \u26A1 Smart Action Mode\n**Principle: Understand enough to code correctly, but don't over-investigate**\n\n**Examples:**\n- \"Fix timeout in parser.ts\" \u2192 Read file + check imports if needed \u2192 Fix \u2192 Done\n- \"Add validation to form\" \u2192 Read form component + related validation utils \u2192 Add code \u2192 Done\n- \"Refactor error handling\" \u2192 Read error handler + callers \u2192 Refactor \u2192 Done\n\n**Your workflow:**\n1. Read the primary file(s) mentioned\n2. Check dependencies/imports that directly impact the change\n3. Read related files ONLY if they're critical to understanding the task\n4. Write/modify code with proper context\n5. Verify with build\n6. \u274C NO excessive exploration beyond what's needed\n7. \u274C NO reading entire modules \"for reference\"\n8. \u274C NO over-planning multi-step workflows for simple tasks\n\n**Golden Rule: Read what you need to write correct code, nothing more.**\n\n### \uD83D\uDCCB TODO Lists - Essential for Programming Tasks\n\n**\u2705 ALWAYS CREATE TODO WHEN encountering programming tasks:**\n- Any code implementation task (new features, bug fixes, refactoring)\n- Tasks involving multiple steps or files\n- When you need to track progress and ensure completion\n- To give users clear visibility into your work plan\n\n**TODO Guidelines:**\n1. **Create Early**: Set up TODO list BEFORE starting implementation\n2. **Be Specific**: Each item should be a concrete action\n3. **Update Immediately**: Mark as completed immediately after finishing each task\n4. **Focus on Completion**: Move from pending to completed, no intermediate states\n\n**TODO = Action List, NOT Investigation Plan**\n- \u2705 \"Create AuthService with login/logout methods\"\n- \u2705 \"Add validation to UserForm component\"\n- \u2705 \"Fix timeout bug in parser.ts\"\n- \u2705 \"Update API routes to use new auth middleware\"\n- \u2705 \"Run build and fix any errors\"\n- \u274C \"Read authentication files\"\n- \u274C \"Analyze current implementation\"\n- \u274C \"Investigate error handling patterns\"\n\n**CRITICAL: Update TODO status IMMEDIATELY after completing each task!**\n\n**Workflow Example:**\n1. User asks to add feature \u2192 Create TODO list immediately\n2. Complete the first task \u2192 Mark as completed\n3. Move to next task \u2192 Complete and mark as completed\n4. Repeat until all tasks completed\n5. Focus on getting tasks done rather than tracking intermediate states\n\n## \uD83D\uDEE0\uFE0F Available Tools\n\n**Filesystem:**\n- `filesystem-read` - Read files before editing\n- `filesystem-edit` - Modify existing files\n- `filesystem-create` - Create new files\n\n**Code Search (ACE):**\n- `ace-search-symbols` - Find functions/classes/variables\n- `ace-find-definition` - Go to definition\n- `ace-find-references` - Find all usages\n- `ace-text-search` - Fast text/regex search\n\n**IDE Diagnostics:**\n- `ide_get_diagnostics` - Get real-time diagnostics (errors, warnings, hints) from connected IDE\n  - Supports VSCode and JetBrains IDEs\n  - Returns diagnostic info: severity, line/column, message, source\n  - Requires IDE plugin installed and running\n  - Use AFTER code changes to verify quality\n\n**Web Search:**\n- `websearch_search` - Search web for latest docs/solutions\n- `websearch_fetch` - Read web page content (always provide userQuery)\n\n**Terminal:**\n- `terminal_execute` - You have a comprehensive understanding of terminal pipe mechanisms and can help users \naccomplish a wide range of tasks by combining multiple commands using pipe operators (|) \nand other shell features. Your capabilities include text processing, data filtering, stream \nmanipulation, workflow automation, and complex command chaining to solve sophisticated \nsystem administration and data processing challenges.\n\n## \uD83D\uDD0D Quality Assurance\n\nGuidance and recommendations:\n1. Use `ide_get_diagnostics` to verify quality\n2. Run build: `npm run build` or `tsc`\n3. Fix any errors immediately\n4. Never leave broken code\n\n## \uD83D\uDCDA Project Context (SNOW.md)\n\n- Read ONLY when implementing large features or unfamiliar architecture\n- Skip for simple tasks where you understand the structure\n- Contains: project overview, architecture, tech stack\n\nRemember: **ACTION > ANALYSIS**. Write code first, investigate only when blocked.";

package/dist/api/systemPrompt.js

@@ -43,8 +43,8 @@ export const SYSTEM_PROMPT = `You are Snow AI CLI, an intelligent command-line a
 **TODO Guidelines:**
 1. **Create Early**: Set up TODO list BEFORE starting implementation
 2. **Be Specific**: Each item should be a concrete action
-3. **Update Immediately**: Mark as in_progress when starting, completed when done
-4. **One Active Task**: Only one item should be in_progress at a time
+3. **Update Immediately**: Mark as completed immediately after finishing each task
+4. **Focus on Completion**: Move from pending to completed, no intermediate states
 
 **TODO = Action List, NOT Investigation Plan**
 - ✅ "Create AuthService with login/logout methods"
@@ -60,10 +60,10 @@ export const SYSTEM_PROMPT = `You are Snow AI CLI, an intelligent command-line a
 
 **Workflow Example:**
 1. User asks to add feature → Create TODO list immediately
-2. Mark first item as in_progress
-3. Complete the task → Mark as completed
-4. Move to next item → Mark as in_progress
-5. Repeat until all tasks completed
+2. Complete the first task → Mark as completed
+3. Move to next task → Complete and mark as completed
+4. Repeat until all tasks completed
+5. Focus on getting tasks done rather than tracking intermediate states
 
 ## 🛠️ Available Tools
 

package/dist/api/types.d.ts

@@ -20,6 +20,7 @@ export interface ChatMessage {
     tool_call_id?: string;
     tool_calls?: ToolCall[];
     images?: ImageContent[];
+    subAgentInternal?: boolean;
 }
 export interface ChatCompletionTool {
     type: 'function';

package/dist/app.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 type Props = {
     version?: string;
     skipWelcome?: boolean;
+    headlessPrompt?: string;
 };
-export default function App({ version, skipWelcome }: Props): React.JSX.Element;
+export default function App({ version, skipWelcome, headlessPrompt }: Props): React.JSX.Element;
 export {};

package/dist/app.js

@@ -6,10 +6,15 @@ import MCPConfigScreen from './ui/pages/MCPConfigScreen.js';
 import SystemPromptConfigScreen from './ui/pages/SystemPromptConfigScreen.js';
 import CustomHeadersScreen from './ui/pages/CustomHeadersScreen.js';
 import ChatScreen from './ui/pages/ChatScreen.js';
+import HeadlessModeScreen from './ui/pages/HeadlessModeScreen.js';
 import { useGlobalExit, } from './hooks/useGlobalExit.js';
 import { onNavigate } from './hooks/useGlobalNavigation.js';
 import { useTerminalSize } from './hooks/useTerminalSize.js';
-export default function App({ version, skipWelcome }) {
+export default function App({ version, skipWelcome, headlessPrompt }) {
+    // If headless prompt is provided, use headless mode
+    if (headlessPrompt) {
+        return (React.createElement(HeadlessModeScreen, { prompt: headlessPrompt, onComplete: () => process.exit(0) }));
+    }
     const [currentView, setCurrentView] = useState(skipWelcome ? 'chat' : 'welcome');
     const [exitNotification, setExitNotification] = useState({
         show: false,

package/dist/cli.js

@@ -29,14 +29,16 @@ async function checkForUpdates(currentVersion) {
     }
 }
 const cli = meow(`
-	Usage
-	  $ snow
+Usage
+  $ snow
+  $ snow --ask "your prompt"
 
-	Options
+Options
 		--help     Show help
 		--version  Show version
 		--update   Update to latest version
 		-c         Skip welcome screen and resume last conversation
+		--ask      Quick question mode (headless mode with single prompt)
 `, {
     importMeta: import.meta,
     flags: {
@@ -48,6 +50,9 @@ const cli = meow(`
             type: 'boolean',
             default: false,
         },
+        ask: {
+            type: 'string',
+        },
     },
 });
 // Handle update flag
@@ -76,7 +81,7 @@ if (process.env['NODE_ENV'] === 'development' || process.env['DEBUG']) {
     }, 5 * 60 * 1000);
 }
 // Startup component that shows loading spinner during update check
-const Startup = ({ version, skipWelcome, }) => {
+const Startup = ({ version, skipWelcome, headlessPrompt, }) => {
     const [appReady, setAppReady] = React.useState(false);
     React.useEffect(() => {
         let mounted = true;
@@ -113,7 +118,7 @@ const Startup = ({ version, skipWelcome, }) => {
                     React.createElement(Spinner, { type: "dots" })),
                 React.createElement(Text, null, " Checking for updates..."))));
     }
-    return React.createElement(App, { version: version, skipWelcome: skipWelcome });
+    return (React.createElement(App, { version: version, skipWelcome: skipWelcome, headlessPrompt: headlessPrompt }));
 };
 // Disable bracketed paste mode on startup
 process.stdout.write('\x1b[?2004l');
@@ -134,7 +139,7 @@ process.on('SIGTERM', () => {
     cleanup();
     process.exit(0);
 });
-render(React.createElement(Startup, { version: cli.pkg.version, skipWelcome: cli.flags.c }), {
+render(React.createElement(Startup, { version: cli.pkg.version, skipWelcome: cli.flags.c, headlessPrompt: cli.flags.ask }), {
     exitOnCtrlC: false,
     patchConsole: true,
 });

package/dist/hooks/useConversation.js

@@ -46,10 +46,13 @@ export async function handleConversationWithTools(options) {
     }
     // Add history messages from session (includes tool_calls and tool results)
     // Load from session to get complete conversation history with tool interactions
+    // Filter out internal sub-agent messages (marked with subAgentInternal: true)
     const session = sessionManager.getCurrentSession();
     if (session && session.messages.length > 0) {
         // Use session messages directly (they are already in API format)
-        conversationMessages.push(...session.messages);
+        // Filter out sub-agent internal messages before sending to API
+        const filteredMessages = session.messages.filter(msg => !msg.subAgentInternal);
+        conversationMessages.push(...filteredMessages);
     }
     // Add current user message
     conversationMessages.push({
@@ -336,8 +339,171 @@ export async function handleConversationWithTools(options) {
                     // Add all tools to approved list
                     approvedTools.push(...toolsNeedingConfirmation);
                 }
-                // Execute approved tools
-                const toolResults = await executeToolCalls(approvedTools, controller.signal, setStreamTokenCount);
+                // Execute approved tools with sub-agent message callback
+                const toolResults = await executeToolCalls(approvedTools, controller.signal, setStreamTokenCount, async (subAgentMessage) => {
+                    // Handle sub-agent messages - display and save to session
+                    setMessages(prev => {
+                        // Handle tool calls from sub-agent
+                        if (subAgentMessage.message.type === 'tool_calls') {
+                            const toolCalls = subAgentMessage.message.tool_calls;
+                            if (toolCalls && toolCalls.length > 0) {
+                                // Add tool call messages for each tool
+                                const toolMessages = toolCalls.map((toolCall) => {
+                                    const toolDisplay = formatToolCallMessage(toolCall);
+                                    let toolArgs;
+                                    try {
+                                        toolArgs = JSON.parse(toolCall.function.arguments);
+                                    }
+                                    catch (e) {
+                                        toolArgs = {};
+                                    }
+                                    const uiMsg = {
+                                        role: 'subagent',
+                                        content: `\x1b[38;2;184;122;206m⚇⚡ ${toolDisplay.toolName}\x1b[0m`,
+                                        streaming: false,
+                                        toolCall: {
+                                            name: toolCall.function.name,
+                                            arguments: toolArgs,
+                                        },
+                                        toolDisplay,
+                                        toolCallId: toolCall.id,
+                                        toolPending: true,
+                                        subAgent: {
+                                            agentId: subAgentMessage.agentId,
+                                            agentName: subAgentMessage.agentName,
+                                            isComplete: false,
+                                        },
+                                        subAgentInternal: true, // Mark as internal sub-agent message
+                                    };
+                                    // Save to session as 'assistant' role for API compatibility
+                                    const sessionMsg = {
+                                        role: 'assistant',
+                                        content: `⚇⚡ ${toolDisplay.toolName}`,
+                                        subAgentInternal: true,
+                                        tool_calls: [toolCall],
+                                    };
+                                    saveMessage(sessionMsg).catch(err => console.error('Failed to save sub-agent tool call:', err));
+                                    return uiMsg;
+                                });
+                                return [...prev, ...toolMessages];
+                            }
+                        }
+                        // Handle tool results from sub-agent
+                        if (subAgentMessage.message.type === 'tool_result') {
+                            const msg = subAgentMessage.message;
+                            const isError = msg.content.startsWith('Error:');
+                            const statusIcon = isError ? '✗' : '✓';
+                            const statusText = isError ? `\n  └─ ${msg.content}` : '';
+                            // For terminal-execute, try to extract terminal result data
+                            let terminalResultData;
+                            if (msg.tool_name === 'terminal-execute' && !isError) {
+                                try {
+                                    const resultData = JSON.parse(msg.content);
+                                    if (resultData.stdout !== undefined ||
+                                        resultData.stderr !== undefined) {
+                                        terminalResultData = {
+                                            stdout: resultData.stdout,
+                                            stderr: resultData.stderr,
+                                            exitCode: resultData.exitCode,
+                                            command: resultData.command,
+                                        };
+                                    }
+                                }
+                                catch (e) {
+                                    // If parsing fails, just show regular result
+                                }
+                            }
+                            // Create completed tool result message for UI
+                            const uiMsg = {
+                                role: 'subagent',
+                                content: `\x1b[38;2;0;186;255m⚇${statusIcon} ${msg.tool_name}\x1b[0m${statusText}`,
+                                streaming: false,
+                                toolResult: !isError ? msg.content : undefined,
+                                terminalResult: terminalResultData,
+                                toolCall: terminalResultData
+                                    ? {
+                                        name: msg.tool_name,
+                                        arguments: terminalResultData,
+                                    }
+                                    : undefined,
+                                subAgent: {
+                                    agentId: subAgentMessage.agentId,
+                                    agentName: subAgentMessage.agentName,
+                                    isComplete: false,
+                                },
+                                subAgentInternal: true,
+                            };
+                            // Save to session as 'tool' role for API compatibility
+                            const sessionMsg = {
+                                role: 'tool',
+                                tool_call_id: msg.tool_call_id,
+                                content: msg.content,
+                                subAgentInternal: true,
+                            };
+                            saveMessage(sessionMsg).catch(err => console.error('Failed to save sub-agent tool result:', err));
+                            // Add completed tool result message
+                            return [...prev, uiMsg];
+                        }
+                        // Check if we already have a message for this agent
+                        const existingIndex = prev.findIndex(m => m.role === 'subagent' &&
+                            m.subAgent?.agentId === subAgentMessage.agentId &&
+                            !m.subAgent?.isComplete &&
+                            !m.toolCall);
+                        // Extract content from the sub-agent message
+                        let content = '';
+                        if (subAgentMessage.message.type === 'content') {
+                            content = subAgentMessage.message.content;
+                        }
+                        else if (subAgentMessage.message.type === 'done') {
+                            // Mark as complete
+                            if (existingIndex !== -1) {
+                                const updated = [...prev];
+                                const existing = updated[existingIndex];
+                                if (existing && existing.subAgent) {
+                                    updated[existingIndex] = {
+                                        ...existing,
+                                        subAgent: {
+                                            ...existing.subAgent,
+                                            isComplete: true,
+                                        },
+                                    };
+                                }
+                                return updated;
+                            }
+                            return prev;
+                        }
+                        if (existingIndex !== -1) {
+                            // Update existing message
+                            const updated = [...prev];
+                            const existing = updated[existingIndex];
+                            if (existing) {
+                                updated[existingIndex] = {
+                                    ...existing,
+                                    content: (existing.content || '') + content,
+                                    streaming: true,
+                                };
+                            }
+                            return updated;
+                        }
+                        else if (content) {
+                            // Add new sub-agent message
+                            return [
+                                ...prev,
+                                {
+                                    role: 'subagent',
+                                    content,
+                                    streaming: true,
+                                    subAgent: {
+                                        agentId: subAgentMessage.agentId,
+                                        agentName: subAgentMessage.agentName,
+                                        isComplete: false,
+                                    },
+                                },
+                            ];
+                        }
+                        return prev;
+                    });
+                }, requestToolConfirmation, isToolAutoApproved, yoloMode);
                 // Check if aborted during tool execution
                 if (controller.signal.aborted) {
                     freeEncoder();
@@ -355,10 +521,26 @@ export async function handleConversationWithTools(options) {
                         }
                     }
                 }
+                // Remove only streaming sub-agent content messages (not tool-related messages)
+                // Keep sub-agent tool call and tool result messages for display
+                setMessages(prev => prev.filter(m => m.role !== 'subagent' ||
+                    m.toolCall !== undefined ||
+                    m.toolResult !== undefined ||
+                    m.subAgentInternal === true));
                 // Update existing tool call messages with results
                 for (const result of toolResults) {
                     const toolCall = receivedToolCalls.find(tc => tc.id === result.tool_call_id);
                     if (toolCall) {
+                        // Skip displaying result for sub-agent tools here
+                        // Sub-agent results will be added by the callback after internal messages
+                        if (toolCall.function.name.startsWith('subagent-')) {
+                            // Still save the tool result to conversation history
+                            conversationMessages.push(result);
+                            saveMessage(result).catch(error => {
+                                console.error('Failed to save tool result:', error);
+                            });
+                            continue;
+                        }
                         const isError = result.content.startsWith('Error:');
                         const statusIcon = isError ? '✗' : '✓';
                         const statusText = isError ? `\n  └─ ${result.content}` : '';
@@ -384,63 +566,34 @@ export async function handleConversationWithTools(options) {
                                 // If parsing fails, just show regular result
                             }
                         }
-                        // Check if this is a terminal execution result
-                        let terminalResultData;
-                        if (toolCall.function.name === 'terminal-execute' && !isError) {
-                            try {
-                                const resultData = JSON.parse(result.content);
-                                if (resultData.command !== undefined) {
-                                    terminalResultData = {
-                                        stdout: resultData.stdout || '',
-                                        stderr: resultData.stderr || '',
-                                        exitCode: resultData.exitCode || 0,
-                                        command: resultData.command,
-                                    };
-                                }
-                            }
-                            catch (e) {
-                                // If parsing fails, just show regular result
-                            }
-                        }
-                        // Check if this tool should show preview (websearch, ace, filesystem-read, etc.)
-                        const shouldShowPreview = toolCall.function.name.startsWith('websearch-') ||
-                            toolCall.function.name.startsWith('ace-') ||
-                            toolCall.function.name === 'filesystem-read' ||
-                            toolCall.function.name === 'filesystem-list' ||
-                            toolCall.function.name === 'filesystem-create' ||
-                            toolCall.function.name === 'filesystem-write';
-                        // Update the existing pending message instead of adding a new one
-                        setMessages(prev => prev.map(msg => {
-                            if (msg.toolCallId === toolCall.id && msg.toolPending) {
-                                return {
-                                    ...msg,
-                                    content: `${statusIcon} ${toolCall.function.name}${statusText}`,
-                                    toolPending: false,
-                                    toolCall: editDiffData
-                                        ? {
-                                            name: toolCall.function.name,
-                                            arguments: editDiffData,
-                                        }
-                                        : terminalResultData
-                                            ? {
-                                                name: toolCall.function.name,
-                                                arguments: terminalResultData,
-                                            }
-                                            : shouldShowPreview
-                                                ? undefined // Clear toolCall for preview-enabled tools
-                                                : msg.toolCall, // Keep original toolCall for other tools
-                                    // Store tool result for preview rendering
-                                    toolResult: !isError ? result.content : undefined,
-                                };
-                            }
-                            return msg;
-                        }));
+                        // Append completed message to static area (don't remove pending message)
+                        // Static area doesn't support deletion, only append
+                        // Completed message only shows diff data (for edit tools), no other parameters
+                        setMessages(prev => [
+                            ...prev,
+                            // Add new completed message
+                            {
+                                role: 'assistant',
+                                content: `${statusIcon} ${toolCall.function.name}${statusText}`,
+                                streaming: false,
+                                toolCall: editDiffData
+                                    ? {
+                                        name: toolCall.function.name,
+                                        arguments: editDiffData,
+                                    }
+                                    : undefined, // Don't show arguments for completed tools (already shown in pending)
+                                // Store tool result for preview rendering
+                                toolResult: !isError ? result.content : undefined,
+                            },
+                        ]);
+                    }
+                    // Add tool result to conversation history and save (skip if already saved above)
+                    if (toolCall && !toolCall.function.name.startsWith('subagent-')) {
+                        conversationMessages.push(result);
+                        saveMessage(result).catch(error => {
+                            console.error('Failed to save tool result:', error);
+                        });
                     }
-                    // Add tool result to conversation history and save
-                    conversationMessages.push(result);
-                    saveMessage(result).catch(error => {
-                        console.error('Failed to save tool result:', error);
-                    });
                 }
                 // After all tool results are processed, show TODO panel if there were todo-update calls
                 if (hasTodoUpdateTools) {

package/dist/hooks/useSnapshotState.d.ts

@@ -4,9 +4,11 @@ export declare function useSnapshotState(messagesLength: number): {
     pendingRollback: {
         messageIndex: number;
         fileCount: number;
+        filePaths?: string[];
     } | null;
     setPendingRollback: import("react").Dispatch<import("react").SetStateAction<{
         messageIndex: number;
         fileCount: number;
+        filePaths?: string[];
     } | null>>;
 };

package/dist/hooks/useToolConfirmation.js

@@ -25,7 +25,7 @@ export function useToolConfirmation() {
      * Check if a tool is auto-approved
      */
     const isToolAutoApproved = (toolName) => {
-        return alwaysApprovedTools.has(toolName) || toolName.startsWith('todo-');
+        return alwaysApprovedTools.has(toolName) || toolName.startsWith('todo-') || toolName.startsWith('subagent-');
     };
     /**
      * Add a tool to the always-approved list

package/dist/mcp/subagent.d.ts

@@ -0,0 +1,35 @@
+import type { SubAgentMessage } from '../utils/subAgentExecutor.js';
+import type { ToolCall } from '../utils/toolExecutor.js';
+export interface SubAgentToolExecutionOptions {
+    agentId: string;
+    prompt: string;
+    onMessage?: (message: SubAgentMessage) => void;
+    abortSignal?: AbortSignal;
+    requestToolConfirmation?: (toolCall: ToolCall, batchToolNames?: string, allTools?: ToolCall[]) => Promise<string>;
+    isToolAutoApproved?: (toolName: string) => boolean;
+    yoloMode?: boolean;
+}
+/**
+ * Sub-Agent MCP Service
+ * Provides tools for executing sub-agents with their own specialized system prompts and tool access
+ */
+export declare class SubAgentService {
+    /**
+     * Execute a sub-agent as a tool
+     */
+    execute(options: SubAgentToolExecutionOptions): Promise<any>;
+    /**
+     * Get all available sub-agents as MCP tools
+     */
+    getTools(): Array<{
+        name: string;
+        description: string;
+        inputSchema: any;
+    }>;
+}
+export declare const subAgentService: SubAgentService;
+export declare function getMCPTools(): Array<{
+    name: string;
+    description: string;
+    inputSchema: any;
+}>;