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: Misleading MCP Server Lookup Method Name (#11315)
Danny Avilaf8774983a0c5
diff --git a/api/server/middleware/accessResources/canAccessMCPServerResource.js b/api/server/middleware/accessResources/canAccessMCPServerResource.jsindex 69f5f4e4f6..85d479c712 100644--- a/api/server/middleware/accessResources/canAccessMCPServerResource.js+++ b/api/server/middleware/accessResources/canAccessMCPServerResource.js@@ -1,16 +1,16 @@const { ResourceType } = require('librechat-data-provider');const { canAccessResource } = require('./canAccessResource');-const { findMCPServerById } = require('~/models');+const { findMCPServerByServerName } = require('~/models');/**- * MCP Server ID resolver function- * Resolves custom MCP server ID (e.g., "mcp_abc123") to MongoDB ObjectId+ * MCP Server name resolver function+ * Resolves MCP server name (e.g., "my-mcp-server") to MongoDB ObjectId*- * @param {string} mcpServerCustomId - Custom MCP server ID from route parameter+ * @param {string} serverName - Server name from route parameter* @returns {Promise<Object|null>} MCP server document with _id field, or null if not found*/-const resolveMCPServerId = async (mcpServerCustomId) => {- return await findMCPServerById(mcpServerCustomId);+const resolveMCPServerName = async (serverName) => {+ return await findMCPServerByServerName(serverName);};/**@@ -52,7 +52,7 @@ const canAccessMCPServerResource = (options) => {resourceType: ResourceType.MCPSERVER,requiredPermission,resourceIdParam,- idResolver: resolveMCPServerId,+ idResolver: resolveMCPServerName,});};diff --git a/api/server/middleware/accessResources/canAccessMCPServerResource.spec.js b/api/server/middleware/accessResources/canAccessMCPServerResource.spec.jsindex 075cddb000..77508be2d1 100644--- a/api/server/middleware/accessResources/canAccessMCPServerResource.spec.js+++ b/api/server/middleware/accessResources/canAccessMCPServerResource.spec.js@@ -545,7 +545,7 @@ describe('canAccessMCPServerResource middleware', () => {describe('error handling', () => {test('should handle server returning null gracefully (treated as not found)', async () => {- // When an MCP server is not found, findMCPServerById returns null+ // When an MCP server is not found, findMCPServerByServerName returns null// which the middleware correctly handles as a 404req.params.serverName = 'definitely-non-existent-server';diff --git a/api/server/routes/accessPermissions.js b/api/server/routes/accessPermissions.jsindex 2cfd19289d..79e7f3ddca 100644--- a/api/server/routes/accessPermissions.js+++ b/api/server/routes/accessPermissions.js@@ -11,7 +11,7 @@ const {const { requireJwtAuth, checkBan, uaParser, canAccessResource } = require('~/server/middleware');const { checkPeoplePickerAccess } = require('~/server/middleware/checkPeoplePickerAccess');const { checkSharePublicAccess } = require('~/server/middleware/checkSharePublicAccess');-const { findMCPServerById } = require('~/models');+const { findMCPServerByObjectId } = require('~/models');const router = express.Router();@@ -64,7 +64,7 @@ const checkResourcePermissionAccess = (requiredPermission) => (req, res, next) =resourceType: ResourceType.MCPSERVER,requiredPermission,resourceIdParam: 'resourceId',- idResolver: findMCPServerById,+ idResolver: findMCPServerByObjectId,});} else {return res.status(400).json({diff --git a/api/server/routes/accessPermissions.test.js b/api/server/routes/accessPermissions.test.jsindex c7e7b5957c..81c21c8667 100644--- a/api/server/routes/accessPermissions.test.js+++ b/api/server/routes/accessPermissions.test.js@@ -32,7 +32,7 @@ jest.mock('~/server/middleware/checkPeoplePickerAccess', () => ({// Import actual middleware to get canAccessResourceconst { canAccessResource } = require('~/server/middleware');-const { findMCPServerById } = require('~/models');+const { findMCPServerByObjectId } = require('~/models');/*** Security Tests for SBA-ADV-20251203-02@@ -151,7 +151,7 @@ describe('Access Permissions Routes - Security Tests (SBA-ADV-20251203-02)', ()resourceType: ResourceType.MCPSERVER,requiredPermission,resourceIdParam: 'resourceId',- idResolver: findMCPServerById,+ idResolver: findMCPServerByObjectId,});} else {return res.status(400).json({diff --git a/packages/api/src/mcp/registry/db/ServerConfigsDB.ts b/packages/api/src/mcp/registry/db/ServerConfigsDB.tsindex e2eb8d6974..969969a9f6 100644--- a/packages/api/src/mcp/registry/db/ServerConfigsDB.ts+++ b/packages/api/src/mcp/registry/db/ServerConfigsDB.ts@@ -134,7 +134,7 @@ export class ServerConfigsDB implements IServerConfigsRepositoryInterface {);}- const existingServer = await this._dbMethods.findMCPServerById(serverName);+ const existingServer = await this._dbMethods.findMCPServerByServerName(serverName);let configToSave: ParsedServerConfig = { ...config };// Transform user-provided API key config (adds customUserVars and headers)@@ -204,7 +204,7 @@ export class ServerConfigsDB implements IServerConfigsRepositoryInterface {* @returns The parsed server config or undefined if not found. If accessed via agent, consumeOnly will be true.*/public async get(serverName: string, userId?: string): Promise<ParsedServerConfig | undefined> {- const server = await this._dbMethods.findMCPServerById(serverName);+ const server = await this._dbMethods.findMCPServerByServerName(serverName);if (!server) return undefined;// Check public access if no userIddiff --git a/packages/api/src/stream/__tests__/GenerationJobManager.stream_integration.spec.ts b/packages/api/src/stream/__tests__/GenerationJobManager.stream_integration.spec.tsindex d95376f782..4471d8c95d 100644--- a/packages/api/src/stream/__tests__/GenerationJobManager.stream_integration.spec.ts+++ b/packages/api/src/stream/__tests__/GenerationJobManager.stream_integration.spec.ts@@ -584,8 +584,7 @@ describe('GenerationJobManager Integration Tests', () => {};GenerationJobManager.emitDone(streamId, finalEventData as never);- // Wait for async Redis update- await new Promise((resolve) => setTimeout(resolve, 50));+ await new Promise((resolve) => setTimeout(resolve, 200));// Verify finalEvent is in Redisconst jobStore = services.jobStore;diff --git a/packages/data-schemas/src/methods/mcpServer.spec.ts b/packages/data-schemas/src/methods/mcpServer.spec.tsindex 387a697ffc..66f0982438 100644--- a/packages/data-schemas/src/methods/mcpServer.spec.ts+++ b/packages/data-schemas/src/methods/mcpServer.spec.ts@@ -228,22 +228,22 @@ describe('MCPServer Model Tests', () => {});});- describe('findMCPServerById', () => {+ describe('findMCPServerByServerName', () => {test('should find server by serverName', async () => {const created = await methods.createMCPServer({- config: createSSEConfig('Find By Id Test'),+ config: createSSEConfig('Find By Name Test'),author: authorId,});- const found = await methods.findMCPServerById(created.serverName);+ const found = await methods.findMCPServerByServerName(created.serverName);expect(found).toBeDefined();- expect(found?.serverName).toBe('find-by-id-test');- expect(found?.config.title).toBe('Find By Id Test');+ expect(found?.serverName).toBe('find-by-name-test');+ expect(found?.config.title).toBe('Find By Name Test');});test('should return null when server not found', async () => {- const found = await methods.findMCPServerById('non-existent-server');+ const found = await methods.findMCPServerByServerName('non-existent-server');expect(found).toBeNull();});@@ -254,7 +254,7 @@ describe('MCPServer Model Tests', () => {author: authorId,});- const found = await methods.findMCPServerById('lean-test');+ const found = await methods.findMCPServerByServerName('lean-test');// Lean documents don't have mongoose methodsexpect(found).toBeDefined();@@ -621,7 +621,7 @@ describe('MCPServer Model Tests', () => {expect(deleted?.serverName).toBe('delete-test');// Verify it's actually deleted- const found = await methods.findMCPServerById('delete-test');+ const found = await methods.findMCPServerByServerName('delete-test');expect(found).toBeNull();});diff --git a/packages/data-schemas/src/methods/mcpServer.ts b/packages/data-schemas/src/methods/mcpServer.tsindex dd7876f03e..e85421fea2 100644--- a/packages/data-schemas/src/methods/mcpServer.ts+++ b/packages/data-schemas/src/methods/mcpServer.ts@@ -134,10 +134,10 @@ export function createMCPServerMethods(mongoose: typeof import('mongoose')) {/*** Find an MCP server by serverName- * @param serverName - The MCP server ID+ * @param serverName - The unique server name identifier* @returns The MCP server document or null*/- async function findMCPServerById(serverName: string): Promise<MCPServerDocument | null> {+ async function findMCPServerByServerName(serverName: string): Promise<MCPServerDocument | null> {const MCPServer = mongoose.models.MCPServer as Model<MCPServerDocument>;return await MCPServer.findOne({ serverName }).lean();}@@ -311,7 +311,7 @@ export function createMCPServerMethods(mongoose: typeof import('mongoose')) {return {createMCPServer,- findMCPServerById,+ findMCPServerByServerName,findMCPServerByObjectId,findMCPServersByAuthor,getListMCPServersByIds,