🚌 fix: MCP Runtime Errors while Initializing (#9046)

* chore: Remove eslint-plugin-perfectionist from dependencies

* 🚌 fix: MCP Runtime Errors while Initializing

* chore: Bump @librechat/api version to 1.3.1

* chore: import order

* chore: import order

api/server/controllers/PluginController.js

@@ -113,20 +113,26 @@ const getAvailableTools = async (req, res) => {
       return;
     }
 
-    // If not in cache, build from manifest
     let pluginManifest = availableTools;
     if (customConfig?.mcpServers != null) {
-      const mcpManager = getMCPManager();
-      const flowsCache = getLogStores(CacheKeys.FLOWS);
-      const flowManager = flowsCache ? getFlowStateManager(flowsCache) : null;
-      const serverToolsCallback = createServerToolsCallback();
-      const getServerTools = createGetServerTools();
-      const mcpTools = await mcpManager.loadManifestTools({
-        flowManager,
-        serverToolsCallback,
-        getServerTools,
-      });
-      pluginManifest = [...mcpTools, ...pluginManifest];
+      try {
+        const mcpManager = getMCPManager();
+        const flowsCache = getLogStores(CacheKeys.FLOWS);
+        const flowManager = flowsCache ? getFlowStateManager(flowsCache) : null;
+        const serverToolsCallback = createServerToolsCallback();
+        const getServerTools = createGetServerTools();
+        const mcpTools = await mcpManager.loadManifestTools({
+          flowManager,
+          serverToolsCallback,
+          getServerTools,
+        });
+        pluginManifest = [...mcpTools, ...pluginManifest];
+      } catch (error) {
+        logger.error(
+          '[getAvailableTools] Error loading MCP Tools, servers may still be initializing:',
+          error,
+        );
+      }
     }
 
     /** @type {TPlugin[]} */

api/server/routes/config.js

@@ -109,10 +109,10 @@ router.get('/', async function (req, res) {
       for (const serverName in config.mcpServers) {
         const serverConfig = config.mcpServers[serverName];
         payload.mcpServers[serverName] = {
-          customUserVars: serverConfig?.customUserVars || {},
-          chatMenu: serverConfig?.chatMenu,
-          isOAuth: oauthServers.has(serverName),
           startup: serverConfig?.startup,
+          chatMenu: serverConfig?.chatMenu,
+          isOAuth: oauthServers?.has(serverName),
+          customUserVars: serverConfig?.customUserVars || {},
         };
       }
     }

api/server/services/MCP.js

@@ -1,15 +1,21 @@
 const { z } = require('zod');
 const { tool } = require('@langchain/core/tools');
 const { logger } = require('@librechat/data-schemas');
-const { Time, CacheKeys, StepTypes } = require('librechat-data-provider');
 const { Constants: AgentConstants, Providers, GraphEvents } = require('@librechat/agents');
-const { Constants, ContentTypes, isAssistantsEndpoint } = require('librechat-data-provider');
 const {
   sendEvent,
   MCPOAuthHandler,
   normalizeServerName,
   convertWithResolvedRefs,
 } = require('@librechat/api');
+const {
+  Time,
+  CacheKeys,
+  StepTypes,
+  Constants,
+  ContentTypes,
+  isAssistantsEndpoint,
+} = require('librechat-data-provider');
 const { findToken, createToken, updateToken } = require('~/models');
 const { getMCPManager, getFlowStateManager } = require('~/config');
 const { getCachedTools, loadCustomConfig } = require('./Config');
@@ -254,15 +260,21 @@ async function getMCPSetupData(userId) {
   }
 
   const mcpManager = getMCPManager(userId);
-  const appConnections = mcpManager.getAllConnections() || new Map();
+  /** @type {ReturnType<MCPManager['getAllConnections']>} */
+  let appConnections = new Map();
+  try {
+    appConnections = (await mcpManager.getAllConnections()) || new Map();
+  } catch (error) {
+    logger.error(`[MCP][User: ${userId}] Error getting app connections:`, error);
+  }
   const userConnections = mcpManager.getUserConnections(userId) || new Map();
   const oauthServers = mcpManager.getOAuthServers() || new Set();
 
   return {
     mcpConfig,
+    oauthServers,
     appConnections,
     userConnections,
-    oauthServers,
   };
 }
 

api/server/services/initializeMCPs.js

@@ -14,7 +14,7 @@ async function initializeMCPs(app) {
     return;
   }
 
-  // Filter out servers with startup: false
+  /** Servers filtered with `startup: false` */
   const filteredServers = {};
   for (const [name, config] of Object.entries(mcpServers)) {
     if (config.startup === false) {
@@ -41,7 +41,7 @@ async function initializeMCPs(app) {
       return;
     }
 
-    const mcpTools = mcpManager.getAppToolFunctions();
+    const mcpTools = mcpManager.getAppToolFunctions() ?? {};
     await setCachedTools({ ...cachedTools, ...mcpTools }, { isGlobal: true });
 
     const cache = getLogStores(CacheKeys.CONFIG_STORE);