Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🔄 fix: Improve MCP Connection Cleanup (#7400)
Danny Avilafe311df96915
diff --git a/packages/data-provider/src/mcp.ts b/packages/data-provider/src/mcp.tsindex 1fdb6c95f6..8f406fd391 100644--- a/packages/data-provider/src/mcp.ts+++ b/packages/data-provider/src/mcp.ts@@ -85,7 +85,10 @@ export const SSEOptionsSchema = BaseOptionsSchema.extend({export const StreamableHTTPOptionsSchema = BaseOptionsSchema.extend({type: z.literal('streamable-http'),headers: z.record(z.string(), z.string()).optional(),- url: z.string().url().refine(+ url: z+ .string()+ .url()+ .refine((val) => {const protocol = new URL(val).protocol;return protocol !== 'ws:' && protocol !== 'wss:';@@ -93,7 +96,7 @@ export const StreamableHTTPOptionsSchema = BaseOptionsSchema.extend({{message: 'Streamable HTTP URL must not start with ws:// or wss://',},- ),+ ),});export const MCPOptionsSchema = z.union([diff --git a/packages/mcp/src/connection.ts b/packages/mcp/src/connection.tsindex 23b7062dd1..aff0e080ad 100644--- a/packages/mcp/src/connection.ts+++ b/packages/mcp/src/connection.ts@@ -567,8 +567,14 @@ export class MCPConnection extends EventEmitter {return this.connectionState;}- public isConnected(): boolean {- return this.connectionState === 'connected';+ public async isConnected(): Promise<boolean> {+ try {+ await this.client.ping();+ return this.connectionState === 'connected';+ } catch (error) {+ this.logger?.error(`${this.getLogPrefix()} Ping failed:`, error);+ return false;+ }}public getLastError(): Error | null {diff --git a/packages/mcp/src/manager.ts b/packages/mcp/src/manager.tsindex df74580994..8fe9074b8f 100644--- a/packages/mcp/src/manager.ts+++ b/packages/mcp/src/manager.ts@@ -71,7 +71,7 @@ export class MCPManager {const connectionAttempt = this.initializeServer(connection, `[MCP][${serverName}]`);await Promise.race([connectionAttempt, connectionTimeout]);- if (connection.isConnected()) {+ if (await connection.isConnected()) {initializedServers.add(i);this.connections.set(serverName, connection); // Store in app-level map@@ -135,7 +135,7 @@ export class MCPManager {while (attempts < maxAttempts) {try {await connection.connect();- if (connection.isConnected()) {+ if (await connection.isConnected()) {return;}throw new Error('Connection attempt succeeded but status is not connected');@@ -200,7 +200,7 @@ export class MCPManager {}connection = undefined; // Force creation of a new connection} else if (connection) {- if (connection.isConnected()) {+ if (await connection.isConnected()) {this.logger.debug(`[MCP][User: ${userId}][${serverName}] Reusing active connection`);// Update timestamp on reusethis.updateUserLastActivity(userId);@@ -244,7 +244,7 @@ export class MCPManager {);await Promise.race([connectionAttempt, connectionTimeout]);- if (!connection.isConnected()) {+ if (!(await connection.isConnected())) {throw new Error('Failed to establish connection after initialization attempt.');}@@ -342,7 +342,7 @@ export class MCPManager {public async mapAvailableTools(availableTools: t.LCAvailableTools): Promise<void> {for (const [serverName, connection] of this.connections.entries()) {try {- if (connection.isConnected() !== true) {+ if ((await connection.isConnected()) !== true) {this.logger.warn(`[MCP][${serverName}] Connection not established. Skipping tool mapping.`,);@@ -375,7 +375,7 @@ export class MCPManager {for (const [serverName, connection] of this.connections.entries()) {try {- if (connection.isConnected() !== true) {+ if ((await connection.isConnected()) !== true) {this.logger.warn(`[MCP][${serverName}] Connection not established. Skipping manifest loading.`,);@@ -443,7 +443,7 @@ export class MCPManager {}}- if (!connection.isConnected()) {+ if (!(await connection.isConnected())) {// This might happen if getUserConnection failed silently or app connection droppedthrow new McpError(ErrorCode.InternalError, // Use InternalError for connection issuesdiff --git a/packages/mcp/src/parsers.ts b/packages/mcp/src/parsers.tsindex b77c7efa19..3350148a59 100644--- a/packages/mcp/src/parsers.ts+++ b/packages/mcp/src/parsers.ts@@ -1,5 +1,13 @@import type * as t from './types/mcp';-const RECOGNIZED_PROVIDERS = new Set(['google', 'anthropic', 'openai', 'openrouter', 'xai', 'deepseek', 'ollama']);+const RECOGNIZED_PROVIDERS = new Set([+ 'google',+ 'anthropic',+ 'openai',+ 'openrouter',+ 'xai',+ 'deepseek',+ 'ollama',+]);const CONTENT_ARRAY_PROVIDERS = new Set(['google', 'anthropic', 'openai']);const imageFormatters: Record<string, undefined | t.ImageFormatter> = {