@machina.ai/cell-cli-core 1.0.21-rc4 → 1.4.0-rc1

package/dist/src/tools/smart-edit.test.js

@@ -0,0 +1,405 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const mockFixLLMEditWithInstruction = vi.hoisted(() => vi.fn());
+const mockGenerateJson = vi.hoisted(() => vi.fn());
+const mockOpenDiff = vi.hoisted(() => vi.fn());
+import { IdeClient, IDEConnectionStatus } from '../ide/ide-client.js';
+vi.mock('../ide/ide-client.js', () => ({
+    IdeClient: {
+        getInstance: vi.fn(),
+    },
+    IDEConnectionStatus: {
+        Connected: 'connected',
+        Disconnected: 'disconnected',
+    },
+}));
+vi.mock('../utils/llm-edit-fixer.js', () => ({
+    FixLLMEditWithInstruction: mockFixLLMEditWithInstruction,
+}));
+vi.mock('../core/client.js', () => ({
+    GeminiClient: vi.fn().mockImplementation(() => ({
+        generateJson: mockGenerateJson,
+    })),
+}));
+vi.mock('../utils/editor.js', () => ({
+    openDiff: mockOpenDiff,
+}));
+import { describe, it, expect, beforeEach, afterEach, vi, } from 'vitest';
+import { applyReplacement, SmartEditTool, calculateReplacement, } from './smart-edit.js';
+import { ToolConfirmationOutcome } from './tools.js';
+import { ToolErrorType } from './tool-error.js';
+import path from 'node:path';
+import fs from 'node:fs';
+import os from 'node:os';
+import { ApprovalMode } from '../config/config.js';
+import {} from '@google/genai';
+import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
+import { StandardFileSystemService } from '../services/fileSystemService.js';
+describe('SmartEditTool', () => {
+    let tool;
+    let tempDir;
+    let rootDir;
+    let mockConfig;
+    let geminiClient;
+    beforeEach(() => {
+        vi.restoreAllMocks();
+        tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'smart-edit-tool-test-'));
+        rootDir = path.join(tempDir, 'root');
+        fs.mkdirSync(rootDir);
+        geminiClient = {
+            generateJson: mockGenerateJson,
+        };
+        mockConfig = {
+            getGeminiClient: vi.fn().mockReturnValue(geminiClient),
+            getTargetDir: () => rootDir,
+            getApprovalMode: vi.fn(),
+            setApprovalMode: vi.fn(),
+            getWorkspaceContext: () => createMockWorkspaceContext(rootDir),
+            getFileSystemService: () => new StandardFileSystemService(),
+            getIdeMode: () => false,
+            getApiKey: () => 'test-api-key',
+            getModel: () => 'test-model',
+            getSandbox: () => false,
+            getDebugMode: () => false,
+            getQuestion: () => undefined,
+            getFullContext: () => false,
+            getToolDiscoveryCommand: () => undefined,
+            getToolCallCommand: () => undefined,
+            getMcpServerCommand: () => undefined,
+            getMcpServers: () => undefined,
+            getUserAgent: () => 'test-agent',
+            getUserMemory: () => '',
+            setUserMemory: vi.fn(),
+            getGeminiMdFileCount: () => 0,
+            setGeminiMdFileCount: vi.fn(),
+            getToolRegistry: () => ({}),
+        };
+        mockConfig.getApprovalMode.mockClear();
+        mockConfig.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
+        mockFixLLMEditWithInstruction.mockReset();
+        mockFixLLMEditWithInstruction.mockResolvedValue({
+            noChangesRequired: false,
+            search: '',
+            replace: '',
+            explanation: 'LLM fix failed',
+        });
+        mockGenerateJson.mockReset();
+        mockGenerateJson.mockImplementation(async (contents, schema) => {
+            const userContent = contents.find((c) => c.role === 'user');
+            let promptText = '';
+            if (userContent && userContent.parts) {
+                promptText = userContent.parts
+                    .filter((p) => typeof p.text === 'string')
+                    .map((p) => p.text)
+                    .join('\n');
+            }
+            const snippetMatch = promptText.match(/Problematic target snippet:\n```\n([\s\S]*?)\n```/);
+            const problematicSnippet = snippetMatch && snippetMatch[1] ? snippetMatch[1] : '';
+            if (schema.properties?.corrected_target_snippet) {
+                return Promise.resolve({
+                    corrected_target_snippet: problematicSnippet,
+                });
+            }
+            if (schema.properties?.corrected_new_string) {
+                const originalNewStringMatch = promptText.match(/original_new_string \(what was intended to replace original_old_string\):\n```\n([\s\S]*?)\n```/);
+                const originalNewString = originalNewStringMatch && originalNewStringMatch[1]
+                    ? originalNewStringMatch[1]
+                    : '';
+                return Promise.resolve({ corrected_new_string: originalNewString });
+            }
+            return Promise.resolve({});
+        });
+        tool = new SmartEditTool(mockConfig);
+    });
+    afterEach(() => {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    });
+    describe('applyReplacement', () => {
+        it('should return newString if isNewFile is true', () => {
+            expect(applyReplacement(null, 'old', 'new', true)).toBe('new');
+            expect(applyReplacement('existing', 'old', 'new', true)).toBe('new');
+        });
+        it('should replace oldString with newString in currentContent', () => {
+            expect(applyReplacement('hello old world old', 'old', 'new', false)).toBe('hello new world new');
+        });
+    });
+    describe('calculateReplacement', () => {
+        const abortSignal = new AbortController().signal;
+        it('should perform an exact replacement', async () => {
+            const content = 'hello world';
+            const result = await calculateReplacement({
+                params: {
+                    file_path: 'test.txt',
+                    instruction: 'test',
+                    old_string: 'world',
+                    new_string: 'moon',
+                },
+                currentContent: content,
+                abortSignal,
+            });
+            expect(result.newContent).toBe('hello moon');
+            expect(result.occurrences).toBe(1);
+        });
+        it('should perform a flexible, whitespace-insensitive replacement', async () => {
+            const content = '  hello\n    world\n';
+            const result = await calculateReplacement({
+                params: {
+                    file_path: 'test.txt',
+                    instruction: 'test',
+                    old_string: 'hello\nworld',
+                    new_string: 'goodbye\nmoon',
+                },
+                currentContent: content,
+                abortSignal,
+            });
+            expect(result.newContent).toBe('  goodbye\n  moon\n');
+            expect(result.occurrences).toBe(1);
+        });
+        it('should return 0 occurrences if no match is found', async () => {
+            const content = 'hello world';
+            const result = await calculateReplacement({
+                params: {
+                    file_path: 'test.txt',
+                    instruction: 'test',
+                    old_string: 'nomatch',
+                    new_string: 'moon',
+                },
+                currentContent: content,
+                abortSignal,
+            });
+            expect(result.newContent).toBe(content);
+            expect(result.occurrences).toBe(0);
+        });
+    });
+    describe('validateToolParams', () => {
+        it('should return null for valid params', () => {
+            const params = {
+                file_path: path.join(rootDir, 'test.txt'),
+                instruction: 'An instruction',
+                old_string: 'old',
+                new_string: 'new',
+            };
+            expect(tool.validateToolParams(params)).toBeNull();
+        });
+        it('should return error for relative path', () => {
+            const params = {
+                file_path: 'test.txt',
+                instruction: 'An instruction',
+                old_string: 'old',
+                new_string: 'new',
+            };
+            expect(tool.validateToolParams(params)).toMatch(/File path must be absolute/);
+        });
+    });
+    describe('execute', () => {
+        const testFile = 'execute_me.txt';
+        let filePath;
+        beforeEach(() => {
+            filePath = path.join(rootDir, testFile);
+        });
+        it('should edit an existing file and return diff with fileName', async () => {
+            const initialContent = 'This is some old text.';
+            const newContent = 'This is some new text.';
+            fs.writeFileSync(filePath, initialContent, 'utf8');
+            const params = {
+                file_path: filePath,
+                instruction: 'Replace old with new',
+                old_string: 'old',
+                new_string: 'new',
+            };
+            const invocation = tool.build(params);
+            const result = await invocation.execute(new AbortController().signal);
+            expect(result.llmContent).toMatch(/Successfully modified file/);
+            expect(fs.readFileSync(filePath, 'utf8')).toBe(newContent);
+            const display = result.returnDisplay;
+            expect(display.fileDiff).toMatch(initialContent);
+            expect(display.fileDiff).toMatch(newContent);
+            expect(display.fileName).toBe(testFile);
+        });
+        it('should return error if old_string is not found in file', async () => {
+            fs.writeFileSync(filePath, 'Some content.', 'utf8');
+            const params = {
+                file_path: filePath,
+                instruction: 'Replace non-existent text',
+                old_string: 'nonexistent',
+                new_string: 'replacement',
+            };
+            const invocation = tool.build(params);
+            const result = await invocation.execute(new AbortController().signal);
+            expect(result.llmContent).toMatch(/0 occurrences found for old_string/);
+            expect(result.returnDisplay).toMatch(/Failed to edit, could not find the string to replace./);
+            expect(mockFixLLMEditWithInstruction).toHaveBeenCalled();
+        });
+        it('should succeed if FixLLMEditWithInstruction corrects the params', async () => {
+            const initialContent = 'This is some original text.';
+            const finalContent = 'This is some brand new text.';
+            fs.writeFileSync(filePath, initialContent, 'utf8');
+            const params = {
+                file_path: filePath,
+                instruction: 'Replace original with brand new',
+                old_string: 'original text that is slightly wrong', // This will fail first
+                new_string: 'brand new text',
+            };
+            mockFixLLMEditWithInstruction.mockResolvedValueOnce({
+                noChangesRequired: false,
+                search: 'original text', // The corrected search string
+                replace: 'brand new text',
+                explanation: 'Corrected the search string to match the file content.',
+            });
+            const invocation = tool.build(params);
+            const result = await invocation.execute(new AbortController().signal);
+            expect(result.error).toBeUndefined();
+            expect(result.llmContent).toMatch(/Successfully modified file/);
+            expect(fs.readFileSync(filePath, 'utf8')).toBe(finalContent);
+            expect(mockFixLLMEditWithInstruction).toHaveBeenCalledTimes(1);
+        });
+        it('should return NO_CHANGE if FixLLMEditWithInstruction determines no changes are needed', async () => {
+            const initialContent = 'The price is $100.';
+            fs.writeFileSync(filePath, initialContent, 'utf8');
+            const params = {
+                file_path: filePath,
+                instruction: 'Ensure the price is $100',
+                old_string: 'price is $50', // Incorrect old string
+                new_string: 'price is $100',
+            };
+            mockFixLLMEditWithInstruction.mockResolvedValueOnce({
+                noChangesRequired: true,
+                search: '',
+                replace: '',
+                explanation: 'The price is already correctly set to $100.',
+            });
+            const invocation = tool.build(params);
+            const result = await invocation.execute(new AbortController().signal);
+            expect(result.error?.type).toBe(ToolErrorType.EDIT_NO_CHANGE);
+            expect(result.llmContent).toMatch(/A secondary check determined/);
+            expect(fs.readFileSync(filePath, 'utf8')).toBe(initialContent); // File is unchanged
+        });
+        it('should preserve CRLF line endings when editing a file', async () => {
+            const initialContent = 'line one\r\nline two\r\n';
+            const newContent = 'line one\r\nline three\r\n';
+            fs.writeFileSync(filePath, initialContent, 'utf8');
+            const params = {
+                file_path: filePath,
+                instruction: 'Replace two with three',
+                old_string: 'line two',
+                new_string: 'line three',
+            };
+            const invocation = tool.build(params);
+            await invocation.execute(new AbortController().signal);
+            const finalContent = fs.readFileSync(filePath, 'utf8');
+            expect(finalContent).toBe(newContent);
+        });
+        it('should create a new file with CRLF line endings if new_string has them', async () => {
+            const newContentWithCRLF = 'new line one\r\nnew line two\r\n';
+            const params = {
+                file_path: filePath,
+                instruction: 'Create a new file',
+                old_string: '',
+                new_string: newContentWithCRLF,
+            };
+            const invocation = tool.build(params);
+            await invocation.execute(new AbortController().signal);
+            const finalContent = fs.readFileSync(filePath, 'utf8');
+            expect(finalContent).toBe(newContentWithCRLF);
+        });
+    });
+    describe('Error Scenarios', () => {
+        const testFile = 'error_test.txt';
+        let filePath;
+        beforeEach(() => {
+            filePath = path.join(rootDir, testFile);
+        });
+        it('should return FILE_NOT_FOUND error', async () => {
+            const params = {
+                file_path: filePath,
+                instruction: 'test',
+                old_string: 'any',
+                new_string: 'new',
+            };
+            const invocation = tool.build(params);
+            const result = await invocation.execute(new AbortController().signal);
+            expect(result.error?.type).toBe(ToolErrorType.FILE_NOT_FOUND);
+        });
+        it('should return ATTEMPT_TO_CREATE_EXISTING_FILE error', async () => {
+            fs.writeFileSync(filePath, 'existing content', 'utf8');
+            const params = {
+                file_path: filePath,
+                instruction: 'test',
+                old_string: '',
+                new_string: 'new content',
+            };
+            const invocation = tool.build(params);
+            const result = await invocation.execute(new AbortController().signal);
+            expect(result.error?.type).toBe(ToolErrorType.ATTEMPT_TO_CREATE_EXISTING_FILE);
+        });
+        it('should return NO_OCCURRENCE_FOUND error', async () => {
+            fs.writeFileSync(filePath, 'content', 'utf8');
+            const params = {
+                file_path: filePath,
+                instruction: 'test',
+                old_string: 'not-found',
+                new_string: 'new',
+            };
+            const invocation = tool.build(params);
+            const result = await invocation.execute(new AbortController().signal);
+            expect(result.error?.type).toBe(ToolErrorType.EDIT_NO_OCCURRENCE_FOUND);
+        });
+        it('should return EXPECTED_OCCURRENCE_MISMATCH error', async () => {
+            fs.writeFileSync(filePath, 'one one two', 'utf8');
+            const params = {
+                file_path: filePath,
+                instruction: 'test',
+                old_string: 'one',
+                new_string: 'new',
+            };
+            const invocation = tool.build(params);
+            const result = await invocation.execute(new AbortController().signal);
+            expect(result.error?.type).toBe(ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH);
+        });
+    });
+    describe('IDE mode', () => {
+        const testFile = 'edit_me.txt';
+        let filePath;
+        let ideClient;
+        beforeEach(() => {
+            filePath = path.join(rootDir, testFile);
+            ideClient = {
+                openDiff: vi.fn(),
+                getConnectionStatus: vi.fn().mockReturnValue({
+                    status: IDEConnectionStatus.Connected,
+                }),
+            };
+            vi.mocked(IdeClient.getInstance).mockResolvedValue(ideClient);
+            mockConfig.getIdeMode = () => true;
+        });
+        it('should call ideClient.openDiff and update params on confirmation', async () => {
+            const initialContent = 'some old content here';
+            const newContent = 'some new content here';
+            const modifiedContent = 'some modified content here';
+            fs.writeFileSync(filePath, initialContent);
+            const params = {
+                file_path: filePath,
+                instruction: 'test',
+                old_string: 'old',
+                new_string: 'new',
+            };
+            ideClient.openDiff.mockResolvedValueOnce({
+                status: 'accepted',
+                content: modifiedContent,
+            });
+            const invocation = tool.build(params);
+            const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
+            expect(ideClient.openDiff).toHaveBeenCalledWith(filePath, newContent);
+            if (confirmation && 'onConfirm' in confirmation) {
+                await confirmation.onConfirm(ToolConfirmationOutcome.ProceedOnce);
+            }
+            expect(params.old_string).toBe(initialContent);
+            expect(params.new_string).toBe(modifiedContent);
+        });
+    });
+});
+//# sourceMappingURL=smart-edit.test.js.map

package/dist/src/tools/smart-edit.test.js.map

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

package/dist/src/tools/tool-error.d.ts

@@ -20,8 +20,24 @@ export declare enum ToolErrorType {
     PERMISSION_DENIED = "permission_denied",
     NO_SPACE_LEFT = "no_space_left",
     TARGET_IS_DIRECTORY = "target_is_directory",
+    PATH_NOT_IN_WORKSPACE = "path_not_in_workspace",
+    SEARCH_PATH_NOT_FOUND = "search_path_not_found",
+    SEARCH_PATH_NOT_A_DIRECTORY = "search_path_not_a_directory",
     EDIT_PREPARATION_FAILURE = "edit_preparation_failure",
     EDIT_NO_OCCURRENCE_FOUND = "edit_no_occurrence_found",
     EDIT_EXPECTED_OCCURRENCE_MISMATCH = "edit_expected_occurrence_mismatch",
-    EDIT_NO_CHANGE = "edit_no_change"
+    EDIT_NO_CHANGE = "edit_no_change",
+    GLOB_EXECUTION_ERROR = "glob_execution_error",
+    GREP_EXECUTION_ERROR = "grep_execution_error",
+    LS_EXECUTION_ERROR = "ls_execution_error",
+    PATH_IS_NOT_A_DIRECTORY = "path_is_not_a_directory",
+    MCP_TOOL_ERROR = "mcp_tool_error",
+    MEMORY_TOOL_EXECUTION_ERROR = "memory_tool_execution_error",
+    READ_MANY_FILES_SEARCH_ERROR = "read_many_files_search_error",
+    SHELL_EXECUTE_ERROR = "shell_execute_error",
+    DISCOVERED_TOOL_EXECUTION_ERROR = "discovered_tool_execution_error",
+    WEB_FETCH_NO_URL_IN_PROMPT = "web_fetch_no_url_in_prompt",
+    WEB_FETCH_FALLBACK_FAILED = "web_fetch_fallback_failed",
+    WEB_FETCH_PROCESSING_ERROR = "web_fetch_processing_error",
+    WEB_SEARCH_FAILED = "web_search_failed"
 }

package/dist/src/tools/tool-error.js

@@ -23,10 +23,36 @@ export var ToolErrorType;
     ToolErrorType["PERMISSION_DENIED"] = "permission_denied";
     ToolErrorType["NO_SPACE_LEFT"] = "no_space_left";
     ToolErrorType["TARGET_IS_DIRECTORY"] = "target_is_directory";
+    ToolErrorType["PATH_NOT_IN_WORKSPACE"] = "path_not_in_workspace";
+    ToolErrorType["SEARCH_PATH_NOT_FOUND"] = "search_path_not_found";
+    ToolErrorType["SEARCH_PATH_NOT_A_DIRECTORY"] = "search_path_not_a_directory";
     // Edit-specific Errors
     ToolErrorType["EDIT_PREPARATION_FAILURE"] = "edit_preparation_failure";
     ToolErrorType["EDIT_NO_OCCURRENCE_FOUND"] = "edit_no_occurrence_found";
     ToolErrorType["EDIT_EXPECTED_OCCURRENCE_MISMATCH"] = "edit_expected_occurrence_mismatch";
     ToolErrorType["EDIT_NO_CHANGE"] = "edit_no_change";
+    // Glob-specific Errors
+    ToolErrorType["GLOB_EXECUTION_ERROR"] = "glob_execution_error";
+    // Grep-specific Errors
+    ToolErrorType["GREP_EXECUTION_ERROR"] = "grep_execution_error";
+    // Ls-specific Errors
+    ToolErrorType["LS_EXECUTION_ERROR"] = "ls_execution_error";
+    ToolErrorType["PATH_IS_NOT_A_DIRECTORY"] = "path_is_not_a_directory";
+    // MCP-specific Errors
+    ToolErrorType["MCP_TOOL_ERROR"] = "mcp_tool_error";
+    // Memory-specific Errors
+    ToolErrorType["MEMORY_TOOL_EXECUTION_ERROR"] = "memory_tool_execution_error";
+    // ReadManyFiles-specific Errors
+    ToolErrorType["READ_MANY_FILES_SEARCH_ERROR"] = "read_many_files_search_error";
+    // Shell errors
+    ToolErrorType["SHELL_EXECUTE_ERROR"] = "shell_execute_error";
+    // DiscoveredTool-specific Errors
+    ToolErrorType["DISCOVERED_TOOL_EXECUTION_ERROR"] = "discovered_tool_execution_error";
+    // WebFetch-specific Errors
+    ToolErrorType["WEB_FETCH_NO_URL_IN_PROMPT"] = "web_fetch_no_url_in_prompt";
+    ToolErrorType["WEB_FETCH_FALLBACK_FAILED"] = "web_fetch_fallback_failed";
+    ToolErrorType["WEB_FETCH_PROCESSING_ERROR"] = "web_fetch_processing_error";
+    // WebSearch-specific Errors
+    ToolErrorType["WEB_SEARCH_FAILED"] = "web_search_failed";
 })(ToolErrorType || (ToolErrorType = {}));
 //# sourceMappingURL=tool-error.js.map

package/dist/src/tools/tool-error.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-error.js","sourceRoot":"","sources":["../../../src/tools/tool-error.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,CAAN,IAAY,aAuBX;AAvBD,WAAY,aAAa;IACvB,iBAAiB;IACjB,4DAA2C,CAAA;IAC3C,oCAAmB,CAAA;IACnB,4DAA2C,CAAA;IAC3C,4DAA2C,CAAA;IAC3C,sDAAqC,CAAA;IAErC,qBAAqB;IACrB,kDAAiC,CAAA;IACjC,0DAAyC,CAAA;IACzC,8DAA6C,CAAA;IAC7C,oFAAmE,CAAA;IACnE,kDAAiC,CAAA;IACjC,wDAAuC,CAAA;IACvC,gDAA+B,CAAA;IAC/B,4DAA2C,CAAA;IAE3C,uBAAuB;IACvB,sEAAqD,CAAA;IACrD,sEAAqD,CAAA;IACrD,wFAAuE,CAAA;IACvE,kDAAiC,CAAA;AACnC,CAAC,EAvBW,aAAa,KAAb,aAAa,QAuBxB"}
+{"version":3,"file":"tool-error.js","sourceRoot":"","sources":["../../../src/tools/tool-error.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,CAAN,IAAY,aA2DX;AA3DD,WAAY,aAAa;IACvB,iBAAiB;IACjB,4DAA2C,CAAA;IAC3C,oCAAmB,CAAA;IACnB,4DAA2C,CAAA;IAC3C,4DAA2C,CAAA;IAC3C,sDAAqC,CAAA;IAErC,qBAAqB;IACrB,kDAAiC,CAAA;IACjC,0DAAyC,CAAA;IACzC,8DAA6C,CAAA;IAC7C,oFAAmE,CAAA;IACnE,kDAAiC,CAAA;IACjC,wDAAuC,CAAA;IACvC,gDAA+B,CAAA;IAC/B,4DAA2C,CAAA;IAC3C,gEAA+C,CAAA;IAC/C,gEAA+C,CAAA;IAC/C,4EAA2D,CAAA;IAE3D,uBAAuB;IACvB,sEAAqD,CAAA;IACrD,sEAAqD,CAAA;IACrD,wFAAuE,CAAA;IACvE,kDAAiC,CAAA;IAEjC,uBAAuB;IACvB,8DAA6C,CAAA;IAE7C,uBAAuB;IACvB,8DAA6C,CAAA;IAE7C,qBAAqB;IACrB,0DAAyC,CAAA;IACzC,oEAAmD,CAAA;IAEnD,sBAAsB;IACtB,kDAAiC,CAAA;IAEjC,yBAAyB;IACzB,4EAA2D,CAAA;IAE3D,gCAAgC;IAChC,8EAA6D,CAAA;IAE7D,eAAe;IACf,4DAA2C,CAAA;IAE3C,iCAAiC;IACjC,oFAAmE,CAAA;IAEnE,2BAA2B;IAC3B,0EAAyD,CAAA;IACzD,wEAAuD,CAAA;IACvD,0EAAyD,CAAA;IAEzD,4BAA4B;IAC5B,wDAAuC,CAAA;AACzC,CAAC,EA3DW,aAAa,KAAb,aAAa,QA2DxB"}

package/dist/src/tools/tool-registry.d.ts

@@ -3,9 +3,11 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { FunctionDeclaration } from '@google/genai';
-import { AnyDeclarativeTool, ToolResult, BaseDeclarativeTool, ToolInvocation } from './tools.js';
-import { Config } from '../config/config.js';
+import type { FunctionDeclaration } from '@google/genai';
+import type { AnyDeclarativeTool, ToolResult, ToolInvocation } from './tools.js';
+import { BaseDeclarativeTool } from './tools.js';
+import type { Config } from '../config/config.js';
+import type { EventEmitter } from 'node:events';
 type ToolParams = Record<string, unknown>;
 export declare class DiscoveredTool extends BaseDeclarativeTool<ToolParams, ToolResult> {
     private readonly config;
@@ -18,7 +20,7 @@ export declare class ToolRegistry {
     private tools;
     private config;
     private mcpClientManager;
-    constructor(config: Config);
+    constructor(config: Config, eventEmitter?: EventEmitter);
     /**
      * Registers a tool definition.
      * @param tool - The tool object containing schema and execution logic.
@@ -65,6 +67,10 @@ export declare class ToolRegistry {
      * @returns An array of FunctionDeclarations for the specified tools.
      */
     getFunctionDeclarationsFiltered(toolNames: string[]): FunctionDeclaration[];
+    /**
+     * Returns an array of all registered and discovered tool names.
+     */
+    getAllToolNames(): string[];
     /**
      * Returns an array of all registered and discovered tool instances.
      */

package/dist/src/tools/tool-registry.js

@@ -3,13 +3,15 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Kind, BaseDeclarativeTool, BaseToolInvocation, } from './tools.js';
+import { Kind, BaseDeclarativeTool, BaseToolInvocation } from './tools.js';
 import { spawn } from 'node:child_process';
 import { StringDecoder } from 'node:string_decoder';
 import { connectAndDiscover } from './mcp-client.js';
 import { McpClientManager } from './mcp-client-manager.js';
 import { DiscoveredMCPTool } from './mcp-tool.js';
 import { parse } from 'shell-quote';
+import { ToolErrorType } from './tool-error.js';
+import { safeJsonStringify } from '../utils/safeJsonStringify.js';
 class DiscoveredToolInvocation extends BaseToolInvocation {
     config;
     toolName;
@@ -19,7 +21,7 @@ class DiscoveredToolInvocation extends BaseToolInvocation {
         this.toolName = toolName;
     }
     getDescription() {
-        return `Calling discovered tool: ${this.toolName}`;
+        return safeJsonStringify(this.params);
     }
     async execute(_signal, _updateOutput) {
         const callCommand = this.config.getToolCallCommand();
@@ -73,6 +75,10 @@ class DiscoveredToolInvocation extends BaseToolInvocation {
             return {
                 llmContent,
                 returnDisplay: llmContent,
+                error: {
+                    message: llmContent,
+                    type: ToolErrorType.DISCOVERED_TOOL_EXECUTION_ERROR,
+                },
             };
         }
         return {
@@ -118,9 +124,9 @@ export class ToolRegistry {
     tools = new Map();
     config;
     mcpClientManager;
-    constructor(config) {
+    constructor(config, eventEmitter) {
         this.config = config;
-        this.mcpClientManager = new McpClientManager(this.config.getMcpServers() ?? {}, this.config.getMcpServerCommand(), this, this.config.getPromptRegistry(), this.config.getDebugMode(), this.config.getWorkspaceContext());
+        this.mcpClientManager = new McpClientManager(this.config.getMcpServers() ?? {}, this.config.getMcpServerCommand(), this, this.config.getPromptRegistry(), this.config.getDebugMode(), this.config.getWorkspaceContext(), eventEmitter);
     }
     /**
      * Registers a tool definition.
@@ -167,7 +173,7 @@ export class ToolRegistry {
         this.config.getPromptRegistry().clear();
         await this.discoverAndRegisterToolsFromCommand();
         // discover tools using MCP servers, if configured
-        await this.mcpClientManager.discoverAllMcpTools();
+        await this.mcpClientManager.discoverAllMcpTools(this.config);
     }
     /**
      * Discovers tools from project (if available and configured).
@@ -179,7 +185,7 @@ export class ToolRegistry {
         this.removeDiscoveredTools();
         this.config.getPromptRegistry().clear();
         // discover tools using MCP servers, if configured
-        await this.mcpClientManager.discoverAllMcpTools();
+        await this.mcpClientManager.discoverAllMcpTools(this.config);
     }
     /**
      * Restarts all MCP servers and re-discovers tools.
@@ -202,7 +208,7 @@ export class ToolRegistry {
         const mcpServers = this.config.getMcpServers() ?? {};
         const serverConfig = mcpServers[serverName];
         if (serverConfig) {
-            await connectAndDiscover(serverName, serverConfig, this, this.config.getPromptRegistry(), this.config.getDebugMode(), this.config.getWorkspaceContext());
+            await connectAndDiscover(serverName, serverConfig, this, this.config.getPromptRegistry(), this.config.getDebugMode(), this.config.getWorkspaceContext(), this.config);
         }
     }
     async discoverAndRegisterToolsFromCommand() {
@@ -329,6 +335,12 @@ export class ToolRegistry {
         }
         return declarations;
     }
+    /**
+     * Returns an array of all registered and discovered tool names.
+     */
+    getAllToolNames() {
+        return Array.from(this.tools.keys());
+    }
     /**
      * Returns an array of all registered and discovered tool instances.
      */