🔧 feat: Initial MCP Support (Tools)

.eslintrc.js

@@ -18,6 +18,10 @@ module.exports = {
     'client/dist/**/*',
     'client/public/**/*',
     'e2e/playwright-report/**/*',
+    'packages/mcp/types/**/*',
+    'packages/mcp/dist/**/*',
+    'packages/mcp/test_bundle/**/*',
+    'api/demo/**/*',
     'packages/data-provider/types/**/*',
     'packages/data-provider/dist/**/*',
     'packages/data-provider/test_bundle/**/*',
@@ -136,6 +140,30 @@ module.exports = {
         },
       ],
     },
+    {
+      files: './api/demo/**/*.ts',
+      overrides: [
+        {
+          files: '**/*.ts',
+          parser: '@typescript-eslint/parser',
+          parserOptions: {
+            project: './packages/data-provider/tsconfig.json',
+          },
+        },
+      ],
+    },
+    {
+      files: './packages/mcp/**/*.ts',
+      overrides: [
+        {
+          files: '**/*.ts',
+          parser: '@typescript-eslint/parser',
+          parserOptions: {
+            project: './packages/mcp/tsconfig.json',
+          },
+        },
+      ],
+    },
     {
       files: './config/translations/**/*.ts',
       parser: '@typescript-eslint/parser',
@@ -149,6 +177,18 @@ module.exports = {
         project: './packages/data-provider/tsconfig.spec.json',
       },
     },
+    {
+      files: ['./api/demo/specs/**/*.ts'],
+      parserOptions: {
+        project: './packages/data-provider/tsconfig.spec.json',
+      },
+    },
+    {
+      files: ['./packages/mcp/specs/**/*.ts'],
+      parserOptions: {
+        project: './packages/mcp/tsconfig.spec.json',
+      },
+    },
   ],
   settings: {
     react: {

.github/workflows/backend-review.yml

@@ -33,8 +33,11 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Install Data Provider
+      - name: Install Data Provider Package
         run: npm run build:data-provider
+
+      - name: Install MCP Package
+        run: npm run build:mcp
 
       - name: Create empty auth.json file
         run: |

Dockerfile.multi

@@ -10,6 +10,7 @@ RUN npm config set fetch-retry-maxtimeout 600000 && \
     npm config set fetch-retry-mintimeout 15000
 COPY package*.json ./
 COPY packages/data-provider/package*.json ./packages/data-provider/
+COPY packages/mcp/package*.json ./packages/mcp/
 COPY client/package*.json ./client/
 COPY api/package*.json ./api/
 RUN npm ci
@@ -21,6 +22,14 @@ COPY packages/data-provider ./
 RUN npm run build
 RUN npm prune --production
 
+# Build mcp package
+FROM base AS mcp-build
+WORKDIR /app/packages/mcp
+COPY packages/mcp ./
+COPY --from=data-provider-build /app/packages/data-provider/dist /app/packages/data-provider/dist
+RUN npm run build
+RUN npm prune --production
+
 # Client build
 FROM base AS client-build
 WORKDIR /app/client
@@ -36,9 +45,10 @@ WORKDIR /app
 COPY api ./api
 COPY config ./config
 COPY --from=data-provider-build /app/packages/data-provider/dist ./packages/data-provider/dist
+COPY --from=mcp-build /app/packages/mcp/dist ./packages/mcp/dist
 COPY --from=client-build /app/client/dist ./client/dist
 WORKDIR /app/api
 RUN npm prune --production
 EXPOSE 3080
 ENV HOST=0.0.0.0
-CMD ["node", "server/index.js"]
+CMD ["node", "server/index.js"]

api/app/clients/tools/util/handleTools.js

@@ -1,4 +1,4 @@
-const { Tools } = require('librechat-data-provider');
+const { Tools, Constants } = require('librechat-data-provider');
 const { SerpAPI } = require('@langchain/community/tools/serpapi');
 const { Calculator } = require('@langchain/community/tools/calculator');
 const { createCodeExecutionTool, EnvVar } = require('@librechat/agents');
@@ -17,9 +17,12 @@ const {
 } = require('../');
 const { primeFiles: primeCodeFiles } = require('~/server/services/Files/Code/process');
 const { createFileSearchTool, primeFiles: primeSearchFiles } = require('./fileSearch');
+const { createMCPTool } = require('~/server/services/MCP');
 const { loadSpecs } = require('./loadSpecs');
 const { logger } = require('~/config');
 
+const mcpToolPattern = new RegExp(`^.+${Constants.mcp_delimiter}.+$`);
+
 /**
  * Validates the availability and authentication of tools for a user based on environment variables or user-specific plugin authentication values.
  * Tools without required authentication or with valid authentication are considered valid.
@@ -142,10 +145,25 @@ const loadToolWithAuth = (userId, authFields, ToolConstructor, options = {}) =>
   };
 };
 
+/**
+ *
+ * @param {object} object
+ * @param {string} object.user
+ * @param {Agent} [object.agent]
+ * @param {string} [object.model]
+ * @param {EModelEndpoint} [object.endpoint]
+ * @param {LoadToolOptions} [object.options]
+ * @param {boolean} [object.useSpecs]
+ * @param {Array<string>} object.tools
+ * @param {boolean} [object.functions]
+ * @param {boolean} [object.returnMap]
+ * @returns {Promise<{ loadedTools: Tool[], toolContextMap: Object<string, any> } | Record<string,Tool>>}
+ */
 const loadTools = async ({
   user,
+  agent,
   model,
-  isAgent,
+  endpoint,
   useSpecs,
   tools = [],
   options = {},
@@ -182,8 +200,9 @@ const loadTools = async ({
     toolConstructors.dalle = DALLE3;
   }
 
+  /** @type {ImageGenOptions} */
   const imageGenOptions = {
-    isAgent,
+    isAgent: !!agent,
     req: options.req,
     fileStrategy: options.fileStrategy,
     processFileURL: options.processFileURL,
@@ -240,6 +259,15 @@ const loadTools = async ({
         return createFileSearchTool({ req: options.req, files });
       };
       continue;
+    } else if (mcpToolPattern.test(tool)) {
+      requestedTools[tool] = async () =>
+        createMCPTool({
+          req: options.req,
+          toolKey: tool,
+          model: agent?.model ?? model,
+          provider: agent?.provider ?? endpoint,
+        });
+      continue;
     }
 
     if (customConstructors[tool]) {

api/config/index.js

@@ -1,5 +1,22 @@
+const { EventSource } = require('eventsource');
 const logger = require('./winston');
 
+global.EventSource = EventSource;
+
+let mcpManager = null;
+
+/**
+ * @returns {Promise<MCPManager>}
+ */
+async function getMCPManager() {
+  if (!mcpManager) {
+    const { MCPManager } = await import('librechat-mcp');
+    mcpManager = MCPManager.getInstance(logger);
+  }
+  return mcpManager;
+}
+
 module.exports = {
   logger,
+  getMCPManager,
 };

api/package.json

@@ -44,7 +44,7 @@
     "@langchain/google-genai": "^0.1.4",
     "@langchain/google-vertexai": "^0.1.2",
     "@langchain/textsplitters": "^0.1.0",
-    "@librechat/agents": "^1.8.5",
+    "@librechat/agents": "^1.8.8",
     "axios": "^1.7.7",
     "bcryptjs": "^2.4.3",
     "cheerio": "^1.0.0-rc.12",
@@ -73,6 +73,7 @@
     "klona": "^2.0.6",
     "langchain": "^0.2.19",
     "librechat-data-provider": "*",
+    "librechat-mcp": "*",
     "lodash": "^4.17.21",
     "meilisearch": "^0.38.0",
     "mime": "^3.0.0",

api/server/controllers/PluginController.js

@@ -1,6 +1,8 @@
 const { promises: fs } = require('fs');
 const { CacheKeys, AuthType } = require('librechat-data-provider');
 const { addOpenAPISpecs } = require('~/app/clients/tools/util/addOpenAPISpecs');
+const { getCustomConfig } = require('~/server/services/Config');
+const { getMCPManager } = require('~/config');
 const { getLogStores } = require('~/cache');
 
 /**
@@ -107,6 +109,12 @@ const getAvailableTools = async (req, res) => {
     const pluginManifest = await fs.readFile(req.app.locals.paths.pluginManifest, 'utf8');
 
     const jsonData = JSON.parse(pluginManifest);
+    const customConfig = await getCustomConfig();
+    if (customConfig?.mcpServers != null) {
+      const mcpManager = await getMCPManager();
+      await mcpManager.loadManifestTools(jsonData);
+    }
+
     /** @type {TPlugin[]} */
     const uniquePlugins = filterUniquePlugins(jsonData);
 

api/server/controllers/agents/callbacks.js

@@ -1,11 +1,12 @@
-const { Tools, StepTypes, imageGenTools } = require('librechat-data-provider');
+const { Tools, StepTypes, imageGenTools, FileContext } = require('librechat-data-provider');
 const {
   EnvVar,
   GraphEvents,
   ToolEndHandler,
   ChatModelStreamHandler,
 } = require('@librechat/agents');
 const { processCodeOutput } = require('~/server/services/Files/Code/process');
+const { saveBase64Image } = require('~/server/services/Files/process');
 const { loadAuthValues } = require('~/app/clients/tools/util');
 const { logger } = require('~/config');
 
@@ -191,7 +192,11 @@ function createToolEndCallback({ req, res, artifactPromises }) {
       return;
     }
 
-    if (imageGenTools.has(output.name) && output.artifact) {
+    if (!output.artifact) {
+      return;
+    }
+
+    if (imageGenTools.has(output.name)) {
       artifactPromises.push(
         (async () => {
           const fileMetadata = Object.assign(output.artifact, {
@@ -217,10 +222,53 @@ function createToolEndCallback({ req, res, artifactPromises }) {
       return;
     }
 
-    if (output.name !== Tools.execute_code) {
+    if (output.artifact.content) {
+      /** @type {FormattedContent[]} */
+      const content = output.artifact.content;
+      for (const part of content) {
+        if (part.type !== 'image_url') {
+          continue;
+        }
+        const { url } = part.image_url;
+        artifactPromises.push(
+          (async () => {
+            const filename = `${output.tool_call_id}-image-${new Date().getTime()}`;
+            const file = await saveBase64Image(url, {
+              req,
+              filename,
+              endpoint: metadata.provider,
+              context: FileContext.image_generation,
+            });
+            const fileMetadata = Object.assign(file, {
+              messageId: metadata.run_id,
+              toolCallId: output.tool_call_id,
+              conversationId: metadata.thread_id,
+            });
+            if (!res.headersSent) {
+              return fileMetadata;
+            }
+
+            if (!fileMetadata) {
+              return null;
+            }
+
+            res.write(`event: attachment\ndata: ${JSON.stringify(fileMetadata)}\n\n`);
+            return fileMetadata;
+          })().catch((error) => {
+            logger.error('Error processing artifact content:', error);
+            return null;
+          }),
+        );
+      }
       return;
     }
 
+    {
+      if (output.name !== Tools.execute_code) {
+        return;
+      }
+    }
+
     if (!output.artifact.files) {
       return;
     }

api/server/services/AppService.js

@@ -9,6 +9,7 @@ const { azureConfigSetup } = require('./start/azureOpenAI');
 const { loadAndFormatTools } = require('./ToolService');
 const { agentsConfigSetup } = require('./start/agents');
 const { initializeRoles } = require('~/models/Role');
+const { getMCPManager } = require('~/config');
 const paths = require('~/config/paths');
 
 /**
@@ -39,11 +40,17 @@ const AppService = async (app) => {
 
   /** @type {Record<string, FunctionTool} */
   const availableTools = loadAndFormatTools({
-    directory: paths.structuredTools,
     adminFilter: filteredTools,
     adminIncluded: includedTools,
+    directory: paths.structuredTools,
   });
 
+  if (config.mcpServers != null) {
+    const mcpManager = await getMCPManager();
+    await mcpManager.initializeMCP(config.mcpServers);
+    await mcpManager.mapAvailableTools(availableTools);
+  }
+
   const socialLogins =
     config?.registration?.socialLogins ?? configDefaults?.registration?.socialLogins;
   const interfaceConfig = await loadDefaultInterface(config, configDefaults);

api/server/services/Endpoints/agents/initialize.js

@@ -80,8 +80,7 @@ const initializeAgentOptions = async ({
 }) => {
   const { tools, toolContextMap } = await loadAgentTools({
     req,
-    tools: agent.tools,
-    agent_id: agent.id,
+    agent,
     tool_resources,
   });
 

api/server/services/Files/images/resize.js

@@ -58,7 +58,12 @@ async function resizeImageBuffer(inputBuffer, resolution, endpoint) {
   const resizedBuffer = await sharp(inputBuffer).rotate().resize(resizeOptions).toBuffer();
 
   const resizedMetadata = await sharp(resizedBuffer).metadata();
-  return { buffer: resizedBuffer, width: resizedMetadata.width, height: resizedMetadata.height };
+  return {
+    buffer: resizedBuffer,
+    bytes: resizedMetadata.size,
+    width: resizedMetadata.width,
+    height: resizedMetadata.height,
+  };
 }
 
 /**