@google/gemini-cli-core 0.23.0-preview.4 → 0.24.0-nightly.20251231.05049b5ab

package/dist/src/core/coreToolHookTriggers.test.js

@@ -0,0 +1,189 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { executeToolWithHooks } from './coreToolHookTriggers.js';
+import { ToolErrorType } from '../tools/tool-error.js';
+import { BaseToolInvocation, } from '../tools/tools.js';
+import { MessageBusType, } from '../confirmation-bus/types.js';
+class MockInvocation extends BaseToolInvocation {
+    constructor(params) {
+        super(params);
+    }
+    getDescription() {
+        return 'mock';
+    }
+    async execute() {
+        return {
+            llmContent: this.params.key ? `key: ${this.params.key}` : 'success',
+            returnDisplay: this.params.key
+                ? `key: ${this.params.key}`
+                : 'success display',
+        };
+    }
+}
+describe('executeToolWithHooks', () => {
+    let messageBus;
+    let mockTool;
+    beforeEach(() => {
+        messageBus = {
+            request: vi.fn(),
+            publish: vi.fn(),
+            subscribe: vi.fn(),
+            unsubscribe: vi.fn(),
+        };
+        mockTool = {
+            build: vi.fn().mockImplementation((params) => new MockInvocation(params)),
+        };
+    });
+    it('should prioritize continue: false over decision: block in BeforeTool', async () => {
+        const invocation = new MockInvocation({});
+        const abortSignal = new AbortController().signal;
+        vi.mocked(messageBus.request).mockResolvedValue({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: {
+                continue: false,
+                stopReason: 'Stop immediately',
+                decision: 'block',
+                reason: 'Should be ignored because continue is false',
+            },
+        });
+        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, messageBus, true, mockTool);
+        expect(result.error?.type).toBe(ToolErrorType.STOP_EXECUTION);
+        expect(result.error?.message).toBe('Stop immediately');
+    });
+    it('should block execution in BeforeTool if decision is block', async () => {
+        const invocation = new MockInvocation({});
+        const abortSignal = new AbortController().signal;
+        vi.mocked(messageBus.request).mockResolvedValue({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: {
+                decision: 'block',
+                reason: 'Execution blocked',
+            },
+        });
+        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, messageBus, true, mockTool);
+        expect(result.error?.type).toBe(ToolErrorType.EXECUTION_FAILED);
+        expect(result.error?.message).toBe('Execution blocked');
+    });
+    it('should handle continue: false in AfterTool', async () => {
+        const invocation = new MockInvocation({});
+        const abortSignal = new AbortController().signal;
+        const spy = vi.spyOn(invocation, 'execute');
+        // BeforeTool allow
+        vi.mocked(messageBus.request)
+            .mockResolvedValueOnce({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: { decision: 'allow' },
+        })
+            // AfterTool stop
+            .mockResolvedValueOnce({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: {
+                continue: false,
+                stopReason: 'Stop after execution',
+            },
+        });
+        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, messageBus, true, mockTool);
+        expect(result.error?.type).toBe(ToolErrorType.STOP_EXECUTION);
+        expect(result.error?.message).toBe('Stop after execution');
+        expect(spy).toHaveBeenCalled();
+    });
+    it('should block result in AfterTool if decision is deny', async () => {
+        const invocation = new MockInvocation({});
+        const abortSignal = new AbortController().signal;
+        // BeforeTool allow
+        vi.mocked(messageBus.request)
+            .mockResolvedValueOnce({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: { decision: 'allow' },
+        })
+            // AfterTool deny
+            .mockResolvedValueOnce({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: {
+                decision: 'deny',
+                reason: 'Result denied',
+            },
+        });
+        const result = await executeToolWithHooks(invocation, 'test_tool', abortSignal, messageBus, true, mockTool);
+        expect(result.error?.type).toBe(ToolErrorType.EXECUTION_FAILED);
+        expect(result.error?.message).toBe('Result denied');
+    });
+    it('should apply modified tool input from BeforeTool hook', async () => {
+        const params = { key: 'original' };
+        const invocation = new MockInvocation(params);
+        const toolName = 'test-tool';
+        const abortSignal = new AbortController().signal;
+        // Capture arguments to verify what was passed before modification
+        const requestSpy = vi.fn().mockImplementation(async (request) => {
+            if (request.eventName === 'BeforeTool') {
+                // Verify input is original before we return modification instruction
+                expect(request.input.tool_input.key).toBe('original');
+                return {
+                    type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+                    correlationId: 'test-id',
+                    success: true,
+                    output: {
+                        hookSpecificOutput: {
+                            hookEventName: 'BeforeTool',
+                            tool_input: { key: 'modified' },
+                        },
+                    },
+                };
+            }
+            return {
+                type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+                correlationId: 'test-id',
+                success: true,
+                output: {},
+            };
+        });
+        messageBus.request = requestSpy;
+        const result = await executeToolWithHooks(invocation, toolName, abortSignal, messageBus, true, // hooksEnabled
+        mockTool);
+        // Verify result reflects modified input
+        expect(result.llmContent).toBe('key: modified\n\n[System] Tool input parameters (key) were modified by a hook before execution.');
+        // Verify params object was modified in place
+        expect(invocation.params.key).toBe('modified');
+        expect(requestSpy).toHaveBeenCalled();
+        expect(mockTool.build).toHaveBeenCalledWith({ key: 'modified' });
+    });
+    it('should not modify input if hook does not provide tool_input', async () => {
+        const params = { key: 'original' };
+        const invocation = new MockInvocation(params);
+        const toolName = 'test-tool';
+        const abortSignal = new AbortController().signal;
+        vi.mocked(messageBus.request).mockResolvedValue({
+            type: MessageBusType.HOOK_EXECUTION_RESPONSE,
+            correlationId: 'test-id',
+            success: true,
+            output: {
+                hookSpecificOutput: {
+                    hookEventName: 'BeforeTool',
+                    // No tool_input
+                },
+            },
+        });
+        const result = await executeToolWithHooks(invocation, toolName, abortSignal, messageBus, true, // hooksEnabled
+        mockTool);
+        expect(result.llmContent).toBe('key: original');
+        expect(invocation.params.key).toBe('original');
+        expect(mockTool.build).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=coreToolHookTriggers.test.js.map

package/dist/src/core/coreToolHookTriggers.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"coreToolHookTriggers.test.js","sourceRoot":"","sources":["../../../src/core/coreToolHookTriggers.test.ts"],"names":[],"mappings":"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"}

package/dist/src/core/coreToolScheduler.d.ts

@@ -3,82 +3,11 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { ToolCallRequestInfo, ToolCallResponseInfo, ToolCallConfirmationDetails, EditorType, Config, ToolConfirmationPayload, AnyDeclarativeTool, AnyToolInvocation, AnsiOutput } from '../index.js';
-import { ToolConfirmationOutcome } from '../index.js';
-import type { Part, PartListUnion } from '@google/genai';
-export type ValidatingToolCall = {
-    status: 'validating';
-    request: ToolCallRequestInfo;
-    tool: AnyDeclarativeTool;
-    invocation: AnyToolInvocation;
-    startTime?: number;
-    outcome?: ToolConfirmationOutcome;
-};
-export type ScheduledToolCall = {
-    status: 'scheduled';
-    request: ToolCallRequestInfo;
-    tool: AnyDeclarativeTool;
-    invocation: AnyToolInvocation;
-    startTime?: number;
-    outcome?: ToolConfirmationOutcome;
-};
-export type ErroredToolCall = {
-    status: 'error';
-    request: ToolCallRequestInfo;
-    response: ToolCallResponseInfo;
-    tool?: AnyDeclarativeTool;
-    durationMs?: number;
-    outcome?: ToolConfirmationOutcome;
-};
-export type SuccessfulToolCall = {
-    status: 'success';
-    request: ToolCallRequestInfo;
-    tool: AnyDeclarativeTool;
-    response: ToolCallResponseInfo;
-    invocation: AnyToolInvocation;
-    durationMs?: number;
-    outcome?: ToolConfirmationOutcome;
-};
-export type ExecutingToolCall = {
-    status: 'executing';
-    request: ToolCallRequestInfo;
-    tool: AnyDeclarativeTool;
-    invocation: AnyToolInvocation;
-    liveOutput?: string | AnsiOutput;
-    startTime?: number;
-    outcome?: ToolConfirmationOutcome;
-    pid?: number;
-};
-export type CancelledToolCall = {
-    status: 'cancelled';
-    request: ToolCallRequestInfo;
-    response: ToolCallResponseInfo;
-    tool: AnyDeclarativeTool;
-    invocation: AnyToolInvocation;
-    durationMs?: number;
-    outcome?: ToolConfirmationOutcome;
-};
-export type WaitingToolCall = {
-    status: 'awaiting_approval';
-    request: ToolCallRequestInfo;
-    tool: AnyDeclarativeTool;
-    invocation: AnyToolInvocation;
-    confirmationDetails: ToolCallConfirmationDetails;
-    startTime?: number;
-    outcome?: ToolConfirmationOutcome;
-};
-export type Status = ToolCall['status'];
-export type ToolCall = ValidatingToolCall | ScheduledToolCall | ErroredToolCall | SuccessfulToolCall | ExecutingToolCall | CancelledToolCall | WaitingToolCall;
-export type CompletedToolCall = SuccessfulToolCall | CancelledToolCall | ErroredToolCall;
-export type ConfirmHandler = (toolCall: WaitingToolCall) => Promise<ToolConfirmationOutcome>;
-export type OutputUpdateHandler = (toolCallId: string, outputChunk: string | AnsiOutput) => void;
-export type AllToolCallsCompleteHandler = (completedToolCalls: CompletedToolCall[]) => Promise<void>;
-export type ToolCallsUpdateHandler = (toolCalls: ToolCall[]) => void;
-export declare function convertToFunctionResponse(toolName: string, callId: string, llmContent: PartListUnion, model: string): Part[];
-export declare function truncateAndSaveToFile(content: string, callId: string, projectTempDir: string, threshold: number, truncateLines: number): Promise<{
-    content: string;
-    outputFile?: string;
-}>;
+import { type ToolConfirmationPayload, ToolConfirmationOutcome } from '../tools/tools.js';
+import type { EditorType } from '../utils/editor.js';
+import type { Config } from '../config/config.js';
+import { type ToolCall, type ValidatingToolCall, type ScheduledToolCall, type ErroredToolCall, type SuccessfulToolCall, type ExecutingToolCall, type CancelledToolCall, type WaitingToolCall, type Status, type CompletedToolCall, type ConfirmHandler, type OutputUpdateHandler, type AllToolCallsCompleteHandler, type ToolCallsUpdateHandler, type ToolCallRequestInfo, type ToolCallResponseInfo } from '../scheduler/types.js';
+export type { ToolCall, ValidatingToolCall, ScheduledToolCall, ErroredToolCall, SuccessfulToolCall, ExecutingToolCall, CancelledToolCall, WaitingToolCall, Status, CompletedToolCall, ConfirmHandler, OutputUpdateHandler, AllToolCallsCompleteHandler, ToolCallsUpdateHandler, ToolCallRequestInfo, ToolCallResponseInfo, };
 interface CoreToolSchedulerOptions {
     config: Config;
     outputUpdateHandler?: OutputUpdateHandler;
@@ -105,14 +34,6 @@ export declare class CoreToolScheduler {
     private setArgsInternal;
     private isRunning;
     private buildInvocation;
-    /**
-     * Generates a suggestion string for a tool name that was not found in the registry.
-     * It finds the closest matches based on Levenshtein distance.
-     * @param unknownToolName The tool name that was not found.
-     * @param topN The number of suggestions to return. Defaults to 3.
-     * @returns A suggestion string like " Did you mean 'tool'?" or " Did you mean one of: 'tool1', 'tool2'?", or an empty string if no suggestions are found.
-     */
-    private getToolSuggestion;
     schedule(request: ToolCallRequestInfo | ToolCallRequestInfo[], signal: AbortSignal): Promise<void>;
     cancelAll(signal: AbortSignal): void;
     private _schedule;
@@ -132,4 +53,3 @@ export declare class CoreToolScheduler {
     private setToolCallOutcome;
     private isAutoApproved;
 }
-export {};

package/dist/src/core/coreToolScheduler.js

@@ -3,115 +3,24 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ToolConfirmationOutcome, ApprovalMode, logToolCall, ToolErrorType, ToolCallEvent, logToolOutputTruncated, ToolOutputTruncatedEvent, runInDevTraceSpan, } from '../index.js';
-import { READ_FILE_TOOL_NAME, SHELL_TOOL_NAME } from '../tools/tool-names.js';
-import { supportsMultimodalFunctionResponse } from '../config/models.js';
+import { ToolConfirmationOutcome, } from '../tools/tools.js';
+import { ApprovalMode } from '../policy/types.js';
+import { logToolCall, logToolOutputTruncated } from '../telemetry/loggers.js';
+import { ToolErrorType } from '../tools/tool-error.js';
+import { ToolCallEvent, ToolOutputTruncatedEvent } from '../telemetry/types.js';
+import { runInDevTraceSpan } from '../telemetry/trace.js';
+import { SHELL_TOOL_NAME } from '../tools/tool-names.js';
 import { isModifiableDeclarativeTool, modifyWithEditor, } from '../tools/modifiable-tool.js';
 import * as Diff from 'diff';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
 import { SHELL_TOOL_NAMES } from '../utils/shell-utils.js';
-import { doesToolInvocationMatch } from '../utils/tool-utils.js';
+import { doesToolInvocationMatch, getToolSuggestion, } from '../utils/tool-utils.js';
 import { isShellInvocationAllowlisted } from '../utils/shell-permissions.js';
-import levenshtein from 'fast-levenshtein';
 import { ShellToolInvocation } from '../tools/shell.js';
 import { MessageBusType } from '../confirmation-bus/types.js';
 import { fireToolNotificationHook, executeToolWithHooks, } from './coreToolHookTriggers.js';
-import { debugLogger } from '../utils/debugLogger.js';
-/**
- * Formats tool output for a Gemini FunctionResponse.
- */
-function createFunctionResponsePart(callId, toolName, output) {
-    return {
-        functionResponse: {
-            id: callId,
-            name: toolName,
-            response: { output },
-        },
-    };
-}
-export function convertToFunctionResponse(toolName, callId, llmContent, model) {
-    if (typeof llmContent === 'string') {
-        return [createFunctionResponsePart(callId, toolName, llmContent)];
-    }
-    const parts = toParts(llmContent);
-    // Separate text from binary types
-    const textParts = [];
-    const inlineDataParts = [];
-    const fileDataParts = [];
-    for (const part of parts) {
-        if (part.text !== undefined) {
-            textParts.push(part.text);
-        }
-        else if (part.inlineData) {
-            inlineDataParts.push(part);
-        }
-        else if (part.fileData) {
-            fileDataParts.push(part);
-        }
-        else if (part.functionResponse) {
-            if (parts.length > 1) {
-                debugLogger.warn('convertToFunctionResponse received multiple parts with a functionResponse. Only the functionResponse will be used, other parts will be ignored');
-            }
-            // Handle passthrough case
-            return [
-                {
-                    functionResponse: {
-                        id: callId,
-                        name: toolName,
-                        response: part.functionResponse.response,
-                    },
-                },
-            ];
-        }
-        // Ignore other part types
-    }
-    // Build the primary response part
-    const part = {
-        functionResponse: {
-            id: callId,
-            name: toolName,
-            response: textParts.length > 0 ? { output: textParts.join('\n') } : {},
-        },
-    };
-    const isMultimodalFRSupported = supportsMultimodalFunctionResponse(model);
-    const siblingParts = [...fileDataParts];
-    if (inlineDataParts.length > 0) {
-        if (isMultimodalFRSupported) {
-            // Nest inlineData if supported by the model
-            part.functionResponse.parts =
-                inlineDataParts;
-        }
-        else {
-            // Otherwise treat as siblings
-            siblingParts.push(...inlineDataParts);
-        }
-    }
-    // Add descriptive text if the response object is empty but we have binary content
-    if (textParts.length === 0 &&
-        (inlineDataParts.length > 0 || fileDataParts.length > 0)) {
-        const totalBinaryItems = inlineDataParts.length + fileDataParts.length;
-        part.functionResponse.response = {
-            output: `Binary content provided (${totalBinaryItems} item(s)).`,
-        };
-    }
-    if (siblingParts.length > 0) {
-        return [part, ...siblingParts];
-    }
-    return [part];
-}
-function toParts(input) {
-    const parts = [];
-    for (const part of Array.isArray(input) ? input : [input]) {
-        if (typeof part === 'string') {
-            parts.push({ text: part });
-        }
-        else if (part) {
-            parts.push(part);
-        }
-    }
-    return parts;
-}
+import {} from '../scheduler/types.js';
+import { saveTruncatedContent } from '../utils/fileUtils.js';
+import { convertToFunctionResponse } from '../utils/generateContentResponseUtilities.js';
 const createErrorResponse = (request, error, errorType) => ({
     callId: request.callId,
     error,
@@ -128,58 +37,6 @@ const createErrorResponse = (request, error, errorType) => ({
     errorType,
     contentLength: error.message.length,
 });
-export async function truncateAndSaveToFile(content, callId, projectTempDir, threshold, truncateLines) {
-    if (content.length <= threshold) {
-        return { content };
-    }
-    let lines = content.split('\n');
-    let fileContent = content;
-    // If the content is long but has few lines, wrap it to enable line-based truncation.
-    if (lines.length <= truncateLines) {
-        const wrapWidth = 120; // A reasonable width for wrapping.
-        const wrappedLines = [];
-        for (const line of lines) {
-            if (line.length > wrapWidth) {
-                for (let i = 0; i < line.length; i += wrapWidth) {
-                    wrappedLines.push(line.substring(i, i + wrapWidth));
-                }
-            }
-            else {
-                wrappedLines.push(line);
-            }
-        }
-        lines = wrappedLines;
-        fileContent = lines.join('\n');
-    }
-    const head = Math.floor(truncateLines / 5);
-    const beginning = lines.slice(0, head);
-    const end = lines.slice(-(truncateLines - head));
-    const truncatedContent = beginning.join('\n') + '\n... [CONTENT TRUNCATED] ...\n' + end.join('\n');
-    // Sanitize callId to prevent path traversal.
-    const safeFileName = `${path.basename(callId)}.output`;
-    const outputFile = path.join(projectTempDir, safeFileName);
-    try {
-        await fs.writeFile(outputFile, fileContent);
-        return {
-            content: `Tool output was too large and has been truncated.
-The full output has been saved to: ${outputFile}
-To read the complete output, use the ${READ_FILE_TOOL_NAME} tool with the absolute file path above. For large files, you can use the offset and limit parameters to read specific sections:
-- ${READ_FILE_TOOL_NAME} tool with offset=0, limit=100 to see the first 100 lines
-- ${READ_FILE_TOOL_NAME} tool with offset=N to skip N lines from the beginning
-- ${READ_FILE_TOOL_NAME} tool with limit=M to read only M lines at a time
-The truncated output below shows the beginning and end of the content. The marker '... [CONTENT TRUNCATED] ...' indicates where content was removed.
-This allows you to efficiently examine different parts of the output without loading the entire file.
-Truncated part of the output:
-${truncatedContent}`,
-            outputFile,
-        };
-    }
-    catch (_error) {
-        return {
-            content: truncatedContent + `\n[Note: Could not save full output to file]`,
-        };
-    }
-}
 export class CoreToolScheduler {
     // Static WeakMap to track which MessageBus instances already have a handler subscribed
     // This prevents duplicate subscriptions when multiple CoreToolScheduler instances are created
@@ -206,26 +63,24 @@ export class CoreToolScheduler {
         // Use a static WeakMap to ensure we only subscribe ONCE per MessageBus instance
         // This prevents memory leaks when multiple CoreToolScheduler instances are created
         // (e.g., on every React render, or for each non-interactive tool call)
-        if (this.config.getEnableMessageBusIntegration()) {
-            const messageBus = this.config.getMessageBus();
-            // Check if we've already subscribed a handler to this message bus
-            if (!CoreToolScheduler.subscribedMessageBuses.has(messageBus)) {
-                // Create a shared handler that will be used for this message bus
-                const sharedHandler = (request) => {
-                    // When ASK_USER policy decision is made, respond with requiresUserConfirmation=true
-                    // to tell tools to use their legacy confirmation flow
-                    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                    messageBus.publish({
-                        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-                        correlationId: request.correlationId,
-                        confirmed: false,
-                        requiresUserConfirmation: true,
-                    });
-                };
-                messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_REQUEST, sharedHandler);
-                // Store the handler in the WeakMap so we don't subscribe again
-                CoreToolScheduler.subscribedMessageBuses.set(messageBus, sharedHandler);
-            }
+        const messageBus = this.config.getMessageBus();
+        // Check if we've already subscribed a handler to this message bus
+        if (!CoreToolScheduler.subscribedMessageBuses.has(messageBus)) {
+            // Create a shared handler that will be used for this message bus
+            const sharedHandler = (request) => {
+                // When ASK_USER policy decision is made, respond with requiresUserConfirmation=true
+                // to tell tools to use their legacy confirmation flow
+                // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                messageBus.publish({
+                    type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+                    correlationId: request.correlationId,
+                    confirmed: false,
+                    requiresUserConfirmation: true,
+                });
+            };
+            messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_REQUEST, sharedHandler);
+            // Store the handler in the WeakMap so we don't subscribe again
+            CoreToolScheduler.subscribedMessageBuses.set(messageBus, sharedHandler);
         }
     }
     setStatusInternal(targetCallId, newStatus, signal, auxiliaryData) {
@@ -398,34 +253,6 @@ export class CoreToolScheduler {
             return new Error(String(e));
         }
     }
-    /**
-     * Generates a suggestion string for a tool name that was not found in the registry.
-     * It finds the closest matches based on Levenshtein distance.
-     * @param unknownToolName The tool name that was not found.
-     * @param topN The number of suggestions to return. Defaults to 3.
-     * @returns A suggestion string like " Did you mean 'tool'?" or " Did you mean one of: 'tool1', 'tool2'?", or an empty string if no suggestions are found.
-     */
-    getToolSuggestion(unknownToolName, topN = 3) {
-        const allToolNames = this.config.getToolRegistry().getAllToolNames();
-        const matches = allToolNames.map((toolName) => ({
-            name: toolName,
-            distance: levenshtein.get(unknownToolName, toolName),
-        }));
-        matches.sort((a, b) => a.distance - b.distance);
-        const topNResults = matches.slice(0, topN);
-        if (topNResults.length === 0) {
-            return '';
-        }
-        const suggestedNames = topNResults
-            .map((match) => `"${match.name}"`)
-            .join(', ');
-        if (topNResults.length > 1) {
-            return ` Did you mean one of: ${suggestedNames}?`;
-        }
-        else {
-            return ` Did you mean ${suggestedNames}?`;
-        }
-    }
     schedule(request, signal) {
         return runInDevTraceSpan({ name: 'schedule' }, async ({ metadata: spanMetadata }) => {
             spanMetadata.input = request;
@@ -492,7 +319,7 @@ export class CoreToolScheduler {
                     .getToolRegistry()
                     .getTool(reqInfo.name);
                 if (!toolInstance) {
-                    const suggestion = this.getToolSuggestion(reqInfo.name);
+                    const suggestion = getToolSuggestion(reqInfo.name, this.config.getToolRegistry().getAllToolNames());
                     const errorMessage = `Tool "${reqInfo.name}" not found in registry. Tools must use the exact names that are registered.${suggestion}`;
                     return {
                         status: 'error',
@@ -731,10 +558,10 @@ export class CoreToolScheduler {
                                 : tc);
                             this.notifyToolCallsUpdate();
                         };
-                        promise = executeToolWithHooks(invocation, toolName, signal, messageBus, hooksEnabled, liveOutputCallback, shellExecutionConfig, setPidCallback);
+                        promise = executeToolWithHooks(invocation, toolName, signal, messageBus, hooksEnabled, toolCall.tool, liveOutputCallback, shellExecutionConfig, setPidCallback);
                     }
                     else {
-                        promise = executeToolWithHooks(invocation, toolName, signal, messageBus, hooksEnabled, liveOutputCallback, shellExecutionConfig);
+                        promise = executeToolWithHooks(invocation, toolName, signal, messageBus, hooksEnabled, toolCall.tool, liveOutputCallback, shellExecutionConfig);
                     }
                     try {
                         const toolResult = await promise;
@@ -754,7 +581,7 @@ export class CoreToolScheduler {
                                 const originalContentLength = content.length;
                                 const threshold = this.config.getTruncateToolOutputThreshold();
                                 const lines = this.config.getTruncateToolOutputLines();
-                                const truncatedResult = await truncateAndSaveToFile(content, callId, this.config.storage.getProjectTempDir(), threshold, lines);
+                                const truncatedResult = await saveTruncatedContent(content, callId, this.config.storage.getProjectTempDir(), threshold, lines);
                                 content = truncatedResult.content;
                                 outputFile = truncatedResult.outputFile;
                                 if (outputFile) {