@google/gemini-cli-core 0.1.9-nightly.250709.c8cf954e → 0.1.9-rc.1

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

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { FunctionDeclaration, Schema } from '@google/genai';
+import { FunctionDeclaration } from '@google/genai';
 import { Tool, ToolResult, BaseTool } from './tools.js';
 import { Config } from '../config/config.js';
 type ToolParams = Record<string, unknown>;
@@ -17,6 +17,7 @@ export declare class DiscoveredTool extends BaseTool<ToolParams, ToolResult> {
 }
 export declare class ToolRegistry {
     private tools;
+    private discovery;
     private config;
     constructor(config: Config);
     /**
@@ -29,7 +30,6 @@ export declare class ToolRegistry {
      * Can be called multiple times to update discovered tools.
      */
     discoverTools(): Promise<void>;
-    private discoverAndRegisterToolsFromCommand;
     /**
      * Retrieves the list of tool schemas (FunctionDeclaration array).
      * Extracts the declarations from the ToolListUnion structure.
@@ -50,18 +50,4 @@ export declare class ToolRegistry {
      */
     getTool(name: string): Tool | undefined;
 }
-/**
- * Sanitizes a schema object in-place to ensure compatibility with the Gemini API.
- *
- * NOTE: This function mutates the passed schema object.
- *
- * It performs the following actions:
- * - Removes the `default` property when `anyOf` is present.
- * - Removes unsupported `format` values from string properties, keeping only 'enum' and 'date-time'.
- * - Recursively sanitizes nested schemas within `anyOf`, `items`, and `properties`.
- * - Handles circular references within the schema to prevent infinite loops.
- *
- * @param schema The schema object to sanitize. It will be modified directly.
- */
-export declare function sanitizeParameters(schema?: Schema): void;
 export {};

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

@@ -3,13 +3,10 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Type } from '@google/genai';
 import { BaseTool } from './tools.js';
-import { spawn } from 'node:child_process';
-import { StringDecoder } from 'node:string_decoder';
+import { spawn, execSync } from 'node:child_process';
 import { discoverMcpTools } from './mcp-client.js';
 import { DiscoveredMCPTool } from './mcp-tool.js';
-import { parse } from 'shell-quote';
 export class DiscoveredTool extends BaseTool {
     config;
     name;
@@ -103,6 +100,7 @@ Signal: Signal number or \`(none)\` if no signal was received.
 }
 export class ToolRegistry {
     tools = new Map();
+    discovery = null;
     config;
     constructor(config) {
         this.config = config;
@@ -128,108 +126,33 @@ export class ToolRegistry {
             if (tool instanceof DiscoveredTool || tool instanceof DiscoveredMCPTool) {
                 this.tools.delete(tool.name);
             }
+            else {
+                // Keep manually registered tools
+            }
         }
-        await this.discoverAndRegisterToolsFromCommand();
-        // discover tools using MCP servers, if configured
-        await discoverMcpTools(this.config.getMcpServers() ?? {}, this.config.getMcpServerCommand(), this);
-    }
-    async discoverAndRegisterToolsFromCommand() {
+        // discover tools using discovery command, if configured
         const discoveryCmd = this.config.getToolDiscoveryCommand();
-        if (!discoveryCmd) {
-            return;
-        }
-        try {
-            const cmdParts = parse(discoveryCmd);
-            if (cmdParts.length === 0) {
-                throw new Error('Tool discovery command is empty or contains only whitespace.');
-            }
-            const proc = spawn(cmdParts[0], cmdParts.slice(1));
-            let stdout = '';
-            const stdoutDecoder = new StringDecoder('utf8');
-            let stderr = '';
-            const stderrDecoder = new StringDecoder('utf8');
-            let sizeLimitExceeded = false;
-            const MAX_STDOUT_SIZE = 10 * 1024 * 1024; // 10MB limit
-            const MAX_STDERR_SIZE = 10 * 1024 * 1024; // 10MB limit
-            let stdoutByteLength = 0;
-            let stderrByteLength = 0;
-            proc.stdout.on('data', (data) => {
-                if (sizeLimitExceeded)
-                    return;
-                if (stdoutByteLength + data.length > MAX_STDOUT_SIZE) {
-                    sizeLimitExceeded = true;
-                    proc.kill();
-                    return;
-                }
-                stdoutByteLength += data.length;
-                stdout += stdoutDecoder.write(data);
-            });
-            proc.stderr.on('data', (data) => {
-                if (sizeLimitExceeded)
-                    return;
-                if (stderrByteLength + data.length > MAX_STDERR_SIZE) {
-                    sizeLimitExceeded = true;
-                    proc.kill();
-                    return;
-                }
-                stderrByteLength += data.length;
-                stderr += stderrDecoder.write(data);
-            });
-            await new Promise((resolve, reject) => {
-                proc.on('error', reject);
-                proc.on('close', (code) => {
-                    stdout += stdoutDecoder.end();
-                    stderr += stderrDecoder.end();
-                    if (sizeLimitExceeded) {
-                        return reject(new Error(`Tool discovery command output exceeded size limit of ${MAX_STDOUT_SIZE} bytes.`));
-                    }
-                    if (code !== 0) {
-                        console.error(`Command failed with code ${code}`);
-                        console.error(stderr);
-                        return reject(new Error(`Tool discovery command failed with exit code ${code}`));
-                    }
-                    resolve();
-                });
-            });
+        if (discoveryCmd) {
             // execute discovery command and extract function declarations (w/ or w/o "tool" wrappers)
             const functions = [];
-            const discoveredItems = JSON.parse(stdout.trim());
-            if (!discoveredItems || !Array.isArray(discoveredItems)) {
-                throw new Error('Tool discovery command did not return a JSON array of tools.');
-            }
-            for (const tool of discoveredItems) {
-                if (tool && typeof tool === 'object') {
-                    if (Array.isArray(tool['function_declarations'])) {
-                        functions.push(...tool['function_declarations']);
-                    }
-                    else if (Array.isArray(tool['functionDeclarations'])) {
-                        functions.push(...tool['functionDeclarations']);
-                    }
-                    else if (tool['name']) {
-                        functions.push(tool);
-                    }
+            for (const tool of JSON.parse(execSync(discoveryCmd).toString().trim())) {
+                if (tool['function_declarations']) {
+                    functions.push(...tool['function_declarations']);
+                }
+                else if (tool['functionDeclarations']) {
+                    functions.push(...tool['functionDeclarations']);
+                }
+                else if (tool['name']) {
+                    functions.push(tool);
                 }
             }
             // register each function as a tool
             for (const func of functions) {
-                if (!func.name) {
-                    console.warn('Discovered a tool with no name. Skipping.');
-                    continue;
-                }
-                // Sanitize the parameters before registering the tool.
-                const parameters = func.parameters &&
-                    typeof func.parameters === 'object' &&
-                    !Array.isArray(func.parameters)
-                    ? func.parameters
-                    : {};
-                sanitizeParameters(parameters);
-                this.registerTool(new DiscoveredTool(this.config, func.name, func.description ?? '', parameters));
+                this.registerTool(new DiscoveredTool(this.config, func.name, func.description, func.parameters));
             }
         }
-        catch (e) {
-            console.error(`Tool discovery command "${discoveryCmd}" failed:`, e);
-            throw e;
-        }
+        // discover tools using MCP servers, if configured
+        await discoverMcpTools(this.config.getMcpServers() ?? {}, this.config.getMcpServerCommand(), this);
     }
     /**
      * Retrieves the list of tool schemas (FunctionDeclaration array).
@@ -269,58 +192,4 @@ export class ToolRegistry {
         return this.tools.get(name);
     }
 }
-/**
- * Sanitizes a schema object in-place to ensure compatibility with the Gemini API.
- *
- * NOTE: This function mutates the passed schema object.
- *
- * It performs the following actions:
- * - Removes the `default` property when `anyOf` is present.
- * - Removes unsupported `format` values from string properties, keeping only 'enum' and 'date-time'.
- * - Recursively sanitizes nested schemas within `anyOf`, `items`, and `properties`.
- * - Handles circular references within the schema to prevent infinite loops.
- *
- * @param schema The schema object to sanitize. It will be modified directly.
- */
-export function sanitizeParameters(schema) {
-    _sanitizeParameters(schema, new Set());
-}
-/**
- * Internal recursive implementation for sanitizeParameters.
- * @param schema The schema object to sanitize.
- * @param visited A set used to track visited schema objects during recursion.
- */
-function _sanitizeParameters(schema, visited) {
-    if (!schema || visited.has(schema)) {
-        return;
-    }
-    visited.add(schema);
-    if (schema.anyOf) {
-        // Vertex AI gets confused if both anyOf and default are set.
-        schema.default = undefined;
-        for (const item of schema.anyOf) {
-            if (typeof item !== 'boolean') {
-                _sanitizeParameters(item, visited);
-            }
-        }
-    }
-    if (schema.items && typeof schema.items !== 'boolean') {
-        _sanitizeParameters(schema.items, visited);
-    }
-    if (schema.properties) {
-        for (const item of Object.values(schema.properties)) {
-            if (typeof item !== 'boolean') {
-                _sanitizeParameters(item, visited);
-            }
-        }
-    }
-    // Vertex AI only supports 'enum' and 'date-time' for STRING format.
-    if (schema.type === Type.STRING) {
-        if (schema.format &&
-            schema.format !== 'enum' &&
-            schema.format !== 'date-time') {
-            schema.format = undefined;
-        }
-    }
-}
 //# sourceMappingURL=tool-registry.js.map

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

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

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

@@ -5,12 +5,12 @@
  */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
-import { ToolRegistry, sanitizeParameters, } from './tool-registry.js';
+import { ToolRegistry, DiscoveredTool } from './tool-registry.js';
 import { DiscoveredMCPTool } from './mcp-tool.js';
-import { Config, ApprovalMode } from '../config/config.js';
+import { Config, ApprovalMode, } from '../config/config.js';
 import { BaseTool } from './tools.js';
 import { mcpToTool, Type, } from '@google/genai';
-import { spawn } from 'node:child_process';
+import { execSync } from 'node:child_process';
 // Use vi.hoisted to define the mock function so it can be used in the vi.mock factory
 const mockDiscoverMcpTools = vi.hoisted(() => vi.fn());
 // Mock ./mcp-client.js to control its behavior within tool-registry tests
@@ -37,6 +37,7 @@ vi.mock('@modelcontextprotocol/sdk/client/index.js', () => {
         set onerror(handler) {
             mockMcpClientOnError(handler);
         },
+        // listTools and callTool are no longer directly used by ToolRegistry/discoverMcpTools
     }));
     return { Client: MockClient };
 });
@@ -61,6 +62,7 @@ vi.mock('@google/genai', async () => {
     return {
         ...actualGenai,
         mcpToTool: vi.fn().mockImplementation(() => ({
+            // Default mock implementation
             tool: vi.fn().mockResolvedValue({ functionDeclarations: [] }),
             callTool: vi.fn(),
         })),
@@ -74,9 +76,9 @@ const createMockCallableTool = (toolDeclarations) => ({
 class MockTool extends BaseTool {
     constructor(name = 'mock-tool', description = 'A mock tool') {
         super(name, name, description, {
-            type: Type.OBJECT,
+            type: 'object',
             properties: {
-                param: { type: Type.STRING },
+                param: { type: 'string' },
             },
             required: ['param'],
         });
@@ -103,7 +105,6 @@ const baseConfigParams = {
 describe('ToolRegistry', () => {
     let config;
     let toolRegistry;
-    let mockConfigGetToolDiscoveryCommand;
     beforeEach(() => {
         config = new Config(baseConfigParams);
         toolRegistry = new ToolRegistry(config);
@@ -111,15 +112,13 @@ describe('ToolRegistry', () => {
         vi.spyOn(console, 'error').mockImplementation(() => { });
         vi.spyOn(console, 'debug').mockImplementation(() => { });
         vi.spyOn(console, 'log').mockImplementation(() => { });
-        mockMcpClientConnect.mockReset().mockResolvedValue(undefined);
+        // Reset mocks for MCP parts
+        mockMcpClientConnect.mockReset().mockResolvedValue(undefined); // Default connect success
         mockStdioTransportClose.mockReset();
         mockSseTransportClose.mockReset();
         vi.mocked(mcpToTool).mockClear();
+        // Default mcpToTool to return a callable tool that returns no functions
         vi.mocked(mcpToTool).mockReturnValue(createMockCallableTool([]));
-        mockConfigGetToolDiscoveryCommand = vi.spyOn(config, 'getToolDiscoveryCommand');
-        vi.spyOn(config, 'getMcpServers');
-        vi.spyOn(config, 'getMcpServerCommand');
-        mockDiscoverMcpTools.mockReset().mockResolvedValue(undefined);
     });
     afterEach(() => {
         vi.restoreAllMocks();
@@ -130,16 +129,18 @@ describe('ToolRegistry', () => {
             toolRegistry.registerTool(tool);
             expect(toolRegistry.getTool('mock-tool')).toBe(tool);
         });
+        // ... other registerTool tests
     });
     describe('getToolsByServer', () => {
         it('should return an empty array if no tools match the server name', () => {
-            toolRegistry.registerTool(new MockTool());
+            toolRegistry.registerTool(new MockTool()); // A non-MCP tool
             expect(toolRegistry.getToolsByServer('any-mcp-server')).toEqual([]);
         });
         it('should return only tools matching the server name', async () => {
             const server1Name = 'mcp-server-uno';
             const server2Name = 'mcp-server-dos';
-            const mockCallable = {};
+            // Manually register mock MCP tools for this test
+            const mockCallable = {}; // Minimal mock callable
             const mcpTool1 = new DiscoveredMCPTool(mockCallable, server1Name, 'server1Name__tool-on-server1', 'd1', {}, 'tool-on-server1');
             const mcpTool2 = new DiscoveredMCPTool(mockCallable, server2Name, 'server2Name__tool-on-server2', 'd2', {}, 'tool-on-server2');
             const nonMcpTool = new MockTool('regular-tool');
@@ -149,62 +150,48 @@ describe('ToolRegistry', () => {
             const toolsFromServer1 = toolRegistry.getToolsByServer(server1Name);
             expect(toolsFromServer1).toHaveLength(1);
             expect(toolsFromServer1[0].name).toBe(mcpTool1.name);
+            expect(toolsFromServer1[0].serverName).toBe(server1Name);
             const toolsFromServer2 = toolRegistry.getToolsByServer(server2Name);
             expect(toolsFromServer2).toHaveLength(1);
             expect(toolsFromServer2[0].name).toBe(mcpTool2.name);
+            expect(toolsFromServer2[0].serverName).toBe(server2Name);
+            expect(toolRegistry.getToolsByServer('non-existent-server')).toEqual([]);
         });
     });
     describe('discoverTools', () => {
-        it('should sanitize tool parameters during discovery from command', async () => {
+        let mockConfigGetToolDiscoveryCommand;
+        let mockConfigGetMcpServers;
+        let mockConfigGetMcpServerCommand;
+        let mockExecSync;
+        beforeEach(() => {
+            mockConfigGetToolDiscoveryCommand = vi.spyOn(config, 'getToolDiscoveryCommand');
+            mockConfigGetMcpServers = vi.spyOn(config, 'getMcpServers');
+            mockConfigGetMcpServerCommand = vi.spyOn(config, 'getMcpServerCommand');
+            mockExecSync = vi.mocked(execSync);
+            toolRegistry = new ToolRegistry(config); // Reset registry
+            // Reset the mock for discoverMcpTools before each test in this suite
+            mockDiscoverMcpTools.mockReset().mockResolvedValue(undefined);
+        });
+        it('should discover tools using discovery command', async () => {
+            // ... this test remains largely the same
             const discoveryCommand = 'my-discovery-command';
             mockConfigGetToolDiscoveryCommand.mockReturnValue(discoveryCommand);
-            const unsanitizedToolDeclaration = {
-                name: 'tool-with-bad-format',
-                description: 'A tool with an invalid format property',
-                parameters: {
-                    type: Type.OBJECT,
-                    properties: {
-                        some_string: {
-                            type: Type.STRING,
-                            format: 'uuid', // This is an unsupported format
-                        },
-                    },
+            const mockToolDeclarations = [
+                {
+                    name: 'discovered-tool-1',
+                    description: 'A discovered tool',
+                    parameters: { type: Type.OBJECT, properties: {} },
                 },
-            };
-            const mockSpawn = vi.mocked(spawn);
-            const mockChildProcess = {
-                stdout: { on: vi.fn() },
-                stderr: { on: vi.fn() },
-                on: vi.fn(),
-            };
-            mockSpawn.mockReturnValue(mockChildProcess);
-            // Simulate stdout data
-            mockChildProcess.stdout.on.mockImplementation((event, callback) => {
-                if (event === 'data') {
-                    callback(Buffer.from(JSON.stringify([
-                        { function_declarations: [unsanitizedToolDeclaration] },
-                    ])));
-                }
-                return mockChildProcess;
-            });
-            // Simulate process close
-            mockChildProcess.on.mockImplementation((event, callback) => {
-                if (event === 'close') {
-                    callback(0);
-                }
-                return mockChildProcess;
-            });
+            ];
+            mockExecSync.mockReturnValue(Buffer.from(JSON.stringify([{ function_declarations: mockToolDeclarations }])));
             await toolRegistry.discoverTools();
-            const discoveredTool = toolRegistry.getTool('tool-with-bad-format');
-            expect(discoveredTool).toBeDefined();
-            const registeredParams = discoveredTool.schema
-                .parameters;
-            expect(registeredParams.properties?.['some_string']).toBeDefined();
-            expect(registeredParams.properties?.['some_string']).toHaveProperty('format', undefined);
+            expect(execSync).toHaveBeenCalledWith(discoveryCommand);
+            const discoveredTool = toolRegistry.getTool('discovered-tool-1');
+            expect(discoveredTool).toBeInstanceOf(DiscoveredTool);
         });
         it('should discover tools using MCP servers defined in getMcpServers', async () => {
             mockConfigGetToolDiscoveryCommand.mockReturnValue(undefined);
-            vi.spyOn(config, 'getMcpServerCommand').mockReturnValue(undefined);
+            mockConfigGetMcpServerCommand.mockReturnValue(undefined);
             const mcpServerConfigVal = {
                 'my-mcp-server': {
                     command: 'mcp-server-cmd',
@@ -212,142 +199,44 @@ describe('ToolRegistry', () => {
                     trust: true,
                 },
             };
-            vi.spyOn(config, 'getMcpServers').mockReturnValue(mcpServerConfigVal);
+            mockConfigGetMcpServers.mockReturnValue(mcpServerConfigVal);
             await toolRegistry.discoverTools();
             expect(mockDiscoverMcpTools).toHaveBeenCalledWith(mcpServerConfigVal, undefined, toolRegistry);
+            // We no longer check these as discoverMcpTools is mocked
+            // expect(vi.mocked(mcpToTool)).toHaveBeenCalledTimes(1);
+            // expect(Client).toHaveBeenCalledTimes(1);
+            // expect(StdioClientTransport).toHaveBeenCalledWith({
+            //   command: 'mcp-server-cmd',
+            //   args: ['--port', '1234'],
+            //   env: expect.any(Object),
+            //   stderr: 'pipe',
+            // });
+            // expect(mockMcpClientConnect).toHaveBeenCalled();
+            // To verify that tools *would* have been registered, we'd need mockDiscoverMcpTools
+            // to call toolRegistry.registerTool, or we test that separately.
+            // For now, we just check that the delegation happened.
         });
-        it('should discover tools using MCP servers defined in getMcpServers', async () => {
+        it('should discover tools using MCP server command from getMcpServerCommand', async () => {
             mockConfigGetToolDiscoveryCommand.mockReturnValue(undefined);
-            vi.spyOn(config, 'getMcpServerCommand').mockReturnValue(undefined);
-            const mcpServerConfigVal = {
-                'my-mcp-server': {
-                    command: 'mcp-server-cmd',
-                    args: ['--port', '1234'],
-                    trust: true,
-                },
-            };
-            vi.spyOn(config, 'getMcpServers').mockReturnValue(mcpServerConfigVal);
+            mockConfigGetMcpServers.mockReturnValue({});
+            mockConfigGetMcpServerCommand.mockReturnValue('mcp-server-start-command --param');
             await toolRegistry.discoverTools();
-            expect(mockDiscoverMcpTools).toHaveBeenCalledWith(mcpServerConfigVal, undefined, toolRegistry);
+            expect(mockDiscoverMcpTools).toHaveBeenCalledWith({}, 'mcp-server-start-command --param', toolRegistry);
+        });
+        it('should handle errors during MCP client connection gracefully and close transport', async () => {
+            mockConfigGetToolDiscoveryCommand.mockReturnValue(undefined);
+            mockConfigGetMcpServers.mockReturnValue({
+                'failing-mcp': { command: 'fail-cmd' },
+            });
+            mockMcpClientConnect.mockRejectedValue(new Error('Connection failed'));
+            await toolRegistry.discoverTools();
+            expect(mockDiscoverMcpTools).toHaveBeenCalledWith({
+                'failing-mcp': { command: 'fail-cmd' },
+            }, undefined, toolRegistry);
+            expect(toolRegistry.getAllTools()).toHaveLength(0);
         });
     });
-});
-describe('sanitizeParameters', () => {
-    it('should remove unsupported format from a simple string property', () => {
-        const schema = {
-            type: Type.OBJECT,
-            properties: {
-                name: { type: Type.STRING },
-                id: { type: Type.STRING, format: 'uuid' },
-            },
-        };
-        sanitizeParameters(schema);
-        expect(schema.properties?.['id']).toHaveProperty('format', undefined);
-        expect(schema.properties?.['name']).not.toHaveProperty('format');
-    });
-    it('should NOT remove supported format values', () => {
-        const schema = {
-            type: Type.OBJECT,
-            properties: {
-                date: { type: Type.STRING, format: 'date-time' },
-                role: {
-                    type: Type.STRING,
-                    format: 'enum',
-                    enum: ['admin', 'user'],
-                },
-            },
-        };
-        const originalSchema = JSON.parse(JSON.stringify(schema));
-        sanitizeParameters(schema);
-        expect(schema).toEqual(originalSchema);
-    });
-    it('should handle nested objects recursively', () => {
-        const schema = {
-            type: Type.OBJECT,
-            properties: {
-                user: {
-                    type: Type.OBJECT,
-                    properties: {
-                        email: { type: Type.STRING, format: 'email' },
-                    },
-                },
-            },
-        };
-        sanitizeParameters(schema);
-        expect(schema.properties?.['user']?.properties?.['email']).toHaveProperty('format', undefined);
-    });
-    it('should handle arrays of objects', () => {
-        const schema = {
-            type: Type.OBJECT,
-            properties: {
-                items: {
-                    type: Type.ARRAY,
-                    items: {
-                        type: Type.OBJECT,
-                        properties: {
-                            itemId: { type: Type.STRING, format: 'uuid' },
-                        },
-                    },
-                },
-            },
-        };
-        sanitizeParameters(schema);
-        expect(schema.properties?.['items']?.items?.properties?.['itemId']).toHaveProperty('format', undefined);
-    });
-    it('should handle schemas with no properties to sanitize', () => {
-        const schema = {
-            type: Type.OBJECT,
-            properties: {
-                count: { type: Type.NUMBER },
-                isActive: { type: Type.BOOLEAN },
-            },
-        };
-        const originalSchema = JSON.parse(JSON.stringify(schema));
-        sanitizeParameters(schema);
-        expect(schema).toEqual(originalSchema);
-    });
-    it('should not crash on an empty or undefined schema', () => {
-        expect(() => sanitizeParameters({})).not.toThrow();
-        expect(() => sanitizeParameters(undefined)).not.toThrow();
-    });
-    it('should handle cyclic schemas without crashing', () => {
-        const schema = {
-            type: Type.OBJECT,
-            properties: {
-                name: { type: Type.STRING, format: 'hostname' },
-            },
-        };
-        schema.properties.self = schema;
-        expect(() => sanitizeParameters(schema)).not.toThrow();
-        expect(schema.properties.name).toHaveProperty('format', undefined);
-    });
-    it('should handle complex nested schemas with cycles', () => {
-        const userNode = {
-            type: Type.OBJECT,
-            properties: {
-                id: { type: Type.STRING, format: 'uuid' },
-                name: { type: Type.STRING },
-                manager: {
-                    type: Type.OBJECT,
-                    properties: {
-                        id: { type: Type.STRING, format: 'uuid' },
-                    },
-                },
-            },
-        };
-        userNode.properties.reports = {
-            type: Type.ARRAY,
-            items: userNode,
-        };
-        const schema = {
-            type: Type.OBJECT,
-            properties: {
-                ceo: userNode,
-            },
-        };
-        expect(() => sanitizeParameters(schema)).not.toThrow();
-        expect(schema.properties?.['ceo']?.properties?.['id']).toHaveProperty('format', undefined);
-        expect(schema.properties?.['ceo']?.properties?.['manager']?.properties?.['id']).toHaveProperty('format', undefined);
-    });
+    // Other tests for DiscoveredTool and DiscoveredMCPTool can be simplified or removed
+    // if their core logic is now tested in their respective dedicated test files (mcp-tool.test.ts)
 });
 //# sourceMappingURL=tool-registry.test.js.map