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

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,58 +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({});
-        await manager.discoverAllMcpTools({
-            isTrustedFolder: () => true,
-            getMcpServers: () => ({
-                'test-server': {},
-            }),
-            getMcpServerCommand: () => '',
+        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': {},
         });
+        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({});
-        await manager.discoverAllMcpTools({
-            isTrustedFolder: () => false,
-            getMcpServers: () => ({
+        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': {},
+        });
+        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': {},
-            }),
-            getMcpServerCommand: () => '',
-            getPromptRegistry: () => { },
-            getDebugMode: () => false,
-            getWorkspaceContext: () => { },
+            },
+            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":"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"}
+{"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.

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

@@ -59,6 +59,7 @@ import { MCPOAuthTokenStorage } from '../mcp/oauth-token-storage.js';
 import { OAuthUtils } from '../mcp/oauth-utils.js';
 import { getErrorMessage } from '../utils/errors.js';
 import { debugLogger } from '../utils/debugLogger.js';
+import { coreEvents } from '../utils/events.js';
 export const MCP_DEFAULT_TIMEOUT_MSEC = 10 * 60 * 1000; // default to 10 minutes
 /**
  * Enum representing the connection status of an MCP server
@@ -127,7 +128,7 @@ export class McpClient {
                 }
                 if (originalOnError)
                     originalOnError(error);
-                console.error(`MCP ERROR (${this.serverName}):`, error.toString());
+                coreEvents.emitFeedback('error', `MCP ERROR (${this.serverName})`, error);
                 this.updateStatus(MCPServerStatus.DISCONNECTED);
             };
             this.updateStatus(MCPServerStatus.CONNECTED);
@@ -158,6 +159,8 @@ export class McpClient {
         if (this.status !== MCPServerStatus.CONNECTED) {
             return;
         }
+        this.toolRegistry.removeMcpToolsByServer(this.serverName);
+        this.promptRegistry.removePromptsByServer(this.serverName);
         this.updateStatus(MCPServerStatus.DISCONNECTING);
         const client = this.client;
         this.client = undefined;
@@ -186,12 +189,15 @@ export class McpClient {
     }
     async discoverTools(cliConfig) {
         this.assertConnected();
-        return discoverTools(this.serverName, this.serverConfig, this.client, cliConfig);
+        return discoverTools(this.serverName, this.serverConfig, this.client, cliConfig, this.toolRegistry.getMessageBus());
     }
     async discoverPrompts() {
         this.assertConnected();
         return discoverPrompts(this.serverName, this.client, this.promptRegistry);
     }
+    getServerConfig() {
+        return this.serverConfig;
+    }
 }
 /**
  * Map to track the status of each MCP server within the core package
@@ -296,7 +302,7 @@ async function handleAutomaticOAuth(mcpServerName, mcpServerConfig, wwwAuthentic
             oauthConfig = await OAuthUtils.discoverOAuthConfig(baseUrl);
         }
         if (!oauthConfig) {
-            console.error(`❌ Could not configure OAuth for '${mcpServerName}' - please authenticate manually with /mcp auth ${mcpServerName}`);
+            coreEvents.emitFeedback('error', `Could not configure OAuth for '${mcpServerName}' - please authenticate manually with /mcp auth ${mcpServerName}`);
             return false;
         }
         // OAuth configuration discovered - proceed with authentication
@@ -317,7 +323,7 @@ async function handleAutomaticOAuth(mcpServerName, mcpServerConfig, wwwAuthentic
         return true;
     }
     catch (error) {
-        console.error(`Failed to handle automatic OAuth for server '${mcpServerName}': ${getErrorMessage(error)}`);
+        coreEvents.emitFeedback('error', `Failed to handle automatic OAuth for server '${mcpServerName}': ${getErrorMessage(error)}`, error);
         return false;
     }
 }
@@ -357,7 +363,7 @@ async function createTransportWithOAuth(mcpServerName, mcpServerConfig, accessTo
         return null;
     }
     catch (error) {
-        console.error(`Failed to create OAuth transport for server '${mcpServerName}': ${getErrorMessage(error)}`);
+        coreEvents.emitFeedback('error', `Failed to create OAuth transport for server '${mcpServerName}': ${getErrorMessage(error)}`, error);
         return null;
     }
 }
@@ -414,12 +420,12 @@ export async function connectAndDiscover(mcpServerName, mcpServerConfig, toolReg
     try {
         mcpClient = await connectToMcpServer(mcpServerName, mcpServerConfig, debugMode, workspaceContext);
         mcpClient.onerror = (error) => {
-            console.error(`MCP ERROR (${mcpServerName}):`, error.toString());
+            coreEvents.emitFeedback('error', `MCP ERROR (${mcpServerName}):`, error);
             updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
         };
         // Attempt to discover both prompts and tools
         const prompts = await discoverPrompts(mcpServerName, mcpClient, promptRegistry);
-        const tools = await discoverTools(mcpServerName, mcpServerConfig, mcpClient, cliConfig);
+        const tools = await discoverTools(mcpServerName, mcpServerConfig, mcpClient, cliConfig, toolRegistry.getMessageBus());
         // If we have neither prompts nor tools, it's a failed discovery
         if (prompts.length === 0 && tools.length === 0) {
             throw new Error('No prompts or tools found on the server.');
@@ -435,7 +441,7 @@ export async function connectAndDiscover(mcpServerName, mcpServerConfig, toolReg
         if (mcpClient) {
             mcpClient.close();
         }
-        console.error(`Error connecting to MCP server '${mcpServerName}': ${getErrorMessage(error)}`);
+        coreEvents.emitFeedback('error', `Error connecting to MCP server '${mcpServerName}': ${getErrorMessage(error)}`, error);
         updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
     }
 }
@@ -447,10 +453,12 @@ export async function connectAndDiscover(mcpServerName, mcpServerConfig, toolReg
  * @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 async function discoverTools(mcpServerName, mcpServerConfig, mcpClient, cliConfig) {
+export async function discoverTools(mcpServerName, mcpServerConfig, mcpClient, cliConfig, messageBus) {
     try {
         // Only request tools if the server supports them.
         if (mcpClient.getServerCapabilities()?.tools == null)
@@ -469,10 +477,11 @@ export async function discoverTools(mcpServerName, mcpServerConfig, mcpClient, c
                 if (!isEnabled(funcDecl, mcpServerName, mcpServerConfig)) {
                     continue;
                 }
-                discoveredTools.push(new DiscoveredMCPTool(mcpCallableTool, mcpServerName, funcDecl.name, funcDecl.description ?? '', funcDecl.parametersJsonSchema ?? { type: 'object', properties: {} }, mcpServerConfig.trust, undefined, cliConfig, mcpServerConfig.extension?.id));
+                const tool = new DiscoveredMCPTool(mcpCallableTool, mcpServerName, funcDecl.name, funcDecl.description ?? '', funcDecl.parametersJsonSchema ?? { type: 'object', properties: {} }, mcpServerConfig.trust, undefined, cliConfig, mcpServerConfig.extension?.name, mcpServerConfig.extension?.id, messageBus);
+                discoveredTools.push(tool);
             }
             catch (error) {
-                console.error(`Error discovering tool: '${funcDecl.name}' from MCP server '${mcpServerName}': ${error.message}`);
+                coreEvents.emitFeedback('error', `Error discovering tool: '${funcDecl.name}' from MCP server '${mcpServerName}': ${error.message}`, error);
             }
         }
         return discoveredTools;
@@ -480,7 +489,7 @@ export async function discoverTools(mcpServerName, mcpServerConfig, mcpClient, c
     catch (error) {
         if (error instanceof Error &&
             !error.message?.includes('Method not found')) {
-            console.error(`Error discovering tools from ${mcpServerName}: ${getErrorMessage(error)}`);
+            coreEvents.emitFeedback('error', `Error discovering tools from ${mcpServerName}: ${getErrorMessage(error)}`, error);
         }
         return [];
     }
@@ -512,7 +521,7 @@ export async function discoverPrompts(mcpServerName, mcpClient, promptRegistry)
         // Don't log an error if the method is not found, which is a common case.
         if (error instanceof Error &&
             !error.message?.includes('Method not found')) {
-            console.error(`Error discovering prompts from ${mcpServerName}: ${getErrorMessage(error)}`);
+            coreEvents.emitFeedback('error', `Error discovering prompts from ${mcpServerName}: ${getErrorMessage(error)}`, error);
         }
         return [];
     }
@@ -540,7 +549,7 @@ export async function invokeMcpPrompt(mcpServerName, mcpClient, promptName, prom
     catch (error) {
         if (error instanceof Error &&
             !error.message?.includes('Method not found')) {
-            console.error(`Error invoking prompt '${promptName}' from ${mcpServerName} ${promptParams}: ${getErrorMessage(error)}`);
+            coreEvents.emitFeedback('error', `Error invoking prompt '${promptName}' from ${mcpServerName} ${promptParams}: ${getErrorMessage(error)}`, error);
         }
         throw error;
     }
@@ -642,11 +651,11 @@ export async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMo
                         clientId: credentials.clientId,
                     });
                     if (hasStoredTokens) {
-                        debugLogger.log(`Stored OAuth token for SSE server '${mcpServerName}' was rejected. ` +
+                        coreEvents.emitFeedback('error', `Stored OAuth token for SSE server '${mcpServerName}' was rejected. ` +
                             `Please re-authenticate using: /mcp auth ${mcpServerName}`);
                     }
                     else {
-                        debugLogger.log(`401 error received for SSE server '${mcpServerName}' without OAuth configuration. ` +
+                        coreEvents.emitFeedback('error', `401 error received for SSE server '${mcpServerName}' without OAuth configuration. ` +
                             `Please authenticate using: /mcp auth ${mcpServerName}`);
                     }
                 }
@@ -701,35 +710,25 @@ export async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMo
                             // Create transport with OAuth token
                             const oauthTransport = await createTransportWithOAuth(mcpServerName, mcpServerConfig, accessToken);
                             if (oauthTransport) {
-                                try {
-                                    await mcpClient.connect(oauthTransport, {
-                                        timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
-                                    });
-                                    // Connection successful with OAuth
-                                    return mcpClient;
-                                }
-                                catch (retryError) {
-                                    console.error(`Failed to connect with OAuth token: ${getErrorMessage(retryError)}`);
-                                    throw retryError;
-                                }
+                                await mcpClient.connect(oauthTransport, {
+                                    timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
+                                });
+                                // Connection successful with OAuth
+                                return mcpClient;
                             }
                             else {
-                                console.error(`Failed to create OAuth transport for server '${mcpServerName}'`);
                                 throw new Error(`Failed to create OAuth transport for server '${mcpServerName}'`);
                             }
                         }
                         else {
-                            console.error(`Failed to get OAuth token for server '${mcpServerName}'`);
                             throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
                         }
                     }
                     else {
-                        console.error(`Failed to get credentials for server '${mcpServerName}' after successful OAuth authentication`);
                         throw new Error(`Failed to get credentials for server '${mcpServerName}' after successful OAuth authentication`);
                     }
                 }
                 else {
-                    console.error(`Failed to handle automatic OAuth for server '${mcpServerName}'`);
                     throw new Error(`Failed to handle automatic OAuth for server '${mcpServerName}'`);
                 }
             }
@@ -748,11 +747,11 @@ export async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMo
                             clientId: credentials.clientId,
                         });
                         if (hasStoredTokens) {
-                            debugLogger.log(`Stored OAuth token for SSE server '${mcpServerName}' was rejected. ` +
+                            coreEvents.emitFeedback('error', `Stored OAuth token for SSE server '${mcpServerName}' was rejected. ` +
                                 `Please re-authenticate using: /mcp auth ${mcpServerName}`);
                         }
                         else {
-                            debugLogger.log(`401 error received for SSE server '${mcpServerName}' without OAuth configuration. ` +
+                            coreEvents.emitFeedback('error', `401 error received for SSE server '${mcpServerName}' without OAuth configuration. ` +
                                 `Please authenticate using: /mcp auth ${mcpServerName}`);
                         }
                     }
@@ -764,76 +763,59 @@ export async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMo
                 if (hasNetworkTransport(mcpServerConfig)) {
                     const serverUrl = new URL(mcpServerConfig.httpUrl || mcpServerConfig.url);
                     const baseUrl = `${serverUrl.protocol}//${serverUrl.host}`;
-                    try {
-                        // Try to discover OAuth configuration from the base URL
-                        const oauthConfig = await OAuthUtils.discoverOAuthConfig(baseUrl);
-                        if (oauthConfig) {
-                            debugLogger.log(`Discovered OAuth configuration from base URL for server '${mcpServerName}'`);
-                            // Create OAuth configuration for authentication
-                            const oauthAuthConfig = {
-                                enabled: true,
-                                authorizationUrl: oauthConfig.authorizationUrl,
-                                tokenUrl: oauthConfig.tokenUrl,
-                                scopes: oauthConfig.scopes || [],
-                            };
-                            // Perform OAuth authentication
-                            // Pass the server URL for proper discovery
-                            const authServerUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;
-                            debugLogger.log(`Starting OAuth authentication for server '${mcpServerName}'...`);
-                            const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
-                            await authProvider.authenticate(mcpServerName, oauthAuthConfig, authServerUrl);
-                            // Retry connection with OAuth token
-                            const tokenStorage = new MCPOAuthTokenStorage();
-                            const credentials = await tokenStorage.getCredentials(mcpServerName);
-                            if (credentials) {
-                                const authProvider = new MCPOAuthProvider(tokenStorage);
-                                const accessToken = await authProvider.getValidToken(mcpServerName, {
-                                    // Pass client ID if available
-                                    clientId: credentials.clientId,
-                                });
-                                if (accessToken) {
-                                    // Create transport with OAuth token
-                                    const oauthTransport = await createTransportWithOAuth(mcpServerName, mcpServerConfig, accessToken);
-                                    if (oauthTransport) {
-                                        try {
-                                            await mcpClient.connect(oauthTransport, {
-                                                timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
-                                            });
-                                            // Connection successful with OAuth
-                                            return mcpClient;
-                                        }
-                                        catch (retryError) {
-                                            console.error(`Failed to connect with OAuth token: ${getErrorMessage(retryError)}`);
-                                            throw retryError;
-                                        }
-                                    }
-                                    else {
-                                        console.error(`Failed to create OAuth transport for server '${mcpServerName}'`);
-                                        throw new Error(`Failed to create OAuth transport for server '${mcpServerName}'`);
-                                    }
+                    // Try to discover OAuth configuration from the base URL
+                    const oauthConfig = await OAuthUtils.discoverOAuthConfig(baseUrl);
+                    if (oauthConfig) {
+                        debugLogger.log(`Discovered OAuth configuration from base URL for server '${mcpServerName}'`);
+                        // Create OAuth configuration for authentication
+                        const oauthAuthConfig = {
+                            enabled: true,
+                            authorizationUrl: oauthConfig.authorizationUrl,
+                            tokenUrl: oauthConfig.tokenUrl,
+                            scopes: oauthConfig.scopes || [],
+                        };
+                        // Perform OAuth authentication
+                        // Pass the server URL for proper discovery
+                        const authServerUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;
+                        debugLogger.log(`Starting OAuth authentication for server '${mcpServerName}'...`);
+                        const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
+                        await authProvider.authenticate(mcpServerName, oauthAuthConfig, authServerUrl);
+                        // Retry connection with OAuth token
+                        const tokenStorage = new MCPOAuthTokenStorage();
+                        const credentials = await tokenStorage.getCredentials(mcpServerName);
+                        if (credentials) {
+                            const authProvider = new MCPOAuthProvider(tokenStorage);
+                            const accessToken = await authProvider.getValidToken(mcpServerName, {
+                                // Pass client ID if available
+                                clientId: credentials.clientId,
+                            });
+                            if (accessToken) {
+                                // Create transport with OAuth token
+                                const oauthTransport = await createTransportWithOAuth(mcpServerName, mcpServerConfig, accessToken);
+                                if (oauthTransport) {
+                                    await mcpClient.connect(oauthTransport, {
+                                        timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
+                                    });
+                                    // Connection successful with OAuth
+                                    return mcpClient;
                                 }
                                 else {
-                                    console.error(`Failed to get OAuth token for server '${mcpServerName}'`);
-                                    throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
+                                    throw new Error(`Failed to create OAuth transport for server '${mcpServerName}'`);
                                 }
                             }
                             else {
-                                console.error(`Failed to get stored credentials for server '${mcpServerName}'`);
-                                throw new Error(`Failed to get stored credentials for server '${mcpServerName}'`);
+                                throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
                             }
                         }
                         else {
-                            console.error(`❌ Could not configure OAuth for '${mcpServerName}' - please authenticate manually with /mcp auth ${mcpServerName}`);
-                            throw new Error(`OAuth configuration failed for '${mcpServerName}'. Please authenticate manually with /mcp auth ${mcpServerName}`);
+                            throw new Error(`Failed to get stored credentials for server '${mcpServerName}'`);
                         }
                     }
-                    catch (discoveryError) {
-                        console.error(`❌ OAuth discovery failed for '${mcpServerName}' - please authenticate manually with /mcp auth ${mcpServerName}`);
-                        throw discoveryError;
+                    else {
+                        throw new Error(`OAuth configuration failed for '${mcpServerName}'. Please authenticate manually with /mcp auth ${mcpServerName}`);
                     }
                 }
                 else {
-                    console.error(`❌ '${mcpServerName}' requires authentication but no OAuth configuration found`);
                     throw new Error(`MCP server '${mcpServerName}' requires authentication. Please configure OAuth or check server settings.`);
                 }
             }
@@ -896,8 +878,6 @@ export async function createTransport(mcpServerName, mcpServerConfig, debugMode)
         const authProvider = new MCPOAuthProvider(tokenStorage);
         accessToken = await authProvider.getValidToken(mcpServerName, mcpServerConfig.oauth);
         if (!accessToken) {
-            console.error(`MCP server '${mcpServerName}' requires OAuth authentication. ` +
-                `Please authenticate using the /mcp auth command.`);
             throw new Error(`MCP server '${mcpServerName}' requires OAuth authentication. ` +
                 `Please authenticate using the /mcp auth command.`);
         }