🔧 fix: Include apiKey in llmConfig for Azure OpenAI Responses API

* 🔍 feat: Introduce Web Search Functionality for OpenAI API

- Added a new web_search parameter to enable web search capabilities in the OpenAI configuration.
- Updated the DynamicSlider component for improved styling.
- Enhanced the useSetIndexOptions hook to auto-enable the Responses API when web search is activated.
- Modified relevant schemas, types, and translation files to support the new web search feature.

* chore: remove comments

* refactor: tool handling in initializeAgent for better clarity and functionality and reflection of openai features

---------

Co-authored-by: Danny Avila <danny@librechat.ai>

Dockerfile

@@ -1,4 +1,4 @@
-# v0.7.8
+# v0.7.9-rc1
 
 # Base node image
 FROM node:20-alpine AS node

Dockerfile.multi

@@ -1,5 +1,5 @@
 # Dockerfile.multi
-# v0.7.8
+# v0.7.9-rc1
 
 # Base for all builds
 FROM node:20-alpine AS base-min

api/app/clients/BaseClient.js

@@ -13,7 +13,6 @@ const {
 const { getMessages, saveMessage, updateMessage, saveConvo, getConvo } = require('~/models');
 const { checkBalance } = require('~/models/balanceMethods');
 const { truncateToolCallOutputs } = require('./prompts');
-const { addSpaceIfNeeded } = require('~/server/utils');
 const { getFiles } = require('~/models/File');
 const TextStream = require('./TextStream');
 const { logger } = require('~/config');
@@ -572,7 +571,7 @@ class BaseClient {
       });
     }
 
-    const { generation = '' } = opts;
+    const { editedContent } = opts;
 
     // It's not necessary to push to currentMessages
     // depending on subclass implementation of handling messages
@@ -587,11 +586,21 @@ class BaseClient {
           isCreatedByUser: false,
           model: this.modelOptions?.model ?? this.model,
           sender: this.sender,
-          text: generation,
         };
         this.currentMessages.push(userMessage, latestMessage);
-      } else {
-        latestMessage.text = generation;
+      } else if (editedContent != null) {
+        // Handle editedContent for content parts
+        if (editedContent && latestMessage.content && Array.isArray(latestMessage.content)) {
+          const { index, text, type } = editedContent;
+          if (index >= 0 && index < latestMessage.content.length) {
+            const contentPart = latestMessage.content[index];
+            if (type === ContentTypes.THINK && contentPart.type === ContentTypes.THINK) {
+              contentPart[ContentTypes.THINK] = text;
+            } else if (type === ContentTypes.TEXT && contentPart.type === ContentTypes.TEXT) {
+              contentPart[ContentTypes.TEXT] = text;
+            }
+          }
+        }
       }
       this.continued = true;
     } else {
@@ -672,16 +681,32 @@ class BaseClient {
     };
 
     if (typeof completion === 'string') {
-      responseMessage.text = addSpaceIfNeeded(generation) + completion;
+      responseMessage.text = completion;
     } else if (
       Array.isArray(completion) &&
       (this.clientName === EModelEndpoint.agents ||
         isParamEndpoint(this.options.endpoint, this.options.endpointType))
     ) {
       responseMessage.text = '';
-      responseMessage.content = completion;
+
+      if (!opts.editedContent || this.currentMessages.length === 0) {
+        responseMessage.content = completion;
+      } else {
+        const latestMessage = this.currentMessages[this.currentMessages.length - 1];
+        if (!latestMessage?.content) {
+          responseMessage.content = completion;
+        } else {
+          const existingContent = [...latestMessage.content];
+          const { type: editedType } = opts.editedContent;
+          responseMessage.content = this.mergeEditedContent(
+            existingContent,
+            completion,
+            editedType,
+          );
+        }
+      }
     } else if (Array.isArray(completion)) {
-      responseMessage.text = addSpaceIfNeeded(generation) + completion.join('');
+      responseMessage.text = completion.join('');
     }
 
     if (
@@ -1095,6 +1120,50 @@ class BaseClient {
     return numTokens;
   }
 
+  /**
+   * Merges completion content with existing content when editing TEXT or THINK types
+   * @param {Array} existingContent - The existing content array
+   * @param {Array} newCompletion - The new completion content
+   * @param {string} editedType - The type of content being edited
+   * @returns {Array} The merged content array
+   */
+  mergeEditedContent(existingContent, newCompletion, editedType) {
+    if (!newCompletion.length) {
+      return existingContent.concat(newCompletion);
+    }
+
+    if (editedType !== ContentTypes.TEXT && editedType !== ContentTypes.THINK) {
+      return existingContent.concat(newCompletion);
+    }
+
+    const lastIndex = existingContent.length - 1;
+    const lastExisting = existingContent[lastIndex];
+    const firstNew = newCompletion[0];
+
+    if (lastExisting?.type !== firstNew?.type || firstNew?.type !== editedType) {
+      return existingContent.concat(newCompletion);
+    }
+
+    const mergedContent = [...existingContent];
+    if (editedType === ContentTypes.TEXT) {
+      mergedContent[lastIndex] = {
+        ...mergedContent[lastIndex],
+        [ContentTypes.TEXT]:
+          (mergedContent[lastIndex][ContentTypes.TEXT] || '') + (firstNew[ContentTypes.TEXT] || ''),
+      };
+    } else {
+      mergedContent[lastIndex] = {
+        ...mergedContent[lastIndex],
+        [ContentTypes.THINK]:
+          (mergedContent[lastIndex][ContentTypes.THINK] || '') +
+          (firstNew[ContentTypes.THINK] || ''),
+      };
+    }
+
+    // Add remaining completion items
+    return mergedContent.concat(newCompletion.slice(1));
+  }
+
   async sendPayload(payload, opts = {}) {
     if (opts && typeof opts === 'object') {
       this.setOptions(opts);

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@librechat/backend",
-  "version": "v0.7.8",
+  "version": "v0.7.9-rc1",
   "description": "",
   "scripts": {
     "start": "echo 'please run this from the root directory'",
@@ -48,7 +48,7 @@
     "@langchain/google-genai": "^0.2.13",
     "@langchain/google-vertexai": "^0.2.13",
     "@langchain/textsplitters": "^0.1.0",
-    "@librechat/agents": "^2.4.46",
+    "@librechat/agents": "^2.4.50",
     "@librechat/api": "*",
     "@librechat/data-schemas": "*",
     "@node-saml/passport-saml": "^5.0.0",

api/server/controllers/agents/__tests__/v1.spec.js

@@ -0,0 +1,195 @@
+const { duplicateAgent } = require('../v1');
+const { getAgent, createAgent } = require('~/models/Agent');
+const { getActions } = require('~/models/Action');
+const { nanoid } = require('nanoid');
+
+jest.mock('~/models/Agent');
+jest.mock('~/models/Action');
+jest.mock('nanoid');
+
+describe('duplicateAgent', () => {
+  let req, res;
+
+  beforeEach(() => {
+    req = {
+      params: { id: 'agent_123' },
+      user: { id: 'user_456' },
+    };
+    res = {
+      status: jest.fn().mockReturnThis(),
+      json: jest.fn(),
+    };
+    jest.clearAllMocks();
+  });
+
+  it('should duplicate an agent successfully', async () => {
+    const mockAgent = {
+      id: 'agent_123',
+      name: 'Test Agent',
+      description: 'Test Description',
+      instructions: 'Test Instructions',
+      provider: 'openai',
+      model: 'gpt-4',
+      tools: ['file_search'],
+      actions: [],
+      author: 'user_789',
+      versions: [{ name: 'Test Agent', version: 1 }],
+      __v: 0,
+    };
+
+    const mockNewAgent = {
+      id: 'agent_new_123',
+      name: 'Test Agent (1/2/23, 12:34)',
+      description: 'Test Description',
+      instructions: 'Test Instructions',
+      provider: 'openai',
+      model: 'gpt-4',
+      tools: ['file_search'],
+      actions: [],
+      author: 'user_456',
+      versions: [
+        {
+          name: 'Test Agent (1/2/23, 12:34)',
+          description: 'Test Description',
+          instructions: 'Test Instructions',
+          provider: 'openai',
+          model: 'gpt-4',
+          tools: ['file_search'],
+          actions: [],
+          createdAt: new Date(),
+          updatedAt: new Date(),
+        },
+      ],
+    };
+
+    getAgent.mockResolvedValue(mockAgent);
+    getActions.mockResolvedValue([]);
+    nanoid.mockReturnValue('new_123');
+    createAgent.mockResolvedValue(mockNewAgent);
+
+    await duplicateAgent(req, res);
+
+    expect(getAgent).toHaveBeenCalledWith({ id: 'agent_123' });
+    expect(getActions).toHaveBeenCalledWith({ agent_id: 'agent_123' }, true);
+    expect(createAgent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: 'agent_new_123',
+        author: 'user_456',
+        name: expect.stringContaining('Test Agent ('),
+        description: 'Test Description',
+        instructions: 'Test Instructions',
+        provider: 'openai',
+        model: 'gpt-4',
+        tools: ['file_search'],
+        actions: [],
+      }),
+    );
+
+    expect(createAgent).toHaveBeenCalledWith(
+      expect.not.objectContaining({
+        versions: expect.anything(),
+        __v: expect.anything(),
+      }),
+    );
+
+    expect(res.status).toHaveBeenCalledWith(201);
+    expect(res.json).toHaveBeenCalledWith({
+      agent: mockNewAgent,
+      actions: [],
+    });
+  });
+
+  it('should ensure duplicated agent has clean versions array without nested fields', async () => {
+    const mockAgent = {
+      id: 'agent_123',
+      name: 'Test Agent',
+      description: 'Test Description',
+      versions: [
+        {
+          name: 'Test Agent',
+          versions: [{ name: 'Nested' }],
+          __v: 1,
+        },
+      ],
+      __v: 2,
+    };
+
+    const mockNewAgent = {
+      id: 'agent_new_123',
+      name: 'Test Agent (1/2/23, 12:34)',
+      description: 'Test Description',
+      versions: [
+        {
+          name: 'Test Agent (1/2/23, 12:34)',
+          description: 'Test Description',
+          createdAt: new Date(),
+          updatedAt: new Date(),
+        },
+      ],
+    };
+
+    getAgent.mockResolvedValue(mockAgent);
+    getActions.mockResolvedValue([]);
+    nanoid.mockReturnValue('new_123');
+    createAgent.mockResolvedValue(mockNewAgent);
+
+    await duplicateAgent(req, res);
+
+    expect(mockNewAgent.versions).toHaveLength(1);
+
+    const firstVersion = mockNewAgent.versions[0];
+    expect(firstVersion).not.toHaveProperty('versions');
+    expect(firstVersion).not.toHaveProperty('__v');
+
+    expect(mockNewAgent).not.toHaveProperty('__v');
+
+    expect(res.status).toHaveBeenCalledWith(201);
+  });
+
+  it('should return 404 if agent not found', async () => {
+    getAgent.mockResolvedValue(null);
+
+    await duplicateAgent(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(404);
+    expect(res.json).toHaveBeenCalledWith({
+      error: 'Agent not found',
+      status: 'error',
+    });
+  });
+
+  it('should handle tool_resources.ocr correctly', async () => {
+    const mockAgent = {
+      id: 'agent_123',
+      name: 'Test Agent',
+      tool_resources: {
+        ocr: { enabled: true, config: 'test' },
+        other: { should: 'not be copied' },
+      },
+    };
+
+    getAgent.mockResolvedValue(mockAgent);
+    getActions.mockResolvedValue([]);
+    nanoid.mockReturnValue('new_123');
+    createAgent.mockResolvedValue({ id: 'agent_new_123' });
+
+    await duplicateAgent(req, res);
+
+    expect(createAgent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        tool_resources: {
+          ocr: { enabled: true, config: 'test' },
+        },
+      }),
+    );
+  });
+
+  it('should handle errors gracefully', async () => {
+    getAgent.mockRejectedValue(new Error('Database error'));
+
+    await duplicateAgent(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(500);
+    expect(res.json).toHaveBeenCalledWith({ error: 'Database error' });
+  });
+});

api/server/controllers/agents/client.js

@@ -525,7 +525,10 @@ class AgentClient extends BaseClient {
           messagesToProcess = [...messages.slice(-messageWindowSize)];
         }
       }
-      return await this.processMemory(messagesToProcess);
+
+      const bufferString = getBufferString(messagesToProcess);
+      const bufferMessage = new HumanMessage(`# Current Chat:\n\n${bufferString}`);
+      return await this.processMemory([bufferMessage]);
     } catch (error) {
       logger.error('Memory Agent failed to process memory', error);
     }

api/server/controllers/agents/request.js

@@ -14,8 +14,11 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {
     text,
     endpointOption,
     conversationId,
+    isContinued = false,
+    editedContent = null,
     parentMessageId = null,
     overrideParentMessageId = null,
+    responseMessageId: editedResponseMessageId = null,
   } = req.body;
 
   let sender;
@@ -67,7 +70,7 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {
             handler();
           }
         } catch (e) {
-          // Ignore cleanup errors
+          logger.error('[AgentController] Error in cleanup handler', e);
         }
       }
     }
@@ -155,7 +158,7 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {
       try {
         res.removeListener('close', closeHandler);
       } catch (e) {
-        // Ignore
+        logger.error('[AgentController] Error removing close listener', e);
       }
     });
 
@@ -163,10 +166,14 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {
       user: userId,
       onStart,
       getReqData,
+      isContinued,
+      editedContent,
       conversationId,
       parentMessageId,
       abortController,
       overrideParentMessageId,
+      isEdited: !!editedContent,
+      responseMessageId: editedResponseMessageId,
       progressOptions: {
         res,
       },

api/server/controllers/agents/v1.js

@@ -242,6 +242,8 @@ const duplicateAgentHandler = async (req, res) => {
       createdAt: _createdAt,
       updatedAt: _updatedAt,
       tool_resources: _tool_resources = {},
+      versions: _versions,
+      __v: _v,
       ...cloneData
     } = agent;
     cloneData.name = `${agent.name} (${new Date().toLocaleString('en-US', {

api/server/routes/agents/tools.js

@@ -1,5 +1,4 @@
 const express = require('express');
-const { addTool, updateTool, deleteTool } = require('@librechat/api');
 const { callTool, verifyToolAuth, getToolCalls } = require('~/server/controllers/tools');
 const { getAvailableTools } = require('~/server/controllers/PluginController');
 const { toolCallLimiter } = require('~/server/middleware/limiters');
@@ -37,29 +36,4 @@ router.get('/:toolId/auth', verifyToolAuth);
  */
 router.post('/:toolId/call', toolCallLimiter, callTool);
 
-/**
- * Add a new tool/MCP to the system
- * @route POST /agents/tools/add
- * @param {object} req.body - Request body containing tool/MCP data
- * @returns {object} Created tool/MCP object
- */
-router.post('/add', addTool);
-
-/**
- * Update an existing tool/MCP in the system
- * @route PUT /agents/tools/:mcp_id
- * @param {string} mcp_id - The ID of the MCP to update
- * @param {object} req.body - Request body containing updated tool/MCP data
- * @returns {object} Updated tool/MCP object
- */
-router.put('/:mcp_id', updateTool);
-
-/**
- * Delete a tool/MCP from the system
- * @route DELETE /agents/tools/:mcp_id
- * @param {string} mcp_id - The ID of the MCP to delete
- * @returns {object} Deletion confirmation
- */
-router.delete('/:mcp_id', deleteTool);
-
 module.exports = router;

api/server/routes/files/multer.spec.js

@@ -477,7 +477,9 @@ describe('Multer Configuration', () => {
         done(new Error('Expected mkdirSync to throw an error but no error was thrown'));
       } catch (error) {
         // This is the expected behavior - mkdirSync throws synchronously for invalid paths
-        expect(error.code).toBe('EACCES');
+        // On Linux, this typically returns EACCES (permission denied)
+        // On macOS/Darwin, this returns ENOENT (no such file or directory)
+        expect(['EACCES', 'ENOENT']).toContain(error.code);
         done();
       }
     });

api/server/routes/messages.js

@@ -235,12 +235,13 @@ router.put('/:conversationId/:messageId', validateMessageReq, async (req, res) =
       return res.status(400).json({ error: 'Content part not found' });
     }
 
-    if (updatedContent[index].type !== ContentTypes.TEXT) {
+    const currentPartType = updatedContent[index].type;
+    if (currentPartType !== ContentTypes.TEXT && currentPartType !== ContentTypes.THINK) {
       return res.status(400).json({ error: 'Cannot update non-text content' });
     }
 
-    const oldText = updatedContent[index].text;
-    updatedContent[index] = { type: ContentTypes.TEXT, text };
+    const oldText = updatedContent[index][currentPartType];
+    updatedContent[index] = { type: currentPartType, [currentPartType]: text };
 
     let tokenCount = message.tokenCount;
     if (tokenCount !== undefined) {

api/server/services/Config/loadAsyncEndpoints.js

@@ -1,3 +1,5 @@
+const path = require('path');
+const { loadServiceKey } = require('@librechat/api');
 const { EModelEndpoint } = require('librechat-data-provider');
 const { isUserProvided } = require('~/server/utils');
 const { config } = require('./EndpointService');
@@ -11,9 +13,13 @@ const { openAIApiKey, azureOpenAIApiKey, useAzurePlugins, userProvidedOpenAI, go
 async function loadAsyncEndpoints(req) {
   let i = 0;
   let serviceKey, googleUserProvides;
+  const serviceKeyPath =
+    process.env.GOOGLE_SERVICE_KEY_FILE_PATH ||
+    path.join(__dirname, '../../..', 'data', 'auth.json');
+
   try {
-    serviceKey = require('~/data/auth.json');
-  } catch (e) {
+    serviceKey = await loadServiceKey(serviceKeyPath);
+  } catch {
     if (i === 0) {
       i++;
     }
@@ -32,14 +38,14 @@ async function loadAsyncEndpoints(req) {
   const gptPlugins =
     useAzure || openAIApiKey || azureOpenAIApiKey
       ? {
-        availableAgents: ['classic', 'functions'],
-        userProvide: useAzure ? false : userProvidedOpenAI,
-        userProvideURL: useAzure
-          ? false
-          : config[EModelEndpoint.openAI]?.userProvideURL ||
+          availableAgents: ['classic', 'functions'],
+          userProvide: useAzure ? false : userProvidedOpenAI,
+          userProvideURL: useAzure
+            ? false
+            : config[EModelEndpoint.openAI]?.userProvideURL ||
               config[EModelEndpoint.azureOpenAI]?.userProvideURL,
-        azure: useAzurePlugins || useAzure,
-      }
+          azure: useAzurePlugins || useAzure,
+        }
       : false;
 
   return { google, gptPlugins };

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

@@ -85,7 +85,7 @@ const initializeAgent = async ({
   });
 
   const provider = agent.provider;
-  const { tools, toolContextMap } =
+  const { tools: structuredTools, toolContextMap } =
     (await loadTools?.({
       req,
       res,
@@ -140,6 +140,22 @@ const initializeAgent = async ({
     agent.provider = options.provider;
   }
 
+  /** @type {import('@librechat/agents').GenericTool[]} */
+  let tools = options.tools?.length ? options.tools : structuredTools;
+  if (
+    (agent.provider === Providers.GOOGLE || agent.provider === Providers.VERTEXAI) &&
+    options.tools?.length &&
+    structuredTools?.length
+  ) {
+    throw new Error(`{ "type": "${ErrorTypes.GOOGLE_TOOL_CONFLICT}"}`);
+  } else if (
+    (agent.provider === Providers.OPENAI || agent.provider === Providers.AZURE) &&
+    options.tools?.length &&
+    structuredTools?.length
+  ) {
+    tools = structuredTools.concat(options.tools);
+  }
+
   /** @type {import('@librechat/agents').ClientOptions} */
   agent.model_parameters = { ...options.llmConfig };
   if (options.configOptions) {
@@ -162,10 +178,10 @@ const initializeAgent = async ({
 
   return {
     ...agent,
-    tools,
     attachments,
     resendFiles,
     toolContextMap,
+    tools,
     maxContextTokens: (agentMaxContextTokens - maxTokens) * 0.9,
   };
 };

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

@@ -1,5 +1,6 @@
-const { getGoogleConfig, isEnabled } = require('@librechat/api');
+const path = require('path');
 const { EModelEndpoint, AuthKeys } = require('librechat-data-provider');
+const { getGoogleConfig, isEnabled, loadServiceKey } = require('@librechat/api');
 const { getUserKey, checkUserKeyExpiry } = require('~/server/services/UserService');
 const { GoogleClient } = require('~/app');
 
@@ -15,8 +16,15 @@ const initializeClient = async ({ req, res, endpointOption, overrideModel, optio
   }
 
   let serviceKey = {};
+
   try {
-    serviceKey = require('~/data/auth.json');
+    const serviceKeyPath =
+      process.env.GOOGLE_SERVICE_KEY_FILE_PATH ||
+      path.join(__dirname, '../../../..', 'data', 'auth.json');
+    serviceKey = await loadServiceKey(serviceKeyPath);
+    if (!serviceKey) {
+      serviceKey = {};
+    }
   } catch (_e) {
     // Do nothing
   }

api/server/services/Endpoints/index.js

@@ -7,6 +7,16 @@ const initCustom = require('~/server/services/Endpoints/custom/initialize');
 const initGoogle = require('~/server/services/Endpoints/google/initialize');
 const { getCustomEndpointConfig } = require('~/server/services/Config');
 
+/** Check if the provider is a known custom provider
+ * @param {string | undefined} [provider] - The provider string
+ * @returns {boolean} - True if the provider is a known custom provider, false otherwise
+ */
+function isKnownCustomProvider(provider) {
+  return [Providers.XAI, Providers.OLLAMA, Providers.DEEPSEEK, Providers.OPENROUTER].includes(
+    provider || '',
+  );
+}
+
 const providerConfigMap = {
   [Providers.XAI]: initCustom,
   [Providers.OLLAMA]: initCustom,
@@ -46,6 +56,13 @@ async function getProviderConfig(provider) {
     overrideProvider = Providers.OPENAI;
   }
 
+  if (isKnownCustomProvider(overrideProvider)) {
+    customEndpointConfig = await getCustomEndpointConfig(provider);
+    if (!customEndpointConfig) {
+      throw new Error(`Provider ${provider} not supported`);
+    }
+  }
+
   return {
     getOptions,
     overrideProvider,

api/server/services/Files/strategies.js

@@ -1,5 +1,9 @@
 const { FileSources } = require('librechat-data-provider');
-const { uploadMistralOCR, uploadAzureMistralOCR } = require('@librechat/api');
+const {
+  uploadMistralOCR,
+  uploadAzureMistralOCR,
+  uploadGoogleVertexMistralOCR,
+} = require('@librechat/api');
 const {
   getFirebaseURL,
   prepareImageURL,
@@ -222,6 +226,26 @@ const azureMistralOCRStrategy = () => ({
   handleFileUpload: uploadAzureMistralOCR,
 });
 
+const vertexMistralOCRStrategy = () => ({
+  /** @type {typeof saveFileFromURL | null} */
+  saveURL: null,
+  /** @type {typeof getLocalFileURL | null} */
+  getFileURL: null,
+  /** @type {typeof saveLocalBuffer | null} */
+  saveBuffer: null,
+  /** @type {typeof processLocalAvatar | null} */
+  processAvatar: null,
+  /** @type {typeof uploadLocalImage | null} */
+  handleImageUpload: null,
+  /** @type {typeof prepareImagesLocal | null} */
+  prepareImagePayload: null,
+  /** @type {typeof deleteLocalFile | null} */
+  deleteFile: null,
+  /** @type {typeof getLocalFileStream | null} */
+  getDownloadStream: null,
+  handleFileUpload: uploadGoogleVertexMistralOCR,
+});
+
 // Strategy Selector
 const getStrategyFunctions = (fileSource) => {
   if (fileSource === FileSources.firebase) {
@@ -244,6 +268,8 @@ const getStrategyFunctions = (fileSource) => {
     return mistralOCRStrategy();
   } else if (fileSource === FileSources.azure_mistral_ocr) {
     return azureMistralOCRStrategy();
+  } else if (fileSource === FileSources.vertexai_mistral_ocr) {
+    return vertexMistralOCRStrategy();
   } else {
     throw new Error('Invalid file source');
   }

api/strategies/openIdJwtStrategy.js

@@ -1,4 +1,5 @@
 const { SystemRoles } = require('librechat-data-provider');
+const { HttpsProxyAgent } = require('https-proxy-agent');
 const { Strategy: JwtStrategy, ExtractJwt } = require('passport-jwt');
 const { updateUser, findUser } = require('~/models');
 const { logger } = require('~/config');
@@ -13,17 +14,23 @@ const { isEnabled } = require('~/server/utils');
  * The strategy extracts the JWT from the Authorization header as a Bearer token.
  * The JWT is then verified using the signing key, and the user is retrieved from the database.
  */
-const openIdJwtLogin = (openIdConfig) =>
-  new JwtStrategy(
+const openIdJwtLogin = (openIdConfig) => {
+  let jwksRsaOptions = {
+    cache: isEnabled(process.env.OPENID_JWKS_URL_CACHE_ENABLED) || true,
+    cacheMaxAge: process.env.OPENID_JWKS_URL_CACHE_TIME
+      ? eval(process.env.OPENID_JWKS_URL_CACHE_TIME)
+      : 60000,
+    jwksUri: openIdConfig.serverMetadata().jwks_uri,
+  };
+
+  if (process.env.PROXY) {
+    jwksRsaOptions.requestAgent = new HttpsProxyAgent(process.env.PROXY);
+  }
+
+  return new JwtStrategy(
     {
       jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
-      secretOrKeyProvider: jwksRsa.passportJwtSecret({
-        cache: isEnabled(process.env.OPENID_JWKS_URL_CACHE_ENABLED) || true,
-        cacheMaxAge: process.env.OPENID_JWKS_URL_CACHE_TIME
-          ? eval(process.env.OPENID_JWKS_URL_CACHE_TIME)
-          : 60000,
-        jwksUri: openIdConfig.serverMetadata().jwks_uri,
-      }),
+      secretOrKeyProvider: jwksRsa.passportJwtSecret(jwksRsaOptions),
     },
     async (payload, done) => {
       try {
@@ -48,5 +55,6 @@ const openIdJwtLogin = (openIdConfig) =>
       }
     },
   );
+};
 
 module.exports = openIdJwtLogin;

api/strategies/openidStrategy.js

@@ -49,7 +49,7 @@ async function customFetch(url, options) {
       logger.info(`[openidStrategy] proxy agent configured: ${process.env.PROXY}`);
       fetchOptions = {
         ...options,
-        dispatcher: new HttpsProxyAgent(process.env.PROXY),
+        dispatcher: new undici.ProxyAgent(process.env.PROXY),
       };
     }
 

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@librechat/frontend",
-  "version": "v0.7.8",
+  "version": "v0.7.9-rc1",
   "description": "",
   "type": "module",
   "scripts": {

client/src/common/mcp.ts

@@ -1,13 +1,26 @@
+import {
+  AuthorizationTypeEnum,
+  AuthTypeEnum,
+  TokenExchangeMethodEnum,
+} from 'librechat-data-provider';
 import { MCPForm } from '~/common/types';
 
 export const defaultMCPFormValues: MCPForm = {
+  type: AuthTypeEnum.None,
+  saved_auth_fields: false,
+  api_key: '',
+  authorization_type: AuthorizationTypeEnum.Basic,
+  custom_auth_header: '',
+  oauth_client_id: '',
+  oauth_client_secret: '',
+  authorization_url: '',
+  client_url: '',
+  scope: '',
+  token_exchange_method: TokenExchangeMethodEnum.DefaultPost,
   name: '',
   description: '',
   url: '',
   tools: [],
   icon: '',
   trust: false,
-  customHeaders: [],
-  requestTimeout: undefined,
-  connectionTimeout: undefined,
 };

client/src/common/types.ts

@@ -167,23 +167,13 @@ export type ActionAuthForm = {
   token_exchange_method: t.TokenExchangeMethodEnum;
 };
 
-export type MCPAuthForm = {
-  customHeaders?: Array<{
-    id: string;
-    name: string;
-    value: string;
-  }>;
-};
-
-export type MCPForm = MCPAuthForm & {
+export type MCPForm = ActionAuthForm & {
   name?: string;
   description?: string;
   url?: string;
   tools?: string[];
   icon?: string;
   trust?: boolean;
-  requestTimeout?: number;
-  connectionTimeout?: number;
 };
 
 export type ActionWithNullableMetadata = Omit<t.Action, 'metadata'> & {
@@ -346,6 +336,11 @@ export type TAskProps = {
 export type TOptions = {
   editedMessageId?: string | null;
   editedText?: string | null;
+  editedContent?: {
+    index: number;
+    text: string;
+    type: 'text' | 'think';
+  };
   isRegenerate?: boolean;
   isContinued?: boolean;
   isEdited?: boolean;

client/src/components/Chat/Input/Files/AttachFileChat.tsx

@@ -4,18 +4,21 @@ import {
   supportsFiles,
   mergeFileConfig,
   isAgentsEndpoint,
+  isAssistantsEndpoint,
   fileConfig as defaultFileConfig,
 } from 'librechat-data-provider';
 import type { EndpointFileConfig } from 'librechat-data-provider';
 import { useGetFileConfig } from '~/data-provider';
 import AttachFileMenu from './AttachFileMenu';
 import { useChatContext } from '~/Providers';
+import AttachFile from './AttachFile';
 
 function AttachFileChat({ disableInputs }: { disableInputs: boolean }) {
   const { conversation } = useChatContext();
   const conversationId = conversation?.conversationId ?? Constants.NEW_CONVO;
   const { endpoint, endpointType } = conversation ?? { endpoint: null };
   const isAgents = useMemo(() => isAgentsEndpoint(endpoint), [endpoint]);
+  const isAssistants = useMemo(() => isAssistantsEndpoint(endpoint), [endpoint]);
 
   const { data: fileConfig = defaultFileConfig } = useGetFileConfig({
     select: (data) => mergeFileConfig(data),
@@ -25,7 +28,9 @@ function AttachFileChat({ disableInputs }: { disableInputs: boolean }) {
   const endpointSupportsFiles: boolean = supportsFiles[endpointType ?? endpoint ?? ''] ?? false;
   const isUploadDisabled = (disableInputs || endpointFileConfig?.disabled) ?? false;
 
-  if (isAgents || (endpointSupportsFiles && !isUploadDisabled)) {
+  if (isAssistants && endpointSupportsFiles && !isUploadDisabled) {
+    return <AttachFile disabled={disableInputs} />;
+  } else if (isAgents || (endpointSupportsFiles && !isUploadDisabled)) {
     return (
       <AttachFileMenu
         disabled={disableInputs}
@@ -34,7 +39,6 @@ function AttachFileChat({ disableInputs }: { disableInputs: boolean }) {
       />
     );
   }
-
   return null;
 }
 

client/src/components/Chat/Messages/Content/ContentParts.tsx

@@ -81,14 +81,23 @@ const ContentParts = memo(
       return (
         <>
           {content.map((part, idx) => {
-            if (part?.type !== ContentTypes.TEXT || typeof part.text !== 'string') {
+            if (!part) {
+              return null;
+            }
+            const isTextPart =
+              part?.type === ContentTypes.TEXT ||
+              typeof (part as unknown as Agents.MessageContentText)?.text !== 'string';
+            const isThinkPart =
+              part?.type === ContentTypes.THINK ||
+              typeof (part as unknown as Agents.ReasoningDeltaUpdate)?.think !== 'string';
+            if (!isTextPart && !isThinkPart) {
               return null;
             }
 
             return (
               <EditTextPart
                 index={idx}
-                text={part.text}
+                part={part as Agents.MessageContentText | Agents.ReasoningDeltaUpdate}
                 messageId={messageId}
                 isSubmitting={isSubmitting}
                 enterEdit={enterEdit}

client/src/components/Chat/Messages/Content/Parts/EditTextPart.tsx

@@ -1,8 +1,9 @@
+import { useRef, useEffect, useCallback, useMemo } from 'react';
 import { useForm } from 'react-hook-form';
 import { ContentTypes } from 'librechat-data-provider';
 import { useRecoilState, useRecoilValue } from 'recoil';
-import { useRef, useEffect, useCallback, useMemo } from 'react';
 import { useUpdateMessageContentMutation } from 'librechat-data-provider/react-query';
+import type { Agents } from 'librechat-data-provider';
 import type { TEditProps } from '~/common';
 import Container from '~/components/Chat/Messages/Content/Container';
 import { useChatContext, useAddedChatContext } from '~/Providers';
@@ -12,18 +13,19 @@ import { useLocalize } from '~/hooks';
 import store from '~/store';
 
 const EditTextPart = ({
-  text,
+  part,
   index,
   messageId,
   isSubmitting,
   enterEdit,
-}: Omit<TEditProps, 'message' | 'ask'> & {
+}: Omit<TEditProps, 'message' | 'ask' | 'text'> & {
   index: number;
   messageId: string;
+  part: Agents.MessageContentText | Agents.ReasoningDeltaUpdate;
 }) => {
   const localize = useLocalize();
   const { addedIndex } = useAddedChatContext();
-  const { getMessages, setMessages, conversation } = useChatContext();
+  const { ask, getMessages, setMessages, conversation } = useChatContext();
   const [latestMultiMessage, setLatestMultiMessage] = useRecoilState(
     store.latestMessageFamily(addedIndex),
   );
@@ -34,15 +36,16 @@ const EditTextPart = ({
     [getMessages, messageId],
   );
 
+  const chatDirection = useRecoilValue(store.chatDirection);
+
   const textAreaRef = useRef<HTMLTextAreaElement | null>(null);
   const updateMessageContentMutation = useUpdateMessageContentMutation(conversationId ?? '');
 
-  const chatDirection = useRecoilValue(store.chatDirection).toLowerCase();
-  const isRTL = chatDirection === 'rtl';
+  const isRTL = chatDirection?.toLowerCase() === 'rtl';
 
   const { register, handleSubmit, setValue } = useForm({
     defaultValues: {
-      text: text ?? '',
+      text: (ContentTypes.THINK in part ? part.think : part.text) || '',
     },
   });
 
@@ -55,15 +58,7 @@ const EditTextPart = ({
     }
   }, []);
 
-  /*
-  const resubmitMessage = () => {
-    showToast({
-      status: 'warning',
-      message: localize('com_warning_resubmit_unsupported'),
-    });
-
-    // const resubmitMessage = (data: { text: string }) => {
-    // Not supported by AWS Bedrock
+  const resubmitMessage = (data: { text: string }) => {
     const messages = getMessages();
     const parentMessage = messages?.find((msg) => msg.messageId === message?.parentMessageId);
 
@@ -73,17 +68,19 @@ const EditTextPart = ({
     ask(
       { ...parentMessage },
       {
-        editedText: data.text,
+        editedContent: {
+          index,
+          text: data.text,
+          type: part.type,
+        },
         editedMessageId: messageId,
         isRegenerate: true,
         isEdited: true,
       },
     );
 
-    setSiblingIdx((siblingIdx ?? 0) - 1);
     enterEdit(true);
   };
-  */
 
   const updateMessage = (data: { text: string }) => {
     const messages = getMessages();
@@ -167,13 +164,13 @@ const EditTextPart = ({
         />
       </div>
       <div className="mt-2 flex w-full justify-center text-center">
-        {/* <button
+        <button
           className="btn btn-primary relative mr-2"
           disabled={isSubmitting}
           onClick={handleSubmit(resubmitMessage)}
         >
           {localize('com_ui_save_submit')}
-        </button> */}
+        </button>
         <button
           className="btn btn-secondary relative mr-2"
           disabled={isSubmitting}

client/src/components/Messages/Content/Error.tsx

@@ -62,6 +62,7 @@ const errorMessages = {
     const { info } = json;
     return info;
   },
+  [ErrorTypes.GOOGLE_TOOL_CONFLICT]: 'com_error_google_tool_conflict',
   [ViolationTypes.BAN]:
     'Your account has been temporarily banned due to violations of our service.',
   invalid_api_key:

client/src/components/SidePanel/Agents/AgentConfig.tsx

@@ -12,7 +12,6 @@ import Instructions from './Instructions';
 import AgentAvatar from './AgentAvatar';
 import FileContext from './FileContext';
 import SearchForm from './Search/Form';
-import MCPSection from './MCPSection';
 import { useLocalize } from '~/hooks';
 import FileSearch from './FileSearch';
 import Artifacts from './Artifacts';
@@ -357,7 +356,7 @@ export default function AgentConfig({
           </div>
         </div>
         {/* MCP Section */}
-        <MCPSection />
+        {/* <MCPSection /> */}
       </div>
       <ToolSelectDialog
         isOpen={showToolDialog}

client/src/components/SidePanel/Agents/AgentMCPFormPanel.tsx

@@ -1,112 +0,0 @@
-import type { MCP } from 'librechat-data-provider';
-import { useAgentPanelContext } from '~/Providers/AgentPanelContext';
-import { useToastContext } from '~/Providers';
-import { useLocalize } from '~/hooks';
-import { Panel } from '~/common';
-import MCPFormPanel from '../MCP/MCPFormPanel';
-
-// TODO: Add MCP delete (for now mocked for ui)
-// import { useDeleteAgentMCP } from '~/data-provider';
-
-function useDeleteAgentMCP({
-  onSuccess,
-  onError,
-}: {
-  onSuccess: () => void;
-  onError: (error: Error) => void;
-}) {
-  return {
-    mutate: async ({ mcp_id, agent_id }: { mcp_id: string; agent_id: string }) => {
-      try {
-        console.log('Mock delete MCP:', { mcp_id, agent_id });
-        onSuccess();
-      } catch (error) {
-        onError(error as Error);
-      }
-    },
-  };
-}
-
-function useUpdateAgentMCP({
-  onSuccess,
-  onError,
-}: {
-  onSuccess: (mcp: MCP) => void;
-  onError: (error: Error) => void;
-}) {
-  return {
-    mutate: async (mcp: MCP) => {
-      try {
-        // TODO: Implement MCP endpoint
-        onSuccess(mcp);
-      } catch (error) {
-        onError(error as Error);
-      }
-    },
-    isLoading: false,
-  };
-}
-
-export default function AgentMCPFormPanel() {
-  const localize = useLocalize();
-  const { showToast } = useToastContext();
-  const { mcp, setMcp, agent_id, setActivePanel } = useAgentPanelContext();
-
-  const updateAgentMCP = useUpdateAgentMCP({
-    onSuccess(mcp) {
-      showToast({
-        message: localize('com_ui_update_mcp_success'),
-        status: 'success',
-      });
-      setMcp(mcp);
-    },
-    onError(error) {
-      showToast({
-        message: (error as Error).message || localize('com_ui_update_mcp_error'),
-        status: 'error',
-      });
-    },
-  });
-
-  const deleteAgentMCP = useDeleteAgentMCP({
-    onSuccess: () => {
-      showToast({
-        message: localize('com_ui_delete_mcp_success'),
-        status: 'success',
-      });
-      setActivePanel(Panel.builder);
-      setMcp(undefined);
-    },
-    onError(error) {
-      showToast({
-        message: (error as Error).message ?? localize('com_ui_delete_mcp_error'),
-        status: 'error',
-      });
-    },
-  });
-
-  const handleBack = () => {
-    setActivePanel(Panel.builder);
-    setMcp(undefined);
-  };
-
-  const handleSave = (mcp: MCP) => {
-    updateAgentMCP.mutate(mcp);
-  };
-
-  const handleDelete = (mcp_id: string, contextId: string) => {
-    deleteAgentMCP.mutate({ mcp_id, agent_id: contextId });
-  };
-
-  return (
-    <MCPFormPanel
-      mcp={mcp}
-      agent_id={agent_id}
-      onBack={handleBack}
-      onDelete={handleDelete}
-      onSave={handleSave}
-      showDeleteButton={!!mcp}
-      isDeleteDisabled={!agent_id || !mcp?.mcp_id}
-    />
-  );
-}

client/src/components/SidePanel/Agents/AgentPanelSwitch.tsx

@@ -7,7 +7,7 @@ import VersionPanel from './Version/VersionPanel';
 import { useChatContext } from '~/Providers';
 import ActionsPanel from './ActionsPanel';
 import AgentPanel from './AgentPanel';
-import AgentMCPFormPanel from './AgentMCPFormPanel';
+import MCPPanel from './MCPPanel';
 import { Panel } from '~/common';
 
 export default function AgentPanelSwitch() {
@@ -55,7 +55,7 @@ function AgentPanelSwitchWithContext() {
     return <VersionPanel />;
   }
   if (activePanel === Panel.mcp) {
-    return <AgentMCPFormPanel />;
+    return <MCPPanel />;
   }
   return <AgentPanel agentsConfig={agentsConfig} endpointsConfig={endpointsConfig} />;
 }

client/src/components/SidePanel/Agents/AgentTool.tsx

@@ -226,7 +226,7 @@ export default function AgentTool({
                             }}
                             className={cn(
                               'h-4 w-4 rounded border border-gray-300 transition-all duration-200 hover:border-gray-400 dark:border-gray-600 dark:hover:border-gray-500',
-                              isExpanded ? 'opacity-100' : 'opacity-0',
+                              isExpanded ? 'visible' : 'pointer-events-none invisible',
                             )}
                             onClick={(e) => e.stopPropagation()}
                             onKeyDown={(e) => {

client/src/components/SidePanel/Agents/MCPInput.tsx

@@ -1,28 +1,58 @@
 import { useState, useEffect } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
 import type { MCP } from 'librechat-data-provider';
-import { MCPAuth } from '~/components/SidePanel/MCP/MCPAuth';
+import MCPAuth from '~/components/SidePanel/Builder/MCPAuth';
 import MCPIcon from '~/components/SidePanel/Agents/MCPIcon';
 import { Label, Checkbox } from '~/components/ui';
 import useLocalize from '~/hooks/useLocalize';
+import { useToastContext } from '~/Providers';
 import { Spinner } from '~/components/svg';
 import { MCPForm } from '~/common/types';
 
+function useUpdateAgentMCP({
+  onSuccess,
+  onError,
+}: {
+  onSuccess: (data: [string, MCP]) => void;
+  onError: (error: Error) => void;
+}) {
+  return {
+    mutate: async ({
+      mcp_id,
+      metadata,
+      agent_id,
+    }: {
+      mcp_id?: string;
+      metadata: MCP['metadata'];
+      agent_id: string;
+    }) => {
+      try {
+        // TODO: Implement MCP endpoint
+        onSuccess(['success', { mcp_id, metadata, agent_id } as MCP]);
+      } catch (error) {
+        onError(error as Error);
+      }
+    },
+    isLoading: false,
+  };
+}
+
 interface MCPInputProps {
   mcp?: MCP;
   agent_id?: string;
-  onSave: (mcp: MCP) => void;
-  isLoading?: boolean;
+  setMCP: React.Dispatch<React.SetStateAction<MCP | undefined>>;
 }
 
-export default function MCPInput({ mcp, agent_id, onSave, isLoading = false }: MCPInputProps) {
+export default function MCPInput({ mcp, agent_id, setMCP }: MCPInputProps) {
   const localize = useLocalize();
+  const { showToast } = useToastContext();
   const {
     handleSubmit,
     register,
     formState: { errors },
     control,
   } = useFormContext<MCPForm>();
+  const [isLoading, setIsLoading] = useState(false);
   const [showTools, setShowTools] = useState(false);
   const [selectedTools, setSelectedTools] = useState<string[]>([]);
 
@@ -34,16 +64,50 @@ export default function MCPInput({ mcp, agent_id, onSave, isLoading = false }: M
     }
   }, [mcp]);
 
+  const updateAgentMCP = useUpdateAgentMCP({
+    onSuccess(data) {
+      showToast({
+        message: localize('com_ui_update_mcp_success'),
+        status: 'success',
+      });
+      setMCP(data[1]);
+      setShowTools(true);
+      setSelectedTools(data[1].metadata.tools ?? []);
+      setIsLoading(false);
+    },
+    onError(error) {
+      showToast({
+        message: (error as Error).message || localize('com_ui_update_mcp_error'),
+        status: 'error',
+      });
+      setIsLoading(false);
+    },
+  });
+
   const saveMCP = handleSubmit(async (data: MCPForm) => {
-    const updatedMCP: MCP = {
-      mcp_id: mcp?.mcp_id ?? '',
-      agent_id: agent_id ?? '',
-      metadata: {
-        ...data,
-        tools: selectedTools,
-      },
-    };
-    onSave(updatedMCP);
+    setIsLoading(true);
+    try {
+      const response = await updateAgentMCP.mutate({
+        agent_id: agent_id ?? '',
+        mcp_id: mcp?.mcp_id,
+        metadata: {
+          ...data,
+          tools: selectedTools,
+        },
+      });
+      setMCP(response[1]);
+      showToast({
+        message: localize('com_ui_update_mcp_success'),
+        status: 'success',
+      });
+    } catch {
+      showToast({
+        message: localize('com_ui_update_mcp_error'),
+        status: 'error',
+      });
+    } finally {
+      setIsLoading(false);
+    }
   });
 
   const handleSelectAll = () => {
@@ -76,15 +140,14 @@ export default function MCPInput({ mcp, agent_id, onSave, isLoading = false }: M
       const reader = new FileReader();
       reader.onloadend = () => {
         const base64String = reader.result as string;
-        const updatedMCP: MCP = {
+        setMCP({
           mcp_id: mcp?.mcp_id ?? '',
           agent_id: agent_id ?? '',
           metadata: {
             ...mcp?.metadata,
             icon: base64String,
           },
-        };
-        onSave(updatedMCP);
+        });
       };
       reader.readAsDataURL(file);
     }

client/src/components/SidePanel/Agents/MCPPanel.tsx

@@ -0,0 +1,172 @@
+import { useEffect } from 'react';
+import { ChevronLeft } from 'lucide-react';
+import { useForm, FormProvider } from 'react-hook-form';
+import { useAgentPanelContext } from '~/Providers/AgentPanelContext';
+import { OGDialog, OGDialogTrigger, Label } from '~/components/ui';
+import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
+import { defaultMCPFormValues } from '~/common/mcp';
+import useLocalize from '~/hooks/useLocalize';
+import { useToastContext } from '~/Providers';
+import { TrashIcon } from '~/components/svg';
+import type { MCPForm } from '~/common';
+import MCPInput from './MCPInput';
+import { Panel } from '~/common';
+import {
+  AuthTypeEnum,
+  AuthorizationTypeEnum,
+  TokenExchangeMethodEnum,
+} from 'librechat-data-provider';
+// TODO: Add MCP delete (for now mocked for ui)
+// import { useDeleteAgentMCP } from '~/data-provider';
+
+function useDeleteAgentMCP({
+  onSuccess,
+  onError,
+}: {
+  onSuccess: () => void;
+  onError: (error: Error) => void;
+}) {
+  return {
+    mutate: async ({ mcp_id, agent_id }: { mcp_id: string; agent_id: string }) => {
+      try {
+        console.log('Mock delete MCP:', { mcp_id, agent_id });
+        onSuccess();
+      } catch (error) {
+        onError(error as Error);
+      }
+    },
+  };
+}
+
+export default function MCPPanel() {
+  const localize = useLocalize();
+  const { showToast } = useToastContext();
+  const { mcp, setMcp, agent_id, setActivePanel } = useAgentPanelContext();
+  const deleteAgentMCP = useDeleteAgentMCP({
+    onSuccess: () => {
+      showToast({
+        message: localize('com_ui_delete_mcp_success'),
+        status: 'success',
+      });
+      setActivePanel(Panel.builder);
+      setMcp(undefined);
+    },
+    onError(error) {
+      showToast({
+        message: (error as Error).message ?? localize('com_ui_delete_mcp_error'),
+        status: 'error',
+      });
+    },
+  });
+
+  const methods = useForm<MCPForm>({
+    defaultValues: defaultMCPFormValues,
+  });
+
+  const { reset } = methods;
+
+  useEffect(() => {
+    if (mcp) {
+      const formData = {
+        icon: mcp.metadata.icon ?? '',
+        name: mcp.metadata.name ?? '',
+        description: mcp.metadata.description ?? '',
+        url: mcp.metadata.url ?? '',
+        tools: mcp.metadata.tools ?? [],
+        trust: mcp.metadata.trust ?? false,
+      };
+
+      if (mcp.metadata.auth) {
+        Object.assign(formData, {
+          type: mcp.metadata.auth.type || AuthTypeEnum.None,
+          saved_auth_fields: false,
+          api_key: mcp.metadata.api_key ?? '',
+          authorization_type: mcp.metadata.auth.authorization_type || AuthorizationTypeEnum.Basic,
+          oauth_client_id: mcp.metadata.oauth_client_id ?? '',
+          oauth_client_secret: mcp.metadata.oauth_client_secret ?? '',
+          authorization_url: mcp.metadata.auth.authorization_url ?? '',
+          client_url: mcp.metadata.auth.client_url ?? '',
+          scope: mcp.metadata.auth.scope ?? '',
+          token_exchange_method:
+            mcp.metadata.auth.token_exchange_method ?? TokenExchangeMethodEnum.DefaultPost,
+        });
+      }
+
+      reset(formData);
+    }
+  }, [mcp, reset]);
+
+  return (
+    <FormProvider {...methods}>
+      <form className="h-full grow overflow-hidden">
+        <div className="h-full overflow-auto px-2 pb-12 text-sm">
+          <div className="relative flex flex-col items-center px-16 py-6 text-center">
+            <div className="absolute left-0 top-6">
+              <button
+                type="button"
+                className="btn btn-neutral relative"
+                onClick={() => {
+                  setActivePanel(Panel.builder);
+                  setMcp(undefined);
+                }}
+              >
+                <div className="flex w-full items-center justify-center gap-2">
+                  <ChevronLeft />
+                </div>
+              </button>
+            </div>
+
+            {!!mcp && (
+              <OGDialog>
+                <OGDialogTrigger asChild>
+                  <div className="absolute right-0 top-6">
+                    <button
+                      type="button"
+                      disabled={!agent_id || !mcp.mcp_id}
+                      className="btn btn-neutral border-token-border-light relative h-9 rounded-lg font-medium"
+                    >
+                      <TrashIcon className="text-red-500" />
+                    </button>
+                  </div>
+                </OGDialogTrigger>
+                <OGDialogTemplate
+                  showCloseButton={false}
+                  title={localize('com_ui_delete_mcp')}
+                  className="max-w-[450px]"
+                  main={
+                    <Label className="text-left text-sm font-medium">
+                      {localize('com_ui_delete_mcp_confirm')}
+                    </Label>
+                  }
+                  selection={{
+                    selectHandler: () => {
+                      if (!agent_id) {
+                        return showToast({
+                          message: localize('com_agents_no_agent_id_error'),
+                          status: 'error',
+                        });
+                      }
+                      deleteAgentMCP.mutate({
+                        mcp_id: mcp.mcp_id,
+                        agent_id,
+                      });
+                    },
+                    selectClasses:
+                      'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 transition-color duration-200 text-white',
+                    selectText: localize('com_ui_delete'),
+                  }}
+                />
+              </OGDialog>
+            )}
+
+            <div className="text-xl font-medium">
+              {mcp ? localize('com_ui_edit_mcp_server') : localize('com_ui_add_mcp_server')}
+            </div>
+            <div className="text-xs text-text-secondary">{localize('com_agents_mcp_info')}</div>
+          </div>
+          <MCPInput mcp={mcp} agent_id={agent_id} setMCP={setMcp} />
+        </div>
+      </form>
+    </FormProvider>
+  );
+}

client/src/components/SidePanel/Agents/MCPSection.tsx

@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 import { useLocalize } from '~/hooks';
 import { useToastContext } from '~/Providers';
 import { useAgentPanelContext } from '~/Providers/AgentPanelContext';
-import { MCPItem } from '~/components/SidePanel/MCP/MCPItem';
+import MCP from '~/components/SidePanel/Builder/MCP';
 import { Panel } from '~/common';
 
 export default function MCPSection() {
@@ -30,7 +30,7 @@ export default function MCPSection() {
         {mcps
           .filter((mcp) => mcp.agent_id === agent_id)
           .map((mcp, i) => (
-            <MCPItem
+            <MCP
               key={i}
               mcp={mcp}
               onClick={() => {

client/src/components/SidePanel/Builder/MCP.tsx

@@ -9,7 +9,7 @@ type MCPProps = {
   onClick: () => void;
 };
 
-export function MCPItem({ mcp, onClick }: MCPProps) {
+export default function MCP({ mcp, onClick }: MCPProps) {
   const [isHovering, setIsHovering] = useState(false);
 
   return (

client/src/components/SidePanel/Builder/MCPAuth.tsx

@@ -0,0 +1,55 @@
+import { useEffect } from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+import ActionsAuth from '~/components/SidePanel/Builder/ActionsAuth';
+import {
+  AuthorizationTypeEnum,
+  TokenExchangeMethodEnum,
+  AuthTypeEnum,
+} from 'librechat-data-provider';
+
+export default function MCPAuth() {
+  // Create a separate form for auth
+  const authMethods = useForm({
+    defaultValues: {
+      /* General */
+      type: AuthTypeEnum.None,
+      saved_auth_fields: false,
+      /* API key */
+      api_key: '',
+      authorization_type: AuthorizationTypeEnum.Basic,
+      custom_auth_header: '',
+      /* OAuth */
+      oauth_client_id: '',
+      oauth_client_secret: '',
+      authorization_url: '',
+      client_url: '',
+      scope: '',
+      token_exchange_method: TokenExchangeMethodEnum.DefaultPost,
+    },
+  });
+
+  const { watch, setValue } = authMethods;
+  const type = watch('type');
+
+  // Sync form state when auth type changes
+  useEffect(() => {
+    if (type === 'none') {
+      // Reset auth fields when type is none
+      setValue('api_key', '');
+      setValue('authorization_type', AuthorizationTypeEnum.Basic);
+      setValue('custom_auth_header', '');
+      setValue('oauth_client_id', '');
+      setValue('oauth_client_secret', '');
+      setValue('authorization_url', '');
+      setValue('client_url', '');
+      setValue('scope', '');
+      setValue('token_exchange_method', TokenExchangeMethodEnum.DefaultPost);
+    }
+  }, [type, setValue]);
+
+  return (
+    <FormProvider {...authMethods}>
+      <ActionsAuth />
+    </FormProvider>
+  );
+}

client/src/components/SidePanel/MCP/MCPAuth.tsx

@@ -1,226 +0,0 @@
-import { useState } from 'react';
-import { useFormContext } from 'react-hook-form';
-import { Plus, Trash2, CirclePlus } from 'lucide-react';
-import * as Menu from '@ariakit/react/menu';
-import {
-  Accordion,
-  AccordionContent,
-  AccordionItem,
-  AccordionTrigger,
-} from '~/components/ui/Accordion';
-import { DropdownPopup } from '~/components/ui';
-import { useLocalize } from '~/hooks';
-
-interface UserInfoPlaceholder {
-  label: string;
-  value: string;
-  description: string;
-}
-
-const userInfoPlaceholders: UserInfoPlaceholder[] = [
-  { label: 'user-id', value: '{{LIBRECHAT_USER_ID}}', description: 'Current user ID' },
-  { label: 'username', value: '{{LIBRECHAT_USER_USERNAME}}', description: 'Current username' },
-  { label: 'email', value: '{{LIBRECHAT_USER_EMAIL}}', description: 'Current user email' },
-  { label: 'name', value: '{{LIBRECHAT_USER_NAME}}', description: 'Current user name' },
-  {
-    label: 'provider',
-    value: '{{LIBRECHAT_USER_PROVIDER}}',
-    description: 'Authentication provider',
-  },
-  { label: 'role', value: '{{LIBRECHAT_USER_ROLE}}', description: 'User role' },
-];
-
-export function MCPAuth() {
-  const localize = useLocalize();
-  const { register, watch, setValue } = useFormContext();
-  const [isHeadersMenuOpen, setIsHeadersMenuOpen] = useState(false);
-
-  const customHeaders = watch('customHeaders') || [];
-
-  const addCustomHeader = () => {
-    const newHeader = {
-      id: Date.now().toString(),
-      name: '',
-      value: '',
-    };
-    setValue('customHeaders', [...customHeaders, newHeader]);
-  };
-
-  const removeCustomHeader = (id: string) => {
-    setValue(
-      'customHeaders',
-      customHeaders.filter((header: any) => header.id !== id),
-    );
-  };
-
-  const updateCustomHeader = (id: string, field: 'name' | 'value', value: string) => {
-    setValue(
-      'customHeaders',
-      customHeaders.map((header: any) =>
-        header.id === id ? { ...header, [field]: value } : header,
-      ),
-    );
-  };
-
-  const handleAddPlaceholder = (placeholder: UserInfoPlaceholder) => {
-    const newHeader = {
-      id: Date.now().toString(),
-      name: placeholder.label,
-      value: placeholder.value,
-    };
-    setValue('customHeaders', [...customHeaders, newHeader]);
-    setIsHeadersMenuOpen(false);
-  };
-
-  const headerMenuItems = [
-    ...userInfoPlaceholders.map((placeholder) => ({
-      label: `${placeholder.label} - ${placeholder.description}`,
-      onClick: () => handleAddPlaceholder(placeholder),
-    })),
-  ];
-
-  return (
-    <div className="space-y-4">
-      {/* Authentication Accordion */}
-      <Accordion type="single" collapsible className="w-full">
-        <AccordionItem value="authentication" className="rounded-lg border border-border-medium">
-          <AccordionTrigger className="px-4 py-3 text-sm font-medium hover:no-underline">
-            {localize('com_ui_authentication')}
-          </AccordionTrigger>
-          <AccordionContent className="px-4 pb-4">
-            <div className="space-y-4">
-              {/* Custom Headers Section - Individual Inputs Version */}
-              <div>
-                <div className="mb-3 flex items-center justify-between">
-                  <label className="text-sm font-medium text-text-primary">
-                    {localize('com_ui_mcp_custom_headers')}
-                  </label>
-                  <DropdownPopup
-                    menuId="headers-menu"
-                    items={headerMenuItems}
-                    isOpen={isHeadersMenuOpen}
-                    setIsOpen={setIsHeadersMenuOpen}
-                    trigger={
-                      <Menu.MenuButton
-                        onClick={() => setIsHeadersMenuOpen(!isHeadersMenuOpen)}
-                        className="flex h-7 items-center gap-1 rounded-md border border-border-medium bg-surface-secondary px-2 py-0 text-xs text-text-primary transition-colors duration-200 hover:bg-surface-tertiary"
-                      >
-                        <CirclePlus className="mr-1 h-3 w-3 text-text-secondary" />
-                        {localize('com_ui_mcp_headers')}
-                      </Menu.MenuButton>
-                    }
-                  />
-                </div>
-
-                <div className="space-y-2">
-                  {customHeaders.length === 0 ? (
-                    <div className="flex items-center justify-between gap-2">
-                      <p className="min-w-0 flex-1 text-sm text-text-secondary">
-                        {localize('com_ui_mcp_no_custom_headers')}
-                      </p>
-                      <button
-                        type="button"
-                        onClick={addCustomHeader}
-                        className="flex h-7 shrink-0 items-center gap-1 rounded-md border border-border-medium bg-surface-secondary px-2 py-0 text-xs text-text-primary transition-colors duration-200 hover:bg-surface-tertiary"
-                      >
-                        <Plus className="h-3 w-3" />
-                        {localize('com_ui_mcp_add_header')}
-                      </button>
-                    </div>
-                  ) : (
-                    <>
-                      {customHeaders.map((header: any) => (
-                        <div key={header.id} className="flex min-w-0 gap-2">
-                          <input
-                            type="text"
-                            placeholder={localize('com_ui_mcp_header_name')}
-                            value={header.name}
-                            onChange={(e) => updateCustomHeader(header.id, 'name', e.target.value)}
-                            className="min-w-0 flex-1 rounded-md border border-border-medium bg-surface-primary px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-ring"
-                          />
-                          <input
-                            type="text"
-                            placeholder={localize('com_ui_mcp_header_value')}
-                            value={header.value}
-                            onChange={(e) => updateCustomHeader(header.id, 'value', e.target.value)}
-                            className="min-w-0 flex-1 rounded-md border border-border-medium bg-surface-primary px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-ring"
-                          />
-                          <button
-                            type="button"
-                            onClick={() => removeCustomHeader(header.id)}
-                            className="flex h-9 w-9 shrink-0 items-center justify-center rounded-md border border-border-medium bg-surface-primary text-text-secondary hover:bg-surface-secondary hover:text-text-primary"
-                          >
-                            <Trash2 className="h-4 w-4" />
-                          </button>
-                        </div>
-                      ))}
-                      {/* Add New Header Button */}
-                      <div className="flex justify-end">
-                        <button
-                          type="button"
-                          onClick={addCustomHeader}
-                          className="flex h-7 shrink-0 items-center gap-1 rounded-md border border-border-medium bg-surface-secondary px-2 py-0 text-xs text-text-primary transition-colors duration-200 hover:bg-surface-tertiary"
-                        >
-                          <Plus className="h-3 w-3" />
-                          {localize('com_ui_mcp_add_header')}
-                        </button>
-                      </div>
-                    </>
-                  )}
-                </div>
-              </div>
-            </div>
-          </AccordionContent>
-        </AccordionItem>
-      </Accordion>
-
-      {/* Configuration Accordion */}
-      <Accordion type="single" collapsible className="w-full">
-        <AccordionItem value="configuration" className="rounded-lg border border-border-medium">
-          <AccordionTrigger className="px-4 py-3 text-sm font-medium hover:no-underline">
-            {localize('com_ui_mcp_configuration')}
-          </AccordionTrigger>
-          <AccordionContent className="px-4 pb-4">
-            <div className="space-y-4">
-              {/* Request Timeout */}
-              <div>
-                <label className="mb-2 block text-sm font-medium text-text-primary">
-                  {localize('com_ui_mcp_request_timeout')}
-                </label>
-                <input
-                  type="number"
-                  min="1000"
-                  max="300000"
-                  placeholder="10000"
-                  {...register('requestTimeout')}
-                  className="h-9 w-full rounded-md border border-border-medium bg-surface-primary px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-ring"
-                />
-                <p className="mt-1 text-xs text-text-secondary">
-                  {localize('com_ui_mcp_request_timeout_description')}
-                </p>
-              </div>
-
-              {/* Connection Timeout */}
-              <div>
-                <label className="mb-2 block text-sm font-medium text-text-primary">
-                  {localize('com_ui_mcp_connection_timeout')}
-                </label>
-                <input
-                  type="number"
-                  min="1000"
-                  max="60000"
-                  placeholder="10000"
-                  {...register('connectionTimeout')}
-                  className="h-9 w-full rounded-md border border-border-medium bg-surface-primary px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-ring"
-                />
-                <p className="mt-1 text-xs text-text-secondary">
-                  {localize('com_ui_mcp_connection_timeout_description')}
-                </p>
-              </div>
-            </div>
-          </AccordionContent>
-        </AccordionItem>
-      </Accordion>
-    </div>
-  );
-}

client/src/components/SidePanel/MCP/MCPFormPanel.tsx

@@ -1,137 +0,0 @@
-import { useEffect } from 'react';
-import { ChevronLeft } from 'lucide-react';
-import { useForm, FormProvider } from 'react-hook-form';
-import type { MCP } from 'librechat-data-provider';
-import type { MCPForm } from '~/common';
-import { OGDialog, OGDialogTrigger, Label } from '~/components/ui';
-import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
-import { defaultMCPFormValues } from '~/common/mcp';
-import useLocalize from '~/hooks/useLocalize';
-import { TrashIcon } from '~/components/svg';
-import MCPInput from './MCPInput';
-
-interface MCPFormPanelProps {
-  // Data
-  mcp?: MCP;
-  agent_id?: string;
-
-  // Actions
-  onBack: () => void;
-  onDelete?: (mcp_id: string, agent_id: string) => void;
-  onSave: (mcp: MCP) => void;
-
-  // UI customization
-  title?: string;
-  subtitle?: string;
-  showDeleteButton?: boolean;
-  isDeleteDisabled?: boolean;
-  deleteConfirmMessage?: string;
-
-  // Form customization
-  defaultValues?: Partial<MCPForm>;
-}
-
-export default function MCPFormPanel({
-  mcp,
-  agent_id,
-  onBack,
-  onDelete,
-  onSave,
-  title,
-  subtitle,
-  showDeleteButton = true,
-  isDeleteDisabled = false,
-  deleteConfirmMessage,
-  defaultValues = defaultMCPFormValues,
-}: MCPFormPanelProps) {
-  const localize = useLocalize();
-
-  const methods = useForm<MCPForm>({
-    defaultValues: defaultValues,
-  });
-
-  const { reset } = methods;
-
-  useEffect(() => {
-    if (mcp) {
-      const formData = {
-        icon: mcp.metadata.icon ?? '',
-        name: mcp.metadata.name ?? '',
-        description: mcp.metadata.description ?? '',
-        url: mcp.metadata.url ?? '',
-        tools: mcp.metadata.tools ?? [],
-        trust: mcp.metadata.trust ?? false,
-        customHeaders: mcp.metadata.customHeaders ?? [],
-        requestTimeout: mcp.metadata.requestTimeout,
-        connectionTimeout: mcp.metadata.connectionTimeout,
-      };
-
-      reset(formData);
-    }
-  }, [mcp, reset]);
-
-  const handleDelete = () => {
-    if (onDelete && mcp?.mcp_id && agent_id) {
-      onDelete(mcp.mcp_id, agent_id);
-    }
-  };
-
-  return (
-    <FormProvider {...methods}>
-      <form className="h-full grow overflow-hidden">
-        <div className="h-full overflow-auto px-2 pb-12 text-sm">
-          <div className="relative flex flex-col items-center px-16 py-6 text-center">
-            <div className="absolute left-0 top-6">
-              <button type="button" className="btn btn-neutral relative" onClick={onBack}>
-                <div className="flex w-full items-center justify-center gap-2">
-                  <ChevronLeft />
-                </div>
-              </button>
-            </div>
-
-            {!!mcp && showDeleteButton && onDelete && (
-              <OGDialog>
-                <OGDialogTrigger asChild>
-                  <div className="absolute right-0 top-6">
-                    <button
-                      type="button"
-                      disabled={isDeleteDisabled || !mcp.mcp_id || !agent_id}
-                      className="btn btn-neutral border-token-border-light relative h-9 rounded-lg font-medium"
-                    >
-                      <TrashIcon className="text-red-500" />
-                    </button>
-                  </div>
-                </OGDialogTrigger>
-                <OGDialogTemplate
-                  showCloseButton={false}
-                  title={localize('com_ui_delete_mcp')}
-                  className="max-w-[450px]"
-                  main={
-                    <Label className="text-left text-sm font-medium">
-                      {deleteConfirmMessage || localize('com_ui_delete_mcp_confirm')}
-                    </Label>
-                  }
-                  selection={{
-                    selectHandler: handleDelete,
-                    selectClasses:
-                      'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 transition-color duration-200 text-white',
-                    selectText: localize('com_ui_delete'),
-                  }}
-                />
-              </OGDialog>
-            )}
-
-            <div className="text-xl font-medium">
-              {title ||
-                (mcp ? localize('com_ui_edit_mcp_server') : localize('com_ui_add_mcp_server'))}
-            </div>
-            <div className="text-xs text-text-secondary">
-              {subtitle || localize('com_agents_mcp_info')}
-            </div>
-          </div>
-          <MCPInput mcp={mcp} agent_id={agent_id} onSave={onSave} />
-        </div>
-      </form>
-    </FormProvider>
-  );
-}

client/src/components/SidePanel/MCP/MCPPanel.tsx

@@ -1,16 +1,13 @@
+import React, { useState, useCallback, useMemo, useEffect } from 'react';
 import { ChevronLeft } from 'lucide-react';
 import { Constants } from 'librechat-data-provider';
 import { useForm, Controller } from 'react-hook-form';
-import React, { useState, useCallback, useMemo, useEffect } from 'react';
 import { useUpdateUserPluginsMutation } from 'librechat-data-provider/react-query';
 import type { TUpdateUserPlugins } from 'librechat-data-provider';
-import type { MCP } from 'librechat-data-provider';
-import { useCreateMCPMutation } from '~/data-provider';
 import { Button, Input, Label } from '~/components/ui';
 import { useGetStartupConfig } from '~/data-provider';
 import MCPPanelSkeleton from './MCPPanelSkeleton';
 import { useToastContext } from '~/Providers';
-import MCPFormPanel from './MCPFormPanel';
 import { useLocalize } from '~/hooks';
 
 interface ServerConfigWithVars {
@@ -27,7 +24,6 @@ export default function MCPPanel() {
   const [selectedServerNameForEditing, setSelectedServerNameForEditing] = useState<string | null>(
     null,
   );
-  const [showMCPForm, setShowMCPForm] = useState(false);
 
   const mcpServerDefinitions = useMemo(() => {
     if (!startupConfig?.mcpServers) {
@@ -61,23 +57,6 @@ export default function MCPPanel() {
     },
   });
 
-  const create = useCreateMCPMutation({
-    onSuccess: () => {
-      showToast({
-        message: localize('com_ui_update_mcp_success'),
-        status: 'success',
-      });
-      setShowMCPForm(false);
-    },
-    onError: (error) => {
-      console.error('Error creating MCP:', error);
-      showToast({
-        message: localize('com_ui_update_mcp_error'),
-        status: 'error',
-      });
-    },
-  });
-
   const handleSaveServerVars = useCallback(
     (serverName: string, updatedValues: Record<string, string>) => {
       const payload: TUpdateUserPlugins = {
@@ -110,52 +89,14 @@ export default function MCPPanel() {
     setSelectedServerNameForEditing(null);
   };
 
-  const handleAddMCP = () => {
-    setShowMCPForm(true);
-  };
-
-  const handleBackFromForm = () => {
-    setShowMCPForm(false);
-  };
-
-  const handleSaveMCP = (mcp: MCP) => {
-    create.mutate(mcp);
-  };
-
-  if (showMCPForm) {
-    return (
-      <MCPFormPanel
-        onBack={handleBackFromForm}
-        onSave={handleSaveMCP}
-        showDeleteButton={false}
-        title={localize('com_ui_add_mcp_server')}
-        subtitle={localize('com_agents_mcp_info_chat')}
-      />
-    );
-  }
-
   if (startupConfigLoading) {
     return <MCPPanelSkeleton />;
   }
 
   if (mcpServerDefinitions.length === 0) {
     return (
-      <div className="h-auto max-w-full overflow-x-hidden p-3">
-        <div className="p-4 text-center text-sm text-gray-500">
-          {localize('com_sidepanel_mcp_no_servers_with_vars')}
-        </div>
-        <div className="mt-4">
-          <button
-            type="button"
-            onClick={handleAddMCP}
-            className="btn btn-neutral border-token-border-light relative h-9 w-full rounded-lg font-medium"
-            aria-haspopup="dialog"
-          >
-            <div className="flex w-full items-center justify-center gap-2">
-              {localize('com_ui_add_mcp')}
-            </div>
-          </button>
-        </div>
+      <div className="p-4 text-center text-sm text-gray-500">
+        {localize('com_sidepanel_mcp_no_servers_with_vars')}
       </div>
     );
   }
@@ -212,16 +153,6 @@ export default function MCPPanel() {
               {server.serverName}
             </Button>
           ))}
-          <button
-            type="button"
-            onClick={handleAddMCP}
-            className="btn btn-neutral border-token-border-light relative h-9 w-full rounded-lg font-medium"
-            aria-haspopup="dialog"
-          >
-            <div className="flex w-full items-center justify-center gap-2">
-              {localize('com_ui_add_mcp')}
-            </div>
-          </button>
         </div>
       </div>
     );

client/src/components/SidePanel/Parameters/DynamicSlider.tsx

@@ -18,6 +18,7 @@ function DynamicSlider({
   setOption,
   optionType,
   options,
+  enumMappings,
   readonly = false,
   showDefault = false,
   includeInput = true,
@@ -60,24 +61,68 @@ function DynamicSlider({
 
   const enumToNumeric = useMemo(() => {
     if (isEnum && options) {
-      return options.reduce((acc, mapping, index) => {
-        acc[mapping] = index;
-        return acc;
-      }, {} as Record<string, number>);
+      return options.reduce(
+        (acc, mapping, index) => {
+          acc[mapping] = index;
+          return acc;
+        },
+        {} as Record<string, number>,
+      );
     }
     return {};
   }, [isEnum, options]);
 
   const valueToEnumOption = useMemo(() => {
     if (isEnum && options) {
-      return options.reduce((acc, option, index) => {
-        acc[index] = option;
-        return acc;
-      }, {} as Record<number, string>);
+      return options.reduce(
+        (acc, option, index) => {
+          acc[index] = option;
+          return acc;
+        },
+        {} as Record<number, string>,
+      );
     }
     return {};
   }, [isEnum, options]);
 
+  const getDisplayValue = useCallback(
+    (value: string | number | undefined | null): string => {
+      if (isEnum && enumMappings && value != null) {
+        const stringValue = String(value);
+        // Check if the value exists in enumMappings
+        if (stringValue in enumMappings) {
+          const mappedValue = String(enumMappings[stringValue]);
+          // Check if the mapped value is a localization key
+          if (mappedValue.startsWith('com_')) {
+            return localize(mappedValue as TranslationKeys) ?? mappedValue;
+          }
+          return mappedValue;
+        }
+      }
+      // Always return a string for Input component compatibility
+      if (value != null) {
+        return String(value);
+      }
+      return String(defaultValue ?? '');
+    },
+    [isEnum, enumMappings, defaultValue, localize],
+  );
+
+  const getDefaultDisplayValue = useCallback((): string => {
+    if (defaultValue != null && enumMappings) {
+      const stringDefault = String(defaultValue);
+      if (stringDefault in enumMappings) {
+        const mappedValue = String(enumMappings[stringDefault]);
+        // Check if the mapped value is a localization key
+        if (mappedValue.startsWith('com_')) {
+          return localize(mappedValue as TranslationKeys) ?? mappedValue;
+        }
+        return mappedValue;
+      }
+    }
+    return String(defaultValue ?? '');
+  }, [defaultValue, enumMappings, localize]);
+
   const handleValueChange = useCallback(
     (value: number) => {
       if (isEnum) {
@@ -115,12 +160,12 @@ function DynamicSlider({
           <div className="flex w-full items-center justify-between">
             <Label
               htmlFor={`${settingKey}-dynamic-setting`}
-              className="text-left text-sm font-medium"
+              className="break-words text-left text-sm font-medium"
             >
-              {labelCode ? localize(label as TranslationKeys) ?? label : label || settingKey}{' '}
+              {labelCode ? (localize(label as TranslationKeys) ?? label) : label || settingKey}{' '}
               {showDefault && (
                 <small className="opacity-40">
-                  ({localize('com_endpoint_default')}: {defaultValue})
+                  ({localize('com_endpoint_default')}: {getDefaultDisplayValue()})
                 </small>
               )}
             </Label>
@@ -132,13 +177,13 @@ function DynamicSlider({
                 onChange={(value) => setInputValue(Number(value))}
                 max={range ? range.max : (options?.length ?? 0) - 1}
                 min={range ? range.min : 0}
-                step={range ? range.step ?? 1 : 1}
+                step={range ? (range.step ?? 1) : 1}
                 controls={false}
                 className={cn(
                   defaultTextProps,
                   cn(
                     optionText,
-                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 py-1 text-xs group-hover/temp:border-gray-200',
                   ),
                 )}
               />
@@ -146,13 +191,13 @@ function DynamicSlider({
               <Input
                 id={`${settingKey}-dynamic-setting-input`}
                 disabled={readonly}
-                value={selectedValue ?? defaultValue}
+                value={getDisplayValue(selectedValue)}
                 onChange={() => ({})}
                 className={cn(
                   defaultTextProps,
                   cn(
                     optionText,
-                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+                    'reset-rc-number-input h-auto w-14 border-0 py-1 pl-1 text-center text-xs group-hover/temp:border-gray-200',
                   ),
                 )}
               />
@@ -164,19 +209,23 @@ function DynamicSlider({
             value={[
               isEnum
                 ? enumToNumeric[(selectedValue as number) ?? '']
-                : (inputValue as number) ?? (defaultValue as number),
+                : ((inputValue as number) ?? (defaultValue as number)),
             ]}
             onValueChange={(value) => handleValueChange(value[0])}
             onDoubleClick={() => setInputValue(defaultValue as string | number)}
             max={max}
             min={range ? range.min : 0}
-            step={range ? range.step ?? 1 : 1}
+            step={range ? (range.step ?? 1) : 1}
             className="flex h-4 w-full"
           />
         </HoverCardTrigger>
         {description && (
           <OptionHover
-            description={descriptionCode ? localize(description as TranslationKeys) ?? description : description}
+            description={
+              descriptionCode
+                ? (localize(description as TranslationKeys) ?? description)
+                : description
+            }
             side={ESide.Left}
           />
         )}

client/src/components/SidePanel/Parameters/DynamicSwitch.tsx

@@ -50,7 +50,7 @@ function DynamicSwitch({
           <div className="flex justify-between">
             <Label
               htmlFor={`${settingKey}-dynamic-switch`}
-              className="text-left text-sm font-medium"
+              className="break-words text-left text-sm font-medium"
             >
               {labelCode ? (localize(label as TranslationKeys) ?? label) : label || settingKey}{' '}
               {showDefault && (

client/src/data-provider/Tools/mutations.ts

@@ -40,67 +40,3 @@ export const useToolCallMutation = <T extends t.ToolId>(
     },
   );
 };
-
-export const useCreateMCPMutation = (
-  options?: t.CreateMCPMutationOptions,
-): UseMutationResult<Record<string, unknown>, Error, t.MCP> => {
-  const queryClient = useQueryClient();
-
-  return useMutation(
-    (mcp: t.MCP) => {
-      return dataService.createMCP(mcp);
-    },
-    {
-      onMutate: (variables) => options?.onMutate?.(variables),
-      onError: (error, variables, context) => options?.onError?.(error, variables, context),
-      onSuccess: (data, variables, context) => {
-        // Invalidate tools list to trigger refetch
-        queryClient.invalidateQueries([QueryKeys.tools]);
-        // queryClient.invalidateQueries([QueryKeys.mcpTools]);
-        return options?.onSuccess?.(data, variables, context);
-      },
-    },
-  );
-};
-
-export const useUpdateMCPMutation = (
-  options?: t.UpdateMCPMutationOptions,
-): UseMutationResult<Record<string, unknown>, Error, { mcp_id: string; data: t.MCP }> => {
-  const queryClient = useQueryClient();
-
-  return useMutation(
-    ({ mcp_id, data }: { mcp_id: string; data: t.MCP }) => {
-      return dataService.updateMCP({ mcp_id, data });
-    },
-    {
-      onMutate: (variables) => options?.onMutate?.(variables),
-      onError: (error, variables, context) => options?.onError?.(error, variables, context),
-      onSuccess: (data, variables, context) => {
-        // Invalidate tools list to trigger refetch
-        queryClient.invalidateQueries([QueryKeys.tools]);
-        return options?.onSuccess?.(data, variables, context);
-      },
-    },
-  );
-};
-
-export const useDeleteMCPMutation = (
-  options?: t.DeleteMCPMutationOptions,
-): UseMutationResult<Record<string, unknown>, Error, { mcp_id: string }> => {
-  const queryClient = useQueryClient();
-
-  return useMutation(
-    ({ mcp_id }: { mcp_id: string }) => {
-      return dataService.deleteMCP({ mcp_id });
-    },
-    {
-      onMutate: (variables) => options?.onMutate?.(variables),
-      onError: (error, variables, context) => options?.onError?.(error, variables, context),
-      onSuccess: (data, variables, context) => {
-        // Invalidate tools list to trigger refetch
-        queryClient.invalidateQueries([QueryKeys.tools]);
-        return options?.onSuccess?.(data, variables, context);
-      },
-    },
-  );
-};

client/src/hooks/Chat/useChatFunctions.ts

@@ -6,6 +6,7 @@ import {
   QueryKeys,
   ContentTypes,
   EModelEndpoint,
+  isAgentsEndpoint,
   parseCompactConvo,
   replaceSpecialVars,
   isAssistantsEndpoint,
@@ -36,15 +37,6 @@ const logChatRequest = (request: Record<string, unknown>) => {
   logger.log('=====================================');
 };
 
-const usesContentStream = (endpoint: EModelEndpoint | undefined, endpointType?: string) => {
-  if (endpointType === EModelEndpoint.custom) {
-    return true;
-  }
-  if (endpoint === EModelEndpoint.openAI || endpoint === EModelEndpoint.azureOpenAI) {
-    return true;
-  }
-};
-
 export default function useChatFunctions({
   index = 0,
   files,
@@ -93,7 +85,7 @@ export default function useChatFunctions({
       messageId = null,
     },
     {
-      editedText = null,
+      editedContent = null,
       editedMessageId = null,
       isResubmission = false,
       isRegenerate = false,
@@ -245,14 +237,11 @@ export default function useChatFunctions({
       setFilesToDelete({});
     }
 
-    const generation = editedText ?? latestMessage?.text ?? '';
-    const responseText = isEditOrContinue ? generation : '';
-
     const responseMessageId =
       editedMessageId ?? (latestMessage?.messageId ? latestMessage?.messageId + '_' : null) ?? null;
     const initialResponse: TMessage = {
       sender: responseSender,
-      text: responseText,
+      text: '',
       endpoint: endpoint ?? '',
       parentMessageId: isRegenerate ? messageId : intermediateId,
       messageId: responseMessageId ?? `${isRegenerate ? messageId : intermediateId}_`,
@@ -272,34 +261,37 @@ export default function useChatFunctions({
         {
           type: ContentTypes.TEXT,
           [ContentTypes.TEXT]: {
-            value: responseText,
+            value: '',
           },
         },
       ];
-    } else if (endpoint === EModelEndpoint.agents) {
-      initialResponse.model = conversation?.agent_id ?? '';
+    } else if (endpoint != null) {
+      initialResponse.model = isAgentsEndpoint(endpoint)
+        ? (conversation?.agent_id ?? '')
+        : (conversation?.model ?? '');
       initialResponse.text = '';
-      initialResponse.content = [
-        {
-          type: ContentTypes.TEXT,
-          [ContentTypes.TEXT]: {
-            value: responseText,
+
+      if (editedContent && latestMessage?.content) {
+        initialResponse.content = cloneDeep(latestMessage.content);
+        const { index, text, type } = editedContent;
+        if (initialResponse.content && index >= 0 && index < initialResponse.content.length) {
+          const contentPart = initialResponse.content[index];
+          if (type === ContentTypes.THINK && contentPart.type === ContentTypes.THINK) {
+            contentPart[ContentTypes.THINK] = text;
+          } else if (type === ContentTypes.TEXT && contentPart.type === ContentTypes.TEXT) {
+            contentPart[ContentTypes.TEXT] = text;
+          }
+        }
+      } else {
+        initialResponse.content = [
+          {
+            type: ContentTypes.TEXT,
+            [ContentTypes.TEXT]: {
+              value: '',
+            },
           },
-        },
-      ];
-      setShowStopButton(true);
-    } else if (usesContentStream(endpoint, endpointType)) {
-      initialResponse.text = '';
-      initialResponse.content = [
-        {
-          type: ContentTypes.TEXT,
-          [ContentTypes.TEXT]: {
-            value: responseText,
-          },
-        },
-      ];
-      setShowStopButton(true);
-    } else {
+        ];
+      }
       setShowStopButton(true);
     }
 
@@ -316,7 +308,6 @@ export default function useChatFunctions({
       endpointOption,
       userMessage: {
         ...currentMsg,
-        generation,
         responseMessageId,
         overrideParentMessageId: isRegenerate ? messageId : null,
       },
@@ -328,6 +319,7 @@ export default function useChatFunctions({
       initialResponse,
       isTemporary,
       ephemeralAgent,
+      editedContent,
     };
 
     if (isRegenerate) {

client/src/hooks/Conversations/useSetIndexOptions.ts

@@ -30,6 +30,14 @@ const useSetIndexOptions: TUseSetOptions = (preset = false) => {
       };
     }
 
+    // Auto-enable Responses API when web search is enabled
+    if (param === 'web_search' && newValue === true) {
+      const currentUseResponsesApi = conversation?.useResponsesApi ?? false;
+      if (!currentUseResponsesApi) {
+        update['useResponsesApi'] = true;
+      }
+    }
+
     setConversation(
       (prevState) =>
         tConvoUpdateSchema.parse({

client/src/hooks/Nav/useSideNavLinks.ts

@@ -19,6 +19,7 @@ import { Blocks, MCPIcon, AttachmentIcon } from '~/components/svg';
 import Parameters from '~/components/SidePanel/Parameters/Panel';
 import FilesPanel from '~/components/SidePanel/Files/Panel';
 import MCPPanel from '~/components/SidePanel/MCP/MCPPanel';
+import { useGetStartupConfig } from '~/data-provider';
 import { useHasAccess } from '~/hooks';
 
 export default function useSideNavLinks({
@@ -60,6 +61,7 @@ export default function useSideNavLinks({
     permissionType: PermissionTypes.AGENTS,
     permission: Permissions.CREATE,
   });
+  const { data: startupConfig } = useGetStartupConfig();
 
   const Links = useMemo(() => {
     const links: NavLink[] = [];
@@ -150,13 +152,20 @@ export default function useSideNavLinks({
       });
     }
 
-    links.push({
-      title: 'com_nav_mcp_panel',
-      label: '',
-      icon: MCPIcon,
-      id: 'mcp-settings',
-      Component: MCPPanel,
-    });
+    if (
+      startupConfig?.mcpServers &&
+      Object.values(startupConfig.mcpServers).some(
+        (server) => server.customUserVars && Object.keys(server.customUserVars).length > 0,
+      )
+    ) {
+      links.push({
+        title: 'com_nav_setting_mcp',
+        label: '',
+        icon: MCPIcon,
+        id: 'mcp-settings',
+        Component: MCPPanel,
+      });
+    }
 
     links.push({
       title: 'com_sidepanel_hide_panel',
@@ -180,6 +189,7 @@ export default function useSideNavLinks({
     hasAccessToBookmarks,
     hasAccessToCreateAgents,
     hidePanel,
+    startupConfig,
   ]);
 
   return Links;

client/src/hooks/Plugins/useMCPSelect.ts

@@ -30,8 +30,6 @@ export function useMCPSelect({ conversationId }: UseMCPSelectOptions) {
   const [ephemeralAgent, setEphemeralAgent] = useRecoilState(ephemeralAgentByConvoId(key));
   const { data: mcpToolDetails, isFetched } = useAvailableToolsQuery(EModelEndpoint.agents, {
     select: (data: TPlugin[]) => {
-      console.log('🔍 Raw tools data received:', JSON.stringify(data, null, 2));
-
       const mcpToolsMap = new Map<string, TPlugin>();
       data.forEach((tool) => {
         const isMCP = tool.pluginKey.includes(Constants.mcp_delimiter);
@@ -48,10 +46,7 @@ export function useMCPSelect({ conversationId }: UseMCPSelectOptions) {
           }
         }
       });
-
-      const result = Array.from(mcpToolsMap.values());
-      console.log('🔧 Processed MCP tools:', JSON.stringify(result, null, 2));
-      return result;
+      return Array.from(mcpToolsMap.values());
     },
   });
 

client/src/hooks/SSE/useStepHandler.ts

@@ -55,6 +55,26 @@ export default function useStepHandler({
   const messageMap = useRef(new Map<string, TMessage>());
   const stepMap = useRef(new Map<string, Agents.RunStep>());
 
+  const calculateContentIndex = (
+    baseIndex: number,
+    initialContent: TMessageContentParts[],
+    incomingContentType: string,
+    existingContent?: TMessageContentParts[],
+  ): number => {
+    /** Only apply -1 adjustment for TEXT or THINK types when they match existing content */
+    if (
+      initialContent.length > 0 &&
+      (incomingContentType === ContentTypes.TEXT || incomingContentType === ContentTypes.THINK)
+    ) {
+      const targetIndex = baseIndex + initialContent.length - 1;
+      const existingType = existingContent?.[targetIndex]?.type;
+      if (existingType === incomingContentType) {
+        return targetIndex;
+      }
+    }
+    return baseIndex + initialContent.length;
+  };
+
   const updateContent = (
     message: TMessage,
     index: number,
@@ -170,6 +190,11 @@ export default function useStepHandler({
         lastAnnouncementTimeRef.current = currentTime;
       }
 
+      let initialContent: TMessageContentParts[] = [];
+      if (submission?.editedContent != null) {
+        initialContent = submission?.initialResponse?.content ?? initialContent;
+      }
+
       if (event === 'on_run_step') {
         const runStep = data as Agents.RunStep;
         const responseMessageId = runStep.runId ?? '';
@@ -189,7 +214,7 @@ export default function useStepHandler({
             parentMessageId: userMessage.messageId,
             conversationId: userMessage.conversationId,
             messageId: responseMessageId,
-            content: [],
+            content: initialContent,
           };
 
           messageMap.current.set(responseMessageId, response);
@@ -214,7 +239,9 @@ export default function useStepHandler({
               },
             };
 
-            updatedResponse = updateContent(updatedResponse, runStep.index, contentPart);
+            /** Tool calls don't need index adjustment */
+            const currentIndex = runStep.index + initialContent.length;
+            updatedResponse = updateContent(updatedResponse, currentIndex, contentPart);
           });
 
           messageMap.current.set(responseMessageId, updatedResponse);
@@ -234,7 +261,9 @@ export default function useStepHandler({
 
         const response = messageMap.current.get(responseMessageId);
         if (response) {
-          const updatedResponse = updateContent(response, agent_update.index, data);
+          // Agent updates don't need index adjustment
+          const currentIndex = agent_update.index + initialContent.length;
+          const updatedResponse = updateContent(response, currentIndex, data);
           messageMap.current.set(responseMessageId, updatedResponse);
           const currentMessages = getMessages() || [];
           setMessages([...currentMessages.slice(0, -1), updatedResponse]);
@@ -255,7 +284,13 @@ export default function useStepHandler({
             ? messageDelta.delta.content[0]
             : messageDelta.delta.content;
 
-          const updatedResponse = updateContent(response, runStep.index, contentPart);
+          const currentIndex = calculateContentIndex(
+            runStep.index,
+            initialContent,
+            contentPart.type || '',
+            response.content,
+          );
+          const updatedResponse = updateContent(response, currentIndex, contentPart);
 
           messageMap.current.set(responseMessageId, updatedResponse);
           const currentMessages = getMessages() || [];
@@ -277,7 +312,13 @@ export default function useStepHandler({
             ? reasoningDelta.delta.content[0]
             : reasoningDelta.delta.content;
 
-          const updatedResponse = updateContent(response, runStep.index, contentPart);
+          const currentIndex = calculateContentIndex(
+            runStep.index,
+            initialContent,
+            contentPart.type || '',
+            response.content,
+          );
+          const updatedResponse = updateContent(response, currentIndex, contentPart);
 
           messageMap.current.set(responseMessageId, updatedResponse);
           const currentMessages = getMessages() || [];
@@ -318,7 +359,9 @@ export default function useStepHandler({
               contentPart.tool_call.expires_at = runStepDelta.delta.expires_at;
             }
 
-            updatedResponse = updateContent(updatedResponse, runStep.index, contentPart);
+            /** Tool calls don't need index adjustment */
+            const currentIndex = runStep.index + initialContent.length;
+            updatedResponse = updateContent(updatedResponse, currentIndex, contentPart);
           });
 
           messageMap.current.set(responseMessageId, updatedResponse);
@@ -350,7 +393,9 @@ export default function useStepHandler({
             tool_call: result.tool_call,
           };
 
-          updatedResponse = updateContent(updatedResponse, runStep.index, contentPart, true);
+          /** Tool calls don't need index adjustment */
+          const currentIndex = runStep.index + initialContent.length;
+          updatedResponse = updateContent(updatedResponse, currentIndex, contentPart, true);
 
           messageMap.current.set(responseMessageId, updatedResponse);
           const updatedMessages = messages.map((msg) =>

client/src/locales/ar/translation.json

@@ -695,6 +695,5 @@
   "com_ui_versions": "الإصدارات",
   "com_ui_yes": "نعم",
   "com_ui_zoom": "تكبير",
-  "com_user_message": "أنت",
-  "com_warning_resubmit_unsupported": "إعادة إرسال رسالة الذكاء الاصطناعي غير مدعومة لنقطة النهاية هذه"
+  "com_user_message": "أنت"
 }

client/src/locales/ca/translation.json

@@ -868,6 +868,5 @@
   "com_ui_x_selected": "{{0}} seleccionats",
   "com_ui_yes": "Sí",
   "com_ui_zoom": "Zoom",
-  "com_user_message": "Tu",
-  "com_warning_resubmit_unsupported": "Tornar a enviar el missatge de la IA no està suportat per aquest endpoint."
+  "com_user_message": "Tu"
 }

client/src/locales/cs/translation.json

@@ -720,6 +720,5 @@
   "com_ui_write": "Psát",
   "com_ui_yes": "Ano",
   "com_ui_zoom": "Přiblížit",
-  "com_user_message": "Vy",
-  "com_warning_resubmit_unsupported": "Opětovné odeslání AI zprávy není pro tento koncový bod podporováno."
+  "com_user_message": "Vy"
 }

client/src/locales/da/translation.json

@@ -823,6 +823,5 @@
   "com_ui_x_selected": "{{0}} udvalgt",
   "com_ui_yes": "Ja",
   "com_ui_zoom": "Zoom",
-  "com_user_message": "Du",
-  "com_warning_resubmit_unsupported": "Genindsendelse af AI-beskeden understøttes ikke for dette slutpunkt."
+  "com_user_message": "Du"
 }

client/src/locales/de/translation.json

@@ -917,6 +917,5 @@
   "com_ui_x_selected": "{{0}} ausgewählt",
   "com_ui_yes": "Ja",
   "com_ui_zoom": "Zoom",
-  "com_user_message": "Du",
-  "com_warning_resubmit_unsupported": "Das erneute Senden der KI-Nachricht wird für diesen Endpunkt nicht unterstützt."
+  "com_user_message": "Du"
 }

client/src/locales/en/translation.json

@@ -20,7 +20,6 @@
   "com_agents_mcp_description_placeholder": "Explain what it does in a few words",
   "com_agents_mcp_icon_size": "Minimum size 128 x 128 px",
   "com_agents_mcp_info": "Add MCP servers to your agent to enable it to perform tasks and interact with external services",
-  "com_agents_mcp_info_chat": "Add MCP servers to enable chat to perform tasks and interact with external services",
   "com_agents_mcp_name_placeholder": "Custom Tool",
   "com_agents_mcp_trust_subtext": "Custom connectors are not verified by LibreChat",
   "com_agents_mcps_disabled": "You need to create an agent before adding MCPs.",
@@ -210,6 +209,7 @@
   "com_endpoint_google_thinking_budget": "Guides the number of thinking tokens the model uses. The actual amount may exceed or fall below this value depending on the prompt.\n\nThis setting is only supported by certain models (2.5 series). Gemini 2.5 Pro supports 128-32,768 tokens. Gemini 2.5 Flash supports 0-24,576 tokens. Gemini 2.5 Flash Lite supports 512-24,576 tokens.\n\nLeave blank or set to \"-1\" to let the model automatically decide when and how much to think. By default, Gemini 2.5 Flash Lite does not think.",
   "com_endpoint_google_topk": "Top-k changes how the model selects tokens for output. A top-k of 1 means the selected token is the most probable among all tokens in the model's vocabulary (also called greedy decoding), while a top-k of 3 means that the next token is selected from among the 3 most probable tokens (using temperature).",
   "com_endpoint_google_topp": "Top-p changes how the model selects tokens for output. Tokens are selected from most K (see topK parameter) probable to least until the sum of their probabilities equals the top-p value.",
+  "com_endpoint_google_use_search_grounding": "Use Google's search grounding feature to enhance responses with real-time web search results. This enables models to access current information and provide more accurate, up-to-date answers.",
   "com_endpoint_instructions_assistants": "Override Instructions",
   "com_endpoint_instructions_assistants_placeholder": "Overrides the instructions of the assistant. This is useful for modifying the behavior on a per-run basis.",
   "com_endpoint_max_output_tokens": "Max Output Tokens",
@@ -227,11 +227,14 @@
   "com_endpoint_openai_pres": "Number between -2.0 and 2.0. Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics.",
   "com_endpoint_openai_prompt_prefix_placeholder": "Set custom instructions to include in System Message. Default: none",
   "com_endpoint_openai_reasoning_effort": "o1 and o3 models only: constrains effort on reasoning for reasoning models. Reducing reasoning effort can result in faster responses and fewer tokens used on reasoning in a response.",
+  "com_endpoint_openai_reasoning_summary": "Responses API only: A summary of the reasoning performed by the model. This can be useful for debugging and understanding the model's reasoning process. Set to none,auto, concise, or detailed.",
   "com_endpoint_openai_resend": "Resend all previously attached images. Note: this can significantly increase token cost and you may experience errors with many image attachments.",
   "com_endpoint_openai_resend_files": "Resend all previously attached files. Note: this will increase token cost and you may experience errors with many attachments.",
   "com_endpoint_openai_stop": "Up to 4 sequences where the API will stop generating further tokens.",
   "com_endpoint_openai_temp": "Higher values = more random, while lower values = more focused and deterministic. We recommend altering this or Top P but not both.",
   "com_endpoint_openai_topp": "An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered. We recommend altering this or temperature but not both.",
+  "com_endpoint_openai_use_responses_api": "Use the Responses API instead of Chat Completions, which includes extended features from OpenAI. Required for o1-pro, o3-pro, and to enable reasoning summaries.",
+  "com_endpoint_openai_use_web_search": "Enable web search functionality using OpenAI's built-in search capabilities. This allows the model to search the web for up-to-date information and provide more accurate, current responses.",
   "com_endpoint_output": "Output",
   "com_endpoint_plug_image_detail": "Image Detail",
   "com_endpoint_plug_resend_files": "Resend Files",
@@ -262,6 +265,7 @@
   "com_endpoint_prompt_prefix_assistants_placeholder": "Set additional instructions or context on top of the Assistant's main instructions. Ignored if empty.",
   "com_endpoint_prompt_prefix_placeholder": "Set custom instructions or context. Ignored if empty.",
   "com_endpoint_reasoning_effort": "Reasoning Effort",
+  "com_endpoint_reasoning_summary": "Reasoning Summary",
   "com_endpoint_save_as_preset": "Save As Preset",
   "com_endpoint_search": "Search endpoint by name",
   "com_endpoint_search_endpoint_models": "Search {{0}} models...",
@@ -277,6 +281,8 @@
   "com_endpoint_top_k": "Top K",
   "com_endpoint_top_p": "Top P",
   "com_endpoint_use_active_assistant": "Use Active Assistant",
+  "com_endpoint_use_responses_api": "Use Responses API",
+  "com_endpoint_use_search_grounding": "Grounding with Google Search",
   "com_error_expired_user_key": "Provided key for {{0}} expired at {{1}}. Please provide a new key and try again.",
   "com_error_files_dupe": "Duplicate file detected.",
   "com_error_files_empty": "Empty files are not allowed.",
@@ -285,6 +291,7 @@
   "com_error_files_upload": "An error occurred while uploading the file.",
   "com_error_files_upload_canceled": "The file upload request was canceled. Note: the file upload may still be processing and will need to be manually deleted.",
   "com_error_files_validation": "An error occurred while validating the file.",
+  "com_error_google_tool_conflict": "Usage of built-in Google tools are not supported with external tools. Please disable either the built-in tools or the external tools.",
   "com_error_heic_conversion": "Failed to convert HEIC image to JPEG. Please try converting the image manually or use a different format.",
   "com_error_input_length": "The latest message token count is too long, exceeding the token limit, or your token limit parameters are misconfigured, adversely affecting the context window. More info: {{0}}. Please shorten your message, adjust the max context size from the conversation parameters, or fork the conversation to continue.",
   "com_error_invalid_agent_provider": "The \"{{0}}\" provider is not available for use with Agents. Please go to your agent's settings and select a currently available provider.",
@@ -432,7 +439,6 @@
   "com_nav_log_out": "Log out",
   "com_nav_long_audio_warning": "Longer texts will take longer to process.",
   "com_nav_maximize_chat_space": "Maximize chat space",
-  "com_nav_mcp_panel": "MCP Servers",
   "com_nav_mcp_vars_update_error": "Error updating MCP custom user variables: {{0}}",
   "com_nav_mcp_vars_updated": "MCP custom user variables updated successfully.",
   "com_nav_modular_chat": "Enable switching Endpoints mid-conversation",
@@ -636,6 +642,7 @@
   "com_ui_command_placeholder": "Optional: Enter a command for the prompt or name will be used",
   "com_ui_command_usage_placeholder": "Select a Prompt by command or name",
   "com_ui_complete_setup": "Complete Setup",
+  "com_ui_concise": "Concise",
   "com_ui_configure_mcp_variables_for": "Configure Variables for {{0}}",
   "com_ui_confirm_action": "Confirm Action",
   "com_ui_confirm_admin_use_change": "Changing this setting will block access for admins, including yourself. Are you sure you want to proceed?",
@@ -701,6 +708,7 @@
   "com_ui_description": "Description",
   "com_ui_description_placeholder": "Optional: Enter a description to display for the prompt",
   "com_ui_deselect_all": "Deselect All",
+  "com_ui_detailed": "Detailed",
   "com_ui_disabling": "Disabling...",
   "com_ui_download": "Download",
   "com_ui_download_artifact": "Download Artifact",
@@ -795,6 +803,7 @@
   "com_ui_happy_birthday": "It's my 1st birthday!",
   "com_ui_hide_image_details": "Hide Image Details",
   "com_ui_hide_qr": "Hide QR Code",
+  "com_ui_high": "High",
   "com_ui_host": "Host",
   "com_ui_icon": "Icon",
   "com_ui_idea": "Ideas",
@@ -822,6 +831,7 @@
   "com_ui_loading": "Loading...",
   "com_ui_locked": "Locked",
   "com_ui_logo": "{{0}} Logo",
+  "com_ui_low": "Low",
   "com_ui_manage": "Manage",
   "com_ui_max_tags": "Maximum number allowed is {{0}}, using latest values.",
   "com_ui_mcp_dialog_desc": "Please enter the necessary information below.",
@@ -829,21 +839,7 @@
   "com_ui_mcp_server_not_found": "Server not found.",
   "com_ui_mcp_servers": "MCP Servers",
   "com_ui_mcp_url": "MCP Server URL",
-  "com_ui_mcp_custom_headers": "Custom Headers",
-  "com_ui_mcp_headers": "Headers",
-  "com_ui_mcp_no_custom_headers": "No custom headers configured",
-  "com_ui_mcp_add_header": "Add Header",
-  "com_ui_mcp_header_name": "Header Name",
-  "com_ui_mcp_header_value": "Header Value",
-  "com_ui_mcp_configuration": "Configuration",
-  "com_ui_mcp_request_timeout": "Request Timeout (ms)",
-  "com_ui_mcp_request_timeout_description": "Maximum time in milliseconds to wait for a response from the MCP server",
-  "com_ui_mcp_connection_timeout": "Connection Timeout (ms)",
-  "com_ui_mcp_connection_timeout_description": "Maximum time in milliseconds to establish connection to the MCP server",
-  "com_ui_mcp_reset_timeout_on_progress": "Reset Timeout on Progress",
-  "com_ui_mcp_reset_timeout_on_progress_description": "Reset the request timeout when progress is received",
-  "com_ui_mcp_max_total_timeout": "Maximum Total Timeout (ms)",
-  "com_ui_mcp_max_total_timeout_description": "Maximum total time in milliseconds allowed for the entire request including retries",
+  "com_ui_medium": "Medium",
   "com_ui_memories": "Memories",
   "com_ui_memories_allow_create": "Allow creating Memories",
   "com_ui_memories_allow_opt_out": "Allow users to opt out of Memories",
@@ -1075,6 +1071,5 @@
   "com_ui_x_selected": "{{0}} selected",
   "com_ui_yes": "Yes",
   "com_ui_zoom": "Zoom",
-  "com_user_message": "You",
-  "com_warning_resubmit_unsupported": "Resubmitting the AI message is not supported for this endpoint."
+  "com_user_message": "You"
 }

client/src/locales/es/translation.json

@@ -752,6 +752,5 @@
   "com_ui_x_selected": "{{0}} seleccionado",
   "com_ui_yes": "Sí",
   "com_ui_zoom": "Zoom",
-  "com_user_message": "Usted",
-  "com_warning_resubmit_unsupported": "No se admite el reenvío del mensaje de IA para este punto de conexión."
+  "com_user_message": "Usted"
 }

client/src/locales/et/translation.json

@@ -865,6 +865,5 @@
   "com_ui_x_selected": "{{0}} valitud",
   "com_ui_yes": "Jah",
   "com_ui_zoom": "Suumi",
-  "com_user_message": "Sina",
-  "com_warning_resubmit_unsupported": "AI sõnumi uuesti esitamine pole selle otspunkti jaoks toetatud."
+  "com_user_message": "Sina"
 }

client/src/locales/fa/translation.json

@@ -847,6 +847,5 @@
   "com_ui_write": "نوشتن",
   "com_ui_yes": "بله",
   "com_ui_zoom": "بزرگنمایی ضربه بزنید؛",
-  "com_user_message": "شما",
-  "com_warning_resubmit_unsupported": "ارسال مجدد پیام هوش مصنوعی برای این نقطه پایانی پشتیبانی نمی شود."
+  "com_user_message": "شما"
 }

client/src/locales/fr/translation.json

@@ -752,6 +752,5 @@
   "com_ui_versions": "Versions",
   "com_ui_yes": "Oui",
   "com_ui_zoom": "Zoom",
-  "com_user_message": "Vous",
-  "com_warning_resubmit_unsupported": "La resoumission du message IA n'est pas prise en charge pour ce point de terminaison."
+  "com_user_message": "Vous"
 }

client/src/locales/he/translation.json

@@ -863,6 +863,5 @@
   "com_ui_x_selected": "{{0}} נבחר",
   "com_ui_yes": "כן",
   "com_ui_zoom": "זום",
-  "com_user_message": "אתה",
-  "com_warning_resubmit_unsupported": "שליחת הודעה מחדש אינה נתמכת עבור נקודת קצה זו."
+  "com_user_message": "אתה"
 }

client/src/locales/hu/translation.json

@@ -847,6 +847,5 @@
   "com_ui_write": "Írás",
   "com_ui_yes": "Igen",
   "com_ui_zoom": "Zoom",
-  "com_user_message": "Ön",
-  "com_warning_resubmit_unsupported": "Az AI üzenet újraküldése nem támogatott ennél a végpontnál."
+  "com_user_message": "Ön"
 }

client/src/locales/it/translation.json

@@ -829,6 +829,5 @@
   "com_ui_write": "Scrittura",
   "com_ui_yes": "Sì",
   "com_ui_zoom": "Zoom",
-  "com_user_message": "Mostra nome utente nei messaggi",
-  "com_warning_resubmit_unsupported": "Il reinvio del messaggio AI non è supportato per questo endpoint."
+  "com_user_message": "Mostra nome utente nei messaggi"
 }

client/src/locales/ja/translation.json

@@ -868,6 +868,5 @@
   "com_ui_x_selected": "{{0}}が選択された",
   "com_ui_yes": "はい",
   "com_ui_zoom": "ズーム",
-  "com_user_message": "あなた",
-  "com_warning_resubmit_unsupported": "このエンドポイントではAIメッセージの再送信はサポートされていません"
+  "com_user_message": "あなた"
 }

client/src/locales/ko/translation.json

@@ -921,6 +921,5 @@
   "com_ui_x_selected": "{{0}}개 선택됨",
   "com_ui_yes": "네",
   "com_ui_zoom": "확대/축소",
-  "com_user_message": "당신",
-  "com_warning_resubmit_unsupported": "이 엔드포인트에서는 AI 메시지 재전송이 지원되지 않습니다"
+  "com_user_message": "당신"
 }

client/src/locales/pl/translation.json

@@ -714,6 +714,5 @@
   "com_ui_view_source": "Zobacz źródłowy czat",
   "com_ui_yes": "Tak",
   "com_ui_zoom": "Powiększ",
-  "com_user_message": "Ty",
-  "com_warning_resubmit_unsupported": "Ponowne przesyłanie wiadomości AI nie jest obsługiwane dla tego punktu końcowego."
+  "com_user_message": "Ty"
 }

client/src/locales/pt-BR/translation.json

@@ -817,6 +817,5 @@
   "com_ui_write": "Escrevendo",
   "com_ui_yes": "Sim",
   "com_ui_zoom": "Zoom",
-  "com_user_message": "Você",
-  "com_warning_resubmit_unsupported": "O reenvio da mensagem de IA não é suportado para este endpoint."
+  "com_user_message": "Você"
 }

client/src/locales/pt-PT/translation.json

@@ -819,6 +819,5 @@
   "com_ui_write": "A escrever",
   "com_ui_yes": "Sim",
   "com_ui_zoom": "Ampliar",
-  "com_user_message": "Você",
-  "com_warning_resubmit_unsupported": "O reenvio da mensagem de IA não é suportado por este endereço."
+  "com_user_message": "Você"
 }

client/src/locales/ru/translation.json

@@ -865,6 +865,5 @@
   "com_ui_x_selected": "{{0}} выбрано",
   "com_ui_yes": "Да",
   "com_ui_zoom": "Масштаб",
-  "com_user_message": "Вы",
-  "com_warning_resubmit_unsupported": "Повторная отправка сообщения ИИ не поддерживается для данной конечной точки"
+  "com_user_message": "Вы"
 }

client/src/locales/th/translation.json

@@ -802,6 +802,5 @@
   "com_ui_write": "การเขียน",
   "com_ui_yes": "ใช่",
   "com_ui_zoom": "ขยาย",
-  "com_user_message": "คุณ",
-  "com_warning_resubmit_unsupported": "การส่งข้อความ AI ซ้ำไม่รองรับสำหรับจุดสิ้นสุดนี้"
+  "com_user_message": "คุณ"
 }

client/src/locales/tr/translation.json

@@ -725,6 +725,5 @@
   "com_ui_view_source": "Kaynak sohbeti görüntüle",
   "com_ui_yes": "Evet",
   "com_ui_zoom": "Yakınlaştır",
-  "com_user_message": "Sen",
-  "com_warning_resubmit_unsupported": "Bu uç nokta için yapay zeka mesajını yeniden gönderme desteklenmiyor."
+  "com_user_message": "Sen"
 }

client/src/locales/zh-Hans/translation.json

@@ -852,6 +852,5 @@
   "com_ui_x_selected": "{{0}} 已选择",
   "com_ui_yes": "是的",
   "com_ui_zoom": "缩放",
-  "com_user_message": "您",
-  "com_warning_resubmit_unsupported": "此终端不支持重新提交AI消息"
+  "com_user_message": "您"
 }

client/src/locales/zh-Hant/translation.json

@@ -695,6 +695,5 @@
   "com_ui_versions": "版本",
   "com_ui_yes": "是",
   "com_ui_zoom": "縮放",
-  "com_user_message": "您",
-  "com_warning_resubmit_unsupported": "此端點不支援重新送出 AI 訊息。"
+  "com_user_message": "您"
 }

e2e/jestSetup.js

@@ -1,3 +1,3 @@
-// v0.7.8
+// v0.7.9-rc1
 // See .env.test.example for an example of the '.env.test' file.
 require('dotenv').config({ path: './e2e/.env.test' });

helm/librechat/Chart.yaml

@@ -22,7 +22,7 @@ version: 1.8.9
 # It is recommended to use it with quotes.
 
 # renovate: image=ghcr.io/danny-avila/librechat
-appVersion: "v0.7.8"
+appVersion: "v0.7.9-rc1"
 
 home: https://www.librechat.ai
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "LibreChat",
-  "version": "v0.7.8",
+  "version": "v0.7.9-rc1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "LibreChat",
-      "version": "v0.7.8",
+      "version": "v0.7.9-rc1",
       "license": "ISC",
       "workspaces": [
         "api",
@@ -47,7 +47,7 @@
     },
     "api": {
       "name": "@librechat/backend",
-      "version": "v0.7.8",
+      "version": "v0.7.9-rc1",
       "license": "ISC",
       "dependencies": {
         "@anthropic-ai/sdk": "^0.52.0",
@@ -64,7 +64,7 @@
         "@langchain/google-genai": "^0.2.13",
         "@langchain/google-vertexai": "^0.2.13",
         "@langchain/textsplitters": "^0.1.0",
-        "@librechat/agents": "^2.4.46",
+        "@librechat/agents": "^2.4.50",
         "@librechat/api": "*",
         "@librechat/data-schemas": "*",
         "@node-saml/passport-saml": "^5.0.0",
@@ -2502,7 +2502,7 @@
     },
     "client": {
       "name": "@librechat/frontend",
-      "version": "v0.7.8",
+      "version": "v0.7.9-rc1",
       "license": "ISC",
       "dependencies": {
         "@ariakit/react": "^0.4.15",
@@ -19436,9 +19436,9 @@
       }
     },
     "node_modules/@librechat/agents": {
-      "version": "2.4.46",
-      "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-2.4.46.tgz",
-      "integrity": "sha512-zR27U19/WGF3HN64oBbiaFgjjWHaF7BjYzRFWzQKEkk+iEzCe59IpuEZUizQ54YcY02nhhh6S3MNUjhAJwMYVA==",
+      "version": "2.4.50",
+      "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-2.4.50.tgz",
+      "integrity": "sha512-8yUndPTa5ctxGBqlzMcyBDi+c6lup37wtXXFJMyBcm2Bx4MhqrEOMdI3HRu/3CsYpRgC07wAK2AwZ593aGLWoA==",
       "license": "MIT",
       "dependencies": {
         "@langchain/anthropic": "^0.3.23",
@@ -46624,7 +46624,7 @@
         "typescript": "^5.0.4"
       },
       "peerDependencies": {
-        "@librechat/agents": "^2.4.46",
+        "@librechat/agents": "^2.4.50",
         "@librechat/data-schemas": "*",
         "@modelcontextprotocol/sdk": "^1.12.3",
         "axios": "^1.8.2",
@@ -46717,7 +46717,7 @@
     },
     "packages/data-provider": {
       "name": "librechat-data-provider",
-      "version": "0.7.88",
+      "version": "0.7.899",
       "license": "ISC",
       "dependencies": {
         "axios": "^1.8.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "LibreChat",
-  "version": "v0.7.8",
+  "version": "v0.7.9-rc1",
   "description": "",
   "workspaces": [
     "api",

packages/api/package.json

@@ -69,7 +69,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "peerDependencies": {
-    "@librechat/agents": "^2.4.46",
+    "@librechat/agents": "^2.4.50",
     "@librechat/data-schemas": "*",
     "@modelcontextprotocol/sdk": "^1.12.3",
     "axios": "^1.8.2",

packages/api/src/agents/run.ts

@@ -1,6 +1,7 @@
 import { Run, Providers } from '@librechat/agents';
 import { providerEndpointMap, KnownEndpoints } from 'librechat-data-provider';
 import type {
+  OpenAIClientOptions,
   StandardGraphConfig,
   EventHandler,
   GenericTool,
@@ -76,6 +77,11 @@ export async function createRun({
     (agent.endpoint && agent.endpoint.toLowerCase().includes(KnownEndpoints.openrouter))
   ) {
     reasoningKey = 'reasoning';
+  } else if (
+    (llmConfig as OpenAIClientOptions).useResponsesApi === true &&
+    (provider === Providers.OPENAI || provider === Providers.AZURE)
+  ) {
+    reasoningKey = 'reasoning';
   }
 
   const graphConfig: StandardGraphConfig = {

packages/api/src/endpoints/google/llm.ts

@@ -1,6 +1,7 @@
 import { Providers } from '@librechat/agents';
 import { googleSettings, AuthKeys } from 'librechat-data-provider';
 import type { GoogleClientOptions, VertexAIClientOptions } from '@librechat/agents';
+import type { GoogleAIToolType } from '@langchain/google-common';
 import type * as t from '~/types';
 import { isEnabled } from '~/utils';
 
@@ -98,13 +99,14 @@ export function getGoogleConfig(
   const serviceKey =
     typeof serviceKeyRaw === 'string' ? JSON.parse(serviceKeyRaw) : (serviceKeyRaw ?? {});
 
-  const project_id = serviceKey?.project_id ?? null;
   const apiKey = creds[AuthKeys.GOOGLE_API_KEY] ?? null;
+  const project_id = !apiKey ? (serviceKey?.project_id ?? null) : null;
 
   const reverseProxyUrl = options.reverseProxyUrl;
   const authHeader = options.authHeader;
 
   const {
+    grounding,
     thinking = googleSettings.thinking.default,
     thinkingBudget = googleSettings.thinkingBudget.default,
     ...modelOptions
@@ -128,7 +130,7 @@ export function getGoogleConfig(
   }
 
   // If we have a GCP project => Vertex AI
-  if (project_id && provider === Providers.VERTEXAI) {
+  if (provider === Providers.VERTEXAI) {
     (llmConfig as VertexAIClientOptions).authOptions = {
       credentials: { ...serviceKey },
       projectId: project_id,
@@ -136,6 +138,10 @@ export function getGoogleConfig(
     (llmConfig as VertexAIClientOptions).location = process.env.GOOGLE_LOC || 'us-central1';
   } else if (apiKey && provider === Providers.GOOGLE) {
     llmConfig.apiKey = apiKey;
+  } else {
+    throw new Error(
+      `Invalid credentials provided. Please provide either a valid API key or service account credentials for Google Cloud.`,
+    );
   }
 
   const shouldEnableThinking =
@@ -183,8 +189,16 @@ export function getGoogleConfig(
     };
   }
 
+  const tools: GoogleAIToolType[] = [];
+
+  if (grounding) {
+    tools.push({ googleSearch: {} });
+  }
+
   // Return the final shape
   return {
+    /** @type {GoogleAIToolType[]} */
+    tools,
     /** @type {Providers.GOOGLE | Providers.VERTEXAI} */
     provider,
     /** @type {GoogleClientOptions | VertexAIClientOptions} */

packages/api/src/endpoints/openai/llm.ts

@@ -1,9 +1,25 @@
 import { ProxyAgent } from 'undici';
-import { KnownEndpoints } from 'librechat-data-provider';
+import { KnownEndpoints, removeNullishValues } from 'librechat-data-provider';
+import type { BindToolsInput } from '@langchain/core/language_models/chat_models';
+import type { AzureOpenAIInput } from '@langchain/openai';
+import type { OpenAI } from 'openai';
 import type * as t from '~/types';
 import { sanitizeModelName, constructAzureURL } from '~/utils/azure';
 import { isEnabled } from '~/utils/common';
 
+function hasReasoningParams({
+  reasoning_effort,
+  reasoning_summary,
+}: {
+  reasoning_effort?: string | null;
+  reasoning_summary?: string | null;
+}): boolean {
+  return (
+    (reasoning_effort != null && reasoning_effort !== '') ||
+    (reasoning_summary != null && reasoning_summary !== '')
+  );
+}
+
 /**
  * Generates configuration options for creating a language model (LLM) instance.
  * @param apiKey - The API key for authentication.
@@ -17,7 +33,7 @@ export function getOpenAIConfig(
   endpoint?: string | null,
 ): t.LLMConfigResult {
   const {
-    modelOptions = {},
+    modelOptions: _modelOptions = {},
     reverseProxyUrl,
     defaultQuery,
     headers,
@@ -27,8 +43,10 @@ export function getOpenAIConfig(
     addParams,
     dropParams,
   } = options;
-
-  const llmConfig: Partial<t.ClientOptions> & Partial<t.OpenAIParameters> = Object.assign(
+  const { reasoning_effort, reasoning_summary, ...modelOptions } = _modelOptions;
+  const llmConfig: Partial<t.ClientOptions> &
+    Partial<t.OpenAIParameters> &
+    Partial<AzureOpenAIInput> = Object.assign(
     {
       streaming,
       model: modelOptions.model ?? '',
@@ -40,39 +58,6 @@ export function getOpenAIConfig(
     Object.assign(llmConfig, addParams);
   }
 
-  // Note: OpenAI Web Search models do not support any known parameters besides `max_tokens`
-  if (modelOptions.model && /gpt-4o.*search/.test(modelOptions.model)) {
-    const searchExcludeParams = [
-      'frequency_penalty',
-      'presence_penalty',
-      'temperature',
-      'top_p',
-      'top_k',
-      'stop',
-      'logit_bias',
-      'seed',
-      'response_format',
-      'n',
-      'logprobs',
-      'user',
-    ];
-
-    const updatedDropParams = dropParams || [];
-    const combinedDropParams = [...new Set([...updatedDropParams, ...searchExcludeParams])];
-
-    combinedDropParams.forEach((param) => {
-      if (param in llmConfig) {
-        delete llmConfig[param as keyof t.ClientOptions];
-      }
-    });
-  } else if (dropParams && Array.isArray(dropParams)) {
-    dropParams.forEach((param) => {
-      if (param in llmConfig) {
-        delete llmConfig[param as keyof t.ClientOptions];
-      }
-    });
-  }
-
   let useOpenRouter = false;
   const configOptions: t.OpenAIConfiguration = {};
 
@@ -119,7 +104,10 @@ export function getOpenAIConfig(
       llmConfig.model = process.env.AZURE_OPENAI_DEFAULT_MODEL;
     }
 
-    if (configOptions.baseURL) {
+    const constructBaseURL = () => {
+      if (!configOptions.baseURL) {
+        return;
+      }
       const azureURL = constructAzureURL({
         baseURL: configOptions.baseURL,
         azureOptions: updatedAzure,
@@ -127,9 +115,40 @@ export function getOpenAIConfig(
       updatedAzure.azureOpenAIBasePath = azureURL.split(
         `/${updatedAzure.azureOpenAIApiDeploymentName}`,
       )[0];
-    }
+    };
 
+    constructBaseURL();
     Object.assign(llmConfig, updatedAzure);
+
+    const constructAzureResponsesApi = () => {
+      if (!llmConfig.useResponsesApi) {
+        return;
+      }
+
+      configOptions.baseURL = constructAzureURL({
+        baseURL: configOptions.baseURL || 'https://${INSTANCE_NAME}.openai.azure.com/openai/v1',
+        azureOptions: llmConfig,
+      });
+
+      delete llmConfig.azureOpenAIApiDeploymentName;
+      delete llmConfig.azureOpenAIApiInstanceName;
+      delete llmConfig.azureOpenAIApiVersion;
+      delete llmConfig.azureOpenAIBasePath;
+      delete llmConfig.azureOpenAIApiKey;
+      llmConfig.apiKey = apiKey;
+
+      configOptions.defaultHeaders = {
+        ...configOptions.defaultHeaders,
+        'api-key': apiKey,
+      };
+      configOptions.defaultQuery = {
+        ...configOptions.defaultQuery,
+        'api-version': 'preview',
+      };
+    };
+
+    constructAzureResponsesApi();
+
     llmConfig.model = updatedAzure.azureOpenAIApiDeploymentName;
   } else {
     llmConfig.apiKey = apiKey;
@@ -139,11 +158,19 @@ export function getOpenAIConfig(
     configOptions.organization = process.env.OPENAI_ORGANIZATION;
   }
 
-  if (useOpenRouter && llmConfig.reasoning_effort != null) {
-    llmConfig.reasoning = {
-      effort: llmConfig.reasoning_effort,
-    };
-    delete llmConfig.reasoning_effort;
+  if (
+    hasReasoningParams({ reasoning_effort, reasoning_summary }) &&
+    (llmConfig.useResponsesApi === true || useOpenRouter)
+  ) {
+    llmConfig.reasoning = removeNullishValues(
+      {
+        effort: reasoning_effort,
+        summary: reasoning_summary,
+      },
+      true,
+    ) as OpenAI.Reasoning;
+  } else if (hasReasoningParams({ reasoning_effort })) {
+    llmConfig.reasoning_effort = reasoning_effort;
   }
 
   if (llmConfig.max_tokens != null) {
@@ -151,8 +178,53 @@ export function getOpenAIConfig(
     delete llmConfig.max_tokens;
   }
 
+  const tools: BindToolsInput[] = [];
+
+  if (modelOptions.web_search) {
+    llmConfig.useResponsesApi = true;
+    tools.push({ type: 'web_search_preview' });
+  }
+
+  /**
+   * Note: OpenAI Web Search models do not support any known parameters besides `max_tokens`
+   */
+  if (modelOptions.model && /gpt-4o.*search/.test(modelOptions.model)) {
+    const searchExcludeParams = [
+      'frequency_penalty',
+      'presence_penalty',
+      'reasoning',
+      'reasoning_effort',
+      'temperature',
+      'top_p',
+      'top_k',
+      'stop',
+      'logit_bias',
+      'seed',
+      'response_format',
+      'n',
+      'logprobs',
+      'user',
+    ];
+
+    const updatedDropParams = dropParams || [];
+    const combinedDropParams = [...new Set([...updatedDropParams, ...searchExcludeParams])];
+
+    combinedDropParams.forEach((param) => {
+      if (param in llmConfig) {
+        delete llmConfig[param as keyof t.ClientOptions];
+      }
+    });
+  } else if (dropParams && Array.isArray(dropParams)) {
+    dropParams.forEach((param) => {
+      if (param in llmConfig) {
+        delete llmConfig[param as keyof t.ClientOptions];
+      }
+    });
+  }
+
   return {
     llmConfig,
     configOptions,
+    tools,
   };
 }

packages/api/src/files/mistral/crud.ts

@@ -21,6 +21,7 @@ import type {
   OCRImage,
 } from '~/types';
 import { logAxiosError, createAxiosInstance } from '~/utils/axios';
+import { loadServiceKey } from '~/utils/key';
 
 const axios = createAxiosInstance();
 const DEFAULT_MISTRAL_BASE_URL = 'https://api.mistral.ai/v1';
@@ -32,6 +33,13 @@ interface AuthConfig {
   baseURL: string;
 }
 
+/** Helper type for Google service account */
+interface GoogleServiceAccount {
+  client_email?: string;
+  private_key?: string;
+  project_id?: string;
+}
+
 /** Helper type for OCR request context */
 interface OCRContext {
   req: Pick<ServerRequest, 'user' | 'app'> & {
@@ -424,3 +432,216 @@ export const uploadAzureMistralOCR = async (
     throw createOCRError(error, 'Error uploading document to Azure Mistral OCR API:');
   }
 };
+
+/**
+ * Loads Google service account configuration
+ */
+async function loadGoogleAuthConfig(): Promise<{
+  serviceAccount: GoogleServiceAccount;
+  accessToken: string;
+}> {
+  /** Path from environment variable or default location */
+  const serviceKeyPath =
+    process.env.GOOGLE_SERVICE_KEY_FILE_PATH ||
+    path.join(__dirname, '..', '..', '..', 'api', 'data', 'auth.json');
+
+  const serviceKey = await loadServiceKey(serviceKeyPath);
+
+  if (!serviceKey) {
+    throw new Error(
+      `Google service account not found or could not be loaded from ${serviceKeyPath}`,
+    );
+  }
+
+  if (!serviceKey.client_email || !serviceKey.private_key || !serviceKey.project_id) {
+    throw new Error('Invalid Google service account configuration');
+  }
+
+  const jwt = await createJWT(serviceKey as GoogleServiceAccount);
+  const accessToken = await exchangeJWTForAccessToken(jwt);
+
+  return {
+    serviceAccount: serviceKey as GoogleServiceAccount,
+    accessToken,
+  };
+}
+
+/**
+ * Creates a JWT token manually
+ */
+async function createJWT(serviceKey: GoogleServiceAccount): Promise<string> {
+  const crypto = await import('crypto');
+
+  const header = {
+    alg: 'RS256',
+    typ: 'JWT',
+  };
+
+  const now = Math.floor(Date.now() / 1000);
+  const payload = {
+    iss: serviceKey.client_email,
+    scope: 'https://www.googleapis.com/auth/cloud-platform',
+    aud: 'https://oauth2.googleapis.com/token',
+    exp: now + 3600,
+    iat: now,
+  };
+
+  const encodedHeader = Buffer.from(JSON.stringify(header)).toString('base64url');
+  const encodedPayload = Buffer.from(JSON.stringify(payload)).toString('base64url');
+
+  const signatureInput = `${encodedHeader}.${encodedPayload}`;
+
+  const sign = crypto.createSign('RSA-SHA256');
+  sign.update(signatureInput);
+  sign.end();
+
+  const signature = sign.sign(serviceKey.private_key!, 'base64url');
+
+  return `${signatureInput}.${signature}`;
+}
+
+/**
+ * Exchanges JWT for access token
+ */
+async function exchangeJWTForAccessToken(jwt: string): Promise<string> {
+  const response = await axios.post(
+    'https://oauth2.googleapis.com/token',
+    new URLSearchParams({
+      grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
+      assertion: jwt,
+    }),
+    {
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      },
+    },
+  );
+
+  if (!response.data?.access_token) {
+    throw new Error('No access token in response');
+  }
+
+  return response.data.access_token;
+}
+
+/**
+ * Performs OCR using Google Vertex AI
+ */
+async function performGoogleVertexOCR({
+  url,
+  accessToken,
+  projectId,
+  model,
+  documentType = 'document_url',
+}: {
+  url: string;
+  accessToken: string;
+  projectId: string;
+  model: string;
+  documentType?: 'document_url' | 'image_url';
+}): Promise<OCRResult> {
+  const location = process.env.GOOGLE_LOC || 'us-central1';
+  const modelId = model || 'mistral-ocr-2505';
+
+  let baseURL: string;
+  if (location === 'global') {
+    baseURL = `https://aiplatform.googleapis.com/v1/projects/${projectId}/locations/global/publishers/mistralai/models/${modelId}:rawPredict`;
+  } else {
+    baseURL = `https://${location}-aiplatform.googleapis.com/v1/projects/${projectId}/locations/${location}/publishers/mistralai/models/${modelId}:rawPredict`;
+  }
+
+  const documentKey = documentType === 'image_url' ? 'image_url' : 'document_url';
+
+  const requestBody = {
+    model: modelId,
+    document: {
+      type: documentType,
+      [documentKey]: url,
+    },
+    include_image_base64: true,
+  };
+
+  logger.debug('Sending request to Google Vertex AI:', {
+    url: baseURL,
+    body: {
+      ...requestBody,
+      document: { ...requestBody.document, [documentKey]: 'base64_data_hidden' },
+    },
+  });
+
+  return axios
+    .post(baseURL, requestBody, {
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${accessToken}`,
+        Accept: 'application/json',
+      },
+    })
+    .then((res) => {
+      logger.debug('Google Vertex AI response received');
+      return res.data;
+    })
+    .catch((error) => {
+      if (error.response?.data) {
+        logger.error('Vertex AI error response: ' + JSON.stringify(error.response.data, null, 2));
+      }
+      throw new Error(
+        logAxiosError({
+          error: error as AxiosError,
+          message: 'Error calling Google Vertex AI Mistral OCR',
+        }),
+      );
+    });
+}
+
+/**
+ * Use Google Vertex AI Mistral OCR API to process the OCR result.
+ *
+ * @param params - The params object.
+ * @param params.req - The request object from Express. It should have a `user` property with an `id`
+ *                       representing the user
+ * @param params.file - The file object, which is part of the request. The file object should
+ *                                     have a `mimetype` property that tells us the file type
+ * @param params.loadAuthValues - Function to load authentication values
+ * @returns - The result object containing the processed `text` and `images` (not currently used),
+ *                       along with the `filename` and `bytes` properties.
+ */
+export const uploadGoogleVertexMistralOCR = async (
+  context: OCRContext,
+): Promise<MistralOCRUploadResult> => {
+  try {
+    const { serviceAccount, accessToken } = await loadGoogleAuthConfig();
+    const model = getModelConfig(context.req.app.locals?.ocr);
+
+    const buffer = fs.readFileSync(context.file.path);
+    const base64 = buffer.toString('base64');
+    const base64Prefix = `data:${context.file.mimetype || 'application/pdf'};base64,`;
+
+    const documentType = getDocumentType(context.file);
+    const ocrResult = await performGoogleVertexOCR({
+      url: `${base64Prefix}${base64}`,
+      accessToken,
+      projectId: serviceAccount.project_id!,
+      model,
+      documentType,
+    });
+
+    if (!ocrResult || !ocrResult.pages || ocrResult.pages.length === 0) {
+      throw new Error(
+        'No OCR result returned from service, may be down or the file is not supported.',
+      );
+    }
+
+    const { text, images } = processOCRResult(ocrResult);
+
+    return {
+      filename: context.file.originalname,
+      bytes: text.length * 4,
+      filepath: FileSources.vertexai_mistral_ocr as string,
+      text,
+      images,
+    };
+  } catch (error) {
+    throw createOCRError(error, 'Error uploading document to Google Vertex AI Mistral OCR:');
+  }
+};

packages/api/src/index.ts

@@ -2,7 +2,6 @@
 export * from './mcp/manager';
 export * from './mcp/oauth';
 export * from './mcp/auth';
-export * from './mcp/mcpOps';
 /* Utilities */
 export * from './mcp/utils';
 export * from './utils';

packages/api/src/mcp/mcpOps.ts

@@ -1,17 +0,0 @@
-import { MCP } from 'librechat-data-provider';
-import { Response } from 'express';
-
-export const addTool = (req: { body: MCP }, res: Response) => {
-  console.log('CREATE MCP:', JSON.stringify(req.body, null, 2));
-  res.send('ok');
-};
-
-export const updateTool = (req: { body: MCP; params: { mcp_id: string } }, res: Response) => {
-  console.log('UPDATE MCP:', req.params.mcp_id, JSON.stringify(req.body, null, 2));
-  res.send('ok');
-};
-
-export const deleteTool = (req: { params: { mcp_id: string } }, res: Response) => {
-  console.log('DELETE MCP:', req.params.mcp_id);
-  res.send('ok');
-};

packages/api/src/types/openai.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 import { openAISchema, EModelEndpoint } from 'librechat-data-provider';
 import type { TEndpointOption, TAzureConfig, TEndpoint } from 'librechat-data-provider';
+import type { BindToolsInput } from '@langchain/core/language_models/chat_models';
 import type { OpenAIClientOptions } from '@librechat/agents';
 import type { AzureOptions } from './azure';
 
@@ -33,6 +34,7 @@ export type ClientOptions = OpenAIClientOptions & {
 export interface LLMConfigResult {
   llmConfig: ClientOptions;
   configOptions: OpenAIConfiguration;
+  tools?: BindToolsInput[];
 }
 
 /**

packages/api/src/types/run.ts

@@ -1,4 +1,4 @@
-import type { Providers } from '@librechat/agents';
+import type { Providers, ClientOptions } from '@librechat/agents';
 import type { AgentModelParameters } from 'librechat-data-provider';
 import type { OpenAIConfiguration } from './openai';
 
@@ -8,4 +8,5 @@ export type RunLLMConfig = {
   streamUsage: boolean;
   usage?: boolean;
   configuration?: OpenAIConfiguration;
-} & AgentModelParameters;
+} & AgentModelParameters &
+  ClientOptions;

packages/api/src/utils/index.ts

@@ -5,6 +5,7 @@ export * from './env';
 export * from './events';
 export * from './files';
 export * from './generators';
+export * from './key';
 export * from './llm';
 export * from './math';
 export * from './openid';

packages/api/src/utils/key.ts

@@ -0,0 +1,70 @@
+import fs from 'fs';
+import path from 'path';
+import axios from 'axios';
+import { logger } from '@librechat/data-schemas';
+
+export interface GoogleServiceKey {
+  type?: string;
+  project_id?: string;
+  private_key_id?: string;
+  private_key?: string;
+  client_email?: string;
+  client_id?: string;
+  auth_uri?: string;
+  token_uri?: string;
+  auth_provider_x509_cert_url?: string;
+  client_x509_cert_url?: string;
+  [key: string]: unknown;
+}
+
+/**
+ * Load Google service key from file path or URL
+ * @param keyPath - The path or URL to the service key file
+ * @returns The parsed service key object or null if failed
+ */
+export async function loadServiceKey(keyPath: string): Promise<GoogleServiceKey | null> {
+  if (!keyPath) {
+    return null;
+  }
+
+  let serviceKey: unknown;
+
+  // Check if it's a URL
+  if (/^https?:\/\//.test(keyPath)) {
+    try {
+      const response = await axios.get(keyPath);
+      serviceKey = response.data;
+    } catch (error) {
+      logger.error(`Failed to fetch the service key from URL: ${keyPath}`, error);
+      return null;
+    }
+  } else {
+    // It's a file path
+    try {
+      const absolutePath = path.isAbsolute(keyPath) ? keyPath : path.resolve(keyPath);
+      const fileContent = fs.readFileSync(absolutePath, 'utf8');
+      serviceKey = JSON.parse(fileContent);
+    } catch (error) {
+      logger.error(`Failed to load service key from file: ${keyPath}`, error);
+      return null;
+    }
+  }
+
+  // If the response is a string (e.g., from a URL that returns JSON as text), parse it
+  if (typeof serviceKey === 'string') {
+    try {
+      serviceKey = JSON.parse(serviceKey);
+    } catch (parseError) {
+      logger.error(`Failed to parse service key JSON from ${keyPath}`, parseError);
+      return null;
+    }
+  }
+
+  // Validate the service key has required fields
+  if (!serviceKey || typeof serviceKey !== 'object') {
+    logger.error(`Invalid service key format from ${keyPath}`);
+    return null;
+  }
+
+  return serviceKey as GoogleServiceKey;
+}

packages/data-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "librechat-data-provider",
-  "version": "0.7.88",
+  "version": "0.7.899",
   "description": "data services for librechat apps",
   "main": "dist/index.js",
   "module": "dist/index.es.js",

packages/data-provider/specs/generate.spec.ts

@@ -1,4 +1,3 @@
-/* eslint-disable jest/no-conditional-expect */
 import { ZodError, z } from 'zod';
 import { generateDynamicSchema, validateSettingDefinitions, OptionTypes } from '../src/generate';
 import type { SettingsConfiguration } from '../src/generate';
@@ -97,6 +96,37 @@ describe('generateDynamicSchema', () => {
     expect(result['data']).toEqual({ testEnum: 'option2' });
   });
 
+  it('should generate a schema for enum settings with empty string option', () => {
+    const settings: SettingsConfiguration = [
+      {
+        key: 'testEnumWithEmpty',
+        description: 'A test enum setting with empty string',
+        type: 'enum',
+        default: '',
+        options: ['', 'option1', 'option2'],
+        enumMappings: {
+          '': 'None',
+          option1: 'First Option',
+          option2: 'Second Option',
+        },
+        component: 'slider',
+        columnSpan: 2,
+        label: 'Test Enum with Empty String',
+      },
+    ];
+
+    const schema = generateDynamicSchema(settings);
+    const result = schema.safeParse({ testEnumWithEmpty: '' });
+
+    expect(result.success).toBeTruthy();
+    expect(result['data']).toEqual({ testEnumWithEmpty: '' });
+
+    // Test with non-empty option
+    const result2 = schema.safeParse({ testEnumWithEmpty: 'option1' });
+    expect(result2.success).toBeTruthy();
+    expect(result2['data']).toEqual({ testEnumWithEmpty: 'option1' });
+  });
+
   it('should fail for incorrect enum value', () => {
     const settings: SettingsConfiguration = [
       {
@@ -481,6 +511,47 @@ describe('validateSettingDefinitions', () => {
 
     expect(() => validateSettingDefinitions(settingsExceedingMaxTags)).toThrow(ZodError);
   });
+
+  // Test for incomplete enumMappings
+  test('should throw error for incomplete enumMappings', () => {
+    const settingsWithIncompleteEnumMappings: SettingsConfiguration = [
+      {
+        key: 'displayMode',
+        type: 'enum',
+        component: 'dropdown',
+        options: ['light', 'dark', 'auto'],
+        enumMappings: {
+          light: 'Light Mode',
+          dark: 'Dark Mode',
+          // Missing mapping for 'auto'
+        },
+        optionType: OptionTypes.Custom,
+      },
+    ];
+
+    expect(() => validateSettingDefinitions(settingsWithIncompleteEnumMappings)).toThrow(ZodError);
+  });
+
+  // Test for complete enumMappings including empty string
+  test('should not throw error for complete enumMappings including empty string', () => {
+    const settingsWithCompleteEnumMappings: SettingsConfiguration = [
+      {
+        key: 'selectionMode',
+        type: 'enum',
+        component: 'slider',
+        options: ['', 'single', 'multiple'],
+        enumMappings: {
+          '': 'None',
+          single: 'Single Selection',
+          multiple: 'Multiple Selection',
+        },
+        default: '',
+        optionType: OptionTypes.Custom,
+      },
+    ];
+
+    expect(() => validateSettingDefinitions(settingsWithCompleteEnumMappings)).not.toThrow();
+  });
 });
 
 const settingsConfiguration: SettingsConfiguration = [
@@ -515,7 +586,7 @@ const settingsConfiguration: SettingsConfiguration = [
   {
     key: 'presence_penalty',
     description:
-      'Number between -2.0 and 2.0. Positive values penalize new tokens based on whether they appear in the text so far, increasing the model\'s likelihood to talk about new topics.',
+      "Number between -2.0 and 2.0. Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics.",
     type: 'number',
     default: 0,
     range: {
@@ -529,7 +600,7 @@ const settingsConfiguration: SettingsConfiguration = [
   {
     key: 'frequency_penalty',
     description:
-      'Number between -2.0 and 2.0. Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model\'s likelihood to repeat the same line verbatim.',
+      "Number between -2.0 and 2.0. Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim.",
     type: 'number',
     default: 0,
     range: {

packages/data-provider/src/config.ts

@@ -615,6 +615,7 @@ export enum OCRStrategy {
   MISTRAL_OCR = 'mistral_ocr',
   CUSTOM_OCR = 'custom_ocr',
   AZURE_MISTRAL_OCR = 'azure_mistral_ocr',
+  VERTEXAI_MISTRAL_OCR = 'vertexai_mistral_ocr',
 }
 
 export enum SearchCategories {
@@ -1256,6 +1257,10 @@ export enum ErrorTypes {
    * Google provider returned an error
    */
   GOOGLE_ERROR = 'google_error',
+  /**
+   * Google provider does not allow custom tools with built-in tools
+   */
+  GOOGLE_TOOL_CONFLICT = 'google_tool_conflict',
   /**
    * Invalid Agent Provider (excluded by Admin)
    */
@@ -1378,7 +1383,7 @@ export enum TTSProviders {
 /** Enum for app-wide constants */
 export enum Constants {
   /** Key for the app's version. */
-  VERSION = 'v0.7.8',
+  VERSION = 'v0.7.9-rc1',
   /** Key for the Custom Config's version (librechat.yaml). */
   CONFIG_VERSION = '1.2.8',
   /** Standard value for the first message's `parentMessageId` value, to indicate no parent exists. */

packages/data-provider/src/createPayload.ts

@@ -11,18 +11,20 @@ export default function createPayload(submission: t.TSubmission) {
     isContinued,
     isTemporary,
     ephemeralAgent,
+    editedContent,
   } = submission;
   const { conversationId } = s.tConvoUpdateSchema.parse(conversation);
-  const { endpoint: _e } = endpointOption as {
+  const { endpoint: _e, endpointType } = endpointOption as {
     endpoint: s.EModelEndpoint;
     endpointType?: s.EModelEndpoint;
   };
 
   const endpoint = _e as s.EModelEndpoint;
   let server = `${EndpointURLs[s.EModelEndpoint.agents]}/${endpoint}`;
-
-  if (isEdited && s.isAssistantsEndpoint(endpoint)) {
-    server += '/modify';
+  if (s.isAssistantsEndpoint(endpoint)) {
+    server =
+      EndpointURLs[(endpointType ?? endpoint) as 'assistants' | 'azureAssistants'] +
+      (isEdited ? '/modify' : '');
   }
 
   const payload: t.TPayload = {
@@ -33,6 +35,7 @@ export default function createPayload(submission: t.TSubmission) {
     isContinued: !!(isEdited && isContinued),
     conversationId,
     isTemporary,
+    editedContent,
   };
 
   return { server, payload };

packages/data-provider/src/data-service.ts

@@ -832,35 +832,3 @@ export const createMemory = (data: {
 }): Promise<{ created: boolean; memory: q.TUserMemory }> => {
   return request.post(endpoints.memories(), data);
 };
-
-export const createMCP = (mcp: ag.MCP): Promise<Record<string, unknown>> => {
-  return request.post(
-    endpoints.agents({
-      path: 'tools/add',
-    }),
-    mcp,
-  );
-};
-
-export const updateMCP = ({
-  mcp_id,
-  data,
-}: {
-  mcp_id: string;
-  data: ag.MCP;
-}): Promise<Record<string, unknown>> => {
-  return request.put(
-    endpoints.agents({
-      path: `tools/${mcp_id}`,
-    }),
-    data,
-  );
-};
-
-export const deleteMCP = ({ mcp_id }: { mcp_id: string }): Promise<Record<string, unknown>> => {
-  return request.delete(
-    endpoints.agents({
-      path: `tools/${mcp_id}`,
-    }),
-  );
-};

packages/data-provider/src/generate.ts

@@ -467,7 +467,11 @@ export function validateSettingDefinitions(settings: SettingsConfiguration): voi
     }
 
     /* Default value checks */
-    if (setting.type === SettingTypes.Number && isNaN(setting.default as number)  && setting.default != null) {
+    if (
+      setting.type === SettingTypes.Number &&
+      isNaN(setting.default as number) &&
+      setting.default != null
+    ) {
       errors.push({
         code: ZodIssueCode.custom,
         message: `Invalid default value for setting ${setting.key}. Must be a number.`,
@@ -475,7 +479,11 @@ export function validateSettingDefinitions(settings: SettingsConfiguration): voi
       });
     }
 
-    if (setting.type === SettingTypes.Boolean && typeof setting.default !== 'boolean' && setting.default != null) {
+    if (
+      setting.type === SettingTypes.Boolean &&
+      typeof setting.default !== 'boolean' &&
+      setting.default != null
+    ) {
       errors.push({
         code: ZodIssueCode.custom,
         message: `Invalid default value for setting ${setting.key}. Must be a boolean.`,
@@ -485,7 +493,8 @@ export function validateSettingDefinitions(settings: SettingsConfiguration): voi
 
     if (
       (setting.type === SettingTypes.String || setting.type === SettingTypes.Enum) &&
-      typeof setting.default !== 'string' && setting.default != null
+      typeof setting.default !== 'string' &&
+      setting.default != null
     ) {
       errors.push({
         code: ZodIssueCode.custom,
@@ -520,6 +529,19 @@ export function validateSettingDefinitions(settings: SettingsConfiguration): voi
         path: ['default'],
       });
     }
+
+    // Validate enumMappings
+    if (setting.enumMappings && setting.type === SettingTypes.Enum && setting.options) {
+      for (const option of setting.options) {
+        if (!(option in setting.enumMappings)) {
+          errors.push({
+            code: ZodIssueCode.custom,
+            message: `Missing enumMapping for option "${option}" in setting ${setting.key}.`,
+            path: ['enumMappings'],
+          });
+        }
+      }
+    }
   }
 
   if (errors.length > 0) {

packages/data-provider/src/keys.ts

@@ -48,7 +48,6 @@ export enum QueryKeys {
   banner = 'banner',
   /* Memories */
   memories = 'memories',
-  mcpTools = 'mcpTools',
 }
 
 export enum MutationKeys {

packages/data-provider/src/parameterSettings.ts

@@ -4,6 +4,7 @@ import {
   openAISettings,
   googleSettings,
   ReasoningEffort,
+  ReasoningSummary,
   BedrockProviders,
   anthropicSettings,
 } from './types';
@@ -71,6 +72,11 @@ const baseDefinitions: Record<string, SettingDefinition> = {
     default: ImageDetail.auto,
     component: 'slider',
     options: [ImageDetail.low, ImageDetail.auto, ImageDetail.high],
+    enumMappings: {
+      [ImageDetail.low]: 'com_ui_low',
+      [ImageDetail.auto]: 'com_ui_auto',
+      [ImageDetail.high]: 'com_ui_high',
+    },
     optionType: 'conversation',
     columnSpan: 2,
   },
@@ -211,9 +217,70 @@ const openAIParams: Record<string, SettingDefinition> = {
     description: 'com_endpoint_openai_reasoning_effort',
     descriptionCode: true,
     type: 'enum',
-    default: ReasoningEffort.medium,
+    default: ReasoningEffort.none,
     component: 'slider',
-    options: [ReasoningEffort.low, ReasoningEffort.medium, ReasoningEffort.high],
+    options: [
+      ReasoningEffort.none,
+      ReasoningEffort.low,
+      ReasoningEffort.medium,
+      ReasoningEffort.high,
+    ],
+    enumMappings: {
+      [ReasoningEffort.none]: 'com_ui_none',
+      [ReasoningEffort.low]: 'com_ui_low',
+      [ReasoningEffort.medium]: 'com_ui_medium',
+      [ReasoningEffort.high]: 'com_ui_high',
+    },
+    optionType: 'model',
+    columnSpan: 4,
+  },
+  useResponsesApi: {
+    key: 'useResponsesApi',
+    label: 'com_endpoint_use_responses_api',
+    labelCode: true,
+    description: 'com_endpoint_openai_use_responses_api',
+    descriptionCode: true,
+    type: 'boolean',
+    default: false,
+    component: 'switch',
+    optionType: 'model',
+    showDefault: false,
+    columnSpan: 2,
+  },
+  web_search: {
+    key: 'web_search',
+    label: 'com_ui_web_search',
+    labelCode: true,
+    description: 'com_endpoint_openai_use_web_search',
+    descriptionCode: true,
+    type: 'boolean',
+    default: false,
+    component: 'switch',
+    optionType: 'model',
+    showDefault: false,
+    columnSpan: 2,
+  },
+  reasoning_summary: {
+    key: 'reasoning_summary',
+    label: 'com_endpoint_reasoning_summary',
+    labelCode: true,
+    description: 'com_endpoint_openai_reasoning_summary',
+    descriptionCode: true,
+    type: 'enum',
+    default: ReasoningSummary.none,
+    component: 'slider',
+    options: [
+      ReasoningSummary.none,
+      ReasoningSummary.auto,
+      ReasoningSummary.concise,
+      ReasoningSummary.detailed,
+    ],
+    enumMappings: {
+      [ReasoningSummary.none]: 'com_ui_none',
+      [ReasoningSummary.auto]: 'com_ui_auto',
+      [ReasoningSummary.concise]: 'com_ui_concise',
+      [ReasoningSummary.detailed]: 'com_ui_detailed',
+    },
     optionType: 'model',
     columnSpan: 4,
   },
@@ -347,7 +414,9 @@ const bedrock: Record<string, SettingDefinition> = {
     labelCode: true,
     type: 'number',
     component: 'input',
-    placeholder: 'com_endpoint_anthropic_maxoutputtokens',
+    description: 'com_endpoint_anthropic_maxoutputtokens',
+    descriptionCode: true,
+    placeholder: 'com_nav_theme_system',
     placeholderCode: true,
     optionType: 'model',
     columnSpan: 2,
@@ -481,6 +550,19 @@ const google: Record<string, SettingDefinition> = {
     optionType: 'conversation',
     columnSpan: 2,
   },
+  grounding: {
+    key: 'grounding',
+    label: 'com_endpoint_use_search_grounding',
+    labelCode: true,
+    description: 'com_endpoint_google_use_search_grounding',
+    descriptionCode: true,
+    type: 'boolean',
+    default: false,
+    component: 'switch',
+    optionType: 'model',
+    showDefault: false,
+    columnSpan: 2,
+  },
 };
 
 const googleConfig: SettingsConfiguration = [
@@ -494,6 +576,7 @@ const googleConfig: SettingsConfiguration = [
   librechat.resendFiles,
   google.thinking,
   google.thinkingBudget,
+  google.grounding,
 ];
 
 const googleCol1: SettingsConfiguration = [
@@ -511,6 +594,7 @@ const googleCol2: SettingsConfiguration = [
   librechat.resendFiles,
   google.thinking,
   google.thinkingBudget,
+  google.grounding,
 ];
 
 const openAI: SettingsConfiguration = [
@@ -525,7 +609,10 @@ const openAI: SettingsConfiguration = [
   baseDefinitions.stop,
   librechat.resendFiles,
   baseDefinitions.imageDetail,
+  openAIParams.web_search,
   openAIParams.reasoning_effort,
+  openAIParams.useResponsesApi,
+  openAIParams.reasoning_summary,
 ];
 
 const openAICol1: SettingsConfiguration = [
@@ -542,9 +629,12 @@ const openAICol2: SettingsConfiguration = [
   openAIParams.frequency_penalty,
   openAIParams.presence_penalty,
   baseDefinitions.stop,
-  openAIParams.reasoning_effort,
   librechat.resendFiles,
   baseDefinitions.imageDetail,
+  openAIParams.reasoning_effort,
+  openAIParams.reasoning_summary,
+  openAIParams.useResponsesApi,
+  openAIParams.web_search,
 ];
 
 const anthropicConfig: SettingsConfiguration = [

packages/data-provider/src/schemas.ts

@@ -112,11 +112,19 @@ export enum ImageDetail {
 }
 
 export enum ReasoningEffort {
+  none = '',
   low = 'low',
   medium = 'medium',
   high = 'high',
 }
 
+export enum ReasoningSummary {
+  none = '',
+  auto = 'auto',
+  concise = 'concise',
+  detailed = 'detailed',
+}
+
 export const imageDetailNumeric = {
   [ImageDetail.low]: 0,
   [ImageDetail.auto]: 1,
@@ -131,6 +139,7 @@ export const imageDetailValue = {
 
 export const eImageDetailSchema = z.nativeEnum(ImageDetail);
 export const eReasoningEffortSchema = z.nativeEnum(ReasoningEffort);
+export const eReasoningSummarySchema = z.nativeEnum(ReasoningSummary);
 
 export const defaultAssistantFormValues = {
   assistant: '',
@@ -494,6 +503,7 @@ export const tMessageSchema = z.object({
   title: z.string().nullable().or(z.literal('New Chat')).default('New Chat'),
   sender: z.string().optional(),
   text: z.string(),
+  /** @deprecated */
   generation: z.string().nullable().optional(),
   isCreatedByUser: z.boolean(),
   error: z.boolean().optional(),
@@ -619,8 +629,15 @@ export const tConversationSchema = z.object({
   file_ids: z.array(z.string()).optional(),
   /* vision */
   imageDetail: eImageDetailSchema.optional(),
-  /* OpenAI: o1 only */
-  reasoning_effort: eReasoningEffortSchema.optional(),
+  /* OpenAI: Reasoning models only */
+  reasoning_effort: eReasoningEffortSchema.optional().nullable(),
+  reasoning_summary: eReasoningSummarySchema.optional().nullable(),
+  /* OpenAI: use Responses API */
+  useResponsesApi: z.boolean().optional(),
+  /* OpenAI: use Responses API with Web Search */
+  web_search: z.boolean().optional(),
+  /* Google: use Search Grounding */
+  grounding: z.boolean().optional(),
   /* assistant */
   assistant_id: z.string().optional(),
   /* agents */
@@ -717,6 +734,14 @@ export const tQueryParamsSchema = tConversationSchema
     top_p: true,
     /** @endpoints openAI, custom, azureOpenAI */
     max_tokens: true,
+    /** @endpoints openAI, custom, azureOpenAI */
+    reasoning_effort: true,
+    /** @endpoints openAI, custom, azureOpenAI */
+    reasoning_summary: true,
+    /** @endpoints openAI, custom, azureOpenAI */
+    useResponsesApi: true,
+    /** @endpoints google */
+    grounding: true,
     /** @endpoints google, anthropic, bedrock */
     topP: true,
     /** @endpoints google, anthropic */
@@ -799,6 +824,7 @@ export const googleBaseSchema = tConversationSchema.pick({
   topK: true,
   thinking: true,
   thinkingBudget: true,
+  grounding: true,
   iconURL: true,
   greeting: true,
   spec: true,
@@ -830,6 +856,7 @@ export const googleGenConfigSchema = z
         thinkingBudget: coerceNumber.optional(),
       })
       .optional(),
+    grounding: z.boolean().optional(),
   })
   .strip()
   .optional();
@@ -1044,10 +1071,13 @@ export const openAIBaseSchema = tConversationSchema.pick({
   maxContextTokens: true,
   max_tokens: true,
   reasoning_effort: true,
+  reasoning_summary: true,
+  useResponsesApi: true,
+  web_search: true,
 });
 
 export const openAISchema = openAIBaseSchema
-  .transform((obj: Partial<TConversation>) => removeNullishValues(obj))
+  .transform((obj: Partial<TConversation>) => removeNullishValues(obj, true))
   .catch(() => ({}));
 
 export const compactGoogleSchema = googleBaseSchema

packages/data-provider/src/types.ts

@@ -109,6 +109,11 @@ export type TPayload = Partial<TMessage> &
     messages?: TMessages;
     isTemporary: boolean;
     ephemeralAgent?: TEphemeralAgent | null;
+    editedContent?: {
+      index: number;
+      text: string;
+      type: 'text' | 'think';
+    } | null;
   };
 
 export type TSubmission = {
@@ -127,6 +132,11 @@ export type TSubmission = {
   endpointOption: TEndpointOption;
   clientTimestamp?: string;
   ephemeralAgent?: TEphemeralAgent | null;
+  editedContent?: {
+    index: number;
+    text: string;
+    type: 'text' | 'think';
+  } | null;
 };
 
 export type EventSubmission = Omit<TSubmission, 'initialResponse'> & { initialResponse: TMessage };

packages/data-provider/src/types/agents.ts

@@ -342,17 +342,13 @@ export type MCPMetadata = Omit<ActionMetadata, 'auth'> & {
   description?: string;
   url?: string;
   tools?: string[];
+  auth?: MCPAuth;
   icon?: string;
   trust?: boolean;
-  customHeaders?: Array<{
-    id: string;
-    name: string;
-    value: string;
-  }>;
-  requestTimeout?: number;
-  connectionTimeout?: number;
 };
 
+export type MCPAuth = ActionAuth;
+
 export type AgentToolType = {
   tool_id: string;
   metadata: ToolMetadata;

packages/data-provider/src/types/files.ts

@@ -11,6 +11,7 @@ export enum FileSources {
   execute_code = 'execute_code',
   mistral_ocr = 'mistral_ocr',
   azure_mistral_ocr = 'azure_mistral_ocr',
+  vertexai_mistral_ocr = 'vertexai_mistral_ocr',
   text = 'text',
 }
 

packages/data-provider/src/types/mutations.ts

@@ -12,7 +12,7 @@ import {
   AgentCreateParams,
   AgentUpdateParams,
 } from './assistants';
-import { Action, ActionMetadata, MCP } from './agents';
+import { Action, ActionMetadata } from './agents';
 
 export type MutationOptions<
   Response,
@@ -319,15 +319,6 @@ export type AcceptTermsMutationOptions = MutationOptions<
 /* Tools */
 export type UpdatePluginAuthOptions = MutationOptions<types.TUser, types.TUpdateUserPlugins>;
 
-export type CreateMCPMutationOptions = MutationOptions<Record<string, unknown>, MCP>;
-
-export type UpdateMCPMutationOptions = MutationOptions<
-  Record<string, unknown>,
-  { mcp_id: string; data: MCP }
->;
-
-export type DeleteMCPMutationOptions = MutationOptions<Record<string, unknown>, { mcp_id: string }>;
-
 export type ToolParamsMap = {
   [Tools.execute_code]: {
     lang: string;

packages/data-schemas/src/schema/defaults.ts

@@ -131,8 +131,14 @@ export const conversationPreset = {
   max_tokens: {
     type: Number,
   },
-  /** omni models only */
+  useResponsesApi: {
+    type: Boolean,
+  },
+  /** Reasoning models only */
   reasoning_effort: {
     type: String,
   },
+  reasoning_summary: {
+    type: String,
+  },
 };

packages/data-schemas/src/schema/preset.ts

@@ -46,6 +46,8 @@ export interface IPreset extends Document {
   maxContextTokens?: number;
   max_tokens?: number;
   reasoning_effort?: string;
+  reasoning_summary?: string;
+  useResponsesApi?: boolean;
   // end of additional fields
   agentOptions?: unknown;
 }

packages/data-schemas/src/types/convo.ts

@@ -45,6 +45,10 @@ export interface IConversation extends Document {
   maxContextTokens?: number;
   max_tokens?: number;
   reasoning_effort?: string;
+  reasoning_summary?: string;
+  useResponsesApi?: boolean;
+  web_search?: boolean;
+  grounding?: boolean;
   // Additional fields
   files?: string[];
   expiredAt?: Date;