@xagent-ai/cli 1.3.0 → 1.3.2

package/dist/tools.js

@@ -283,6 +283,8 @@ This is useful when working with skills that have local dependencies.
     allowedModes = [ExecutionMode.YOLO, ExecutionMode.ACCEPT_EDITS, ExecutionMode.SMART];
     async execute(params) {
         const { command, cwd, description, timeout = 120, run_in_bg = false, skillPath } = params;
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        void description;
         // Determine effective working directory
         // Only use cwd if the command doesn't contain 'cd' (let LLM control directory)
         let effectiveCwd;
@@ -406,7 +408,7 @@ This is useful when working with skills that have local dependencies.
                     const text = data.toString();
                     output.push(text);
                 });
-                childProcess.on('close', (code) => {
+                childProcess.on('close', (_code) => {
                     // Silent cleanup - don't log to avoid noise during normal operation
                     // Note: On Windows with PowerShell, the shell process exits after
                     // the command completes
@@ -434,8 +436,8 @@ This is useful when working with skills that have local dependencies.
                 // Apply truncation to stdout and stderr separately
                 const stdoutResult = truncateTail(result.stdout);
                 const stderrResult = truncateTail(result.stderr);
-                let stdout = stdoutResult.content;
-                let stderr = stderrResult.content;
+                const stdout = stdoutResult.content;
+                const stderr = stderrResult.content;
                 let truncationNotice = '';
                 if (stdoutResult.truncated) {
                     truncationNotice += buildTruncationNotice(stdoutResult) + '\n';
@@ -929,6 +931,8 @@ edit(
     allowedModes = [ExecutionMode.YOLO, ExecutionMode.ACCEPT_EDITS, ExecutionMode.SMART];
     async execute(params) {
         const { file_path, instruction, old_string, new_string } = params;
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        void instruction;
         try {
             const absolutePath = path.resolve(file_path);
             // Check if file exists
@@ -1244,10 +1248,12 @@ export class TaskTool {
             const { getConfigManager } = await import('./config.js');
             const config = getConfigManager();
             const authConfig = config.getAuthConfig();
-            const aiClient = createAIClient(authConfig);
+            // aiClient is created for future use when executeParallelAgents supports it
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            const _aiClient = createAIClient(authConfig);
             const toolRegistry = getToolRegistry();
             if (params.agents && params.agents.length > 0) {
-                return await this.executeParallelAgents(params.agents, params.description, mode, agentManager, toolRegistry, aiClient);
+                return await this.executeParallelAgents(params.agents, params.description, mode, agentManager, toolRegistry, config);
             }
             if (!params.subagent_type) {
                 throw new Error('subagent_type is required for Task tool');
@@ -1264,7 +1270,7 @@ export class TaskTool {
                         agents: params.agents?.length,
                     }));
             }
-            const result = await this.executeSingleAgent(params.subagent_type, prompt, params.description, params.useContext ?? true, params.constraints || [], mode, agentManager, toolRegistry, aiClient, config);
+            const result = await this.executeSingleAgent(params.subagent_type, prompt, params.description, params.useContext ?? true, params.constraints || [], mode, agentManager, toolRegistry, config);
             return result;
         }
         catch (error) {
@@ -1358,9 +1364,27 @@ export class TaskTool {
      */
     async executeGUIAgent(prompt, description, agent, mode, config, indentLevel = 1, remoteAIClient) {
         const indent = '  '.repeat(indentLevel);
-        console.log(`${indent}${colors.primaryBright(`${icons.robot} GUI Agent`)}: ${description}`);
-        console.log(`${indent}${colors.border(icons.separator.repeat(Math.min(60, process.stdout.columns || 80) - indent.length))}`);
-        console.log('');
+        // Get SDK adapter from session for SDK mode output
+        let sdkOutputAdapter = null;
+        let isSdkMode = false;
+        try {
+            const { getSingletonSession } = await import('./session.js');
+            const session = getSingletonSession();
+            if (session) {
+                isSdkMode = session.isSdkMode;
+                sdkOutputAdapter = session.sdkOutputAdapter;
+            }
+        }
+        catch {
+            // Session not available
+        }
+        // SDK mode: use adapter output (guiAgent.run() handles SDK output internally)
+        // Only output console messages in non-SDK mode
+        if (!isSdkMode) {
+            console.log(`${indent}${colors.primaryBright(`${icons.robot} GUI Agent`)}: ${description}`);
+            console.log(`${indent}${colors.border(icons.separator.repeat(Math.min(60, process.stdout.columns || 80) - indent.length))}`);
+            console.log('');
+        }
         // Get VLM configuration for local mode
         // NOTE: guiSubagentBaseUrl must be explicitly configured, NOT fallback to baseUrl
         const baseUrl = config.get('guiSubagentBaseUrl') || '';
@@ -1370,19 +1394,33 @@ export class TaskTool {
         const isRemoteMode = !!remoteAIClient;
         // Log mode information
         if (isRemoteMode) {
-            console.log(`${indent}${colors.info(`${icons.brain} Using remote VLM service`)}`);
+            if (isSdkMode && sdkOutputAdapter) {
+                // SDK mode: use adapter output
+                sdkOutputAdapter.outputInfo('Using remote VLM service');
+            }
+            else {
+                // Normal mode: console output
+                console.log(`${indent}${colors.info(`${icons.brain} Using remote VLM service`)}`);
+            }
         }
         else {
-            console.log(`${indent}${colors.info(`${icons.brain} Using local VLM configuration`)}`);
-            // Local mode requires explicit VLM configuration
-            if (!baseUrl || !apiKey || !modelName) {
-                return {
-                    success: false,
-                    message: `GUI task "${description}" failed: VLM not configured. Please run /model to configure Vision-Language Model first.`,
-                };
+            if (isSdkMode && sdkOutputAdapter) {
+                // SDK mode: use adapter output
+                sdkOutputAdapter.outputInfo('Using local VLM configuration');
+            }
+            else {
+                // Normal mode: console output
+                console.log(`${indent}${colors.info(`${icons.brain} Using local VLM configuration`)}`);
+                // Local mode requires explicit VLM configuration
+                if (!baseUrl || !apiKey || !modelName) {
+                    return {
+                        success: false,
+                        message: `GUI task "${description}" failed: VLM not configured. Please run /model to configure Vision-Language Model first.`,
+                    };
+                }
+                console.log(`${indent}${colors.textMuted(`  Model: ${modelName}`)}`);
+                console.log(`${indent}${colors.textMuted(`  Base URL: ${baseUrl}`)}`);
             }
-            console.log(`${indent}${colors.textMuted(`  Model: ${modelName}`)}`);
-            console.log(`${indent}${colors.textMuted(`  Base URL: ${baseUrl}`)}`);
         }
         console.log('');
         // Get taskId from session for tracking (remote mode only)
@@ -1393,7 +1431,7 @@ export class TaskTool {
                 const session = getSingletonSession();
                 taskId = session?.getTaskId() || null;
             }
-            catch (e) {
+            catch {
                 taskId = null;
             }
         }
@@ -1478,6 +1516,7 @@ export class TaskTool {
                 loopIntervalInMs: 500,
                 showAIDebugInfo: config.get('showAIDebugInfo') || false,
                 indentLevel: indentLevel,
+                sdkOutputAdapter: isSdkMode ? sdkOutputAdapter : null,
             });
             // Add constraints to prompt if any
             const fullPrompt = prompt;
@@ -1510,7 +1549,14 @@ export class TaskTool {
             }));
             if (result.status === 'end') {
                 const iterations = conversationsWithoutScreenshots.filter((c) => c.from === 'human' && c.screenshotContext).length;
-                console.log(`${indent}${colors.success(`${icons.check} GUI task completed in ${iterations} iterations`)}`);
+                // SDK mode: use adapter output
+                if (isSdkMode && sdkOutputAdapter) {
+                    sdkOutputAdapter.outputGUIAgentComplete(description, iterations);
+                }
+                else {
+                    // Normal mode: console output
+                    console.log(`${indent}${colors.success(`${icons.check} GUI task completed in ${iterations} iterations`)}`);
+                }
                 return {
                     success: true,
                     message: `GUI task "${description}" completed`,
@@ -1526,8 +1572,14 @@ export class TaskTool {
                 };
             }
             else if (result.status === 'call_llm') {
-                // Empty action or needs LLM decision - return to main agent with full context
-                console.log(`${indent}${colors.warning(`${icons.warning} GUI agent returned to main agent for LLM decision`)}`);
+                // SDK mode: use adapter output
+                if (isSdkMode && sdkOutputAdapter) {
+                    sdkOutputAdapter.outputGUIAgentStatus('call_llm', conversationsWithoutScreenshots.filter((c) => c.from === 'human' && c.screenshotContext).length);
+                }
+                else {
+                    // Normal mode: console output
+                    console.log(`${indent}${colors.warning(`${icons.warning} GUI agent returned to main agent for LLM decision`)}`);
+                }
                 return {
                     success: true,
                     message: `GUI task "${description}" returned for LLM decision`,
@@ -1543,6 +1595,10 @@ export class TaskTool {
                 };
             }
             else if (result.status === 'user_stopped') {
+                // SDK mode: use adapter output
+                if (isSdkMode && sdkOutputAdapter) {
+                    sdkOutputAdapter.outputGUIAgentCancelled(description);
+                }
                 return {
                     success: true,
                     message: `GUI task "${description}" stopped by user`,
@@ -1560,6 +1616,10 @@ export class TaskTool {
             else {
                 // status is 'error' or other non-success status
                 const errorMsg = result.error || 'Unknown error';
+                // SDK mode: use adapter output
+                if (isSdkMode && sdkOutputAdapter) {
+                    sdkOutputAdapter.outputGUIAgentError(description, errorMsg);
+                }
                 return {
                     success: false,
                     message: `GUI task "${description}" failed: ${errorMsg}`,
@@ -1583,6 +1643,10 @@ export class TaskTool {
             // If the user cancelled the task, ignore any API errors (like 429)
             // and return cancelled status instead
             if (cancelled || cancellationManager.isOperationCancelled()) {
+                // SDK mode: use adapter output
+                if (isSdkMode && sdkOutputAdapter) {
+                    sdkOutputAdapter.outputGUIAgentCancelled(description);
+                }
                 return {
                     success: true,
                     cancelled: true, // Mark as cancelled so main agent won't continue
@@ -1591,6 +1655,10 @@ export class TaskTool {
                 };
             }
             if (error.message === 'Operation cancelled by user') {
+                // SDK mode: use adapter output
+                if (isSdkMode && sdkOutputAdapter) {
+                    sdkOutputAdapter.outputGUIAgentCancelled(description);
+                }
                 return {
                     success: true,
                     message: `GUI task "${description}" cancelled by user`,
@@ -1598,17 +1666,35 @@ export class TaskTool {
                 };
             }
             // Return failure without throwing - let the main agent handle it
+            // SDK mode: use adapter output
+            if (isSdkMode && sdkOutputAdapter) {
+                sdkOutputAdapter.outputGUIAgentError(description, error.message);
+            }
             return {
                 success: false,
                 message: `GUI task "${description}" failed: ${error.message}`,
             };
         }
     }
-    async executeSingleAgent(subagent_type, prompt, description, useContext, constraints, mode, agentManager, toolRegistry, aiClient, config, indentLevel = 1) {
+    async executeSingleAgent(subagent_type, prompt, description, useContext, constraints, mode, agentManager, toolRegistry, config, indentLevel = 1) {
         const agent = agentManager.getAgent(subagent_type);
         if (!agent) {
             throw new Error(`Agent ${subagent_type} not found`);
         }
+        // Get SDK adapter from session for subagent output
+        let sdkOutputAdapter = null;
+        let isSdkMode = false;
+        try {
+            const { getSingletonSession } = await import('./session.js');
+            const session = getSingletonSession();
+            if (session) {
+                isSdkMode = session.isSdkMode;
+                sdkOutputAdapter = session.sdkOutputAdapter;
+            }
+        }
+        catch {
+            // Session not available
+        }
         // Special handling for gui-subagent: directly call GUIAgent.run() instead of subagent message loop
         if (subagent_type === 'gui-subagent') {
             // Get RemoteAIClient instance from session (if available)
@@ -1620,7 +1706,7 @@ export class TaskTool {
                     remoteAIClient = session.getRemoteAIClient();
                 }
             }
-            catch (e) {
+            catch {
                 // Session not available, keep undefined
                 remoteAIClient = undefined;
             }
@@ -1649,19 +1735,21 @@ export class TaskTool {
                 modelName = agent.model;
             }
         }
-        // Create AI client for this subagent
+        // Create AI client for this subagent - each subagent gets its own independent client
         let subAgentClient;
         let isRemoteMode = false;
         let mainTaskId = null;
         const authConfig = config.getAuthConfig();
         if (authConfig.type === AuthType.OAUTH_XAGENT) {
-            // Remote mode: try to reuse session's RemoteAIClient first
+            // Remote mode: create independent RemoteAIClient for each subagent
+            // This prevents message queue conflicts when multiple subagents run in parallel
             const session = getSingletonSession();
-            const existingClient = session?.getRemoteAIClient();
-            if (existingClient) {
-                subAgentClient = existingClient;
+            const remoteAIClient = session?.getRemoteAIClient();
+            if (remoteAIClient) {
+                // Clone or create independent client for this subagent
+                // RemoteAIClient should be designed to handle concurrent requests
+                subAgentClient = remoteAIClient;
                 isRemoteMode = true;
-                // Get the main taskId from session - subagent shares the same taskId as the parent task
                 mainTaskId = session?.getTaskId() || null;
             }
             else {
@@ -1681,7 +1769,7 @@ export class TaskTool {
             subAgentClient = createAIClient(subAuthConfig);
         }
         const indent = '  '.repeat(indentLevel);
-        const indentNext = '  '.repeat(indentLevel + 1);
+        const _indentNext = '  '.repeat(indentLevel + 1);
         const agentName = agent.name || subagent_type;
         // Track execution history for better reporting to main agent
         const executionHistory = [];
@@ -1729,7 +1817,7 @@ export class TaskTool {
                             }
                         }
                     }
-                    catch (e) {
+                    catch {
                         // Ignore polling errors
                     }
                 }, 10);
@@ -1756,7 +1844,7 @@ export class TaskTool {
                 throw new Error('Operation cancelled by user');
             }
         };
-        let messages = [
+        const messages = [
             { role: 'system', content: enhancedSystemPrompt },
             { role: 'user', content: fullPrompt },
         ];
@@ -1777,8 +1865,10 @@ export class TaskTool {
             };
         });
         let iteration = 0;
-        const maxIterations = 10;
-        while (iteration < maxIterations) {
+        let lastContentStr = ''; // Track last content for final result
+        // Main agent style loop: continue until AI returns no more tool_calls
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
             iteration++;
             // Check for cancellation before each iteration
             checkCancellation();
@@ -1843,134 +1933,66 @@ export class TaskTool {
             messages.push(assistantMessage);
             // Display reasoning content if present
             if (reasoningContent) {
-                console.log(`\n${indent}${colors.textDim(`${icons.brain} Thinking Process:`)}`);
-                const truncatedReasoning = reasoningContent.length > 500
-                    ? reasoningContent.substring(0, 500) + '...'
-                    : reasoningContent;
-                const indentedReasoning = indentMultiline(truncatedReasoning, indent);
-                console.log(`${indentedReasoning}\n`);
+                if (isSdkMode && sdkOutputAdapter) {
+                    sdkOutputAdapter.outputThinking(reasoningContent, 'compact');
+                }
+                else {
+                    console.log(`\n${indent}${colors.textDim(`${icons.brain} Thinking Process:`)}`);
+                    const truncatedReasoning = reasoningContent.length > 500
+                        ? reasoningContent.substring(0, 500) + '...'
+                        : reasoningContent;
+                    const indentedReasoning = indentMultiline(truncatedReasoning, indent);
+                    console.log(`${indentedReasoning}\n`);
+                }
             }
             // Display assistant response (if there's any text content) with proper indentation
             if (contentStr) {
-                console.log(`\n${indent}${colors.primaryBright(agentName)}: ${description}`);
-                const truncatedContent = contentStr.length > 500 ? contentStr.substring(0, 500) + '...' : contentStr;
-                const indentedContent = indentMultiline(truncatedContent, indent);
-                console.log(`${indentedContent}\n`);
+                if (isSdkMode && sdkOutputAdapter) {
+                    sdkOutputAdapter.outputAssistant(contentStr);
+                }
+                else {
+                    console.log(`\n${indent}${colors.primaryBright(agentName)}: ${description}`);
+                    const truncatedContent = contentStr.length > 500 ? contentStr.substring(0, 500) + '...' : contentStr;
+                    const indentedContent = indentMultiline(truncatedContent, indent);
+                    console.log(`${indentedContent}\n`);
+                }
             }
-            // Process tool calls with proper indentation
+            // Process tool calls in parallel (照搬 session 的实现)
             if (toolCalls && toolCalls.length > 0) {
-                for (const toolCall of toolCalls) {
+                // Prepare all tool calls with their indices
+                const preparedToolCalls = toolCalls.map((toolCall, index) => {
                     const { name, arguments: params } = toolCall.function;
                     let parsedParams;
                     try {
                         parsedParams = typeof params === 'string' ? JSON.parse(params) : params;
                     }
-                    catch (e) {
+                    catch {
                         parsedParams = params;
                     }
-                    console.log(`${indent}${colors.textMuted(`${icons.loading} Tool: ${name}`)}`);
+                    return { name, params: parsedParams, id: toolCall.id, index };
+                });
+                // Display all tool call info first
+                for (const tc of preparedToolCalls) {
+                    if (isSdkMode && sdkOutputAdapter) {
+                        sdkOutputAdapter.outputToolStart(tc.name, tc.params);
+                    }
+                    else {
+                        console.log(`${indent}${colors.textMuted(`${icons.loading} Tool: ${tc.name}`)}`);
+                    }
+                }
+                // Execute all tool calls in parallel
+                const executePromises = preparedToolCalls.map(async (tc) => {
                     try {
                         // Check cancellation before tool execution
                         checkCancellation();
-                        const toolResult = await cancellationManager.withCancellation(toolRegistry.execute(name, parsedParams, mode, indent), `subagent-${subagent_type}-${name}-${iteration}`);
-                        // Get showToolDetails config to control result display
-                        const showToolDetails = config.get('showToolDetails') || false;
-                        // Prepare result preview for history
-                        const resultPreview = typeof toolResult === 'string' ? toolResult : JSON.stringify(toolResult, null, 2);
-                        const truncatedPreview = resultPreview.length > 200 ? resultPreview.substring(0, 200) + '...' : resultPreview;
-                        // Special handling for different tools (consistent with session.ts display logic)
-                        const isTodoTool = name === 'todo_write' || name === 'todo_read';
-                        const isEditTool = name === 'Edit';
-                        const isWriteTool = name === 'Write';
-                        const isDeleteTool = name === 'DeleteFile';
-                        const hasDiff = isEditTool && toolResult?.diff;
-                        const hasFilePreview = isWriteTool && toolResult?.preview;
-                        const hasDeleteInfo = isDeleteTool && toolResult?.filePath;
-                        // Import render functions for consistent display
-                        const { renderDiff, renderLines } = await import('./theme.js');
-                        if (isTodoTool) {
-                            // Display todo list
-                            console.log(`${indent}${colors.success(`${icons.check} Todo List:`)}`);
-                            const todos = toolResult?.todos || [];
-                            if (todos.length === 0) {
-                                console.log(`${indent}  ${colors.textMuted('No tasks')}`);
-                            }
-                            else {
-                                const statusConfig = {
-                                    pending: { icon: icons.circle, color: colors.textMuted, label: 'Pending' },
-                                    in_progress: { icon: icons.loading, color: colors.warning, label: 'In Progress' },
-                                    completed: { icon: icons.success, color: colors.success, label: 'Completed' },
-                                    failed: { icon: icons.error, color: colors.error, label: 'Failed' },
-                                };
-                                for (const todo of todos) {
-                                    const status = statusConfig[todo.status] || statusConfig['pending'];
-                                    console.log(`${indent}  ${status.color(status.icon)} ${status.color(status.label)}: ${colors.text(todo.task)}`);
-                                }
-                            }
-                            if (toolResult?.message) {
-                                console.log(`${indent}${colors.textDim(toolResult.message)}`);
-                            }
-                            console.log('');
-                        }
-                        else if (hasDiff) {
-                            // Display edit result with diff
-                            console.log('');
-                            const diffOutput = renderDiff(toolResult.diff);
-                            const indentedDiff = diffOutput
-                                .split('\n')
-                                .map((line) => `${indent}  ${line}`)
-                                .join('\n');
-                            console.log(`${indentedDiff}\n`);
-                        }
-                        else if (hasFilePreview) {
-                            // Display new file content in preview style
-                            console.log('');
-                            console.log(`${indent}${colors.success(`${icons.file} ${toolResult.filePath}`)}`);
-                            console.log(`${indent}${colors.textDim(`  ${toolResult.lineCount} lines`)}`);
-                            console.log('');
-                            console.log(renderLines(toolResult.preview, { maxLines: 10, indent: indent + '  ' }));
-                            console.log('');
-                        }
-                        else if (hasDeleteInfo) {
-                            // Display DeleteFile result
-                            console.log('');
-                            console.log(`${indent}${colors.success(`${icons.check} Deleted: ${toolResult.filePath}`)}`);
-                            console.log('');
-                        }
-                        else if (showToolDetails) {
-                            // Show full result details
-                            const indentedPreview = indentMultiline(resultPreview, indent);
-                            console.log(`${indent}${colors.success(`${icons.check} Tool Result:`)}\n${indentedPreview}\n`);
-                        }
-                        else if (toolResult && toolResult.success === false) {
-                            // Tool failed
-                            console.log(`${indent}${colors.error(`${icons.cross} ${toolResult.message || 'Failed'}`)}\n`);
-                        }
-                        else if (toolResult) {
-                            // Show brief preview by default
-                            const indentedPreview = indentMultiline(truncatedPreview, indent);
-                            console.log(`${indent}${colors.success(`${icons.check} Completed`)}\n${indentedPreview}\n`);
-                        }
-                        else {
-                            console.log(`${indent}${colors.textDim('(no result)')}\n`);
-                        }
-                        // Record successful tool execution in history (use truncated preview to save memory)
-                        executionHistory.push({
-                            tool: name,
-                            status: 'success',
-                            params: parsedParams,
-                            result: truncatedPreview,
-                            timestamp: new Date().toISOString(),
-                        });
-                        messages.push({
-                            role: 'tool',
-                            content: JSON.stringify(toolResult),
-                            tool_call_id: toolCall.id,
-                        });
+                        const toolResult = await cancellationManager.withCancellation(toolRegistry.execute(tc.name, tc.params, mode, indent), `subagent-${subagent_type}-${tc.name}-${iteration}`);
+                        return { ...tc, toolResult, error: undefined };
                     }
                     catch (error) {
                         if (error.message === 'Operation cancelled by user') {
-                            console.log(`${indent}${colors.warning(`⚠️  Operation cancelled`)}\n`);
+                            if (!isSdkMode || !sdkOutputAdapter) {
+                                console.log(`${indent}${colors.warning(`⚠️  Operation cancelled`)}\n`);
+                            }
                             cancellationManager.off('cancelled', cancelHandler);
                             cleanupStdinPolling();
                             const summaryPreview = contentStr.length > 300 ? contentStr.substring(0, 300) + '...' : contentStr;
@@ -1990,56 +2012,174 @@ export class TaskTool {
                                 },
                             };
                         }
-                        console.log(`${indent}${colors.error(`${icons.cross} Error:`)} ${error.message}\n`);
+                        return { ...tc, toolResult: undefined, error: error.message };
+                    }
+                });
+                const settledResults = await Promise.all(executePromises);
+                // Check for cancellation in results
+                const cancellationResult = settledResults.find((r) => 'success' in r && r.success === false);
+                if (cancellationResult) {
+                    return cancellationResult;
+                }
+                const resultsByIndex = new Map();
+                const usedIndices = new Set();
+                for (const result of settledResults) {
+                    // Find the first unused original index that matches the tool name
+                    const originalIndex = preparedToolCalls.findIndex((tc, idx) => tc.name === result.name && !usedIndices.has(idx));
+                    if (originalIndex !== -1) {
+                        usedIndices.add(originalIndex);
+                        resultsByIndex.set(originalIndex, result);
+                    }
+                }
+                // Import render functions for consistent display
+                const { renderDiff, renderLines } = await import('./theme.js');
+                // Process results in the original tool_calls order
+                for (let i = 0; i < preparedToolCalls.length; i++) {
+                    const result = resultsByIndex.get(i);
+                    if (!result)
+                        continue;
+                    const { name, params: parsedParams, toolResult, error } = result;
+                    // Get showToolDetails config to control result display
+                    const showToolDetails = config.get('showToolDetails') || false;
+                    // Prepare result preview for history
+                    const resultPreview = typeof toolResult === 'string' ? toolResult : JSON.stringify(toolResult, null, 2);
+                    const truncatedPreview = resultPreview.length > 200 ? resultPreview.substring(0, 200) + '...' : resultPreview;
+                    if (error) {
+                        // Handle error case
+                        if (isSdkMode && sdkOutputAdapter) {
+                            sdkOutputAdapter.outputToolError(name, error);
+                        }
+                        else {
+                            console.log(`${indent}${colors.error(`${icons.cross} Error:`)} ${error}\n`);
+                        }
                         // Record failed tool execution in history
                         executionHistory.push({
                             tool: name,
                             status: 'error',
                             params: parsedParams,
-                            error: error.message,
+                            error,
                             timestamp: new Date().toISOString(),
                         });
                         messages.push({
                             role: 'tool',
-                            content: JSON.stringify({ error: error.message }),
-                            tool_call_id: toolCall.id,
+                            content: JSON.stringify({ error }),
+                            tool_call_id: result.id,
+                        });
+                    }
+                    else {
+                        // Handle success case - display result
+                        // SDK mode: output tool result via adapter
+                        if (isSdkMode && sdkOutputAdapter) {
+                            sdkOutputAdapter.outputToolResult(name, toolResult);
+                        }
+                        // Normal mode: console output (SDK mode already output via adapter above)
+                        if (!isSdkMode || !sdkOutputAdapter) {
+                            // Special handling for different tools (consistent with session.ts display logic)
+                            const isTodoTool = name === 'todo_write' || name === 'todo_read';
+                            const isEditTool = name === 'Edit';
+                            const isWriteTool = name === 'Write';
+                            const isDeleteTool = name === 'DeleteFile';
+                            const hasDiff = isEditTool && toolResult?.diff;
+                            const hasFilePreview = isWriteTool && toolResult?.preview;
+                            const hasDeleteInfo = isDeleteTool && toolResult?.filePath;
+                            if (isTodoTool) {
+                                // Display todo list
+                                console.log(`${indent}${colors.success(`${icons.check} Todo List:`)}`);
+                                const todos = toolResult?.todos || [];
+                                if (todos.length === 0) {
+                                    console.log(`${indent}  ${colors.textMuted('No tasks')}`);
+                                }
+                                else {
+                                    const statusConfig = {
+                                        pending: { icon: icons.circle, color: colors.textMuted, label: 'Pending' },
+                                        in_progress: { icon: icons.loading, color: colors.warning, label: 'In Progress' },
+                                        completed: { icon: icons.success, color: colors.success, label: 'Completed' },
+                                        failed: { icon: icons.error, color: colors.error, label: 'Failed' },
+                                    };
+                                    for (const todo of todos) {
+                                        const status = statusConfig[todo.status] || statusConfig['pending'];
+                                        console.log(`${indent}  ${status.color(status.icon)} ${status.color(status.label)}: ${colors.text(todo.task)}`);
+                                    }
+                                }
+                                if (toolResult?.message) {
+                                    console.log(`${indent}${colors.textDim(toolResult.message)}`);
+                                }
+                                console.log('');
+                            }
+                            else if (hasDiff) {
+                                // Display edit result with diff
+                                console.log('');
+                                const diffOutput = renderDiff(toolResult.diff);
+                                const indentedDiff = diffOutput
+                                    .split('\n')
+                                    .map((line) => `${indent}  ${line}`)
+                                    .join('\n');
+                                console.log(`${indentedDiff}\n`);
+                            }
+                            else if (hasFilePreview) {
+                                // Display new file content in preview style
+                                console.log('');
+                                console.log(`${indent}${colors.success(`${icons.file} ${toolResult.filePath}`)}`);
+                                console.log(`${indent}${colors.textDim(`  ${toolResult.lineCount} lines`)}`);
+                                console.log('');
+                                console.log(renderLines(toolResult.preview, { maxLines: 10, indent: indent + '  ' }));
+                                console.log('');
+                            }
+                            else if (hasDeleteInfo) {
+                                // Display DeleteFile result
+                                console.log('');
+                                console.log(`${indent}${colors.success(`${icons.check} Deleted: ${toolResult.filePath}`)}`);
+                                console.log('');
+                            }
+                            else if (showToolDetails) {
+                                // Show full result details
+                                const indentedPreview = indentMultiline(resultPreview, indent);
+                                console.log(`${indent}${colors.success(`${icons.check} Tool Result:`)}\n${indentedPreview}\n`);
+                            }
+                            else if (toolResult && toolResult.success === false) {
+                                // Tool failed
+                                console.log(`${indent}${colors.error(`${icons.cross} ${toolResult.message || 'Failed'}`)}\n`);
+                            }
+                            else if (toolResult) {
+                                // Show brief preview by default
+                                const indentedPreview = indentMultiline(truncatedPreview, indent);
+                                console.log(`${indent}${colors.success(`${icons.check} Completed`)}\n${indentedPreview}\n`);
+                            }
+                            else {
+                                console.log(`${indent}${colors.textDim('(no result)')}\n`);
+                            }
+                        }
+                        // Record successful tool execution in history (use truncated preview to save memory)
+                        executionHistory.push({
+                            tool: name,
+                            status: 'success',
+                            params: parsedParams,
+                            result: truncatedPreview,
+                            timestamp: new Date().toISOString(),
+                        });
+                        messages.push({
+                            role: 'tool',
+                            content: JSON.stringify(toolResult),
+                            tool_call_id: result.id,
                         });
                     }
                 }
-                console.log('');
+                if (!isSdkMode || !sdkOutputAdapter) {
+                    console.log('');
+                }
                 continue; // Continue to next iteration to get final response
             }
-            // No more tool calls, return the result with execution history
-            cancellationManager.off('cancelled', cancelHandler);
-            cleanupStdinPolling();
-            const summaryPreview = contentStr.length > 300 ? contentStr.substring(0, 300) + '...' : contentStr;
-            return {
-                success: true,
-                message: `Task "${description}" completed by ${subagent_type}`,
-                result: {
-                    summary: summaryPreview,
-                    executionHistory: {
-                        totalIterations: iteration,
-                        toolsExecuted: executionHistory.length,
-                        successfulTools: executionHistory.filter((t) => t.status === 'success').length,
-                        failedTools: executionHistory.filter((t) => t.status === 'error').length,
-                        history: executionHistory,
-                    },
-                },
-            };
+            // No more tool calls - break loop (same as main agent)
+            lastContentStr = contentStr || '';
+            break;
         }
-        // Max iterations reached - return accumulated results instead of throwing error
-        // Get the last assistant message content
-        const lastAssistantMsg = messages.filter((m) => m.role === 'assistant').pop();
-        const lastContentStr = typeof lastAssistantMsg?.content === 'string'
-            ? lastAssistantMsg.content
-            : JSON.stringify(lastAssistantMsg?.content || '');
+        // Loop ended - return result (same as main agent pattern)
         cancellationManager.off('cancelled', cancelHandler);
         cleanupStdinPolling();
         const summaryPreview = lastContentStr.length > 300 ? lastContentStr.substring(0, 300) + '...' : lastContentStr;
         return {
             success: true,
-            message: `Task "${description}" completed (max iterations reached) by ${subagent_type}`,
+            message: `Task "${description}" completed by ${subagent_type}`,
             result: {
                 summary: summaryPreview,
                 executionHistory: {
@@ -2048,12 +2188,11 @@ export class TaskTool {
                     successfulTools: executionHistory.filter((t) => t.status === 'success').length,
                     failedTools: executionHistory.filter((t) => t.status === 'error').length,
                     history: executionHistory,
-                    maxIterationsReached: true,
                 },
             },
         };
     }
-    async executeParallelAgents(agents, description, mode, agentManager, toolRegistry, aiClient, indentLevel = 1) {
+    async executeParallelAgents(agents, description, mode, agentManager, toolRegistry, config, indentLevel = 1) {
         const indent = '  '.repeat(indentLevel);
         const indentNext = '  '.repeat(indentLevel + 1);
         const cancellationManager = getCancellationManager();
@@ -2086,7 +2225,7 @@ export class TaskTool {
                             }
                         }
                     }
-                    catch (e) {
+                    catch {
                         // Ignore polling errors
                     }
                 }, 10);
@@ -2108,7 +2247,7 @@ export class TaskTool {
         cancellationManager.on('cancelled', cancelHandler);
         console.log(`\n${indent}${colors.accent('◆')} ${colors.primaryBright('Parallel Agents')}: ${agents.length} running...`);
         const startTime = Date.now();
-        const agentPromises = agents.map(async (agentTask, index) => {
+        const agentPromises = agents.map(async (agentTask, _index) => {
             // Check if cancelled
             if (cancelled || cancellationManager.isOperationCancelled()) {
                 return {
@@ -2119,7 +2258,7 @@ export class TaskTool {
                 };
             }
             try {
-                const result = await this.executeSingleAgent(agentTask.subagent_type, agentTask.prompt, agentTask.description, agentTask.useContext ?? true, agentTask.constraints || [], mode, agentManager, toolRegistry, aiClient, indentLevel + 1);
+                const result = await this.executeSingleAgent(agentTask.subagent_type, agentTask.prompt, agentTask.description, agentTask.useContext ?? true, agentTask.constraints || [], mode, agentManager, toolRegistry, config, indentLevel + 1);
                 return {
                     success: true,
                     agent: agentTask.subagent_type,
@@ -2329,6 +2468,19 @@ export class AskUserQuestionTool {
         ExecutionMode.SMART,
     ];
     async execute(params) {
+        // Check if in SDK mode
+        const sdkMode = this._sdkMode;
+        const sdkAdapter = this._sdkOutputAdapter;
+        if (sdkMode && sdkAdapter) {
+            return this.executeSdk(params, sdkAdapter);
+        }
+        // Regular TUI mode
+        return this.executeTui(params);
+    }
+    /**
+     * Execute in TUI mode using @clack/prompts
+     */
+    async executeTui(params) {
         const { questions } = params;
         try {
             if (questions.length === 0 || questions.length > 4) {
@@ -2357,6 +2509,38 @@ export class AskUserQuestionTool {
             throw new Error(`Failed to ask user questions: ${error.message}`);
         }
     }
+    /**
+     * Execute in SDK mode - output question request and wait for response
+     */
+    async executeSdk(params, sdkAdapter) {
+        const { questions } = params;
+        if (questions.length === 0 || questions.length > 4) {
+            throw new Error('Must provide 1-4 questions');
+        }
+        const requestId = `question_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+        // Output question request through SDK adapter
+        sdkAdapter.outputQuestionRequest({
+            requestId,
+            questions
+        });
+        // Wait for SDK question response
+        // The response will be handled by session.ts which has access to the SDK input
+        // For now, we use a polling mechanism or wait for a specific event
+        try {
+            // Import the session to get response handling
+            const { getSingletonSession } = await import('./session.js');
+            const session = getSingletonSession();
+            if (!session) {
+                throw new Error('SDK session not available');
+            }
+            const answers = await session.waitForQuestionResponse(requestId);
+            sdkAdapter.outputQuestionResponse(requestId, answers);
+            return { answers };
+        }
+        catch (error) {
+            throw new Error(`Failed to get SDK question response: ${error.message}`);
+        }
+    }
 }
 export class SaveMemoryTool {
     name = 'save_memory';
@@ -2696,7 +2880,6 @@ export class InvokeSkillTool {
         const { skillId, taskDescription, inputFile, outputFile, options } = params;
         try {
             const { getSkillInvoker } = await import('./skill-invoker.js');
-            const { SkillExecutionParams } = (await import('./skill-invoker.js'));
             const skillInvoker = getSkillInvoker();
             await skillInvoker.initialize();
             // Verify skill exists
@@ -2827,6 +3010,8 @@ export class ToolRegistry {
     tools = new Map();
     todoWriteTool;
     backgroundTasks = new Map();
+    _isSdkMode = false;
+    _sdkOutputAdapter = null;
     constructor() {
         this.todoWriteTool = new TodoWriteTool();
         this.registerDefaultTools();
@@ -2915,12 +3100,36 @@ export class ToolRegistry {
                 this.tools.set(toolName, mcpTool);
                 registeredCount++;
                 if (toolName !== originalName) {
-                    console.log(`[MCP] Tool '${originalName}' renamed to '${toolName}' to avoid conflict`);
+                    // 在 SDK 模式下不输出重命名信息
+                    if (!this._isSdkMode) {
+                        console.log(`[MCP] Tool '${originalName}' renamed to '${toolName}' to avoid conflict`);
+                    }
                 }
             }
         }
         if (registeredCount > 0) {
-            console.log(`[MCP] Registered ${registeredCount} tool(s)`);
+            // 在 SDK 模式下不输出注册信息（MCP 相关输出已在 session 中处理）
+            if (!this._isSdkMode) {
+                console.log(`[MCP] Registered ${registeredCount} tool(s)`);
+            }
+        }
+    }
+    /**
+     * Set SDK mode for the tool registry.
+     * In SDK mode, tool execution output is sent to the SDK output adapter.
+     */
+    async setSdkMode(enabled, adapter) {
+        this._isSdkMode = enabled;
+        this._sdkOutputAdapter = adapter;
+        // Mark all tools as SDK mode enabled
+        for (const [, tool] of this.tools) {
+            tool._sdkMode = enabled;
+            tool._sdkOutputAdapter = adapter;
+        }
+        // Initialize SDK mode for TaskTool specifically
+        const taskTool = this.tools.get('task');
+        if (taskTool) {
+            await taskTool.setSdkMode?.(enabled, adapter);
         }
     }
     /**
@@ -3426,7 +3635,7 @@ export class ToolRegistry {
                         required: ['skill'],
                     };
                     break;
-                default:
+                default: {
                     // For MCP tools, use their inputSchema; for other unknown tools, keep empty schema
                     const mcpTool = tool;
                     if (mcpTool._isMcpTool && mcpTool.inputSchema) {
@@ -3455,6 +3664,7 @@ export class ToolRegistry {
                             required: [],
                         };
                     }
+                }
             }
             return {
                 type: 'function',
@@ -3481,12 +3691,12 @@ export class ToolRegistry {
             return await this.executeMCPTool(toolName, params, executionMode, indent);
         }
         // Try to find MCP tool with just the tool name (try each server)
-        for (const [fullName, tool] of allMcpTools) {
+        for (const [fullName, _tool] of allMcpTools) {
             // Split only on the first __ to preserve underscores in tool names
             const firstUnderscoreIndex = fullName.indexOf('__');
             if (firstUnderscoreIndex === -1)
                 continue;
-            const [serverName, actualToolName] = [
+            const [_serverName, actualToolName] = [
                 fullName.substring(0, firstUnderscoreIndex),
                 fullName.substring(firstUnderscoreIndex + 2),
             ];
@@ -3509,6 +3719,8 @@ export class ToolRegistry {
         if (!tool.allowedModes.includes(executionMode)) {
             throw new Error(`Tool ${toolName} is not allowed in ${executionMode} mode`);
         }
+        const isSdkMode = this._isSdkMode;
+        const sdkOutputAdapter = this._sdkOutputAdapter;
         // Smart approval mode
         if (executionMode === ExecutionMode.SMART) {
             const debugMode = process.env.DEBUG === 'smart-approval';
@@ -3529,12 +3741,22 @@ export class ToolRegistry {
             const isRemoteMode = authConfig.type === AuthType.OAUTH_XAGENT;
             if (isRemoteMode && toolName === 'InvokeSkill') {
                 console.log('');
-                console.log(`${indent}${colors.success(`✅ [Smart Mode] Remote mode: tool '${toolName}' auto-approved (remote LLM already approved)`)}`);
-                console.log('');
+                if (isSdkMode && sdkOutputAdapter) {
+                    sdkOutputAdapter.outputInfo(`[Smart Mode] Remote mode: tool '${toolName}' auto-approved (remote LLM already approved)`);
+                }
+                else {
+                    console.log('');
+                    console.log(`${indent}${colors.success(`✅ [Smart Mode] Remote mode: tool '${toolName}' auto-approved (remote LLM already approved)`)}`);
+                    console.log('');
+                }
                 return await cancellationManager.withCancellation(tool.execute(params, executionMode), `tool-${toolName}`);
             }
             const { getSmartApprovalEngine } = await import('./smart-approval.js');
             const approvalEngine = getSmartApprovalEngine(debugMode);
+            // Set SDK mode for approval engine if in SDK mode
+            if (isSdkMode && sdkOutputAdapter) {
+                approvalEngine.setSdkMode(true, sdkOutputAdapter);
+            }
             // Evaluate tool call
             const result = await approvalEngine.evaluate({
                 toolName,
@@ -3544,35 +3766,56 @@ export class ToolRegistry {
             // Decide whether to execute based on approval result
             if (result.decision === 'approved') {
                 // Whitelist or AI approval passed, execute directly
-                console.log('');
-                console.log(`${indent}${colors.success(`✅ [Smart Mode] Tool '${toolName}' passed approval, executing directly`)}`);
-                console.log(`${indent}${colors.textDim(`  Detection method: ${result.detectionMethod === 'whitelist' ? 'Whitelist' : 'AI Review'}`)}`);
-                console.log(`${indent}${colors.textDim(`  Latency: ${result.latency}ms`)}`);
-                console.log('');
+                if (isSdkMode && sdkOutputAdapter) {
+                    sdkOutputAdapter.outputInfo(`[Smart Mode] Tool '${toolName}' passed approval, executing directly`);
+                    sdkOutputAdapter.outputInfo(`Detection method: ${result.detectionMethod === 'whitelist' ? 'Whitelist' : 'AI Review'}, Latency: ${result.latency}ms`);
+                }
+                else {
+                    console.log('');
+                    console.log(`${indent}${colors.success(`✅ [Smart Mode] Tool '${toolName}' passed approval, executing directly`)}`);
+                    console.log(`${indent}${colors.textDim(`  Detection method: ${result.detectionMethod === 'whitelist' ? 'Whitelist' : 'AI Review'}`)}`);
+                    console.log(`${indent}${colors.textDim(`  Latency: ${result.latency}ms`)}`);
+                    console.log('');
+                }
                 return await cancellationManager.withCancellation(tool.execute(params, executionMode), `tool-${toolName}`);
             }
             else if (result.decision === 'requires_confirmation') {
                 // Requires user confirmation
-                const confirmed = await approvalEngine.requestConfirmation(result);
+                const confirmed = await approvalEngine.requestConfirmation(result, toolName, params);
                 if (confirmed) {
-                    console.log('');
-                    console.log(`${indent}${colors.success(`✅ [Smart Mode] User confirmed execution of tool '${toolName}'`)}`);
-                    console.log('');
+                    if (isSdkMode && sdkOutputAdapter) {
+                        sdkOutputAdapter.outputInfo(`[Smart Mode] User confirmed execution of tool '${toolName}'`);
+                    }
+                    else {
+                        console.log('');
+                        console.log(`${indent}${colors.success(`✅ [Smart Mode] User confirmed execution of tool '${toolName}'`)}`);
+                        console.log('');
+                    }
                     return await cancellationManager.withCancellation(tool.execute(params, executionMode), `tool-${toolName}`);
                 }
                 else {
-                    console.log('');
-                    console.log(`${indent}${colors.warning(`⚠️  [Smart Mode] User cancelled execution of tool '${toolName}'`)}`);
-                    console.log('');
+                    if (isSdkMode && sdkOutputAdapter) {
+                        sdkOutputAdapter.outputWarning(`[Smart Mode] User cancelled execution of tool '${toolName}'`);
+                    }
+                    else {
+                        console.log('');
+                        console.log(`${indent}${colors.warning(`⚠️  [Smart Mode] User cancelled execution of tool '${toolName}'`)}`);
+                        console.log('');
+                    }
                     throw new Error(`Tool execution cancelled by user: ${toolName}`);
                 }
             }
             else {
                 // Rejected execution
-                console.log('');
-                console.log(`${indent}${colors.error(`❌ [Smart Mode] Tool '${toolName}' execution rejected`)}`);
-                console.log(`${indent}${colors.textDim(`  Reason: ${result.description}`)}`);
-                console.log('');
+                if (isSdkMode && sdkOutputAdapter) {
+                    sdkOutputAdapter.outputError(`[Smart Mode] Tool '${toolName}' execution rejected`, { reason: result.description });
+                }
+                else {
+                    console.log('');
+                    console.log(`${indent}${colors.error(`❌ [Smart Mode] Tool '${toolName}' execution rejected`)}`);
+                    console.log(`${indent}${colors.textDim(`  Reason: ${result.description}`)}`);
+                    console.log('');
+                }
                 throw new Error(`Tool execution rejected: ${toolName}`);
             }
         }
@@ -3592,10 +3835,14 @@ export class ToolRegistry {
         const actualToolName = toolName.substring(firstUnderscoreIndex + 2);
         // Get server info for display
         const server = mcpManager.getServer(serverName);
-        const serverTools = server?.getToolNames() || [];
+        const _serverTools = server?.getToolNames() || [];
+        const isSdkMode = this._isSdkMode;
+        const sdkOutputAdapter = this._sdkOutputAdapter;
         // Display tool call info
-        console.log('');
-        console.log(`${indent}${colors.warning(`${icons.tool} MCP Tool Call: ${serverName}::${actualToolName}`)}`);
+        if (!isSdkMode || !sdkOutputAdapter) {
+            console.log('');
+            console.log(`${indent}${colors.warning(`${icons.tool} MCP Tool Call: ${serverName}::${actualToolName}`)}`);
+        }
         // Smart approval mode for MCP tools
         if (executionMode === ExecutionMode.SMART) {
             const debugMode = process.env.DEBUG === 'smart-approval';
@@ -3606,10 +3853,19 @@ export class ToolRegistry {
             const isRemoteMode = authConfig.type === AuthType.OAUTH_XAGENT;
             // Remote mode: remote LLM has already approved the tool, auto-approve
             if (isRemoteMode) {
-                console.log(`${indent}${colors.success(`✅ [Smart Mode] Remote mode: MCP tool '${serverName}::${actualToolName}' auto-approved`)}`);
+                if (isSdkMode && sdkOutputAdapter) {
+                    sdkOutputAdapter.outputInfo(`[Smart Mode] Remote mode: MCP tool '${serverName}::${actualToolName}' auto-approved`);
+                }
+                else {
+                    console.log(`${indent}${colors.success(`✅ [Smart Mode] Remote mode: MCP tool '${serverName}::${actualToolName}' auto-approved`)}`);
+                }
             }
             else {
                 const approvalEngine = getSmartApprovalEngine(debugMode);
+                // Set SDK mode for approval engine if in SDK mode
+                if (isSdkMode && sdkOutputAdapter) {
+                    approvalEngine.setSdkMode(true, sdkOutputAdapter);
+                }
                 // Evaluate MCP tool call
                 const result = await approvalEngine.evaluate({
                     toolName: `MCP[${serverName}]::${actualToolName}`,
@@ -3617,19 +3873,35 @@ export class ToolRegistry {
                     timestamp: Date.now(),
                 });
                 if (result.decision === 'approved') {
-                    console.log(`${indent}${colors.success(`✅ [Smart Mode] MCP tool '${serverName}::${actualToolName}' passed approval`)}`);
-                    console.log(`${indent}${colors.textDim(`  Detection method: ${result.detectionMethod === 'whitelist' ? 'Whitelist' : 'AI Review'}`)}`);
+                    if (isSdkMode && sdkOutputAdapter) {
+                        sdkOutputAdapter.outputInfo(`[Smart Mode] MCP tool '${serverName}::${actualToolName}' passed approval`);
+                        sdkOutputAdapter.outputInfo(`Detection method: ${result.detectionMethod === 'whitelist' ? 'Whitelist' : 'AI Review'}`);
+                    }
+                    else {
+                        console.log(`${indent}${colors.success(`✅ [Smart Mode] MCP tool '${serverName}::${actualToolName}' passed approval`)}`);
+                        console.log(`${indent}${colors.textDim(`  Detection method: ${result.detectionMethod === 'whitelist' ? 'Whitelist' : 'AI Review'}`)}`);
+                    }
                 }
                 else if (result.decision === 'requires_confirmation') {
-                    const confirmed = await approvalEngine.requestConfirmation(result);
+                    const confirmed = await approvalEngine.requestConfirmation(result, `MCP[${serverName}]::${actualToolName}`, params);
                     if (!confirmed) {
-                        console.log(`${indent}${colors.warning(`⚠️  [Smart Mode] User cancelled MCP tool execution`)}`);
+                        if (isSdkMode && sdkOutputAdapter) {
+                            sdkOutputAdapter.outputWarning(`[Smart Mode] User cancelled MCP tool execution`);
+                        }
+                        else {
+                            console.log(`${indent}${colors.warning(`⚠️  [Smart Mode] User cancelled MCP tool execution`)}`);
+                        }
                         throw new Error(`Tool execution cancelled by user: ${toolName}`);
                     }
                 }
                 else {
-                    console.log(`${indent}${colors.error(`❌ [Smart Mode] MCP tool execution rejected`)}`);
-                    console.log(`${indent}${colors.textDim(`  Reason: ${result.description}`)}`);
+                    if (isSdkMode && sdkOutputAdapter) {
+                        sdkOutputAdapter.outputError(`[Smart Mode] MCP tool execution rejected`, { reason: result.description });
+                    }
+                    else {
+                        console.log(`${indent}${colors.error(`❌ [Smart Mode] MCP tool execution rejected`)}`);
+                        console.log(`${indent}${colors.textDim(`  Reason: ${result.description}`)}`);
+                    }
                     throw new Error(`Tool execution rejected: ${toolName}`);
                 }
             }