@machina.ai/cell-cli-core 1.10.0-rc1 → 1.13.0-rc1

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

@@ -3,8 +3,11 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { isManagedMcpConfig, getManagedMcpConfig } from '../mcp/mcpLauncher.js';
 import { McpClient, MCPDiscoveryState, populateMcpServerCommand, } from './mcp-client.js';
 import { getErrorMessage } from '../utils/errors.js';
+import { coreEvents } from '../utils/events.js';
+import { debugLogger } from '../utils/debugLogger.js';
 /**
  * Manages the lifecycle of multiple MCP clients, including local child processes.
  * This class is responsible for starting, stopping, and discovering tools from
@@ -12,53 +15,218 @@ import { getErrorMessage } from '../utils/errors.js';
  */
 export class McpClientManager {
     clients = new Map();
-    mcpServers;
-    mcpServerCommand;
     toolRegistry;
-    promptRegistry;
-    debugMode;
-    workspaceContext;
+    cliConfig;
+    // If we have ongoing MCP client discovery, this completes once that is done.
+    discoveryPromise;
     discoveryState = MCPDiscoveryState.NOT_STARTED;
     eventEmitter;
-    constructor(mcpServers, mcpServerCommand, toolRegistry, promptRegistry, debugMode, workspaceContext, eventEmitter) {
-        this.mcpServers = mcpServers;
-        this.mcpServerCommand = mcpServerCommand;
+    blockedMcpServers = [];
+    constructor(toolRegistry, cliConfig, eventEmitter) {
         this.toolRegistry = toolRegistry;
-        this.promptRegistry = promptRegistry;
-        this.debugMode = debugMode;
-        this.workspaceContext = workspaceContext;
+        this.cliConfig = cliConfig;
         this.eventEmitter = eventEmitter;
     }
+    getBlockedMcpServers() {
+        return this.blockedMcpServers;
+    }
+    /**
+     * For all the MCP servers associated with this extension:
+     *
+     *    - Removes all its MCP servers from the global configuration object.
+     *    - Disconnects all MCP clients from their servers.
+     *    - Updates the Gemini chat configuration to load the new tools.
+     */
+    async stopExtension(extension) {
+        debugLogger.log(`Unloading extension: ${extension.name}`);
+        await Promise.all(Object.keys(extension.mcpServers ?? {}).map(this.disconnectClient.bind(this)));
+    }
+    /**
+     * For all the MCP servers associated with this extension:
+     *
+     *    - Adds all its MCP servers to the global configuration object.
+     *    - Connects MCP clients to each server and discovers their tools.
+     *    - Updates the Gemini chat configuration to load the new tools.
+     */
+    async startExtension(extension) {
+        debugLogger.log(`Loading extension: ${extension.name}`);
+        await Promise.all(Object.entries(extension.mcpServers ?? {}).map(([name, config]) => this.maybeDiscoverMcpServer(name, {
+            ...config,
+            extension,
+        })));
+    }
+    isAllowedMcpServer(name) {
+        const allowedNames = this.cliConfig.getAllowedMcpServers();
+        if (allowedNames &&
+            allowedNames.length > 0 &&
+            allowedNames.indexOf(name) === -1) {
+            return false;
+        }
+        const blockedNames = this.cliConfig.getBlockedMcpServers();
+        if (blockedNames &&
+            blockedNames.length > 0 &&
+            blockedNames.indexOf(name) !== -1) {
+            return false;
+        }
+        return true;
+    }
+    async disconnectClient(name) {
+        const existing = this.clients.get(name);
+        if (existing) {
+            try {
+                this.clients.delete(name);
+                this.eventEmitter?.emit('mcp-client-update', this.clients);
+                await existing.disconnect();
+            }
+            catch (error) {
+                debugLogger.warn(`Error stopping client '${name}': ${getErrorMessage(error)}`);
+            }
+            finally {
+                // This is required to update the content generator configuration with the
+                // new tool configuration.
+                const geminiClient = this.cliConfig.getGeminiClient();
+                if (geminiClient.isInitialized()) {
+                    await geminiClient.setTools();
+                }
+            }
+        }
+    }
+    maybeDiscoverMcpServer(name, config) {
+        if (!this.isAllowedMcpServer(name)) {
+            if (!this.blockedMcpServers.find((s) => s.name === name)) {
+                this.blockedMcpServers?.push({
+                    name,
+                    extensionName: config.extension?.name ?? '',
+                });
+            }
+            return;
+        }
+        if (!this.cliConfig.isTrustedFolder()) {
+            return;
+        }
+        if (config.extension && !config.extension.isActive) {
+            return;
+        }
+        const existing = this.clients.get(name);
+        if (existing && existing.getServerConfig().extension !== config.extension) {
+            const extensionText = config.extension
+                ? ` from extension "${config.extension.name}"`
+                : '';
+            debugLogger.warn(`Skipping MCP config for server with name "${name}"${extensionText} as it already exists.`);
+            return;
+        }
+        const currentDiscoveryPromise = new Promise((resolve, _reject) => {
+            (async () => {
+                try {
+                    if (existing) {
+                        await existing.disconnect();
+                    }
+                    const client = existing ??
+                        new McpClient(name, config, this.toolRegistry, this.cliConfig.getPromptRegistry(), this.cliConfig.getWorkspaceContext(), this.cliConfig.getDebugMode());
+                    if (!existing) {
+                        this.clients.set(name, client);
+                        this.eventEmitter?.emit('mcp-client-update', this.clients);
+                    }
+                    try {
+                        await client.connect();
+                        await client.discover(this.cliConfig);
+                        this.eventEmitter?.emit('mcp-client-update', this.clients);
+                    }
+                    catch (error) {
+                        this.eventEmitter?.emit('mcp-client-update', this.clients);
+                        // Log the error but don't let a single failed server stop the others
+                        coreEvents.emitFeedback('error', `Error during discovery for server '${name}': ${getErrorMessage(error)}`, error);
+                    }
+                }
+                finally {
+                    // This is required to update the content generator configuration with the
+                    // new tool configuration.
+                    const geminiClient = this.cliConfig.getGeminiClient();
+                    if (geminiClient.isInitialized()) {
+                        await geminiClient.setTools();
+                    }
+                    resolve();
+                }
+            })();
+        });
+        if (this.discoveryPromise) {
+            this.discoveryPromise = this.discoveryPromise.then(() => currentDiscoveryPromise);
+        }
+        else {
+            this.discoveryState = MCPDiscoveryState.IN_PROGRESS;
+            this.discoveryPromise = currentDiscoveryPromise;
+        }
+        this.eventEmitter?.emit('mcp-client-update', this.clients);
+        const currentPromise = this.discoveryPromise;
+        currentPromise.then((_) => {
+            // If we are the last recorded discoveryPromise, then we are done, reset
+            // the world.
+            if (currentPromise === this.discoveryPromise) {
+                this.discoveryPromise = undefined;
+                this.discoveryState = MCPDiscoveryState.COMPLETED;
+            }
+        });
+        return currentPromise;
+    }
     /**
-     * Initiates the tool discovery process for all configured MCP servers.
+     * Initiates the tool discovery process for all configured MCP servers (via
+     * gemini settings or command line arguments).
+     *
      * It connects to each server, discovers its available tools, and registers
      * them with the `ToolRegistry`.
+     *
+     * For any server which is already connected, it will first be disconnected.
+     *
+     * This does NOT load extension MCP servers - this happens when the
+     * ExtensionLoader explicitly calls `loadExtension`.
      */
-    async discoverAllMcpTools(cliConfig) {
-        if (!cliConfig.isTrustedFolder()) {
+    async startConfiguredMcpServers() {
+        if (!this.cliConfig.isTrustedFolder()) {
             return;
         }
-        await this.stop();
-        const servers = populateMcpServerCommand(this.mcpServers, this.mcpServerCommand);
-        this.discoveryState = MCPDiscoveryState.IN_PROGRESS;
+        const servers = populateMcpServerCommand(this.cliConfig.getMcpServers() || {}, this.cliConfig.getMcpServerCommand());
+        for (const name in servers) {
+            if (Object.hasOwn(servers, name)) {
+                const config = servers[name];
+                if (isManagedMcpConfig(config) && config.managed) {
+                    try {
+                        servers[name] = await getManagedMcpConfig(name);
+                    }
+                    catch (error) {
+                        const errorMessage = error instanceof Error
+                            ? error.message
+                            : `Failed to bootstrap managed MCP server '${name}'. See logs for details.`;
+                        coreEvents.emitFeedback('error', errorMessage, error);
+                        delete servers[name]; // Don't try to start a failed server.
+                    }
+                }
+            }
+        }
         this.eventEmitter?.emit('mcp-client-update', this.clients);
-        const discoveryPromises = Object.entries(servers).map(async ([name, config]) => {
-            const client = new McpClient(name, config, this.toolRegistry, this.promptRegistry, this.workspaceContext, this.debugMode);
-            this.clients.set(name, client);
-            this.eventEmitter?.emit('mcp-client-update', this.clients);
+        await Promise.all(Object.entries(servers).map(([name, config]) => this.maybeDiscoverMcpServer(name, config)));
+    }
+    /**
+     * Restarts all active MCP Clients.
+     */
+    async restart() {
+        await Promise.all(Array.from(this.clients.entries()).map(async ([name, client]) => {
             try {
-                await client.connect();
-                await client.discover(cliConfig);
-                this.eventEmitter?.emit('mcp-client-update', this.clients);
+                await this.maybeDiscoverMcpServer(name, client.getServerConfig());
             }
             catch (error) {
-                this.eventEmitter?.emit('mcp-client-update', this.clients);
-                // Log the error but don't let a single failed server stop the others
-                console.error(`Error during discovery for server '${name}': ${getErrorMessage(error)}`);
+                debugLogger.error(`Error restarting client '${name}': ${getErrorMessage(error)}`);
             }
-        });
-        await Promise.all(discoveryPromises);
-        this.discoveryState = MCPDiscoveryState.COMPLETED;
+        }));
+    }
+    /**
+     * Restart a single MCP server by name.
+     */
+    async restartServer(name) {
+        const client = this.clients.get(name);
+        if (!client) {
+            throw new Error(`No MCP server registered with the name "${name}"`);
+        }
+        await this.maybeDiscoverMcpServer(name, client.getServerConfig());
     }
     /**
      * Stops all running local MCP servers and closes all client connections.
@@ -70,7 +238,7 @@ export class McpClientManager {
                 await client.disconnect();
             }
             catch (error) {
-                console.error(`Error stopping client '${name}': ${getErrorMessage(error)}`);
+                coreEvents.emitFeedback('error', `Error stopping client '${name}':`, error);
             }
         });
         await Promise.all(disconnectionPromises);
@@ -79,5 +247,15 @@ export class McpClientManager {
     getDiscoveryState() {
         return this.discoveryState;
     }
+    /**
+     * All of the MCP server configurations currently loaded.
+     */
+    getMcpServers() {
+        const mcpServers = {};
+        for (const [name, client] of this.clients.entries()) {
+            mcpServers[name] = client.getServerConfig();
+        }
+        return mcpServers;
+    }
 }
 //# sourceMappingURL=mcp-client-manager.js.map

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

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

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

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { afterEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi, } from 'vitest';
 import { McpClientManager } from './mcp-client-manager.js';
 import { McpClient } from './mcp-client.js';
 vi.mock('./mcp-client.js', async () => {
@@ -11,48 +11,155 @@ vi.mock('./mcp-client.js', async () => {
     return {
         ...originalModule,
         McpClient: vi.fn(),
-        populateMcpServerCommand: vi.fn(() => ({
-            'test-server': {},
-        })),
     };
 });
 describe('McpClientManager', () => {
-    afterEach(() => {
-        vi.restoreAllMocks();
-    });
-    it('should discover tools from all servers', async () => {
-        const mockedMcpClient = {
+    let mockedMcpClient;
+    let mockConfig;
+    beforeEach(() => {
+        mockedMcpClient = vi.mockObject({
             connect: vi.fn(),
             discover: vi.fn(),
             disconnect: vi.fn(),
             getStatus: vi.fn(),
-        };
+            getServerConfig: vi.fn(),
+        });
         vi.mocked(McpClient).mockReturnValue(mockedMcpClient);
-        const manager = new McpClientManager({
+        mockConfig = vi.mockObject({
+            isTrustedFolder: vi.fn().mockReturnValue(true),
+            getMcpServers: vi.fn().mockReturnValue({}),
+            getPromptRegistry: () => { },
+            getDebugMode: () => false,
+            getWorkspaceContext: () => { },
+            getAllowedMcpServers: vi.fn().mockReturnValue([]),
+            getBlockedMcpServers: vi.fn().mockReturnValue([]),
+            getMcpServerCommand: vi.fn().mockReturnValue(''),
+            getGeminiClient: vi.fn().mockReturnValue({
+                isInitialized: vi.fn(),
+            }),
+        });
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('should discover tools from all configured', async () => {
+        mockConfig.getMcpServers.mockReturnValue({
             'test-server': {},
-        }, '', {}, {}, false, {});
-        await manager.discoverAllMcpTools({
-            isTrustedFolder: () => true,
         });
+        const manager = new McpClientManager({}, mockConfig);
+        await manager.startConfiguredMcpServers();
         expect(mockedMcpClient.connect).toHaveBeenCalledOnce();
         expect(mockedMcpClient.discover).toHaveBeenCalledOnce();
     });
     it('should not discover tools if folder is not trusted', async () => {
-        const mockedMcpClient = {
-            connect: vi.fn(),
-            discover: vi.fn(),
-            disconnect: vi.fn(),
-            getStatus: vi.fn(),
-        };
-        vi.mocked(McpClient).mockReturnValue(mockedMcpClient);
-        const manager = new McpClientManager({
+        mockConfig.getMcpServers.mockReturnValue({
+            'test-server': {},
+        });
+        mockConfig.isTrustedFolder.mockReturnValue(false);
+        const manager = new McpClientManager({}, mockConfig);
+        await manager.startConfiguredMcpServers();
+        expect(mockedMcpClient.connect).not.toHaveBeenCalled();
+        expect(mockedMcpClient.discover).not.toHaveBeenCalled();
+    });
+    it('should not start blocked servers', async () => {
+        mockConfig.getMcpServers.mockReturnValue({
             'test-server': {},
-        }, '', {}, {}, false, {});
-        await manager.discoverAllMcpTools({
-            isTrustedFolder: () => false,
         });
+        mockConfig.getBlockedMcpServers.mockReturnValue(['test-server']);
+        const manager = new McpClientManager({}, mockConfig);
+        await manager.startConfiguredMcpServers();
         expect(mockedMcpClient.connect).not.toHaveBeenCalled();
         expect(mockedMcpClient.discover).not.toHaveBeenCalled();
     });
+    it('should only start allowed servers if allow list is not empty', async () => {
+        mockConfig.getMcpServers.mockReturnValue({
+            'test-server': {},
+            'another-server': {},
+        });
+        mockConfig.getAllowedMcpServers.mockReturnValue(['another-server']);
+        const manager = new McpClientManager({}, mockConfig);
+        await manager.startConfiguredMcpServers();
+        expect(mockedMcpClient.connect).toHaveBeenCalledOnce();
+        expect(mockedMcpClient.discover).toHaveBeenCalledOnce();
+    });
+    it('should start servers from extensions', async () => {
+        const manager = new McpClientManager({}, mockConfig);
+        await manager.startExtension({
+            name: 'test-extension',
+            mcpServers: {
+                'test-server': {},
+            },
+            isActive: true,
+            version: '1.0.0',
+            path: '/some-path',
+            contextFiles: [],
+            id: '123',
+        });
+        expect(mockedMcpClient.connect).toHaveBeenCalledOnce();
+        expect(mockedMcpClient.discover).toHaveBeenCalledOnce();
+    });
+    it('should not start servers from disabled extensions', async () => {
+        const manager = new McpClientManager({}, mockConfig);
+        await manager.startExtension({
+            name: 'test-extension',
+            mcpServers: {
+                'test-server': {},
+            },
+            isActive: false,
+            version: '1.0.0',
+            path: '/some-path',
+            contextFiles: [],
+            id: '123',
+        });
+        expect(mockedMcpClient.connect).not.toHaveBeenCalled();
+        expect(mockedMcpClient.discover).not.toHaveBeenCalled();
+    });
+    it('should add blocked servers to the blockedMcpServers list', async () => {
+        mockConfig.getMcpServers.mockReturnValue({
+            'test-server': {},
+        });
+        mockConfig.getBlockedMcpServers.mockReturnValue(['test-server']);
+        const manager = new McpClientManager({}, mockConfig);
+        await manager.startConfiguredMcpServers();
+        expect(manager.getBlockedMcpServers()).toEqual([
+            { name: 'test-server', extensionName: '' },
+        ]);
+    });
+    describe('restart', () => {
+        it('should restart all running servers', async () => {
+            mockConfig.getMcpServers.mockReturnValue({
+                'test-server': {},
+            });
+            mockedMcpClient.getServerConfig.mockReturnValue({});
+            const manager = new McpClientManager({}, mockConfig);
+            await manager.startConfiguredMcpServers();
+            expect(mockedMcpClient.connect).toHaveBeenCalledTimes(1);
+            expect(mockedMcpClient.discover).toHaveBeenCalledTimes(1);
+            await manager.restart();
+            expect(mockedMcpClient.disconnect).toHaveBeenCalledTimes(1);
+            expect(mockedMcpClient.connect).toHaveBeenCalledTimes(2);
+            expect(mockedMcpClient.discover).toHaveBeenCalledTimes(2);
+        });
+    });
+    describe('restartServer', () => {
+        it('should restart the specified server', async () => {
+            mockConfig.getMcpServers.mockReturnValue({
+                'test-server': {},
+            });
+            mockedMcpClient.getServerConfig.mockReturnValue({});
+            const manager = new McpClientManager({}, mockConfig);
+            await manager.startConfiguredMcpServers();
+            expect(mockedMcpClient.connect).toHaveBeenCalledTimes(1);
+            expect(mockedMcpClient.discover).toHaveBeenCalledTimes(1);
+            await manager.restartServer('test-server');
+            expect(mockedMcpClient.disconnect).toHaveBeenCalledTimes(1);
+            expect(mockedMcpClient.connect).toHaveBeenCalledTimes(2);
+            expect(mockedMcpClient.discover).toHaveBeenCalledTimes(2);
+        });
+        it('should throw an error if the server does not exist', async () => {
+            const manager = new McpClientManager({}, mockConfig);
+            await expect(manager.restartServer('non-existent')).rejects.toThrow('No MCP server registered with the name "non-existent"');
+        });
+    });
 });
 //# sourceMappingURL=mcp-client-manager.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"mcp-client-manager.test.js","sourceRoot":"","sources":["../../../src/tools/mcp-client-manager.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM5C,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,IAAI,EAAE;IACpC,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAChE,OAAO;QACL,GAAG,cAAc;QACjB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;QAClB,wBAAwB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YACrC,aAAa,EAAE,EAAE;SAClB,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACtD,MAAM,eAAe,GAAG;YACtB,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;YAChB,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE;YACjB,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;YACnB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;SACnB,CAAC;QACF,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,eAAe,CAClC,eAAuC,CACxC,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,gBAAgB,CAClC;YACE,aAAa,EAAE,EAAE;SAClB,EACD,EAAE,EACF,EAAkB,EAClB,EAAoB,EACpB,KAAK,EACL,EAAsB,CACvB,CAAC;QACF,MAAM,OAAO,CAAC,mBAAmB,CAAC;YAChC,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI;SACP,CAAC,CAAC;QACxB,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,oBAAoB,EAAE,CAAC;QACvD,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,oBAAoB,EAAE,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,MAAM,eAAe,GAAG;YACtB,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;YAChB,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE;YACjB,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;YACnB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;SACnB,CAAC;QACF,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,eAAe,CAClC,eAAuC,CACxC,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,gBAAgB,CAClC;YACE,aAAa,EAAE,EAAE;SAClB,EACD,EAAE,EACF,EAAkB,EAClB,EAAoB,EACpB,KAAK,EACL,EAAsB,CACvB,CAAC;QACF,MAAM,OAAO,CAAC,mBAAmB,CAAC;YAChC,eAAe,EAAE,GAAG,EAAE,CAAC,KAAK;SACR,CAAC,CAAC;QACxB,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACvD,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAC1D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"mcp-client-manager.test.js","sourceRoot":"","sources":["../../../src/tools/mcp-client-manager.test.ts"],"names":[],"mappings":"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"}

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

@@ -12,6 +12,7 @@ import type { FunctionDeclaration } from '@google/genai';
 import type { PromptRegistry } from '../prompts/prompt-registry.js';
 import type { WorkspaceContext } from '../utils/workspaceContext.js';
 import type { ToolRegistry } from './tool-registry.js';
+import type { MessageBus } from '../confirmation-bus/message-bus.js';
 export declare const MCP_DEFAULT_TIMEOUT_MSEC: number;
 export type DiscoveredMCPPrompt = Prompt & {
     serverName: string;
@@ -78,6 +79,7 @@ export declare class McpClient {
     private assertConnected;
     private discoverTools;
     private discoverPrompts;
+    getServerConfig(): MCPServerConfig;
 }
 /**
  * Map to track which MCP servers have been discovered to require OAuth
@@ -143,10 +145,12 @@ export declare function connectAndDiscover(mcpServerName: string, mcpServerConfi
  * @param mcpServerName The name of the MCP server.
  * @param mcpServerConfig The configuration for the MCP server.
  * @param mcpClient The active MCP client instance.
+ * @param cliConfig The CLI configuration object.
+ * @param messageBus Optional message bus for policy engine integration.
  * @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 declare function discoverTools(mcpServerName: string, mcpServerConfig: MCPServerConfig, mcpClient: Client, cliConfig: Config): Promise<DiscoveredMCPTool[]>;
+export declare function discoverTools(mcpServerName: string, mcpServerConfig: MCPServerConfig, mcpClient: Client, cliConfig: Config, messageBus?: MessageBus): Promise<DiscoveredMCPTool[]>;
 /**
  * Discovers and logs prompts from a connected MCP client.
  * It retrieves prompt declarations from the client and logs their names.