@vybestack/llxprt-code-core 0.1.12

package/dist/src/tools/mcp-client.js

@@ -0,0 +1,332 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
+import { SSEClientTransport, } from '@modelcontextprotocol/sdk/client/sse.js';
+import { StreamableHTTPClientTransport, } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { parse } from 'shell-quote';
+import { DiscoveredMCPTool } from './mcp-tool.js';
+import { Type, mcpToTool } from '@google/genai';
+import { sanitizeParameters } from './tool-registry.js';
+import { ActiveFileNotificationSchema, IDE_SERVER_NAME, ideContext, } from '../services/ideContext.js';
+export const MCP_DEFAULT_TIMEOUT_MSEC = 10 * 60 * 1000; // default to 10 minutes
+/**
+ * Enum representing the connection status of an MCP server
+ */
+export var MCPServerStatus;
+(function (MCPServerStatus) {
+    /** Server is disconnected or experiencing errors */
+    MCPServerStatus["DISCONNECTED"] = "disconnected";
+    /** Server is in the process of connecting */
+    MCPServerStatus["CONNECTING"] = "connecting";
+    /** Server is connected and ready to use */
+    MCPServerStatus["CONNECTED"] = "connected";
+})(MCPServerStatus || (MCPServerStatus = {}));
+/**
+ * Enum representing the overall MCP discovery state
+ */
+export var MCPDiscoveryState;
+(function (MCPDiscoveryState) {
+    /** Discovery has not started yet */
+    MCPDiscoveryState["NOT_STARTED"] = "not_started";
+    /** Discovery is currently in progress */
+    MCPDiscoveryState["IN_PROGRESS"] = "in_progress";
+    /** Discovery has completed (with or without errors) */
+    MCPDiscoveryState["COMPLETED"] = "completed";
+})(MCPDiscoveryState || (MCPDiscoveryState = {}));
+/**
+ * Map to track the status of each MCP server within the core package
+ */
+const mcpServerStatusesInternal = new Map();
+/**
+ * Track the overall MCP discovery state
+ */
+let mcpDiscoveryState = MCPDiscoveryState.NOT_STARTED;
+const statusChangeListeners = [];
+/**
+ * Add a listener for MCP server status changes
+ */
+export function addMCPStatusChangeListener(listener) {
+    statusChangeListeners.push(listener);
+}
+/**
+ * Remove a listener for MCP server status changes
+ */
+export function removeMCPStatusChangeListener(listener) {
+    const index = statusChangeListeners.indexOf(listener);
+    if (index !== -1) {
+        statusChangeListeners.splice(index, 1);
+    }
+}
+/**
+ * Update the status of an MCP server
+ */
+function updateMCPServerStatus(serverName, status) {
+    mcpServerStatusesInternal.set(serverName, status);
+    // Notify all listeners
+    for (const listener of statusChangeListeners) {
+        listener(serverName, status);
+    }
+}
+/**
+ * Get the current status of an MCP server
+ */
+export function getMCPServerStatus(serverName) {
+    return (mcpServerStatusesInternal.get(serverName) || MCPServerStatus.DISCONNECTED);
+}
+/**
+ * Get all MCP server statuses
+ */
+export function getAllMCPServerStatuses() {
+    return new Map(mcpServerStatusesInternal);
+}
+/**
+ * Get the current MCP discovery state
+ */
+export function getMCPDiscoveryState() {
+    return mcpDiscoveryState;
+}
+/**
+ * Discovers tools from all configured MCP servers and registers them with the tool registry.
+ * It orchestrates the connection and discovery process for each server defined in the
+ * configuration, as well as any server specified via a command-line argument.
+ *
+ * @param mcpServers A record of named MCP server configurations.
+ * @param mcpServerCommand An optional command string for a dynamically specified MCP server.
+ * @param toolRegistry The central registry where discovered tools will be registered.
+ * @returns A promise that resolves when the discovery process has been attempted for all servers.
+ */
+export async function discoverMcpTools(mcpServers, mcpServerCommand, toolRegistry, debugMode) {
+    mcpDiscoveryState = MCPDiscoveryState.IN_PROGRESS;
+    try {
+        mcpServers = populateMcpServerCommand(mcpServers, mcpServerCommand);
+        const discoveryPromises = Object.entries(mcpServers).map(([mcpServerName, mcpServerConfig]) => connectAndDiscover(mcpServerName, mcpServerConfig, toolRegistry, debugMode));
+        await Promise.all(discoveryPromises);
+    }
+    finally {
+        mcpDiscoveryState = MCPDiscoveryState.COMPLETED;
+    }
+}
+/** Visible for Testing */
+export function populateMcpServerCommand(mcpServers, mcpServerCommand) {
+    if (mcpServerCommand) {
+        const cmd = mcpServerCommand;
+        const args = parse(cmd, process.env);
+        if (args.some((arg) => typeof arg !== 'string')) {
+            throw new Error('failed to parse mcpServerCommand: ' + cmd);
+        }
+        // use generic server name 'mcp'
+        mcpServers['mcp'] = {
+            command: args[0],
+            args: args.slice(1),
+        };
+    }
+    return mcpServers;
+}
+/**
+ * Connects to an MCP server and discovers available tools, registering them with the tool registry.
+ * This function handles the complete lifecycle of connecting to a server, discovering tools,
+ * and cleaning up resources if no tools are found.
+ *
+ * @param mcpServerName The name identifier for this MCP server
+ * @param mcpServerConfig Configuration object containing connection details
+ * @param toolRegistry The registry to register discovered tools with
+ * @returns Promise that resolves when discovery is complete
+ */
+export async function connectAndDiscover(mcpServerName, mcpServerConfig, toolRegistry, debugMode) {
+    updateMCPServerStatus(mcpServerName, MCPServerStatus.CONNECTING);
+    try {
+        const mcpClient = await connectToMcpServer(mcpServerName, mcpServerConfig, debugMode);
+        try {
+            updateMCPServerStatus(mcpServerName, MCPServerStatus.CONNECTED);
+            mcpClient.onerror = (error) => {
+                console.error(`MCP ERROR (${mcpServerName}):`, error.toString());
+                updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
+            };
+            if (mcpServerName === IDE_SERVER_NAME) {
+                mcpClient.setNotificationHandler(ActiveFileNotificationSchema, (notification) => {
+                    ideContext.setActiveFileContext(notification.params);
+                });
+            }
+            const tools = await discoverTools(mcpServerName, mcpServerConfig, mcpClient);
+            for (const tool of tools) {
+                toolRegistry.registerTool(tool);
+            }
+        }
+        catch (error) {
+            mcpClient.close();
+            throw error;
+        }
+    }
+    catch (error) {
+        console.error(`Error connecting to MCP server '${mcpServerName}':`, error);
+        updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
+    }
+}
+/**
+ * Discovers and sanitizes tools from a connected MCP client.
+ * It retrieves function declarations from the client, filters out disabled tools,
+ * generates valid names for them, and wraps them in `DiscoveredMCPTool` instances.
+ *
+ * @param mcpServerName The name of the MCP server.
+ * @param mcpServerConfig The configuration for the MCP server.
+ * @param mcpClient The active MCP client instance.
+ * @returns A promise that resolves to an array of discovered and enabled tools.
+ * @throws An error if no enabled tools are found or if the server provides invalid function declarations.
+ */
+export async function discoverTools(mcpServerName, mcpServerConfig, mcpClient) {
+    try {
+        const mcpCallableTool = mcpToTool(mcpClient);
+        const tool = await mcpCallableTool.tool();
+        if (!Array.isArray(tool.functionDeclarations)) {
+            throw new Error(`Server did not return valid function declarations.`);
+        }
+        const discoveredTools = [];
+        for (const funcDecl of tool.functionDeclarations) {
+            if (!isEnabled(funcDecl, mcpServerName, mcpServerConfig)) {
+                continue;
+            }
+            const toolNameForModel = generateValidName(funcDecl, mcpServerName);
+            sanitizeParameters(funcDecl.parameters);
+            discoveredTools.push(new DiscoveredMCPTool(mcpCallableTool, mcpServerName, toolNameForModel, funcDecl.description ?? '', funcDecl.parameters ?? { type: Type.OBJECT, properties: {} }, funcDecl.name, mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC, mcpServerConfig.trust));
+        }
+        if (discoveredTools.length === 0) {
+            throw Error('No enabled tools found');
+        }
+        return discoveredTools;
+    }
+    catch (error) {
+        throw new Error(`Error discovering tools: ${error}`);
+    }
+}
+/**
+ * Creates and connects an MCP client to a server based on the provided configuration.
+ * It determines the appropriate transport (Stdio, SSE, or Streamable HTTP) and
+ * establishes a connection. It also applies a patch to handle request timeouts.
+ *
+ * @param mcpServerName The name of the MCP server, used for logging and identification.
+ * @param mcpServerConfig The configuration specifying how to connect to the server.
+ * @returns A promise that resolves to a connected MCP `Client` instance.
+ * @throws An error if the connection fails or the configuration is invalid.
+ */
+export async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMode) {
+    const mcpClient = new Client({
+        name: 'gemini-cli-mcp-client',
+        version: '0.0.1',
+    });
+    // patch Client.callTool to use request timeout as genai McpCallTool.callTool does not do it
+    // TODO: remove this hack once GenAI SDK does callTool with request options
+    if ('callTool' in mcpClient) {
+        const origCallTool = mcpClient.callTool.bind(mcpClient);
+        mcpClient.callTool = function (params, resultSchema, options) {
+            return origCallTool(params, resultSchema, {
+                ...options,
+                timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
+            });
+        };
+    }
+    try {
+        const transport = createTransport(mcpServerName, mcpServerConfig, debugMode);
+        try {
+            await mcpClient.connect(transport, {
+                timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
+            });
+            return mcpClient;
+        }
+        catch (error) {
+            await transport.close();
+            throw error;
+        }
+    }
+    catch (error) {
+        // Create a safe config object that excludes sensitive information
+        const safeConfig = {
+            command: mcpServerConfig.command,
+            url: mcpServerConfig.url,
+            httpUrl: mcpServerConfig.httpUrl,
+            cwd: mcpServerConfig.cwd,
+            timeout: mcpServerConfig.timeout,
+            trust: mcpServerConfig.trust,
+            // Exclude args, env, and headers which may contain sensitive data
+        };
+        let errorString = `failed to start or connect to MCP server '${mcpServerName}' ` +
+            `${JSON.stringify(safeConfig)}; \n${error}`;
+        if (process.env.SANDBOX) {
+            errorString += `\nMake sure it is available in the sandbox`;
+        }
+        throw new Error(errorString);
+    }
+}
+/** Visible for Testing */
+export function createTransport(mcpServerName, mcpServerConfig, debugMode) {
+    if (mcpServerConfig.httpUrl) {
+        const transportOptions = {};
+        if (mcpServerConfig.headers) {
+            transportOptions.requestInit = {
+                headers: mcpServerConfig.headers,
+            };
+        }
+        return new StreamableHTTPClientTransport(new URL(mcpServerConfig.httpUrl), transportOptions);
+    }
+    if (mcpServerConfig.url) {
+        const transportOptions = {};
+        if (mcpServerConfig.headers) {
+            transportOptions.requestInit = {
+                headers: mcpServerConfig.headers,
+            };
+        }
+        return new SSEClientTransport(new URL(mcpServerConfig.url), transportOptions);
+    }
+    if (mcpServerConfig.command) {
+        const transport = new StdioClientTransport({
+            command: mcpServerConfig.command,
+            args: mcpServerConfig.args || [],
+            env: {
+                ...process.env,
+                ...(mcpServerConfig.env || {}),
+            },
+            cwd: mcpServerConfig.cwd,
+            stderr: 'pipe',
+        });
+        if (debugMode) {
+            transport.stderr.on('data', (data) => {
+                const stderrStr = data.toString().trim();
+                console.debug(`[DEBUG] [MCP STDERR (${mcpServerName})]: `, stderrStr);
+            });
+        }
+        return transport;
+    }
+    throw new Error(`Invalid configuration: missing httpUrl (for Streamable HTTP), url (for SSE), and command (for stdio).`);
+}
+/** Visible for testing */
+export function generateValidName(funcDecl, mcpServerName) {
+    // Replace invalid characters (based on 400 error message from Gemini API) with underscores
+    let validToolname = funcDecl.name.replace(/[^a-zA-Z0-9_.-]/g, '_');
+    // Prepend MCP server name to avoid conflicts with other tools
+    validToolname = mcpServerName + '__' + validToolname;
+    // If longer than 63 characters, replace middle with '___'
+    // (Gemini API says max length 64, but actual limit seems to be 63)
+    if (validToolname.length > 63) {
+        validToolname =
+            validToolname.slice(0, 28) + '___' + validToolname.slice(-32);
+    }
+    return validToolname;
+}
+/** Visible for testing */
+export function isEnabled(funcDecl, mcpServerName, mcpServerConfig) {
+    if (!funcDecl.name) {
+        console.warn(`Discovered a function declaration without a name from MCP server '${mcpServerName}'. Skipping.`);
+        return false;
+    }
+    const { includeTools, excludeTools } = mcpServerConfig;
+    // excludeTools takes precedence over includeTools
+    if (excludeTools && excludeTools.includes(funcDecl.name)) {
+        return false;
+    }
+    return (!includeTools ||
+        includeTools.some((tool) => tool === funcDecl.name || tool.startsWith(`${funcDecl.name}(`)));
+}
+//# sourceMappingURL=mcp-client.js.map

package/dist/src/tools/mcp-client.js.map

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

package/dist/src/tools/mcp-client.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/tools/mcp-client.test.js

@@ -0,0 +1,227 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { afterEach, describe, expect, it, vi, beforeEach } from 'vitest';
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { populateMcpServerCommand, createTransport, generateValidName, isEnabled, discoverTools, } from './mcp-client.js';
+import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
+import * as SdkClientStdioLib from '@modelcontextprotocol/sdk/client/stdio.js';
+import * as GenAiLib from '@google/genai';
+vi.mock('@modelcontextprotocol/sdk/client/stdio.js');
+vi.mock('@modelcontextprotocol/sdk/client/index.js');
+vi.mock('@google/genai');
+describe('mcp-client', () => {
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    describe('discoverTools', () => {
+        it('should discover tools', async () => {
+            const mockedClient = {};
+            const mockedMcpToTool = vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
+                tool: () => ({
+                    functionDeclarations: [
+                        {
+                            name: 'testFunction',
+                        },
+                    ],
+                }),
+            });
+            const tools = await discoverTools('test-server', {}, mockedClient);
+            expect(tools.length).toBe(1);
+            expect(mockedMcpToTool).toHaveBeenCalledOnce();
+        });
+    });
+    describe('appendMcpServerCommand', () => {
+        it('should do nothing if no MCP servers or command are configured', () => {
+            const out = populateMcpServerCommand({}, undefined);
+            expect(out).toEqual({});
+        });
+        it('should discover tools via mcpServerCommand', () => {
+            const commandString = 'command --arg1 value1';
+            const out = populateMcpServerCommand({}, commandString);
+            expect(out).toEqual({
+                mcp: {
+                    command: 'command',
+                    args: ['--arg1', 'value1'],
+                },
+            });
+        });
+        it('should handle error if mcpServerCommand parsing fails', () => {
+            expect(() => populateMcpServerCommand({}, 'derp && herp')).toThrowError();
+        });
+    });
+    describe('createTransport', () => {
+        const originalEnv = process.env;
+        beforeEach(() => {
+            vi.resetModules();
+            process.env = {};
+        });
+        afterEach(() => {
+            process.env = originalEnv;
+        });
+        describe('should connect via httpUrl', () => {
+            it('without headers', async () => {
+                const transport = createTransport('test-server', {
+                    httpUrl: 'http://test-server',
+                }, false);
+                expect(transport).toEqual(new StreamableHTTPClientTransport(new URL('http://test-server'), {}));
+            });
+            it('with headers', async () => {
+                const transport = createTransport('test-server', {
+                    httpUrl: 'http://test-server',
+                    headers: { Authorization: 'derp' },
+                }, false);
+                expect(transport).toEqual(new StreamableHTTPClientTransport(new URL('http://test-server'), {
+                    requestInit: {
+                        headers: { Authorization: 'derp' },
+                    },
+                }));
+            });
+        });
+        describe('should connect via url', () => {
+            it('without headers', async () => {
+                const transport = createTransport('test-server', {
+                    url: 'http://test-server',
+                }, false);
+                expect(transport).toEqual(new SSEClientTransport(new URL('http://test-server'), {}));
+            });
+            it('with headers', async () => {
+                const transport = createTransport('test-server', {
+                    url: 'http://test-server',
+                    headers: { Authorization: 'derp' },
+                }, false);
+                expect(transport).toEqual(new SSEClientTransport(new URL('http://test-server'), {
+                    requestInit: {
+                        headers: { Authorization: 'derp' },
+                    },
+                }));
+            });
+        });
+        it('should connect via command', () => {
+            const mockedTransport = vi.mocked(SdkClientStdioLib.StdioClientTransport);
+            createTransport('test-server', {
+                command: 'test-command',
+                args: ['--foo', 'bar'],
+                env: { FOO: 'bar' },
+                cwd: 'test/cwd',
+            }, false);
+            expect(mockedTransport).toHaveBeenCalledWith({
+                command: 'test-command',
+                args: ['--foo', 'bar'],
+                cwd: 'test/cwd',
+                env: { FOO: 'bar' },
+                stderr: 'pipe',
+            });
+        });
+    });
+    describe('generateValidName', () => {
+        it('should return a valid name for a simple function', () => {
+            const funcDecl = { name: 'myFunction' };
+            const serverName = 'myServer';
+            const result = generateValidName(funcDecl, serverName);
+            expect(result).toBe('myServer__myFunction');
+        });
+        it('should prepend the server name', () => {
+            const funcDecl = { name: 'anotherFunction' };
+            const serverName = 'production-server';
+            const result = generateValidName(funcDecl, serverName);
+            expect(result).toBe('production-server__anotherFunction');
+        });
+        it('should replace invalid characters with underscores', () => {
+            const funcDecl = { name: 'invalid-name with spaces' };
+            const serverName = 'test_server';
+            const result = generateValidName(funcDecl, serverName);
+            expect(result).toBe('test_server__invalid-name_with_spaces');
+        });
+        it('should truncate long names', () => {
+            const funcDecl = {
+                name: 'a_very_long_function_name_that_will_definitely_exceed_the_limit',
+            };
+            const serverName = 'a_long_server_name';
+            const result = generateValidName(funcDecl, serverName);
+            expect(result.length).toBe(63);
+            expect(result).toBe('a_long_server_name__a_very_l___will_definitely_exceed_the_limit');
+        });
+        it('should handle names with only invalid characters', () => {
+            const funcDecl = { name: '!@#$%^&*()' };
+            const serverName = 'special-chars';
+            const result = generateValidName(funcDecl, serverName);
+            expect(result).toBe('special-chars____________');
+        });
+        it('should handle names that are already valid', () => {
+            const funcDecl = { name: 'already_valid' };
+            const serverName = 'validator';
+            const result = generateValidName(funcDecl, serverName);
+            expect(result).toBe('validator__already_valid');
+        });
+        it('should handle names with leading/trailing invalid characters', () => {
+            const funcDecl = { name: '-_invalid-_' };
+            const serverName = 'trim-test';
+            const result = generateValidName(funcDecl, serverName);
+            expect(result).toBe('trim-test__-_invalid-_');
+        });
+        it('should handle names that are exactly 63 characters long', () => {
+            const longName = 'a'.repeat(45);
+            const funcDecl = { name: longName };
+            const serverName = 'server';
+            const result = generateValidName(funcDecl, serverName);
+            expect(result).toBe(`server__${longName}`);
+            expect(result.length).toBe(53);
+        });
+        it('should handle names that are exactly 64 characters long', () => {
+            const longName = 'a'.repeat(55);
+            const funcDecl = { name: longName };
+            const serverName = 'server';
+            const result = generateValidName(funcDecl, serverName);
+            expect(result.length).toBe(63);
+            expect(result).toBe('server__aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
+        });
+        it('should handle names that are longer than 64 characters', () => {
+            const longName = 'a'.repeat(100);
+            const funcDecl = { name: longName };
+            const serverName = 'long-server';
+            const result = generateValidName(funcDecl, serverName);
+            expect(result.length).toBe(63);
+            expect(result).toBe('long-server__aaaaaaaaaaaaaaa___aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
+        });
+    });
+    describe('isEnabled', () => {
+        const funcDecl = { name: 'myTool' };
+        const serverName = 'myServer';
+        it('should return true if no include or exclude lists are provided', () => {
+            const mcpServerConfig = {};
+            expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(true);
+        });
+        it('should return false if the tool is in the exclude list', () => {
+            const mcpServerConfig = { excludeTools: ['myTool'] };
+            expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(false);
+        });
+        it('should return true if the tool is in the include list', () => {
+            const mcpServerConfig = { includeTools: ['myTool'] };
+            expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(true);
+        });
+        it('should return true if the tool is in the include list with parentheses', () => {
+            const mcpServerConfig = { includeTools: ['myTool()'] };
+            expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(true);
+        });
+        it('should return false if the include list exists but does not contain the tool', () => {
+            const mcpServerConfig = { includeTools: ['anotherTool'] };
+            expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(false);
+        });
+        it('should return false if the tool is in both the include and exclude lists', () => {
+            const mcpServerConfig = {
+                includeTools: ['myTool'],
+                excludeTools: ['myTool'],
+            };
+            expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(false);
+        });
+        it('should return false if the function declaration has no name', () => {
+            const namelessFuncDecl = {};
+            const mcpServerConfig = {};
+            expect(isEnabled(namelessFuncDecl, serverName, mcpServerConfig)).toBe(false);
+        });
+    });
+});
+//# sourceMappingURL=mcp-client.test.js.map

package/dist/src/tools/mcp-client.test.js.map

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

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

@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { BaseTool, ToolResult, ToolCallConfirmationDetails } from './tools.js';
+import { CallableTool, Schema } from '@google/genai';
+type ToolParams = Record<string, unknown>;
+export declare class DiscoveredMCPTool extends BaseTool<ToolParams, ToolResult> {
+    private readonly mcpTool;
+    readonly serverName: string;
+    readonly name: string;
+    readonly description: string;
+    readonly parameterSchema: Schema;
+    readonly serverToolName: string;
+    readonly timeout?: number | undefined;
+    readonly trust?: boolean | undefined;
+    private static readonly allowlist;
+    constructor(mcpTool: CallableTool, serverName: string, name: string, description: string, parameterSchema: Schema, serverToolName: string, timeout?: number | undefined, trust?: boolean | undefined);
+    shouldConfirmExecute(_params: ToolParams, _abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails | false>;
+    execute(params: ToolParams): Promise<ToolResult>;
+}
+export {};