@vybestack/llxprt-code-core 0.7.0-nightly.251219.3619c584b → 0.7.0-nightly.251221.60dcdf714

package/dist/src/core/nonInteractiveToolExecutor.js

@@ -3,50 +3,17 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { logToolCall, ToolErrorType, DEFAULT_AGENT_ID, } from '../index.js';
-import { DiscoveredMCPTool } from '../tools/mcp-tool.js';
-import { convertToFunctionResponse } from './coreToolScheduler.js';
-import { ToolCallDecision } from '../telemetry/types.js';
+import { ToolErrorType, DEFAULT_AGENT_ID, } from '../index.js';
+import { ApprovalMode } from '../config/config.js';
+import { MessageBus } from '../confirmation-bus/message-bus.js';
+import { PolicyEngine } from '../policy/policy-engine.js';
+import { PolicyDecision } from '../policy/types.js';
+import { CoreToolScheduler, } from './coreToolScheduler.js';
 import { EmojiFilter } from '../filters/EmojiFilter.js';
-import { DebugLogger } from '../debug/index.js';
 /**
  * Global emoji filter instance for reuse across tool calls
  */
 let emojiFilter = null;
-const logger = new DebugLogger('llxprt:tool-executor');
-function buildToolGovernance(config) {
-    const ephemerals = typeof config.getEphemeralSettings === 'function'
-        ? config.getEphemeralSettings() || {}
-        : {};
-    const allowedRaw = Array.isArray(ephemerals['tools.allowed'])
-        ? ephemerals['tools.allowed']
-        : [];
-    const disabledRaw = Array.isArray(ephemerals['tools.disabled'])
-        ? ephemerals['tools.disabled']
-        : Array.isArray(ephemerals['disabled-tools'])
-            ? ephemerals['disabled-tools']
-            : [];
-    const excludedRaw = config.getExcludeTools?.() ?? [];
-    const normalize = (name) => name.trim().toLowerCase();
-    return {
-        allowed: new Set(allowedRaw.map(normalize)),
-        disabled: new Set(disabledRaw.map(normalize)),
-        excluded: new Set(excludedRaw.map(normalize)),
-    };
-}
-function isToolBlocked(toolName, governance) {
-    const canonical = toolName.trim().toLowerCase();
-    if (governance.excluded.has(canonical)) {
-        return true;
-    }
-    if (governance.disabled.has(canonical)) {
-        return true;
-    }
-    if (governance.allowed.size > 0 && !governance.allowed.has(canonical)) {
-        return true;
-    }
-    return false;
-}
 /**
  * Gets or creates the emoji filter instance based on current configuration
  * Always checks current configuration to ensure filter is up-to-date
@@ -73,7 +40,8 @@ function filterFileModificationArgs(filter, toolName, args) {
     // Only filter the content being written to files
     if (toolName === 'edit_file' ||
         toolName === 'edit' ||
-        toolName === 'replace') {
+        toolName === 'replace' ||
+        toolName === 'replace_all') {
         const oldString = args?.old_string;
         const newString = args?.new_string;
         // CRITICAL: Never filter old_string - it must match exactly what's in the file
@@ -124,299 +92,224 @@ function filterFileModificationArgs(filter, toolName, args) {
     return filter.filterToolArgs(args);
 }
 export async function executeToolCall(config, toolCallRequest, abortSignal) {
+    const startTime = Date.now();
     const agentId = toolCallRequest.agentId ?? DEFAULT_AGENT_ID;
     toolCallRequest.agentId = agentId;
-    const toolRegistry = config.getToolRegistry();
-    const governance = buildToolGovernance(config);
-    const startTime = Date.now();
-    const telemetryConfig = {
-        getSessionId: () => config.getSessionId(),
-        getTelemetryLogPromptsEnabled: () => config.getTelemetryLogPromptsEnabled(),
-    };
-    if (isToolBlocked(toolCallRequest.name, governance)) {
-        const error = new Error(`Tool "${toolCallRequest.name}" is disabled in the current profile.`);
-        const durationMs = Date.now() - startTime;
-        logToolCall(telemetryConfig, {
-            'event.name': 'tool_call',
-            'event.timestamp': new Date().toISOString(),
-            function_name: toolCallRequest.name,
-            function_args: toolCallRequest.args,
-            duration_ms: durationMs,
-            success: false,
-            error: error.message,
-            prompt_id: toolCallRequest.prompt_id,
-            tool_type: 'native',
-            agent_id: agentId,
-        });
-        return {
-            callId: toolCallRequest.callId,
-            error,
-            errorType: ToolErrorType.TOOL_DISABLED,
-            resultDisplay: error.message,
-            responseParts: [
-                {
-                    functionCall: {
-                        id: toolCallRequest.callId,
-                        name: toolCallRequest.name,
-                        args: toolCallRequest.args,
-                    },
-                },
-                {
-                    functionResponse: {
-                        id: toolCallRequest.callId,
-                        name: toolCallRequest.name,
-                        response: { error: error.message },
-                    },
-                },
-            ],
-            agentId,
-        };
-    }
-    const tool = toolRegistry.getTool(toolCallRequest.name);
-    if (!tool) {
-        const error = new Error(`Tool "${toolCallRequest.name}" not found in registry.`);
-        const durationMs = Date.now() - startTime;
-        logToolCall(telemetryConfig, {
-            'event.name': 'tool_call',
-            'event.timestamp': new Date().toISOString(),
-            function_name: toolCallRequest.name,
-            function_args: toolCallRequest.args,
-            duration_ms: durationMs,
-            success: false,
-            error: error.message,
-            prompt_id: toolCallRequest.prompt_id,
-            tool_type: 'native',
-            agent_id: agentId,
-        });
-        // Ensure the response structure matches what the API expects for an error
-        // Include both tool call and error response
-        return {
-            callId: toolCallRequest.callId,
-            responseParts: [
-                // Tool call
-                {
-                    functionCall: {
-                        id: toolCallRequest.callId,
-                        name: toolCallRequest.name,
-                        args: toolCallRequest.args,
-                    },
-                },
-                // Error response
-                {
-                    functionResponse: {
-                        id: toolCallRequest.callId,
-                        name: toolCallRequest.name,
-                        response: { error: error.message },
-                    },
-                },
-            ],
-            resultDisplay: error.message,
-            error,
-            errorType: ToolErrorType.TOOL_NOT_REGISTERED,
-            agentId,
-        };
+    const internalAbortController = new AbortController();
+    if (abortSignal) {
+        if (abortSignal.aborted) {
+            internalAbortController.abort();
+        }
+        else {
+            abortSignal.addEventListener('abort', () => internalAbortController.abort(), { once: true });
+        }
     }
+    const filter = getOrCreateFilter(config);
+    let filteredRequest = toolCallRequest;
+    let systemFeedback;
     try {
-        // Get emoji filter instance
-        const filter = getOrCreateFilter(config);
-        // Check if this is a search tool that should bypass filtering
-        const isSearchTool = [
-            'shell',
-            'bash',
-            'exec',
-            'run_shell_command',
-            'grep',
-            'search_file_content',
-            'glob',
-            'find',
-            'ls',
-            'list_directory',
-            'read_file',
-            'read_many_files',
-        ].includes(toolCallRequest.name);
-        let filteredArgs = toolCallRequest.args;
-        let systemFeedback;
-        // Search tools need unfiltered access for finding emojis
-        if (!isSearchTool) {
-            // Check if this is a file modification tool
-            const isFileModTool = [
-                'edit_file',
-                'edit',
-                'write_file',
-                'create_file',
-                'replace',
-                'replace_all',
-            ].includes(toolCallRequest.name);
-            // Filter tool arguments
-            let filterResult;
-            if (isFileModTool) {
-                filterResult = filterFileModificationArgs(filter, toolCallRequest.name, toolCallRequest.args);
-            }
-            else {
-                filterResult = filter.filterToolArgs(toolCallRequest.args);
+        const filtered = applyEmojiFiltering(filter, toolCallRequest);
+        filteredRequest = filtered.filteredRequest;
+        systemFeedback = filtered.systemFeedback;
+    }
+    catch (e) {
+        return createErrorCompletedToolCall(toolCallRequest, e instanceof Error ? e : new Error(String(e)), ToolErrorType.INVALID_TOOL_PARAMS, Date.now() - startTime);
+    }
+    const schedulerConfig = createSchedulerConfigForNonInteractive(config);
+    let completionResolver = null;
+    const completionPromise = new Promise((resolve) => {
+        completionResolver = resolve;
+    });
+    let awaitingApprovalResolver = null;
+    const awaitingApprovalPromise = new Promise((resolve) => {
+        awaitingApprovalResolver = resolve;
+    });
+    const scheduler = new CoreToolScheduler({
+        config: schedulerConfig,
+        toolContextInteractiveMode: false,
+        getPreferredEditor: () => undefined,
+        onEditorClose: () => { },
+        onAllToolCallsComplete: async (completedToolCalls) => {
+            completionResolver?.(completedToolCalls);
+        },
+        onToolCallsUpdate: (toolCalls) => {
+            try {
+                const awaiting = toolCalls.find((call) => call.status === 'awaiting_approval');
+                if (awaiting && awaitingApprovalResolver) {
+                    awaitingApprovalResolver(awaiting);
+                    awaitingApprovalResolver = null;
+                }
             }
-            // Handle blocking in error mode
-            if (filterResult.blocked) {
-                const durationMs = Date.now() - startTime;
-                logToolCall(telemetryConfig, {
-                    'event.name': 'tool_call',
-                    'event.timestamp': new Date().toISOString(),
-                    function_name: toolCallRequest.name,
-                    function_args: toolCallRequest.args,
-                    duration_ms: durationMs,
-                    success: false,
-                    error: filterResult.error,
-                    prompt_id: toolCallRequest.prompt_id,
-                    tool_type: typeof tool !== 'undefined' && tool instanceof DiscoveredMCPTool
-                        ? 'mcp'
-                        : 'native',
-                    agent_id: agentId,
-                });
-                return {
-                    callId: toolCallRequest.callId,
-                    responseParts: [
-                        // Tool call
-                        {
-                            functionCall: {
-                                id: toolCallRequest.callId,
-                                name: toolCallRequest.name,
-                                args: toolCallRequest.args,
-                            },
-                        },
-                        // Error response
-                        {
-                            functionResponse: {
-                                id: toolCallRequest.callId,
-                                name: toolCallRequest.name,
-                                response: { error: filterResult.error },
-                            },
-                        },
-                    ],
-                    resultDisplay: filterResult.error || 'Tool execution blocked',
-                    error: new Error(filterResult.error || 'Tool execution blocked'),
-                    errorType: ToolErrorType.INVALID_TOOL_PARAMS,
-                    agentId,
-                };
+            catch {
+                // Callback must be non-throwing.
             }
-            // Use filtered arguments
-            filteredArgs = filterResult.filtered;
-            systemFeedback = filterResult.systemFeedback;
+        },
+    });
+    try {
+        const effectiveSignal = internalAbortController.signal;
+        await scheduler.schedule([filteredRequest], effectiveSignal);
+        const raceResult = await Promise.race([
+            completionPromise.then((calls) => ({ kind: 'complete', calls })),
+            awaitingApprovalPromise.then((call) => ({
+                kind: 'awaiting',
+                call,
+            })),
+        ]);
+        if (raceResult.kind === 'awaiting') {
+            internalAbortController.abort();
+            scheduler.cancelAll();
+            return createErrorCompletedToolCall(toolCallRequest, new Error('Non-interactive tool execution reached awaiting_approval; treat as policy denial (no user interaction is possible).'), ToolErrorType.POLICY_VIOLATION, Date.now() - startTime);
         }
-        // Directly execute without confirmation or live output handling
-        const effectiveAbortSignal = abortSignal ?? new AbortController().signal;
-        const toolResult = await tool.buildAndExecute(filteredArgs, effectiveAbortSignal);
-        const tool_output = toolResult.llmContent;
-        const tool_display = toolResult.returnDisplay;
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        let metadata = {};
-        if (toolResult.error === undefined &&
-            typeof tool_display === 'object' &&
-            tool_display !== null &&
-            'diffStat' in tool_display) {
-            const diffStat = tool_display.diffStat;
-            if (diffStat) {
-                metadata = {
-                    ai_added_lines: diffStat.ai_added_lines,
-                    ai_removed_lines: diffStat.ai_removed_lines,
-                    user_added_lines: diffStat.user_added_lines,
-                    user_removed_lines: diffStat.user_removed_lines,
-                };
-            }
+        const completedCalls = raceResult.calls;
+        if (completedCalls.length !== 1) {
+            throw new Error('Non-interactive executor expects exactly one tool call');
         }
-        const durationMs = Date.now() - startTime;
-        logToolCall(telemetryConfig, {
-            'event.name': 'tool_call',
-            'event.timestamp': new Date().toISOString(),
-            function_name: toolCallRequest.name,
-            function_args: toolCallRequest.args,
-            duration_ms: durationMs,
-            success: toolResult.error === undefined,
-            error: toolResult.error === undefined ? undefined : toolResult.error.message,
-            error_type: toolResult.error === undefined ? undefined : toolResult.error.type,
-            prompt_id: toolCallRequest.prompt_id,
-            metadata,
-            decision: ToolCallDecision.AUTO_ACCEPT,
-            tool_type: typeof tool !== 'undefined' && tool instanceof DiscoveredMCPTool
-                ? 'mcp'
-                : 'native',
-            agent_id: agentId,
-        });
-        // Add system feedback for warn mode if emojis were detected and filtered
-        let finalLlmContent = tool_output;
+        const completed = completedCalls[0];
         if (systemFeedback) {
-            finalLlmContent = `${tool_output}\n\n<system-reminder>\n${systemFeedback}\n</system-reminder>`;
+            appendSystemFeedbackToResponse(completed.response, systemFeedback);
         }
-        const finalResponse = convertToFunctionResponse(toolCallRequest.name, toolCallRequest.callId, finalLlmContent, config);
-        // Return BOTH the tool call and response as an array
-        // This ensures they're always paired and added to history atomically
-        const responseParts = [
-            // First, the tool call from the model
-            {
-                functionCall: {
-                    id: toolCallRequest.callId,
-                    name: toolCallRequest.name,
-                    args: toolCallRequest.args,
-                },
-            },
-            // Then, spread the tool response(s) since convertToFunctionResponse returns Part[]
-            ...finalResponse,
-        ];
-        logger.debug(() => `Returning paired tool call and response for ${toolCallRequest.name} (${toolCallRequest.callId})`);
-        return {
-            callId: toolCallRequest.callId,
-            responseParts,
-            resultDisplay: tool_display,
-            error: toolResult.error === undefined
-                ? undefined
-                : new Error(toolResult.error.message),
-            errorType: toolResult.error === undefined ? undefined : toolResult.error.type,
-            agentId,
-        };
+        if (!completed.response.agentId) {
+            completed.response.agentId = agentId;
+        }
+        return completed;
     }
     catch (e) {
-        const error = e instanceof Error ? e : new Error(String(e));
-        const durationMs = Date.now() - startTime;
-        logToolCall(telemetryConfig, {
-            'event.name': 'tool_call',
-            'event.timestamp': new Date().toISOString(),
-            function_name: toolCallRequest.name,
-            function_args: toolCallRequest.args,
-            duration_ms: durationMs,
-            success: false,
-            error: error.message,
-            error_type: ToolErrorType.UNHANDLED_EXCEPTION,
-            prompt_id: toolCallRequest.prompt_id,
-            decision: ToolCallDecision.AUTO_ACCEPT,
-            tool_type: typeof tool !== 'undefined' && tool instanceof DiscoveredMCPTool
-                ? 'mcp'
-                : 'native',
-            agent_id: agentId,
+        return createErrorCompletedToolCall(toolCallRequest, e instanceof Error ? e : new Error(String(e)), ToolErrorType.UNHANDLED_EXCEPTION, Date.now() - startTime);
+    }
+    finally {
+        if (internalAbortController.signal.aborted) {
+            scheduler.cancelAll();
+        }
+        scheduler.dispose();
+    }
+}
+function applyEmojiFiltering(filter, request) {
+    const isSearchTool = [
+        'shell',
+        'bash',
+        'exec',
+        'run_shell_command',
+        'grep',
+        'search_file_content',
+        'glob',
+        'find',
+        'ls',
+        'list_directory',
+        'read_file',
+        'read_many_files',
+    ].includes(request.name);
+    if (isSearchTool) {
+        return { filteredRequest: request };
+    }
+    const isFileModTool = [
+        'edit_file',
+        'edit',
+        'write_file',
+        'create_file',
+        'replace',
+        'replace_all',
+    ].includes(request.name);
+    const filterResult = isFileModTool
+        ? filterFileModificationArgs(filter, request.name, request.args)
+        : filter.filterToolArgs(request.args);
+    if (filterResult.blocked) {
+        throw new Error(filterResult.error || 'Tool execution blocked');
+    }
+    const filteredArgs = filterResult.filtered !== null && typeof filterResult.filtered === 'object'
+        ? filterResult.filtered
+        : request.args;
+    if (filteredArgs === request.args && !filterResult.systemFeedback) {
+        return { filteredRequest: request };
+    }
+    return {
+        filteredRequest: {
+            ...request,
+            args: filteredArgs,
+        },
+        systemFeedback: filterResult.systemFeedback,
+    };
+}
+function createNonInteractivePolicyEngine(policyEngine) {
+    if (!policyEngine) {
+        return new PolicyEngine({
+            rules: [],
+            defaultDecision: PolicyDecision.DENY,
+            nonInteractive: true,
         });
-        return {
-            callId: toolCallRequest.callId,
+    }
+    if (policyEngine.isNonInteractive()) {
+        return policyEngine;
+    }
+    return new PolicyEngine({
+        rules: [...policyEngine.getRules()],
+        defaultDecision: policyEngine.getDefaultDecision(),
+        nonInteractive: true,
+    });
+}
+function createSchedulerConfigForNonInteractive(config) {
+    const policyEngine = createNonInteractivePolicyEngine(config.getPolicyEngine?.());
+    const messageBus = config.getMessageBus?.() ?? new MessageBus(policyEngine);
+    return {
+        getToolRegistry: () => config.getToolRegistry(),
+        getEphemeralSettings: () => config.getEphemeralSettings(),
+        getEphemeralSetting: (key) => config.getEphemeralSetting(key),
+        getExcludeTools: () => config.getExcludeTools(),
+        getSessionId: () => config.getSessionId(),
+        getTelemetryLogPromptsEnabled: () => config.getTelemetryLogPromptsEnabled(),
+        getAllowedTools: () => config.getAllowedTools?.(),
+        getApprovalMode: () => config.getApprovalMode?.() ?? ApprovalMode.DEFAULT,
+        getMessageBus: () => messageBus,
+        getPolicyEngine: () => policyEngine,
+    };
+}
+function createErrorCompletedToolCall(request, error, errorType, durationMs) {
+    return {
+        status: 'error',
+        request,
+        response: {
+            callId: request.callId,
+            agentId: request.agentId ?? DEFAULT_AGENT_ID,
+            error,
+            errorType,
+            resultDisplay: error.message,
             responseParts: [
-                // Tool call
                 {
                     functionCall: {
-                        id: toolCallRequest.callId,
-                        name: toolCallRequest.name,
-                        args: toolCallRequest.args,
+                        id: request.callId,
+                        name: request.name,
+                        args: request.args,
                     },
                 },
-                // Error response
                 {
                     functionResponse: {
-                        id: toolCallRequest.callId,
-                        name: toolCallRequest.name,
+                        id: request.callId,
+                        name: request.name,
                         response: { error: error.message },
                     },
                 },
             ],
-            resultDisplay: error.message,
-            error,
-            errorType: ToolErrorType.UNHANDLED_EXCEPTION,
-            agentId,
-        };
+        },
+        durationMs,
+    };
+}
+function appendSystemFeedbackToResponse(response, systemFeedback) {
+    const reminder = `\n\n<system-reminder>\n${systemFeedback}\n</system-reminder>`;
+    if (response.error) {
+        response.error = new Error(`${response.error.message}${reminder}`);
+        if (response.resultDisplay) {
+            response.resultDisplay = `${response.resultDisplay}${reminder}`;
+        }
+        const functionResponsePart = response.responseParts.find((part) => part.functionResponse?.response);
+        const responseObj = functionResponsePart?.functionResponse?.response;
+        if (responseObj && typeof responseObj.error === 'string') {
+            responseObj.error = `${responseObj.error}${reminder}`;
+        }
+        return;
+    }
+    const functionResponsePart = response.responseParts.find((part) => part.functionResponse?.response);
+    const responseObj = functionResponsePart?.functionResponse?.response;
+    if (responseObj && typeof responseObj.output === 'string') {
+        responseObj.output = `${responseObj.output}${reminder}`;
     }
 }
 //# sourceMappingURL=nonInteractiveToolExecutor.js.map

package/dist/src/core/nonInteractiveToolExecutor.js.map

@@ -1 +1 @@
-{"version":3,"file":"nonInteractiveToolExecutor.js","sourceRoot":"","sources":["../../../src/core/nonInteractiveToolExecutor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAEL,WAAW,EAGX,aAAa,EAEb,gBAAgB,GACjB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAqB,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD;;GAEG;AACH,IAAI,WAAW,GAAuB,IAAI,CAAC;AAE3C,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,sBAAsB,CAAC,CAAC;AAEvD,SAAS,mBAAmB,CAAC,MAA2B;IAKtD,MAAM,UAAU,GACd,OAAO,MAAM,CAAC,oBAAoB,KAAK,UAAU;QAC/C,CAAC,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,EAAE;QACrC,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAC3D,CAAC,CAAE,UAAU,CAAC,eAAe,CAAc;QAC3C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;QAC7D,CAAC,CAAE,UAAU,CAAC,gBAAgB,CAAc;QAC5C,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;YAC3C,CAAC,CAAE,UAAU,CAAC,gBAAgB,CAAc;YAC5C,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,WAAW,GAAG,MAAM,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,CAAC;IAErD,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAE9D,OAAO;QACL,OAAO,EAAE,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3C,QAAQ,EAAE,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7C,QAAQ,EAAE,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;KAC9C,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CACpB,QAAgB,EAChB,UAAkD;IAElD,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAChD,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,SAAS,iBAAiB,CAAC,MAA2B;IACpD,+DAA+D;IAC/D,MAAM,IAAI,GACP,MAAM,CAAC,mBAAmB,CAAC,aAAa,CAI7B,IAAI,MAAM,CAAC;IAEzB;;;OAGG;IACH,MAAM,UAAU,GAA0C,IAAI,CAAC;IAE/D,wEAAwE;IACxE,+EAA+E;IAC/E,MAAM,YAAY,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC1C,WAAW,GAAG,IAAI,WAAW,CAAC,YAAY,CAAC,CAAC;IAE5C,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,SAAS,0BAA0B,CACjC,MAAmB,EACnB,QAAgB,EAChB,IAA6B;IAE7B,mEAAmE;IACnE,iDAAiD;IAEjD,IACE,QAAQ,KAAK,WAAW;QACxB,QAAQ,KAAK,MAAM;QACnB,QAAQ,KAAK,SAAS,EACtB,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,EAAE,UAAoB,CAAC;QAC7C,MAAM,SAAS,GAAG,IAAI,EAAE,UAAoB,CAAC;QAE7C,+EAA+E;QAC/E,8DAA8D;QAC9D,MAAM,SAAS,GAAG,MAAM,CAAC,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAEhE,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO;gBACL,QAAQ,EAAE,IAAI;gBACd,aAAa,EAAE,IAAI;gBACnB,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,mCAAmC;aAC3C,CAAC;QACJ,CAAC;QAED,OAAO;YACL,QAAQ,EAAE;gBACR,GAAG,IAAI;gBACP,oDAAoD;gBACpD,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,gDAAgD;gBAChD,UAAU,EAAE,SAAS;gBACrB,qCAAqC;gBACrC,UAAU,EAAE,SAAS,CAAC,QAAQ;aAC/B;YACD,aAAa,EAAE,SAAS,CAAC,aAAa;YACtC,OAAO,EAAE,KAAK;YACd,cAAc,EAAE,SAAS,CAAC,cAAc;SACzC,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ,KAAK,YAAY,IAAI,QAAQ,KAAK,aAAa,EAAE,CAAC;QAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAiB,CAAC;QACvC,MAAM,MAAM,GAAG,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE3D,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,OAAO;YACL,QAAQ,EAAE;gBACR,GAAG,IAAI;gBACP,oDAAoD;gBACpD,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO,EAAE,MAAM,CAAC,QAAQ;aACzB;YACD,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,OAAO,EAAE,KAAK;YACd,cAAc,EAAE,MAAM,CAAC,cAAc;SACtC,CAAC;IACJ,CAAC;IAED,2BAA2B;IAC3B,OAAO,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC;AAgBD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,MAA2B,EAC3B,eAAoC,EACpC,WAAyB;IAEzB,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,IAAI,gBAAgB,CAAC;IAC5D,eAAe,CAAC,OAAO,GAAG,OAAO,CAAC;IAClC,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;IAC9C,MAAM,UAAU,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,eAAe,GAGjB;QACF,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE;QACzC,6BAA6B,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,6BAA6B,EAAE;KAC5E,CAAC;IAEF,IAAI,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,IAAI,KAAK,CACrB,SAAS,eAAe,CAAC,IAAI,uCAAuC,CACrE,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAC1C,WAAW,CAAC,eAAe,EAAE;YAC3B,YAAY,EAAE,WAAW;YACzB,iBAAiB,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAC3C,aAAa,EAAE,eAAe,CAAC,IAAI;YACnC,aAAa,EAAE,eAAe,CAAC,IAAI;YACnC,WAAW,EAAE,UAAU;YACvB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,KAAK,CAAC,OAAO;YACpB,SAAS,EAAE,eAAe,CAAC,SAAS;YACpC,SAAS,EAAE,QAAQ;YACnB,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QACH,OAAO;YACL,MAAM,EAAE,eAAe,CAAC,MAAM;YAC9B,KAAK;YACL,SAAS,EAAE,aAAa,CAAC,aAAa;YACtC,aAAa,EAAE,KAAK,CAAC,OAAO;YAC5B,aAAa,EAAE;gBACb;oBACE,YAAY,EAAE;wBACZ,EAAE,EAAE,eAAe,CAAC,MAAM;wBAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;wBAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;qBAC3B;iBACF;gBACD;oBACE,gBAAgB,EAAE;wBAChB,EAAE,EAAE,eAAe,CAAC,MAAM;wBAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;wBAC1B,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE;qBACnC;iBACF;aACF;YACD,OAAO;SACR,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACxD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,KAAK,GAAG,IAAI,KAAK,CACrB,SAAS,eAAe,CAAC,IAAI,0BAA0B,CACxD,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAC1C,WAAW,CAAC,eAAe,EAAE;YAC3B,YAAY,EAAE,WAAW;YACzB,iBAAiB,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAC3C,aAAa,EAAE,eAAe,CAAC,IAAI;YACnC,aAAa,EAAE,eAAe,CAAC,IAAI;YACnC,WAAW,EAAE,UAAU;YACvB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,KAAK,CAAC,OAAO;YACpB,SAAS,EAAE,eAAe,CAAC,SAAS;YACpC,SAAS,EAAE,QAAQ;YACnB,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QACH,0EAA0E;QAC1E,4CAA4C;QAC5C,OAAO;YACL,MAAM,EAAE,eAAe,CAAC,MAAM;YAC9B,aAAa,EAAE;gBACb,YAAY;gBACZ;oBACE,YAAY,EAAE;wBACZ,EAAE,EAAE,eAAe,CAAC,MAAM;wBAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;wBAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;qBAC3B;iBACF;gBACD,iBAAiB;gBACjB;oBACE,gBAAgB,EAAE;wBAChB,EAAE,EAAE,eAAe,CAAC,MAAM;wBAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;wBAC1B,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE;qBACnC;iBACF;aACF;YACD,aAAa,EAAE,KAAK,CAAC,OAAO;YAC5B,KAAK;YACL,SAAS,EAAE,aAAa,CAAC,mBAAmB;YAC5C,OAAO;SACR,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,4BAA4B;QAC5B,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAEzC,8DAA8D;QAC9D,MAAM,YAAY,GAAG;YACnB,OAAO;YACP,MAAM;YACN,MAAM;YACN,mBAAmB;YACnB,MAAM;YACN,qBAAqB;YACrB,MAAM;YACN,MAAM;YACN,IAAI;YACJ,gBAAgB;YAChB,WAAW;YACX,iBAAiB;SAClB,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAI,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC;QACxC,IAAI,cAAkC,CAAC;QAEvC,yDAAyD;QACzD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,4CAA4C;YAC5C,MAAM,aAAa,GAAG;gBACpB,WAAW;gBACX,MAAM;gBACN,YAAY;gBACZ,aAAa;gBACb,SAAS;gBACT,aAAa;aACd,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAEjC,wBAAwB;YACxB,IAAI,YAA0B,CAAC;YAC/B,IAAI,aAAa,EAAE,CAAC;gBAClB,YAAY,GAAG,0BAA0B,CACvC,MAAM,EACN,eAAe,CAAC,IAAI,EACpB,eAAe,CAAC,IAAI,CACrB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAC7D,CAAC;YAED,gCAAgC;YAChC,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;gBACzB,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;gBAC1C,WAAW,CAAC,eAAe,EAAE;oBAC3B,YAAY,EAAE,WAAW;oBACzB,iBAAiB,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;oBAC3C,aAAa,EAAE,eAAe,CAAC,IAAI;oBACnC,aAAa,EAAE,eAAe,CAAC,IAAI;oBACnC,WAAW,EAAE,UAAU;oBACvB,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,YAAY,CAAC,KAAK;oBACzB,SAAS,EAAE,eAAe,CAAC,SAAS;oBACpC,SAAS,EACP,OAAO,IAAI,KAAK,WAAW,IAAI,IAAI,YAAY,iBAAiB;wBAC9D,CAAC,CAAC,KAAK;wBACP,CAAC,CAAC,QAAQ;oBACd,QAAQ,EAAE,OAAO;iBAClB,CAAC,CAAC;gBAEH,OAAO;oBACL,MAAM,EAAE,eAAe,CAAC,MAAM;oBAC9B,aAAa,EAAE;wBACb,YAAY;wBACZ;4BACE,YAAY,EAAE;gCACZ,EAAE,EAAE,eAAe,CAAC,MAAM;gCAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;gCAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;6BAC3B;yBACF;wBACD,iBAAiB;wBACjB;4BACE,gBAAgB,EAAE;gCAChB,EAAE,EAAE,eAAe,CAAC,MAAM;gCAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;gCAC1B,QAAQ,EAAE,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE;6BACxC;yBACF;qBACF;oBACD,aAAa,EAAE,YAAY,CAAC,KAAK,IAAI,wBAAwB;oBAC7D,KAAK,EAAE,IAAI,KAAK,CAAC,YAAY,CAAC,KAAK,IAAI,wBAAwB,CAAC;oBAChE,SAAS,EAAE,aAAa,CAAC,mBAAmB;oBAC5C,OAAO;iBACR,CAAC;YACJ,CAAC;YAED,yBAAyB;YACzB,YAAY,GAAG,YAAY,CAAC,QAAmC,CAAC;YAChE,cAAc,GAAG,YAAY,CAAC,cAAc,CAAC;QAC/C,CAAC;QAED,gEAAgE;QAChE,MAAM,oBAAoB,GAAG,WAAW,IAAI,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC;QACzE,MAAM,UAAU,GAAe,MAAM,IAAI,CAAC,eAAe,CACvD,YAAY,EACZ,oBAAoB,CAErB,CAAC;QAEF,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC;QAE1C,MAAM,YAAY,GAAG,UAAU,CAAC,aAAa,CAAC;QAE9C,8DAA8D;QAC9D,IAAI,QAAQ,GAA2B,EAAE,CAAC;QAC1C,IACE,UAAU,CAAC,KAAK,KAAK,SAAS;YAC9B,OAAO,YAAY,KAAK,QAAQ;YAChC,YAAY,KAAK,IAAI;YACrB,UAAU,IAAI,YAAY,EAC1B,CAAC;YACD,MAAM,QAAQ,GAAI,YAAyB,CAAC,QAAQ,CAAC;YACrD,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,GAAG;oBACT,cAAc,EAAE,QAAQ,CAAC,cAAc;oBACvC,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;oBAC3C,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;oBAC3C,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;iBAChD,CAAC;YACJ,CAAC;QACH,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAC1C,WAAW,CAAC,eAAe,EAAE;YAC3B,YAAY,EAAE,WAAW;YACzB,iBAAiB,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAC3C,aAAa,EAAE,eAAe,CAAC,IAAI;YACnC,aAAa,EAAE,eAAe,CAAC,IAAI;YACnC,WAAW,EAAE,UAAU;YACvB,OAAO,EAAE,UAAU,CAAC,KAAK,KAAK,SAAS;YACvC,KAAK,EACH,UAAU,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO;YACvE,UAAU,EACR,UAAU,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI;YACpE,SAAS,EAAE,eAAe,CAAC,SAAS;YACpC,QAAQ;YACR,QAAQ,EAAE,gBAAgB,CAAC,WAAW;YACtC,SAAS,EACP,OAAO,IAAI,KAAK,WAAW,IAAI,IAAI,YAAY,iBAAiB;gBAC9D,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,QAAQ;YACd,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QAEH,yEAAyE;QACzE,IAAI,eAAe,GAAG,WAAW,CAAC;QAClC,IAAI,cAAc,EAAE,CAAC;YACnB,eAAe,GAAG,GAAG,WAAW,0BAA0B,cAAc,sBAAsB,CAAC;QACjG,CAAC;QAED,MAAM,aAAa,GAAG,yBAAyB,CAC7C,eAAe,CAAC,IAAI,EACpB,eAAe,CAAC,MAAM,EACtB,eAAe,EACf,MAAM,CACP,CAAC;QAEF,qDAAqD;QACrD,qEAAqE;QACrE,MAAM,aAAa,GAAG;YACpB,sCAAsC;YACtC;gBACE,YAAY,EAAE;oBACZ,EAAE,EAAE,eAAe,CAAC,MAAM;oBAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;oBAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;iBAC3B;aACF;YACD,mFAAmF;YACnF,GAAG,aAAa;SACP,CAAC;QAEZ,MAAM,CAAC,KAAK,CACV,GAAG,EAAE,CACH,+CAA+C,eAAe,CAAC,IAAI,KAAK,eAAe,CAAC,MAAM,GAAG,CACpG,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,eAAe,CAAC,MAAM;YAC9B,aAAa;YACb,aAAa,EAAE,YAAY;YAC3B,KAAK,EACH,UAAU,CAAC,KAAK,KAAK,SAAS;gBAC5B,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC;YACzC,SAAS,EACP,UAAU,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI;YACpE,OAAO;SACR,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,KAAK,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAC1C,WAAW,CAAC,eAAe,EAAE;YAC3B,YAAY,EAAE,WAAW;YACzB,iBAAiB,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAC3C,aAAa,EAAE,eAAe,CAAC,IAAI;YACnC,aAAa,EAAE,eAAe,CAAC,IAAI;YACnC,WAAW,EAAE,UAAU;YACvB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,KAAK,CAAC,OAAO;YACpB,UAAU,EAAE,aAAa,CAAC,mBAAmB;YAC7C,SAAS,EAAE,eAAe,CAAC,SAAS;YACpC,QAAQ,EAAE,gBAAgB,CAAC,WAAW;YACtC,SAAS,EACP,OAAO,IAAI,KAAK,WAAW,IAAI,IAAI,YAAY,iBAAiB;gBAC9D,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,QAAQ;YACd,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QACH,OAAO;YACL,MAAM,EAAE,eAAe,CAAC,MAAM;YAC9B,aAAa,EAAE;gBACb,YAAY;gBACZ;oBACE,YAAY,EAAE;wBACZ,EAAE,EAAE,eAAe,CAAC,MAAM;wBAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;wBAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;qBAC3B;iBACF;gBACD,iBAAiB;gBACjB;oBACE,gBAAgB,EAAE;wBAChB,EAAE,EAAE,eAAe,CAAC,MAAM;wBAC1B,IAAI,EAAE,eAAe,CAAC,IAAI;wBAC1B,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE;qBACnC;iBACF;aACF;YACD,aAAa,EAAE,KAAK,CAAC,OAAO;YAC5B,KAAK;YACL,SAAS,EAAE,aAAa,CAAC,mBAAmB;YAC5C,OAAO;SACR,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"nonInteractiveToolExecutor.js","sourceRoot":"","sources":["../../../src/core/nonInteractiveToolExecutor.ts"],"names":[],"mappings":"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"}

package/dist/src/core/subagent.js

@@ -11,7 +11,7 @@
 import { reportError } from '../utils/errorReporting.js';
 import { DebugLogger } from '../debug/DebugLogger.js';
 import { ApprovalMode } from '../config/config.js';
-import { GeminiEventType, Turn } from './turn.js';
+import { GeminiEventType, Turn, } from './turn.js';
 import { executeToolCall, } from './nonInteractiveToolExecutor.js';
 import { Type, } from '@google/genai';
 import { GeminiChat, StreamEventType } from './geminiChat.js';
@@ -797,7 +797,8 @@ export class SubAgentScope {
             else {
                 // @plan PLAN-20251028-STATELESS6.P08
                 // @requirement REQ-STAT6-001.1
-                toolResponse = await executeToolCall(this.toolExecutorContext, requestInfo, abortController.signal);
+                const completed = await executeToolCall(this.createSchedulerConfig({ interactive: false }), requestInfo, abortController.signal);
+                toolResponse = completed.response;
             }
             if (toolResponse.error) {
                 console.error(`Error executing tool ${functionCall.name}: ${toolResponse.resultDisplay || toolResponse.error.message}`);
@@ -837,6 +838,10 @@ export class SubAgentScope {
                 ...this.toolExecutorContext.getEphemeralSettings(),
             })
             : () => this.config.getEphemeralSettings();
+        const getEphemeralSetting = (key) => {
+            const settings = getEphemeralSettings();
+            return settings[key];
+        };
         const getExcludeTools = typeof this.toolExecutorContext.getExcludeTools === 'function'
             ? () => this.toolExecutorContext.getExcludeTools()
             : () => this.config.getExcludeTools?.() ?? [];
@@ -857,6 +862,7 @@ export class SubAgentScope {
             getToolRegistry: () => this.toolExecutorContext.getToolRegistry(),
             getSessionId: () => this.toolExecutorContext.getSessionId(),
             getEphemeralSettings,
+            getEphemeralSetting,
             getExcludeTools,
             getTelemetryLogPromptsEnabled,
             getAllowedTools: () => allowedTools,
@@ -1004,8 +1010,15 @@ export class SubAgentScope {
             else if (call.status === 'cancelled') {
                 this.logger.warn(() => `Subagent ${this.subagentId} tool '${call.request.name}' was cancelled.`);
             }
+            // Only display resultDisplay for tools that don't stream live output.
+            // Tools with canUpdateOutput=true already streamed their output via outputUpdateHandler,
+            // so displaying resultDisplay here would cause duplicate output (fixes #898).
+            const toolCanUpdateOutput = call.status === 'success' && call.tool?.canUpdateOutput === true;
             const display = call.response?.resultDisplay;
-            if (typeof display === 'string' && this.onMessage && display.trim()) {
+            if (typeof display === 'string' &&
+                this.onMessage &&
+                display.trim() &&
+                !toolCanUpdateOutput) {
                 this.onMessage(display);
             }
         }