@vybestack/llxprt-code-core 0.1.13 → 0.1.14

package/dist/src/tools/ls.js

@@ -8,6 +8,7 @@ import path from 'path';
 import { BaseTool, Icon } from './tools.js';
 import { SchemaValidator } from '../utils/schemaValidator.js';
 import { makeRelative, shortenPath } from '../utils/paths.js';
+import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/config.js';
 import { Type } from '@google/genai';
 import { isWithinRoot } from '../utils/fileUtils.js';
 /**
@@ -30,9 +31,19 @@ export class LSTool extends BaseTool {
                     },
                     type: Type.ARRAY,
                 },
-                respect_git_ignore: {
-                    description: 'Optional: Whether to respect .gitignore patterns when listing files. Only available in git repositories. Defaults to true.',
-                    type: Type.BOOLEAN,
+                file_filtering_options: {
+                    description: 'Optional: Whether to respect ignore patterns from .gitignore or .llxprtignore',
+                    type: Type.OBJECT,
+                    properties: {
+                        respect_git_ignore: {
+                            description: 'Optional: Whether to respect .gitignore patterns when listing files. Only available in git repositories. Defaults to true.',
+                            type: Type.BOOLEAN,
+                        },
+                        respect_llxprt_ignore: {
+                            description: 'Optional: Whether to respect .llxprtignore patterns when listing files. Defaults to true.',
+                            type: Type.BOOLEAN,
+                        },
+                    },
                 },
             },
             required: ['path'],
@@ -119,12 +130,18 @@ export class LSTool extends BaseTool {
                 return this.errorResult(`Error: Path is not a directory: ${params.path}`, `Path is not a directory.`);
             }
             const files = fs.readdirSync(params.path);
+            const defaultFileIgnores = this.config.getFileFilteringOptions() ?? DEFAULT_FILE_FILTERING_OPTIONS;
+            const fileFilteringOptions = {
+                respectGitIgnore: params.file_filtering_options?.respect_git_ignore ??
+                    defaultFileIgnores.respectGitIgnore,
+                respectLlxprtIgnore: params.file_filtering_options?.respect_llxprt_ignore ??
+                    defaultFileIgnores.respectLlxprtIgnore,
+            };
             // Get centralized file discovery service
-            const respectGitIgnore = params.respect_git_ignore ??
-                this.config.getFileFilteringRespectGitIgnore();
             const fileDiscovery = this.config.getFileService();
             const entries = [];
             let gitIgnoredCount = 0;
+            let llxprtIgnoredCount = 0;
             if (files.length === 0) {
                 // Changed error message to be more neutral for LLM
                 return {
@@ -138,12 +155,17 @@ export class LSTool extends BaseTool {
                 }
                 const fullPath = path.join(params.path, file);
                 const relativePath = path.relative(this.config.getTargetDir(), fullPath);
-                // Check if this file should be git-ignored (only in git repositories)
-                if (respectGitIgnore &&
+                // Check if this file should be ignored based on git or llxprt ignore rules
+                if (fileFilteringOptions.respectGitIgnore &&
                     fileDiscovery.shouldGitIgnoreFile(relativePath)) {
                     gitIgnoredCount++;
                     continue;
                 }
+                if (fileFilteringOptions.respectLlxprtIgnore &&
+                    fileDiscovery.shouldLlxprtIgnoreFile(relativePath)) {
+                    llxprtIgnoredCount++;
+                    continue;
+                }
                 try {
                     const stats = fs.statSync(fullPath);
                     const isDir = stats.isDirectory();
@@ -173,12 +195,19 @@ export class LSTool extends BaseTool {
                 .map((entry) => `${entry.isDirectory ? '[DIR] ' : ''}${entry.name}`)
                 .join('\n');
             let resultMessage = `Directory listing for ${params.path}:\n${directoryContent}`;
+            const ignoredMessages = [];
             if (gitIgnoredCount > 0) {
-                resultMessage += `\n\n(${gitIgnoredCount} items were git-ignored)`;
+                ignoredMessages.push(`${gitIgnoredCount} git-ignored`);
+            }
+            if (llxprtIgnoredCount > 0) {
+                ignoredMessages.push(`${llxprtIgnoredCount} llxprt-ignored`);
+            }
+            if (ignoredMessages.length > 0) {
+                resultMessage += `\n\n(${ignoredMessages.join(', ')})`;
             }
             let displayMessage = `Listed ${entries.length} item(s).`;
-            if (gitIgnoredCount > 0) {
-                displayMessage += ` (${gitIgnoredCount} git-ignored)`;
+            if (ignoredMessages.length > 0) {
+                displayMessage += ` (${ignoredMessages.join(', ')})`;
             }
             return {
                 llmContent: resultMessage,

package/dist/src/tools/ls.js.map

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

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

@@ -32,6 +32,10 @@ export declare enum MCPDiscoveryState {
     /** Discovery has completed (with or without errors) */
     COMPLETED = "completed"
 }
+/**
+ * Map to track which MCP servers have been discovered to require OAuth
+ */
+export declare const mcpServerRequiresOAuth: Map<string, boolean>;
 /**
  * Event listeners for MCP server status changes
  */
@@ -104,7 +108,7 @@ export declare function discoverTools(mcpServerName: string, mcpServerConfig: MC
  */
 export declare function connectToMcpServer(mcpServerName: string, mcpServerConfig: MCPServerConfig, debugMode: boolean): Promise<Client>;
 /** Visible for Testing */
-export declare function createTransport(mcpServerName: string, mcpServerConfig: MCPServerConfig, debugMode: boolean): Transport;
+export declare function createTransport(mcpServerName: string, mcpServerConfig: MCPServerConfig, debugMode: boolean): Promise<Transport>;
 /** Visible for testing */
 export declare function isEnabled(funcDecl: FunctionDeclaration, mcpServerName: string, mcpServerConfig: MCPServerConfig): boolean;
 export {};

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

@@ -8,9 +8,14 @@ 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 { AuthProviderType } from '../config/config.js';
+import { GoogleCredentialProvider } from '../mcp/google-auth-provider.js';
 import { DiscoveredMCPTool } from './mcp-tool.js';
 import { mcpToTool } from '@google/genai';
-import { ActiveFileNotificationSchema, IDE_SERVER_NAME, ideContext, } from '../services/ideContext.js';
+import { MCPOAuthProvider } from '../mcp/oauth-provider.js';
+import { OAuthUtils } from '../mcp/oauth-utils.js';
+import { MCPOAuthTokenStorage } from '../mcp/oauth-token-storage.js';
+import { getErrorMessage } from '../utils/errors.js';
 export const MCP_DEFAULT_TIMEOUT_MSEC = 10 * 60 * 1000; // default to 10 minutes
 /**
  * Enum representing the connection status of an MCP server
@@ -44,6 +49,10 @@ const mcpServerStatusesInternal = new Map();
  * Track the overall MCP discovery state
  */
 let mcpDiscoveryState = MCPDiscoveryState.NOT_STARTED;
+/**
+ * Map to track which MCP servers have been discovered to require OAuth
+ */
+export const mcpServerRequiresOAuth = new Map();
 const statusChangeListeners = [];
 /**
  * Add a listener for MCP server status changes
@@ -88,6 +97,132 @@ export function getAllMCPServerStatuses() {
 export function getMCPDiscoveryState() {
     return mcpDiscoveryState;
 }
+/**
+ * Parse www-authenticate header to extract OAuth metadata URI.
+ *
+ * @param wwwAuthenticate The www-authenticate header value
+ * @returns The resource metadata URI if found, null otherwise
+ */
+function _parseWWWAuthenticate(wwwAuthenticate) {
+    // Parse header like: Bearer realm="MCP Server", resource_metadata_uri="https://..."
+    const resourceMetadataMatch = wwwAuthenticate.match(/resource_metadata_uri="([^"]+)"/);
+    return resourceMetadataMatch ? resourceMetadataMatch[1] : null;
+}
+/**
+ * Extract WWW-Authenticate header from error message string.
+ * This is a more robust approach than regex matching.
+ *
+ * @param errorString The error message string
+ * @returns The www-authenticate header value if found, null otherwise
+ */
+function extractWWWAuthenticateHeader(errorString) {
+    // Try multiple patterns to extract the header
+    const patterns = [
+        /www-authenticate:\s*([^\n\r]+)/i,
+        /WWW-Authenticate:\s*([^\n\r]+)/i,
+        /"www-authenticate":\s*"([^"]+)"/i,
+        /'www-authenticate':\s*'([^']+)'/i,
+    ];
+    for (const pattern of patterns) {
+        const match = errorString.match(pattern);
+        if (match) {
+            return match[1].trim();
+        }
+    }
+    return null;
+}
+/**
+ * Handle automatic OAuth discovery and authentication for a server.
+ *
+ * @param mcpServerName The name of the MCP server
+ * @param mcpServerConfig The MCP server configuration
+ * @param wwwAuthenticate The www-authenticate header value
+ * @returns True if OAuth was successfully configured and authenticated, false otherwise
+ */
+async function handleAutomaticOAuth(mcpServerName, mcpServerConfig, wwwAuthenticate) {
+    try {
+        console.log(`🔐 '${mcpServerName}' requires OAuth authentication`);
+        // Always try to parse the resource metadata URI from the www-authenticate header
+        let oauthConfig;
+        const resourceMetadataUri = OAuthUtils.parseWWWAuthenticateHeader(wwwAuthenticate);
+        if (resourceMetadataUri) {
+            oauthConfig = await OAuthUtils.discoverOAuthConfig(resourceMetadataUri);
+        }
+        else if (mcpServerConfig.url) {
+            // Fallback: try to discover OAuth config from the base URL for SSE
+            const sseUrl = new URL(mcpServerConfig.url);
+            const baseUrl = `${sseUrl.protocol}//${sseUrl.host}`;
+            oauthConfig = await OAuthUtils.discoverOAuthConfig(baseUrl);
+        }
+        else if (mcpServerConfig.httpUrl) {
+            // Fallback: try to discover OAuth config from the base URL for HTTP
+            const httpUrl = new URL(mcpServerConfig.httpUrl);
+            const baseUrl = `${httpUrl.protocol}//${httpUrl.host}`;
+            oauthConfig = await OAuthUtils.discoverOAuthConfig(baseUrl);
+        }
+        if (!oauthConfig) {
+            console.error(`❌ Could not configure OAuth for '${mcpServerName}' - please authenticate manually with /mcp auth ${mcpServerName}`);
+            return false;
+        }
+        // OAuth configuration discovered - proceed with authentication
+        // Create OAuth configuration for authentication
+        const oauthAuthConfig = {
+            enabled: true,
+            authorizationUrl: oauthConfig.authorizationUrl,
+            tokenUrl: oauthConfig.tokenUrl,
+            scopes: oauthConfig.scopes || [],
+        };
+        // Perform OAuth authentication
+        console.log(`Starting OAuth authentication for server '${mcpServerName}'...`);
+        await MCPOAuthProvider.authenticate(mcpServerName, oauthAuthConfig);
+        console.log(`OAuth authentication successful for server '${mcpServerName}'`);
+        return true;
+    }
+    catch (error) {
+        console.error(`Failed to handle automatic OAuth for server '${mcpServerName}': ${getErrorMessage(error)}`);
+        return false;
+    }
+}
+/**
+ * Create a transport with OAuth token for the given server configuration.
+ *
+ * @param mcpServerName The name of the MCP server
+ * @param mcpServerConfig The MCP server configuration
+ * @param accessToken The OAuth access token
+ * @returns The transport with OAuth token, or null if creation fails
+ */
+async function createTransportWithOAuth(mcpServerName, mcpServerConfig, accessToken) {
+    try {
+        if (mcpServerConfig.httpUrl) {
+            // Create HTTP transport with OAuth token
+            const oauthTransportOptions = {
+                requestInit: {
+                    headers: {
+                        ...mcpServerConfig.headers,
+                        Authorization: `Bearer ${accessToken}`,
+                    },
+                },
+            };
+            return new StreamableHTTPClientTransport(new URL(mcpServerConfig.httpUrl), oauthTransportOptions);
+        }
+        else if (mcpServerConfig.url) {
+            // Create SSE transport with OAuth token in Authorization header
+            return new SSEClientTransport(new URL(mcpServerConfig.url), {
+                requestInit: {
+                    headers: {
+                        ...mcpServerConfig.headers,
+                        Authorization: `Bearer ${accessToken}`,
+                    },
+                },
+            });
+        }
+        return null;
+    }
+    catch (error) {
+        console.error(`Failed to create OAuth transport for server '${mcpServerName}': ${getErrorMessage(error)}`);
+        return null;
+    }
+}
 /**
  * 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
@@ -144,15 +279,7 @@ export async function connectAndDiscover(mcpServerName, mcpServerConfig, toolReg
             mcpClient.onerror = (error) => {
                 console.error(`MCP ERROR (${mcpServerName}):`, error.toString());
                 updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
-                if (mcpServerName === IDE_SERVER_NAME) {
-                    ideContext.clearActiveFileContext();
-                }
             };
-            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);
@@ -164,7 +291,7 @@ export async function connectAndDiscover(mcpServerName, mcpServerConfig, toolReg
         }
     }
     catch (error) {
-        console.error(`Error connecting to MCP server '${mcpServerName}':`, error);
+        console.error(`Error connecting to MCP server '${mcpServerName}': ${getErrorMessage(error)}`);
         updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
     }
 }
@@ -229,7 +356,7 @@ export async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMo
         };
     }
     try {
-        const transport = createTransport(mcpServerName, mcpServerConfig, debugMode);
+        const transport = await createTransport(mcpServerName, mcpServerConfig, debugMode);
         try {
             await mcpClient.connect(transport, {
                 timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
@@ -242,29 +369,280 @@ export async function connectToMcpServer(mcpServerName, mcpServerConfig, debugMo
         }
     }
     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`;
+        // Check if this is a 401 error that might indicate OAuth is required
+        const errorString = String(error);
+        if (errorString.includes('401') &&
+            (mcpServerConfig.httpUrl || mcpServerConfig.url)) {
+            mcpServerRequiresOAuth.set(mcpServerName, true);
+            // Only trigger automatic OAuth discovery for HTTP servers or when OAuth is explicitly configured
+            // For SSE servers, we should not trigger new OAuth flows automatically
+            const shouldTriggerOAuth = mcpServerConfig.httpUrl || mcpServerConfig.oauth?.enabled;
+            if (!shouldTriggerOAuth) {
+                // For SSE servers without explicit OAuth config, if a token was found but rejected, report it accurately.
+                const credentials = await MCPOAuthTokenStorage.getToken(mcpServerName);
+                if (credentials) {
+                    const hasStoredTokens = await MCPOAuthProvider.getValidToken(mcpServerName, {
+                        // Pass client ID if available
+                        clientId: credentials.clientId,
+                    });
+                    if (hasStoredTokens) {
+                        console.log(`Stored OAuth token for SSE server '${mcpServerName}' was rejected. ` +
+                            `Please re-authenticate using: /mcp auth ${mcpServerName}`);
+                    }
+                    else {
+                        console.log(`401 error received for SSE server '${mcpServerName}' without OAuth configuration. ` +
+                            `Please authenticate using: /mcp auth ${mcpServerName}`);
+                    }
+                }
+                throw new Error(`401 error received for SSE server '${mcpServerName}' without OAuth configuration. ` +
+                    `Please authenticate using: /mcp auth ${mcpServerName}`);
+            }
+            // Try to extract www-authenticate header from the error
+            let wwwAuthenticate = extractWWWAuthenticateHeader(errorString);
+            // If we didn't get the header from the error string, try to get it from the server
+            if (!wwwAuthenticate && mcpServerConfig.url) {
+                console.log(`No www-authenticate header in error, trying to fetch it from server...`);
+                try {
+                    const response = await fetch(mcpServerConfig.url, {
+                        method: 'HEAD',
+                        headers: {
+                            Accept: 'text/event-stream',
+                        },
+                        signal: AbortSignal.timeout(5000),
+                    });
+                    if (response.status === 401) {
+                        wwwAuthenticate = response.headers.get('www-authenticate');
+                        if (wwwAuthenticate) {
+                            console.log(`Found www-authenticate header from server: ${wwwAuthenticate}`);
+                        }
+                    }
+                }
+                catch (fetchError) {
+                    console.debug(`Failed to fetch www-authenticate header: ${getErrorMessage(fetchError)}`);
+                }
+            }
+            if (wwwAuthenticate) {
+                console.log(`Received 401 with www-authenticate header: ${wwwAuthenticate}`);
+                // Try automatic OAuth discovery and authentication
+                const oauthSuccess = await handleAutomaticOAuth(mcpServerName, mcpServerConfig, wwwAuthenticate);
+                if (oauthSuccess) {
+                    // Retry connection with OAuth token
+                    console.log(`Retrying connection to '${mcpServerName}' with OAuth token...`);
+                    // Get the valid token - we need to create a proper OAuth config
+                    // The token should already be available from the authentication process
+                    const credentials = await MCPOAuthTokenStorage.getToken(mcpServerName);
+                    if (credentials) {
+                        const accessToken = await MCPOAuthProvider.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}'`);
+                            }
+                        }
+                        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}'`);
+                }
+            }
+            else {
+                // No www-authenticate header found, but we got a 401
+                // Only try OAuth discovery for HTTP servers or when OAuth is explicitly configured
+                // For SSE servers, we should not trigger new OAuth flows automatically
+                const shouldTryDiscovery = mcpServerConfig.httpUrl || mcpServerConfig.oauth?.enabled;
+                if (!shouldTryDiscovery) {
+                    const credentials = await MCPOAuthTokenStorage.getToken(mcpServerName);
+                    if (credentials) {
+                        const hasStoredTokens = await MCPOAuthProvider.getValidToken(mcpServerName, {
+                            // Pass client ID if available
+                            clientId: credentials.clientId,
+                        });
+                        if (hasStoredTokens) {
+                            console.log(`Stored OAuth token for SSE server '${mcpServerName}' was rejected. ` +
+                                `Please re-authenticate using: /mcp auth ${mcpServerName}`);
+                        }
+                        else {
+                            console.log(`401 error received for SSE server '${mcpServerName}' without OAuth configuration. ` +
+                                `Please authenticate using: /mcp auth ${mcpServerName}`);
+                        }
+                    }
+                    throw new Error(`401 error received for SSE server '${mcpServerName}' without OAuth configuration. ` +
+                        `Please authenticate using: /mcp auth ${mcpServerName}`);
+                }
+                // For SSE servers, try to discover OAuth configuration from the base URL
+                console.log(`🔍 Attempting OAuth discovery for '${mcpServerName}'...`);
+                if (mcpServerConfig.url) {
+                    const sseUrl = new URL(mcpServerConfig.url);
+                    const baseUrl = `${sseUrl.protocol}//${sseUrl.host}`;
+                    try {
+                        // Try to discover OAuth configuration from the base URL
+                        const oauthConfig = await OAuthUtils.discoverOAuthConfig(baseUrl);
+                        if (oauthConfig) {
+                            console.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
+                            console.log(`Starting OAuth authentication for server '${mcpServerName}'...`);
+                            await MCPOAuthProvider.authenticate(mcpServerName, oauthAuthConfig);
+                            // Retry connection with OAuth token
+                            const credentials = await MCPOAuthTokenStorage.getToken(mcpServerName);
+                            if (credentials) {
+                                const accessToken = await MCPOAuthProvider.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}'`);
+                                    }
+                                }
+                                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 stored credentials for server '${mcpServerName}'`);
+                                throw new Error(`Failed to get stored credentials 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}`);
+                        }
+                    }
+                    catch (discoveryError) {
+                        console.error(`❌ OAuth discovery failed for '${mcpServerName}' - please authenticate manually with /mcp auth ${mcpServerName}`);
+                        throw discoveryError;
+                    }
+                }
+                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.`);
+                }
+            }
+        }
+        else {
+            // Handle other connection errors
+            // Create a concise error message
+            const errorMessage = error.message || String(error);
+            const isNetworkError = errorMessage.includes('ENOTFOUND') ||
+                errorMessage.includes('ECONNREFUSED');
+            let conciseError;
+            if (isNetworkError) {
+                conciseError = `Cannot connect to '${mcpServerName}' - server may be down or URL incorrect`;
+            }
+            else {
+                conciseError = `Connection failed for '${mcpServerName}': ${errorMessage}`;
+            }
+            if (process.env.SANDBOX) {
+                conciseError += ` (check sandbox availability)`;
+            }
+            throw new Error(conciseError);
         }
-        throw new Error(errorString);
     }
 }
 /** Visible for Testing */
-export function createTransport(mcpServerName, mcpServerConfig, debugMode) {
+export async function createTransport(mcpServerName, mcpServerConfig, debugMode) {
+    if (mcpServerConfig.authProviderType === AuthProviderType.GOOGLE_CREDENTIALS) {
+        const provider = new GoogleCredentialProvider(mcpServerConfig);
+        const transportOptions = {
+            authProvider: provider,
+        };
+        if (mcpServerConfig.httpUrl) {
+            return new StreamableHTTPClientTransport(new URL(mcpServerConfig.httpUrl), transportOptions);
+        }
+        else if (mcpServerConfig.url) {
+            return new SSEClientTransport(new URL(mcpServerConfig.url), transportOptions);
+        }
+        throw new Error('No URL configured for Google Credentials MCP server');
+    }
+    // Check if we have OAuth configuration or stored tokens
+    let accessToken = null;
+    let hasOAuthConfig = mcpServerConfig.oauth?.enabled;
+    if (hasOAuthConfig && mcpServerConfig.oauth) {
+        accessToken = await MCPOAuthProvider.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.`);
+        }
+    }
+    else {
+        // Check if we have stored OAuth tokens for this server (from previous authentication)
+        const credentials = await MCPOAuthTokenStorage.getToken(mcpServerName);
+        if (credentials) {
+            accessToken = await MCPOAuthProvider.getValidToken(mcpServerName, {
+                // Pass client ID if available
+                clientId: credentials.clientId,
+            });
+            if (accessToken) {
+                hasOAuthConfig = true;
+                console.log(`Found stored OAuth token for server '${mcpServerName}'`);
+            }
+        }
+    }
     if (mcpServerConfig.httpUrl) {
         const transportOptions = {};
-        if (mcpServerConfig.headers) {
+        // Set up headers with OAuth token if available
+        if (hasOAuthConfig && accessToken) {
+            transportOptions.requestInit = {
+                headers: {
+                    ...mcpServerConfig.headers,
+                    Authorization: `Bearer ${accessToken}`,
+                },
+            };
+        }
+        else if (mcpServerConfig.headers) {
             transportOptions.requestInit = {
                 headers: mcpServerConfig.headers,
             };
@@ -273,7 +651,16 @@ export function createTransport(mcpServerName, mcpServerConfig, debugMode) {
     }
     if (mcpServerConfig.url) {
         const transportOptions = {};
-        if (mcpServerConfig.headers) {
+        // Set up headers with OAuth token if available
+        if (hasOAuthConfig && accessToken) {
+            transportOptions.requestInit = {
+                headers: {
+                    ...mcpServerConfig.headers,
+                    Authorization: `Bearer ${accessToken}`,
+                },
+            };
+        }
+        else if (mcpServerConfig.headers) {
             transportOptions.requestInit = {
                 headers: mcpServerConfig.headers,
             };