From c7f2ee36c534c1a25adece754f04f7f2bec8495c Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Mon, 2 Jun 2025 14:37:37 -0400
Subject: [PATCH 01/49] =?UTF-8?q?=F0=9F=94=84=20chore:=20Update=20mongoose?=
 =?UTF-8?q?=20model=20imports=20in=20delete-banner.js=20and=20reset-passwo?=
 =?UTF-8?q?rd.js=20(#7690)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/delete-banner.js  | 3 ++-
 config/reset-password.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/delete-banner.js b/config/delete-banner.js
index efb89f3418..af1353ff39 100644
--- a/config/delete-banner.js
+++ b/config/delete-banner.js
@@ -1,7 +1,8 @@
 const path = require('path');
+const mongoose = require(path.resolve(__dirname, '..', 'api', 'node_modules', 'mongoose'));
+const { Banner } = require('@librechat/data-schemas').createModels(mongoose);
 require('module-alias')({ base: path.resolve(__dirname, '..', 'api') });
 const { askQuestion, silentExit } = require('./helpers');
-const Banner = require('~/models/schema/banner');
 const connect = require('./connect');
 
 (async () => {
diff --git a/config/reset-password.js b/config/reset-password.js
index 0fbeb1c890..736f6c24a1 100644
--- a/config/reset-password.js
+++ b/config/reset-password.js
@@ -1,8 +1,9 @@
 const path = require('path');
 const bcrypt = require('bcryptjs');
 const readline = require('readline');
+const mongoose = require(path.resolve(__dirname, '..', 'api', 'node_modules', 'mongoose'));
+const { User } = require('@librechat/data-schemas').createModels(mongoose);
 require('module-alias')({ base: path.resolve(__dirname, '..', 'api') });
-const User = require('../api/models/User');
 const connect = require('./connect');
 
 const rl = readline.createInterface({

From 8cade2120d8f6d6155524a6590b024b27643caa1 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Mon, 2 Jun 2025 14:56:26 -0400
Subject: [PATCH 02/49] =?UTF-8?q?=F0=9F=8E=A8=20style:=20Reduce=20Transiti?=
 =?UTF-8?q?on=20Duration=20For=20Nav=20And=20Header=20from=20#7653=20(#769?=
 =?UTF-8?q?1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/Chat/Header.tsx | 4 ++--
 client/src/components/Nav/Nav.tsx     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/components/Chat/Header.tsx b/client/src/components/Chat/Header.tsx
index 8a9bd80c23..93a265f4a2 100644
--- a/client/src/components/Chat/Header.tsx
+++ b/client/src/components/Chat/Header.tsx
@@ -39,7 +39,7 @@ export default function Header() {
         <div className="mx-1 flex items-center gap-2">
           <div
             className={`flex items-center gap-2 ${
-              !isSmallScreen ? 'transition-all duration-500 ease-in-out' : ''
+              !isSmallScreen ? 'transition-all duration-200 ease-in-out' : ''
             } ${
               !navVisible
                 ? 'translate-x-0 opacity-100'
@@ -51,7 +51,7 @@ export default function Header() {
           </div>
           <div
             className={`flex items-center gap-2 ${
-              !isSmallScreen ? 'transition-all duration-500 ease-in-out' : ''
+              !isSmallScreen ? 'transition-all duration-200 ease-in-out' : ''
             } ${!navVisible ? 'translate-x-0' : 'translate-x-[-100px]'}`}
           >
             <ModelSelector startupConfig={startupConfig} />
diff --git a/client/src/components/Nav/Nav.tsx b/client/src/components/Nav/Nav.tsx
index d425468ca6..a692274719 100644
--- a/client/src/components/Nav/Nav.tsx
+++ b/client/src/components/Nav/Nav.tsx
@@ -30,7 +30,7 @@ const NavMask = memo(
       id="mobile-nav-mask-toggle"
       role="button"
       tabIndex={0}
-      className={`nav-mask transition-opacity duration-500 ease-in-out ${navVisible ? 'active opacity-100' : 'opacity-0'}`}
+      className={`nav-mask transition-opacity duration-200 ease-in-out ${navVisible ? 'active opacity-100' : 'opacity-0'}`}
       onClick={toggleNavVisible}
       onKeyDown={(e) => {
         if (e.key === 'Enter' || e.key === ' ') {
@@ -186,7 +186,7 @@ const Nav = memo(
         <div
           data-testid="nav"
           className={cn(
-            'nav active max-w-[320px] flex-shrink-0 transform overflow-x-hidden bg-surface-primary-alt transition-all duration-500 ease-in-out',
+            'nav active max-w-[320px] flex-shrink-0 transform overflow-x-hidden bg-surface-primary-alt transition-all duration-200 ease-in-out',
             'md:max-w-[260px]',
           )}
           style={{
@@ -197,7 +197,7 @@ const Nav = memo(
           <div className="h-full w-[320px] md:w-[260px]">
             <div className="flex h-full flex-col">
               <div
-                className={`flex h-full flex-col transition-opacity duration-500 ease-in-out ${navVisible ? 'opacity-100' : 'opacity-0'}`}
+                className={`flex h-full flex-col transition-opacity duration-200 ease-in-out ${navVisible ? 'opacity-100' : 'opacity-0'}`}
               >
                 <div className="flex h-full flex-col">
                   <nav

From 5ccdb83e5ed321d0b6c0c88c42061942a699b7fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A4rt?= <martvaha@users.noreply.github.com>
Date: Tue, 3 Jun 2025 21:05:41 +0300
Subject: [PATCH 03/49] =?UTF-8?q?=F0=9F=94=A7=20fix:=20Use=20Correct=20Des?=
 =?UTF-8?q?cription=20for=20Balance=20Info=20(#7712)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Nav/SettingsTabs/Balance/TokenCreditsItem.tsx    | 2 +-
 client/src/locales/en/translation.json                          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/components/Nav/SettingsTabs/Balance/TokenCreditsItem.tsx b/client/src/components/Nav/SettingsTabs/Balance/TokenCreditsItem.tsx
index 3488872a34..745f401b7c 100644
--- a/client/src/components/Nav/SettingsTabs/Balance/TokenCreditsItem.tsx
+++ b/client/src/components/Nav/SettingsTabs/Balance/TokenCreditsItem.tsx
@@ -15,7 +15,7 @@ const TokenCreditsItem: React.FC<TokenCreditsItemProps> = ({ tokenCredits }) =>
       {/* Left Section: Label */}
       <div className="flex items-center space-x-2">
         <Label className="font-light">{localize('com_nav_balance')}</Label>
-        <HoverCardSettings side="bottom" text="com_nav_info_user_name_display" />
+        <HoverCardSettings side="bottom" text="com_nav_info_balance" />
       </div>
 
       {/* Right Section: tokenCredits Value */}
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index b4c1bd5791..df6e0d123d 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -384,6 +384,7 @@
   "com_nav_info_save_draft": "When enabled, the text and attachments you enter in the chat form will be automatically saved locally as drafts. These drafts will be available even if you reload the page or switch to a different conversation. Drafts are stored locally on your device and are deleted once the message is sent.",
   "com_nav_info_show_thinking": "When enabled, the chat will display the thinking dropdowns open by default, allowing you to view the AI's reasoning in real-time. When disabled, the thinking dropdowns will remain closed by default for a cleaner and more streamlined interface",
   "com_nav_info_user_name_display": "When enabled, the username of the sender will be shown above each message you send. When disabled, you will only see \"You\" above your messages.",
+  "com_nav_info_balance": "Balance shows how many token credits you have left to use. Token credits translate to monetary value (e.g., 1000 credits = $0.001 USD)",
   "com_nav_lang_arabic": "العربية",
   "com_nav_lang_auto": "Auto detect",
   "com_nav_lang_brazilian_portuguese": "Português Brasileiro",

From 1806b704180ea70a7685f1acc50567fb2ef7aeb9 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Tue, 3 Jun 2025 14:42:59 -0400
Subject: [PATCH 04/49] =?UTF-8?q?=F0=9F=91=93=20a11y:=20Add=20Solid=20Mark?=
 =?UTF-8?q?er=20to=20Improve=20Visibility=20in=20LLM=20Menu=20(#7714)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat[a11y]: add solid left border to improve visibility in LLM's submenu items.

* 🎨 style: Update CustomMenuItem class for improved border visibility

---------

Co-authored-by: Derek Jackson <derek_jackson@harvard.edu>
---
 client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx b/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx
index eec0cf23b3..d466698938 100644
--- a/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx
@@ -159,7 +159,7 @@ export const CustomMenuItem = React.forwardRef<HTMLDivElement, CustomMenuItemPro
       blurOnHoverEnd: false,
       ...props,
       className: cn(
-        'flex cursor-default items-center gap-2 rounded-lg p-2 outline-none! scroll-m-1 scroll-mt-[calc(var(--combobox-height,0px)+var(--label-height,4px))] aria-disabled:opacity-25 data-[active-item]:bg-black/[0.075] data-[active-item]:text-black dark:data-[active-item]:bg-white/10 dark:data-[active-item]:text-white sm:py-1 sm:text-sm min-w-0 w-full',
+        'flex cursor-default items-center gap-2 rounded-lg p-2 outline-none! scroll-m-1 scroll-mt-[calc(var(--combobox-height,0px)+var(--label-height,4px))] aria-disabled:opacity-25 border-l-2 border-transparent data-[active-item]:border-black data-[active-item]:rounded-l-none data-[active-item]:bg-black/[0.075] data-[active-item]:text-black dark:data-[active-item]:bg-white/10 dark:data-[active-item]:text-white dark:data-[active-item]:border-white sm:py-1 sm:text-sm min-w-0 w-full',
         props.className,
       ),
     };

From 32bab334999487edf36b2371c79d6c38a6933a47 Mon Sep 17 00:00:00 2001
From: matt burnett <mawburn@users.noreply.github.com>
Date: Tue, 3 Jun 2025 22:04:13 -0400
Subject: [PATCH 05/49] =?UTF-8?q?=F0=9F=94=84=20fix:=20Handle=20Legacy=20A?=
 =?UTF-8?q?gent=20Version=20Creation=20(#7718)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Simplify version creation logic in updateAgent function

* Add comprehensive tests for agent functionality including version history, action metadata generation, and loading agents

- Introduced tests for generating consistent hashes for action metadata.
- Implemented tests for loading agents with various scenarios including null and non-existent IDs.
- Added edge case tests for agent creation, updates, and error handling.
- Ensured proper handling of ephemeral agents and their associated functionalities.

* Enhance tests for Agent model functionality

- Updated test structure for Agent resource file operations, improving organization and readability.
- Added comprehensive tests for handling concurrent file additions and removals, ensuring data integrity.
- Implemented edge case tests for agent creation and resource file management, including scenarios with non-existent agents.
- Enhanced error handling in tests to cover various failure scenarios, ensuring robustness in agent operations.

* optimize tests
---
 api/models/Agent.js      |    5 +-
 api/models/Agent.spec.js | 3161 +++++++++++++++++++++++++++-----------
 2 files changed, 2259 insertions(+), 907 deletions(-)

diff --git a/api/models/Agent.js b/api/models/Agent.js
index 808dbf09e0..eb16e4d238 100644
--- a/api/models/Agent.js
+++ b/api/models/Agent.js
@@ -301,10 +301,7 @@ const updateAgent = async (searchParameter, updateData, options = {}) => {
     }
 
     const shouldCreateVersion =
-      forceVersion ||
-      (versions &&
-        versions.length > 0 &&
-        (Object.keys(directUpdates).length > 0 || $push || $pull || $addToSet));
+      forceVersion || Object.keys(directUpdates).length > 0 || $push || $pull || $addToSet;
 
     if (shouldCreateVersion) {
       const duplicateVersion = isDuplicateVersion(updateData, versionData, versions, actionsHash);
diff --git a/api/models/Agent.spec.js b/api/models/Agent.spec.js
index bfa5a18259..08ece95fb9 100644
--- a/api/models/Agent.spec.js
+++ b/api/models/Agent.spec.js
@@ -12,6 +12,7 @@ const { agentSchema } = require('@librechat/data-schemas');
 const { MongoMemoryServer } = require('mongodb-memory-server');
 const {
   getAgent,
+  loadAgent,
   createAgent,
   updateAgent,
   deleteAgent,
@@ -19,1063 +20,2417 @@ const {
   updateAgentProjects,
   addAgentResourceFile,
   removeAgentResourceFiles,
+  generateActionMetadataHash,
+  revertAgentVersion,
 } = require('./Agent');
+
 /**
  * @type {import('mongoose').Model<import('@librechat/data-schemas').IAgent>}
  */
 let Agent;
 
-describe('Agent Resource File Operations', () => {
-  let mongoServer;
+describe('models/Agent', () => {
+  describe('Agent Resource File Operations', () => {
+    let mongoServer;
 
-  beforeAll(async () => {
-    mongoServer = await MongoMemoryServer.create();
-    const mongoUri = mongoServer.getUri();
-    Agent = mongoose.models.Agent || mongoose.model('Agent', agentSchema);
-    await mongoose.connect(mongoUri);
-  });
-
-  afterAll(async () => {
-    await mongoose.disconnect();
-    await mongoServer.stop();
-    process.env.CREDS_KEY = originalEnv.CREDS_KEY;
-    process.env.CREDS_IV = originalEnv.CREDS_IV;
-  });
-
-  beforeEach(async () => {
-    await Agent.deleteMany({});
-  });
-
-  const createBasicAgent = async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const agent = await Agent.create({
-      id: agentId,
-      name: 'Test Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: new mongoose.Types.ObjectId(),
-    });
-    return agent;
-  };
-
-  test('should add tool_resource to tools if missing', async () => {
-    const agent = await createBasicAgent();
-    const fileId = uuidv4();
-    const toolResource = 'file_search';
-
-    const updatedAgent = await addAgentResourceFile({
-      agent_id: agent.id,
-      tool_resource: toolResource,
-      file_id: fileId,
+    beforeAll(async () => {
+      mongoServer = await MongoMemoryServer.create();
+      const mongoUri = mongoServer.getUri();
+      Agent = mongoose.models.Agent || mongoose.model('Agent', agentSchema);
+      await mongoose.connect(mongoUri);
     });
 
-    expect(updatedAgent.tools).toContain(toolResource);
-    expect(Array.isArray(updatedAgent.tools)).toBe(true);
-    // Should not duplicate
-    const count = updatedAgent.tools.filter((t) => t === toolResource).length;
-    expect(count).toBe(1);
-  });
-
-  test('should not duplicate tool_resource in tools if already present', async () => {
-    const agent = await createBasicAgent();
-    const fileId1 = uuidv4();
-    const fileId2 = uuidv4();
-    const toolResource = 'file_search';
-
-    // First add
-    await addAgentResourceFile({
-      agent_id: agent.id,
-      tool_resource: toolResource,
-      file_id: fileId1,
+    afterAll(async () => {
+      await mongoose.disconnect();
+      await mongoServer.stop();
+      process.env.CREDS_KEY = originalEnv.CREDS_KEY;
+      process.env.CREDS_IV = originalEnv.CREDS_IV;
     });
 
-    // Second add (should not duplicate)
-    const updatedAgent = await addAgentResourceFile({
-      agent_id: agent.id,
-      tool_resource: toolResource,
-      file_id: fileId2,
+    beforeEach(async () => {
+      await Agent.deleteMany({});
     });
 
-    expect(updatedAgent.tools).toContain(toolResource);
-    expect(Array.isArray(updatedAgent.tools)).toBe(true);
-    const count = updatedAgent.tools.filter((t) => t === toolResource).length;
-    expect(count).toBe(1);
-  });
+    test('should add tool_resource to tools if missing', async () => {
+      const agent = await createBasicAgent();
+      const fileId = uuidv4();
+      const toolResource = 'file_search';
 
-  test('should handle concurrent file additions', async () => {
-    const agent = await createBasicAgent();
-    const fileIds = Array.from({ length: 10 }, () => uuidv4());
+      const updatedAgent = await addAgentResourceFile({
+        agent_id: agent.id,
+        tool_resource: toolResource,
+        file_id: fileId,
+      });
 
-    // Concurrent additions
-    const additionPromises = fileIds.map((fileId) =>
-      addAgentResourceFile({
+      expect(updatedAgent.tools).toContain(toolResource);
+      expect(Array.isArray(updatedAgent.tools)).toBe(true);
+      // Should not duplicate
+      const count = updatedAgent.tools.filter((t) => t === toolResource).length;
+      expect(count).toBe(1);
+    });
+
+    test('should not duplicate tool_resource in tools if already present', async () => {
+      const agent = await createBasicAgent();
+      const fileId1 = uuidv4();
+      const fileId2 = uuidv4();
+      const toolResource = 'file_search';
+
+      // First add
+      await addAgentResourceFile({
+        agent_id: agent.id,
+        tool_resource: toolResource,
+        file_id: fileId1,
+      });
+
+      // Second add (should not duplicate)
+      const updatedAgent = await addAgentResourceFile({
+        agent_id: agent.id,
+        tool_resource: toolResource,
+        file_id: fileId2,
+      });
+
+      expect(updatedAgent.tools).toContain(toolResource);
+      expect(Array.isArray(updatedAgent.tools)).toBe(true);
+      const count = updatedAgent.tools.filter((t) => t === toolResource).length;
+      expect(count).toBe(1);
+    });
+
+    test('should handle concurrent file additions', async () => {
+      const agent = await createBasicAgent();
+      const fileIds = Array.from({ length: 10 }, () => uuidv4());
+
+      // Concurrent additions
+      const additionPromises = createFileOperations(agent.id, fileIds, 'add');
+
+      await Promise.all(additionPromises);
+
+      const updatedAgent = await Agent.findOne({ id: agent.id });
+      expect(updatedAgent.tool_resources.test_tool.file_ids).toBeDefined();
+      expect(updatedAgent.tool_resources.test_tool.file_ids).toHaveLength(10);
+      expect(new Set(updatedAgent.tool_resources.test_tool.file_ids).size).toBe(10);
+    });
+
+    test('should handle concurrent additions and removals', async () => {
+      const agent = await createBasicAgent();
+      const initialFileIds = Array.from({ length: 5 }, () => uuidv4());
+
+      await Promise.all(createFileOperations(agent.id, initialFileIds, 'add'));
+
+      const newFileIds = Array.from({ length: 5 }, () => uuidv4());
+      const operations = [
+        ...newFileIds.map((fileId) =>
+          addAgentResourceFile({
+            agent_id: agent.id,
+            tool_resource: 'test_tool',
+            file_id: fileId,
+          }),
+        ),
+        ...initialFileIds.map((fileId) =>
+          removeAgentResourceFiles({
+            agent_id: agent.id,
+            files: [{ tool_resource: 'test_tool', file_id: fileId }],
+          }),
+        ),
+      ];
+
+      await Promise.all(operations);
+
+      const updatedAgent = await Agent.findOne({ id: agent.id });
+      expect(updatedAgent.tool_resources.test_tool.file_ids).toBeDefined();
+      expect(updatedAgent.tool_resources.test_tool.file_ids).toHaveLength(5);
+    });
+
+    test('should initialize array when adding to non-existent tool resource', async () => {
+      const agent = await createBasicAgent();
+      const fileId = uuidv4();
+
+      const updatedAgent = await addAgentResourceFile({
+        agent_id: agent.id,
+        tool_resource: 'new_tool',
+        file_id: fileId,
+      });
+
+      expect(updatedAgent.tool_resources.new_tool.file_ids).toBeDefined();
+      expect(updatedAgent.tool_resources.new_tool.file_ids).toHaveLength(1);
+      expect(updatedAgent.tool_resources.new_tool.file_ids[0]).toBe(fileId);
+    });
+
+    test('should handle rapid sequential modifications to same tool resource', async () => {
+      const agent = await createBasicAgent();
+      const fileId = uuidv4();
+
+      for (let i = 0; i < 10; i++) {
+        await addAgentResourceFile({
+          agent_id: agent.id,
+          tool_resource: 'test_tool',
+          file_id: `${fileId}_${i}`,
+        });
+
+        if (i % 2 === 0) {
+          await removeAgentResourceFiles({
+            agent_id: agent.id,
+            files: [{ tool_resource: 'test_tool', file_id: `${fileId}_${i}` }],
+          });
+        }
+      }
+
+      const updatedAgent = await Agent.findOne({ id: agent.id });
+      expect(updatedAgent.tool_resources.test_tool.file_ids).toBeDefined();
+      expect(Array.isArray(updatedAgent.tool_resources.test_tool.file_ids)).toBe(true);
+    });
+
+    test('should handle multiple tool resources concurrently', async () => {
+      const agent = await createBasicAgent();
+      const toolResources = ['tool1', 'tool2', 'tool3'];
+      const operations = [];
+
+      toolResources.forEach((tool) => {
+        const fileIds = Array.from({ length: 5 }, () => uuidv4());
+        fileIds.forEach((fileId) => {
+          operations.push(
+            addAgentResourceFile({
+              agent_id: agent.id,
+              tool_resource: tool,
+              file_id: fileId,
+            }),
+          );
+        });
+      });
+
+      await Promise.all(operations);
+
+      const updatedAgent = await Agent.findOne({ id: agent.id });
+      toolResources.forEach((tool) => {
+        expect(updatedAgent.tool_resources[tool].file_ids).toBeDefined();
+        expect(updatedAgent.tool_resources[tool].file_ids).toHaveLength(5);
+      });
+    });
+
+    test.each([
+      {
+        name: 'duplicate additions',
+        operation: 'add',
+        duplicateCount: 5,
+        expectedLength: 1,
+        expectedContains: true,
+      },
+      {
+        name: 'duplicate removals',
+        operation: 'remove',
+        duplicateCount: 5,
+        expectedLength: 0,
+        expectedContains: false,
+        setupFile: true,
+      },
+    ])(
+      'should handle concurrent $name',
+      async ({ operation, duplicateCount, expectedLength, expectedContains, setupFile }) => {
+        const agent = await createBasicAgent();
+        const fileId = uuidv4();
+
+        if (setupFile) {
+          await addAgentResourceFile({
+            agent_id: agent.id,
+            tool_resource: 'test_tool',
+            file_id: fileId,
+          });
+        }
+
+        const promises = Array.from({ length: duplicateCount }).map(() =>
+          operation === 'add'
+            ? addAgentResourceFile({
+                agent_id: agent.id,
+                tool_resource: 'test_tool',
+                file_id: fileId,
+              })
+            : removeAgentResourceFiles({
+                agent_id: agent.id,
+                files: [{ tool_resource: 'test_tool', file_id: fileId }],
+              }),
+        );
+
+        await Promise.all(promises);
+
+        const updatedAgent = await Agent.findOne({ id: agent.id });
+        const fileIds = updatedAgent.tool_resources?.test_tool?.file_ids ?? [];
+
+        expect(fileIds).toHaveLength(expectedLength);
+        if (expectedContains) {
+          expect(fileIds[0]).toBe(fileId);
+        } else {
+          expect(fileIds).not.toContain(fileId);
+        }
+      },
+    );
+
+    test('should handle concurrent add and remove of the same file', async () => {
+      const agent = await createBasicAgent();
+      const fileId = uuidv4();
+
+      await addAgentResourceFile({
         agent_id: agent.id,
         tool_resource: 'test_tool',
         file_id: fileId,
-      }),
-    );
+      });
 
-    await Promise.all(additionPromises);
-
-    const updatedAgent = await Agent.findOne({ id: agent.id });
-    expect(updatedAgent.tool_resources.test_tool.file_ids).toBeDefined();
-    expect(updatedAgent.tool_resources.test_tool.file_ids).toHaveLength(10);
-    expect(new Set(updatedAgent.tool_resources.test_tool.file_ids).size).toBe(10);
-  });
-
-  test('should handle concurrent additions and removals', async () => {
-    const agent = await createBasicAgent();
-    const initialFileIds = Array.from({ length: 5 }, () => uuidv4());
-
-    await Promise.all(
-      initialFileIds.map((fileId) =>
+      const operations = [
         addAgentResourceFile({
           agent_id: agent.id,
           tool_resource: 'test_tool',
           file_id: fileId,
         }),
-      ),
-    );
-
-    const newFileIds = Array.from({ length: 5 }, () => uuidv4());
-    const operations = [
-      ...newFileIds.map((fileId) =>
-        addAgentResourceFile({
-          agent_id: agent.id,
-          tool_resource: 'test_tool',
-          file_id: fileId,
-        }),
-      ),
-      ...initialFileIds.map((fileId) =>
         removeAgentResourceFiles({
           agent_id: agent.id,
           files: [{ tool_resource: 'test_tool', file_id: fileId }],
         }),
-      ),
-    ];
+      ];
 
-    await Promise.all(operations);
+      await Promise.all(operations);
 
-    const updatedAgent = await Agent.findOne({ id: agent.id });
-    expect(updatedAgent.tool_resources.test_tool.file_ids).toBeDefined();
-    expect(updatedAgent.tool_resources.test_tool.file_ids).toHaveLength(5);
-  });
+      const updatedAgent = await Agent.findOne({ id: agent.id });
+      const finalFileIds = updatedAgent.tool_resources.test_tool.file_ids;
+      const count = finalFileIds.filter((id) => id === fileId).length;
 
-  test('should initialize array when adding to non-existent tool resource', async () => {
-    const agent = await createBasicAgent();
-    const fileId = uuidv4();
-
-    const updatedAgent = await addAgentResourceFile({
-      agent_id: agent.id,
-      tool_resource: 'new_tool',
-      file_id: fileId,
+      expect(count).toBeLessThanOrEqual(1);
+      if (count === 0) {
+        expect(finalFileIds).toHaveLength(0);
+      } else {
+        expect(finalFileIds).toHaveLength(1);
+        expect(finalFileIds[0]).toBe(fileId);
+      }
     });
 
-    expect(updatedAgent.tool_resources.new_tool.file_ids).toBeDefined();
-    expect(updatedAgent.tool_resources.new_tool.file_ids).toHaveLength(1);
-    expect(updatedAgent.tool_resources.new_tool.file_ids[0]).toBe(fileId);
-  });
+    test('should handle concurrent removals of different files', async () => {
+      const agent = await createBasicAgent();
+      const fileIds = Array.from({ length: 10 }, () => uuidv4());
 
-  test('should handle rapid sequential modifications to same tool resource', async () => {
-    const agent = await createBasicAgent();
-    const fileId = uuidv4();
-
-    for (let i = 0; i < 10; i++) {
-      await addAgentResourceFile({
-        agent_id: agent.id,
-        tool_resource: 'test_tool',
-        file_id: `${fileId}_${i}`,
-      });
-
-      if (i % 2 === 0) {
-        await removeAgentResourceFiles({
-          agent_id: agent.id,
-          files: [{ tool_resource: 'test_tool', file_id: `${fileId}_${i}` }],
-        });
-      }
-    }
-
-    const updatedAgent = await Agent.findOne({ id: agent.id });
-    expect(updatedAgent.tool_resources.test_tool.file_ids).toBeDefined();
-    expect(Array.isArray(updatedAgent.tool_resources.test_tool.file_ids)).toBe(true);
-  });
-
-  test('should handle multiple tool resources concurrently', async () => {
-    const agent = await createBasicAgent();
-    const toolResources = ['tool1', 'tool2', 'tool3'];
-    const operations = [];
-
-    toolResources.forEach((tool) => {
-      const fileIds = Array.from({ length: 5 }, () => uuidv4());
-      fileIds.forEach((fileId) => {
-        operations.push(
+      // Add all files first
+      await Promise.all(
+        fileIds.map((fileId) =>
           addAgentResourceFile({
             agent_id: agent.id,
-            tool_resource: tool,
+            tool_resource: 'test_tool',
             file_id: fileId,
           }),
-        );
+        ),
+      );
+
+      // Concurrently remove all files
+      const removalPromises = fileIds.map((fileId) =>
+        removeAgentResourceFiles({
+          agent_id: agent.id,
+          files: [{ tool_resource: 'test_tool', file_id: fileId }],
+        }),
+      );
+
+      await Promise.all(removalPromises);
+
+      const updatedAgent = await Agent.findOne({ id: agent.id });
+      // Check if the array is empty or the tool resource itself is removed
+      const finalFileIds = updatedAgent.tool_resources?.test_tool?.file_ids ?? [];
+      expect(finalFileIds).toHaveLength(0);
+    });
+
+    describe('Edge Cases', () => {
+      describe.each([
+        {
+          operation: 'add',
+          name: 'empty file_id',
+          needsAgent: true,
+          params: { tool_resource: 'file_search', file_id: '' },
+          shouldResolve: true,
+        },
+        {
+          operation: 'add',
+          name: 'non-existent agent',
+          needsAgent: false,
+          params: { tool_resource: 'file_search', file_id: 'file123' },
+          shouldResolve: false,
+          error: 'Agent not found for adding resource file',
+        },
+      ])('addAgentResourceFile with $name', ({ needsAgent, params, shouldResolve, error }) => {
+        test(`should ${shouldResolve ? 'resolve' : 'reject'}`, async () => {
+          const agent = needsAgent ? await createBasicAgent() : null;
+          const agent_id = needsAgent ? agent.id : `agent_${uuidv4()}`;
+
+          if (shouldResolve) {
+            await expect(addAgentResourceFile({ agent_id, ...params })).resolves.toBeDefined();
+          } else {
+            await expect(addAgentResourceFile({ agent_id, ...params })).rejects.toThrow(error);
+          }
+        });
+      });
+
+      describe.each([
+        {
+          name: 'empty files array',
+          files: [],
+          needsAgent: true,
+          shouldResolve: true,
+        },
+        {
+          name: 'non-existent tool_resource',
+          files: [{ tool_resource: 'non_existent_tool', file_id: 'file123' }],
+          needsAgent: true,
+          shouldResolve: true,
+        },
+        {
+          name: 'non-existent agent',
+          files: [{ tool_resource: 'file_search', file_id: 'file123' }],
+          needsAgent: false,
+          shouldResolve: false,
+          error: 'Agent not found for removing resource files',
+        },
+      ])('removeAgentResourceFiles with $name', ({ files, needsAgent, shouldResolve, error }) => {
+        test(`should ${shouldResolve ? 'resolve' : 'reject'}`, async () => {
+          const agent = needsAgent ? await createBasicAgent() : null;
+          const agent_id = needsAgent ? agent.id : `agent_${uuidv4()}`;
+
+          if (shouldResolve) {
+            const result = await removeAgentResourceFiles({ agent_id, files });
+            expect(result).toBeDefined();
+            if (agent) {
+              expect(result.id).toBe(agent.id);
+            }
+          } else {
+            await expect(removeAgentResourceFiles({ agent_id, files })).rejects.toThrow(error);
+          }
+        });
       });
     });
-
-    await Promise.all(operations);
-
-    const updatedAgent = await Agent.findOne({ id: agent.id });
-    toolResources.forEach((tool) => {
-      expect(updatedAgent.tool_resources[tool].file_ids).toBeDefined();
-      expect(updatedAgent.tool_resources[tool].file_ids).toHaveLength(5);
-    });
   });
 
-  test('should handle concurrent duplicate additions', async () => {
-    const agent = await createBasicAgent();
-    const fileId = uuidv4();
+  describe('Agent CRUD Operations', () => {
+    let mongoServer;
 
-    // Concurrent additions of the same file
-    const additionPromises = Array.from({ length: 5 }).map(() =>
-      addAgentResourceFile({
-        agent_id: agent.id,
-        tool_resource: 'test_tool',
-        file_id: fileId,
-      }),
-    );
-
-    await Promise.all(additionPromises);
-
-    const updatedAgent = await Agent.findOne({ id: agent.id });
-    expect(updatedAgent.tool_resources.test_tool.file_ids).toBeDefined();
-    // Should only contain one instance of the fileId
-    expect(updatedAgent.tool_resources.test_tool.file_ids).toHaveLength(1);
-    expect(updatedAgent.tool_resources.test_tool.file_ids[0]).toBe(fileId);
-  });
-
-  test('should handle concurrent add and remove of the same file', async () => {
-    const agent = await createBasicAgent();
-    const fileId = uuidv4();
-
-    // First, ensure the file exists (or test might be trivial if remove runs first)
-    await addAgentResourceFile({
-      agent_id: agent.id,
-      tool_resource: 'test_tool',
-      file_id: fileId,
+    beforeAll(async () => {
+      mongoServer = await MongoMemoryServer.create();
+      const mongoUri = mongoServer.getUri();
+      await mongoose.connect(mongoUri);
     });
 
-    // Concurrent add (which should be ignored) and remove
-    const operations = [
-      addAgentResourceFile({
-        agent_id: agent.id,
-        tool_resource: 'test_tool',
-        file_id: fileId,
-      }),
-      removeAgentResourceFiles({
-        agent_id: agent.id,
-        files: [{ tool_resource: 'test_tool', file_id: fileId }],
-      }),
-    ];
-
-    await Promise.all(operations);
-
-    const updatedAgent = await Agent.findOne({ id: agent.id });
-    // The final state should ideally be that the file is removed,
-    // but the key point is consistency (not duplicated or error state).
-    // Depending on execution order, the file might remain if the add operation's
-    // findOneAndUpdate runs after the remove operation completes.
-    // A more robust check might be that the length is <= 1.
-    // Given the remove uses an update pipeline, it might be more likely to win.
-    // The final state depends on race condition timing (add or remove might "win").
-    // The critical part is that the state is consistent (no duplicates, no errors).
-    // Assert that the fileId is either present exactly once or not present at all.
-    expect(updatedAgent.tool_resources.test_tool.file_ids).toBeDefined();
-    const finalFileIds = updatedAgent.tool_resources.test_tool.file_ids;
-    const count = finalFileIds.filter((id) => id === fileId).length;
-    expect(count).toBeLessThanOrEqual(1); // Should be 0 or 1, never more
-    // Optional: Check overall length is consistent with the count
-    if (count === 0) {
-      expect(finalFileIds).toHaveLength(0);
-    } else {
-      expect(finalFileIds).toHaveLength(1);
-      expect(finalFileIds[0]).toBe(fileId);
-    }
-  });
-
-  test('should handle concurrent duplicate removals', async () => {
-    const agent = await createBasicAgent();
-    const fileId = uuidv4();
-
-    // Add the file first
-    await addAgentResourceFile({
-      agent_id: agent.id,
-      tool_resource: 'test_tool',
-      file_id: fileId,
+    afterAll(async () => {
+      await mongoose.disconnect();
+      await mongoServer.stop();
     });
 
-    // Concurrent removals of the same file
-    const removalPromises = Array.from({ length: 5 }).map(() =>
-      removeAgentResourceFiles({
-        agent_id: agent.id,
-        files: [{ tool_resource: 'test_tool', file_id: fileId }],
-      }),
-    );
-
-    await Promise.all(removalPromises);
-
-    const updatedAgent = await Agent.findOne({ id: agent.id });
-    // Check if the array is empty or the tool resource itself is removed
-    const fileIds = updatedAgent.tool_resources?.test_tool?.file_ids ?? [];
-    expect(fileIds).toHaveLength(0);
-    expect(fileIds).not.toContain(fileId);
-  });
-
-  test('should handle concurrent removals of different files', async () => {
-    const agent = await createBasicAgent();
-    const fileIds = Array.from({ length: 10 }, () => uuidv4());
-
-    // Add all files first
-    await Promise.all(
-      fileIds.map((fileId) =>
-        addAgentResourceFile({
-          agent_id: agent.id,
-          tool_resource: 'test_tool',
-          file_id: fileId,
-        }),
-      ),
-    );
-
-    // Concurrently remove all files
-    const removalPromises = fileIds.map((fileId) =>
-      removeAgentResourceFiles({
-        agent_id: agent.id,
-        files: [{ tool_resource: 'test_tool', file_id: fileId }],
-      }),
-    );
-
-    await Promise.all(removalPromises);
-
-    const updatedAgent = await Agent.findOne({ id: agent.id });
-    // Check if the array is empty or the tool resource itself is removed
-    const finalFileIds = updatedAgent.tool_resources?.test_tool?.file_ids ?? [];
-    expect(finalFileIds).toHaveLength(0);
-  });
-});
-
-describe('Agent CRUD Operations', () => {
-  let mongoServer;
-
-  beforeAll(async () => {
-    mongoServer = await MongoMemoryServer.create();
-    const mongoUri = mongoServer.getUri();
-    await mongoose.connect(mongoUri);
-  });
-
-  afterAll(async () => {
-    await mongoose.disconnect();
-    await mongoServer.stop();
-  });
-
-  beforeEach(async () => {
-    await Agent.deleteMany({});
-  });
-
-  test('should create and get an agent', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
-
-    const newAgent = await createAgent({
-      id: agentId,
-      name: 'Test Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
-      description: 'Test description',
+    beforeEach(async () => {
+      await Agent.deleteMany({});
     });
 
-    expect(newAgent).toBeDefined();
-    expect(newAgent.id).toBe(agentId);
-    expect(newAgent.name).toBe('Test Agent');
+    test('should create and get an agent', async () => {
+      const { agentId, authorId } = createTestIds();
 
-    const retrievedAgent = await getAgent({ id: agentId });
-    expect(retrievedAgent).toBeDefined();
-    expect(retrievedAgent.id).toBe(agentId);
-    expect(retrievedAgent.name).toBe('Test Agent');
-    expect(retrievedAgent.description).toBe('Test description');
-  });
+      const newAgent = await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        description: 'Test description',
+      });
 
-  test('should delete an agent', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
+      expect(newAgent).toBeDefined();
+      expect(newAgent.id).toBe(agentId);
+      expect(newAgent.name).toBe('Test Agent');
 
-    await createAgent({
-      id: agentId,
-      name: 'Agent To Delete',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
+      const retrievedAgent = await getAgent({ id: agentId });
+      expect(retrievedAgent).toBeDefined();
+      expect(retrievedAgent.id).toBe(agentId);
+      expect(retrievedAgent.name).toBe('Test Agent');
+      expect(retrievedAgent.description).toBe('Test description');
     });
 
-    const agentBeforeDelete = await getAgent({ id: agentId });
-    expect(agentBeforeDelete).toBeDefined();
+    test('should delete an agent', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
 
-    await deleteAgent({ id: agentId });
-
-    const agentAfterDelete = await getAgent({ id: agentId });
-    expect(agentAfterDelete).toBeNull();
-  });
-
-  test('should list agents by author', async () => {
-    const authorId = new mongoose.Types.ObjectId();
-    const otherAuthorId = new mongoose.Types.ObjectId();
-
-    const agentIds = [];
-    for (let i = 0; i < 5; i++) {
-      const id = `agent_${uuidv4()}`;
-      agentIds.push(id);
       await createAgent({
-        id,
-        name: `Agent ${i}`,
+        id: agentId,
+        name: 'Agent To Delete',
         provider: 'test',
         model: 'test-model',
         author: authorId,
       });
-    }
 
-    for (let i = 0; i < 3; i++) {
+      const agentBeforeDelete = await getAgent({ id: agentId });
+      expect(agentBeforeDelete).toBeDefined();
+
+      await deleteAgent({ id: agentId });
+
+      const agentAfterDelete = await getAgent({ id: agentId });
+      expect(agentAfterDelete).toBeNull();
+    });
+
+    test('should list agents by author', async () => {
+      const authorId = new mongoose.Types.ObjectId();
+      const otherAuthorId = new mongoose.Types.ObjectId();
+
+      const agentIds = [];
+      for (let i = 0; i < 5; i++) {
+        const id = `agent_${uuidv4()}`;
+        agentIds.push(id);
+        await createAgent({
+          id,
+          name: `Agent ${i}`,
+          provider: 'test',
+          model: 'test-model',
+          author: authorId,
+        });
+      }
+
+      for (let i = 0; i < 3; i++) {
+        await createAgent({
+          id: `other_agent_${uuidv4()}`,
+          name: `Other Agent ${i}`,
+          provider: 'test',
+          model: 'test-model',
+          author: otherAuthorId,
+        });
+      }
+
+      const result = await getListAgents({ author: authorId.toString() });
+
+      expect(result).toBeDefined();
+      expect(result.data).toBeDefined();
+      expect(result.data).toHaveLength(5);
+      expect(result.has_more).toBe(true);
+
+      for (const agent of result.data) {
+        expect(agent.author).toBe(authorId.toString());
+      }
+    });
+
+    test('should update agent projects', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+      const projectId1 = new mongoose.Types.ObjectId();
+      const projectId2 = new mongoose.Types.ObjectId();
+      const projectId3 = new mongoose.Types.ObjectId();
+
       await createAgent({
-        id: `other_agent_${uuidv4()}`,
-        name: `Other Agent ${i}`,
+        id: agentId,
+        name: 'Project Test Agent',
         provider: 'test',
         model: 'test-model',
-        author: otherAuthorId,
+        author: authorId,
+        projectIds: [projectId1],
       });
-    }
 
-    const result = await getListAgents({ author: authorId.toString() });
+      await updateAgent(
+        { id: agentId },
+        { $addToSet: { projectIds: { $each: [projectId2, projectId3] } } },
+      );
 
-    expect(result).toBeDefined();
-    expect(result.data).toBeDefined();
-    expect(result.data).toHaveLength(5);
-    expect(result.has_more).toBe(true);
+      await updateAgent({ id: agentId }, { $pull: { projectIds: projectId1 } });
 
-    for (const agent of result.data) {
-      expect(agent.author).toBe(authorId.toString());
-    }
-  });
+      await updateAgent({ id: agentId }, { projectIds: [projectId2, projectId3] });
 
-  test('should update agent projects', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
-    const projectId1 = new mongoose.Types.ObjectId();
-    const projectId2 = new mongoose.Types.ObjectId();
-    const projectId3 = new mongoose.Types.ObjectId();
+      const updatedAgent = await getAgent({ id: agentId });
+      expect(updatedAgent.projectIds).toHaveLength(2);
+      expect(updatedAgent.projectIds.map((id) => id.toString())).toContain(projectId2.toString());
+      expect(updatedAgent.projectIds.map((id) => id.toString())).toContain(projectId3.toString());
+      expect(updatedAgent.projectIds.map((id) => id.toString())).not.toContain(
+        projectId1.toString(),
+      );
 
-    await createAgent({
-      id: agentId,
-      name: 'Project Test Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
-      projectIds: [projectId1],
+      await updateAgent({ id: agentId }, { projectIds: [] });
+
+      const emptyProjectsAgent = await getAgent({ id: agentId });
+      expect(emptyProjectsAgent.projectIds).toHaveLength(0);
+
+      const nonExistentId = `agent_${uuidv4()}`;
+      await expect(
+        updateAgentProjects({
+          id: nonExistentId,
+          projectIds: [projectId1],
+        }),
+      ).rejects.toThrow();
     });
 
-    await updateAgent(
-      { id: agentId },
-      { $addToSet: { projectIds: { $each: [projectId2, projectId3] } } },
-    );
+    test('should handle ephemeral agent loading', async () => {
+      const agentId = 'ephemeral_test';
+      const endpoint = 'openai';
 
-    await updateAgent({ id: agentId }, { $pull: { projectIds: projectId1 } });
+      const originalModule = jest.requireActual('librechat-data-provider');
 
-    await updateAgent({ id: agentId }, { projectIds: [projectId2, projectId3] });
+      const mockDataProvider = {
+        ...originalModule,
+        Constants: {
+          ...originalModule.Constants,
+          EPHEMERAL_AGENT_ID: 'ephemeral_test',
+        },
+      };
 
-    const updatedAgent = await getAgent({ id: agentId });
-    expect(updatedAgent.projectIds).toHaveLength(2);
-    expect(updatedAgent.projectIds.map((id) => id.toString())).toContain(projectId2.toString());
-    expect(updatedAgent.projectIds.map((id) => id.toString())).toContain(projectId3.toString());
-    expect(updatedAgent.projectIds.map((id) => id.toString())).not.toContain(projectId1.toString());
+      jest.doMock('librechat-data-provider', () => mockDataProvider);
 
-    await updateAgent({ id: agentId }, { projectIds: [] });
+      expect(agentId).toBeDefined();
+      expect(endpoint).toBeDefined();
 
-    const emptyProjectsAgent = await getAgent({ id: agentId });
-    expect(emptyProjectsAgent.projectIds).toHaveLength(0);
+      jest.dontMock('librechat-data-provider');
+    });
 
-    const nonExistentId = `agent_${uuidv4()}`;
-    await expect(
-      updateAgentProjects({
-        id: nonExistentId,
-        projectIds: [projectId1],
-      }),
-    ).rejects.toThrow();
+    test('should handle loadAgent functionality and errors', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Load Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        tools: ['tool1', 'tool2'],
+      });
+
+      const agent = await getAgent({ id: agentId });
+
+      expect(agent).toBeDefined();
+      expect(agent.id).toBe(agentId);
+      expect(agent.name).toBe('Test Load Agent');
+      expect(agent.tools).toEqual(expect.arrayContaining(['tool1', 'tool2']));
+
+      const mockLoadAgent = jest.fn().mockResolvedValue(agent);
+      const loadedAgent = await mockLoadAgent();
+      expect(loadedAgent).toBeDefined();
+      expect(loadedAgent.id).toBe(agentId);
+
+      const nonExistentId = `agent_${uuidv4()}`;
+      const nonExistentAgent = await getAgent({ id: nonExistentId });
+      expect(nonExistentAgent).toBeNull();
+
+      const mockLoadAgentError = jest.fn().mockRejectedValue(new Error('No agent found with ID'));
+      await expect(mockLoadAgentError()).rejects.toThrow('No agent found with ID');
+    });
+
+    describe('Edge Cases', () => {
+      test.each([
+        {
+          name: 'getAgent with undefined search parameters',
+          fn: () => getAgent(undefined),
+          expected: null,
+        },
+        {
+          name: 'deleteAgent with non-existent agent',
+          fn: () => deleteAgent({ id: 'non-existent' }),
+          expected: null,
+        },
+      ])('$name should return null', async ({ fn, expected }) => {
+        const result = await fn();
+        expect(result).toBe(expected);
+      });
+
+      test('should handle getListAgents with invalid author format', async () => {
+        try {
+          const result = await getListAgents({ author: 'invalid-object-id' });
+          expect(result.data).toEqual([]);
+        } catch (error) {
+          expect(error).toBeDefined();
+        }
+      });
+
+      test('should handle getListAgents with no agents', async () => {
+        const authorId = new mongoose.Types.ObjectId();
+        const result = await getListAgents({ author: authorId.toString() });
+
+        expect(result).toBeDefined();
+        expect(result.data).toEqual([]);
+        expect(result.has_more).toBe(false);
+        expect(result.first_id).toBeNull();
+        expect(result.last_id).toBeNull();
+      });
+
+      test('should handle updateAgentProjects with non-existent agent', async () => {
+        const nonExistentId = `agent_${uuidv4()}`;
+        const userId = new mongoose.Types.ObjectId();
+        const projectId = new mongoose.Types.ObjectId();
+
+        const result = await updateAgentProjects({
+          user: { id: userId.toString() },
+          agentId: nonExistentId,
+          projectIds: [projectId.toString()],
+        });
+
+        expect(result).toBeNull();
+      });
+    });
   });
 
-  test('should handle ephemeral agent loading', async () => {
-    const agentId = 'ephemeral_test';
-    const endpoint = 'openai';
+  describe('Agent Version History', () => {
+    let mongoServer;
 
-    const originalModule = jest.requireActual('librechat-data-provider');
+    beforeAll(async () => {
+      mongoServer = await MongoMemoryServer.create();
+      const mongoUri = mongoServer.getUri();
+      await mongoose.connect(mongoUri);
+    });
 
-    const mockDataProvider = {
-      ...originalModule,
-      Constants: {
-        ...originalModule.Constants,
-        EPHEMERAL_AGENT_ID: 'ephemeral_test',
-      },
-    };
+    afterAll(async () => {
+      await mongoose.disconnect();
+      await mongoServer.stop();
+    });
 
-    jest.doMock('librechat-data-provider', () => mockDataProvider);
+    beforeEach(async () => {
+      await Agent.deleteMany({});
+    });
 
-    const mockReq = {
-      user: { id: 'user123' },
-      body: {
-        promptPrefix: 'This is a test instruction',
-        ephemeralAgent: {
-          execute_code: true,
-          mcp: ['server1', 'server2'],
+    test('should create an agent with a single entry in versions array', async () => {
+      const agent = await createBasicAgent();
+
+      expect(agent.versions).toBeDefined();
+      expect(Array.isArray(agent.versions)).toBe(true);
+      expect(agent.versions).toHaveLength(1);
+      expect(agent.versions[0].name).toBe('Test Agent');
+      expect(agent.versions[0].provider).toBe('test');
+      expect(agent.versions[0].model).toBe('test-model');
+    });
+
+    test('should accumulate version history across multiple updates', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const author = new mongoose.Types.ObjectId();
+      await createAgent({
+        id: agentId,
+        name: 'First Name',
+        provider: 'test',
+        model: 'test-model',
+        author,
+        description: 'First description',
+      });
+
+      await updateAgent(
+        { id: agentId },
+        { name: 'Second Name', description: 'Second description' },
+      );
+      await updateAgent({ id: agentId }, { name: 'Third Name', model: 'new-model' });
+      const finalAgent = await updateAgent({ id: agentId }, { description: 'Final description' });
+
+      expect(finalAgent.versions).toBeDefined();
+      expect(Array.isArray(finalAgent.versions)).toBe(true);
+      expect(finalAgent.versions).toHaveLength(4);
+
+      expect(finalAgent.versions[0].name).toBe('First Name');
+      expect(finalAgent.versions[0].description).toBe('First description');
+      expect(finalAgent.versions[0].model).toBe('test-model');
+
+      expect(finalAgent.versions[1].name).toBe('Second Name');
+      expect(finalAgent.versions[1].description).toBe('Second description');
+      expect(finalAgent.versions[1].model).toBe('test-model');
+
+      expect(finalAgent.versions[2].name).toBe('Third Name');
+      expect(finalAgent.versions[2].description).toBe('Second description');
+      expect(finalAgent.versions[2].model).toBe('new-model');
+
+      expect(finalAgent.versions[3].name).toBe('Third Name');
+      expect(finalAgent.versions[3].description).toBe('Final description');
+      expect(finalAgent.versions[3].model).toBe('new-model');
+
+      expect(finalAgent.name).toBe('Third Name');
+      expect(finalAgent.description).toBe('Final description');
+      expect(finalAgent.model).toBe('new-model');
+    });
+
+    test('should not include metadata fields in version history', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: new mongoose.Types.ObjectId(),
+      });
+
+      const updatedAgent = await updateAgent({ id: agentId }, { description: 'New description' });
+
+      expect(updatedAgent.versions).toHaveLength(2);
+      expect(updatedAgent.versions[0]._id).toBeUndefined();
+      expect(updatedAgent.versions[0].__v).toBeUndefined();
+      expect(updatedAgent.versions[0].name).toBe('Test Agent');
+      expect(updatedAgent.versions[0].author).toBeUndefined();
+
+      expect(updatedAgent.versions[1]._id).toBeUndefined();
+      expect(updatedAgent.versions[1].__v).toBeUndefined();
+    });
+
+    test('should not recursively include previous versions', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: new mongoose.Types.ObjectId(),
+      });
+
+      await updateAgent({ id: agentId }, { name: 'Updated Name 1' });
+      await updateAgent({ id: agentId }, { name: 'Updated Name 2' });
+      const finalAgent = await updateAgent({ id: agentId }, { name: 'Updated Name 3' });
+
+      expect(finalAgent.versions).toHaveLength(4);
+
+      finalAgent.versions.forEach((version) => {
+        expect(version.versions).toBeUndefined();
+      });
+    });
+
+    test('should handle MongoDB operators and field updates correctly', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+      const projectId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'MongoDB Operator Test',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        tools: ['tool1'],
+      });
+
+      await updateAgent(
+        { id: agentId },
+        {
+          description: 'Updated description',
+          $push: { tools: 'tool2' },
+          $addToSet: { projectIds: projectId },
         },
-      },
-      app: {
-        locals: {
-          availableTools: {
-            tool__server1: {},
-            tool__server2: {},
-            another_tool: {},
+      );
+
+      const firstUpdate = await getAgent({ id: agentId });
+      expect(firstUpdate.description).toBe('Updated description');
+      expect(firstUpdate.tools).toContain('tool1');
+      expect(firstUpdate.tools).toContain('tool2');
+      expect(firstUpdate.projectIds.map((id) => id.toString())).toContain(projectId.toString());
+      expect(firstUpdate.versions).toHaveLength(2);
+
+      await updateAgent(
+        { id: agentId },
+        {
+          tools: ['tool2', 'tool3'],
+        },
+      );
+
+      const secondUpdate = await getAgent({ id: agentId });
+      expect(secondUpdate.tools).toHaveLength(2);
+      expect(secondUpdate.tools).toContain('tool2');
+      expect(secondUpdate.tools).toContain('tool3');
+      expect(secondUpdate.tools).not.toContain('tool1');
+      expect(secondUpdate.versions).toHaveLength(3);
+
+      await updateAgent(
+        { id: agentId },
+        {
+          $push: { tools: 'tool3' },
+        },
+      );
+
+      const thirdUpdate = await getAgent({ id: agentId });
+      const toolCount = thirdUpdate.tools.filter((t) => t === 'tool3').length;
+      expect(toolCount).toBe(2);
+      expect(thirdUpdate.versions).toHaveLength(4);
+    });
+
+    test('should handle parameter objects correctly', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Parameters Test',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        model_parameters: { temperature: 0.7 },
+      });
+
+      const updatedAgent = await updateAgent(
+        { id: agentId },
+        { model_parameters: { temperature: 0.8 } },
+      );
+
+      expect(updatedAgent.versions).toHaveLength(2);
+      expect(updatedAgent.model_parameters.temperature).toBe(0.8);
+
+      await updateAgent(
+        { id: agentId },
+        {
+          model_parameters: {
+            temperature: 0.8,
+            max_tokens: 1000,
           },
         },
-      },
-    };
+      );
 
-    const params = {
-      req: mockReq,
-      agent_id: agentId,
-      endpoint,
-      model_parameters: {
-        model: 'gpt-4',
-        temperature: 0.7,
-      },
-    };
+      const complexAgent = await getAgent({ id: agentId });
+      expect(complexAgent.versions).toHaveLength(3);
+      expect(complexAgent.model_parameters.temperature).toBe(0.8);
+      expect(complexAgent.model_parameters.max_tokens).toBe(1000);
 
-    expect(agentId).toBeDefined();
-    expect(endpoint).toBeDefined();
+      await updateAgent({ id: agentId }, { model_parameters: {} });
 
-    jest.dontMock('librechat-data-provider');
-  });
-
-  test('should handle loadAgent functionality and errors', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'Test Load Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
-      tools: ['tool1', 'tool2'],
+      const emptyParamsAgent = await getAgent({ id: agentId });
+      expect(emptyParamsAgent.versions).toHaveLength(4);
+      expect(emptyParamsAgent.model_parameters).toEqual({});
     });
 
-    const agent = await getAgent({ id: agentId });
+    test('should detect duplicate versions and reject updates', async () => {
+      const originalConsoleError = console.error;
+      console.error = jest.fn();
 
-    expect(agent).toBeDefined();
-    expect(agent.id).toBe(agentId);
-    expect(agent.name).toBe('Test Load Agent');
-    expect(agent.tools).toEqual(expect.arrayContaining(['tool1', 'tool2']));
+      try {
+        const authorId = new mongoose.Types.ObjectId();
+        const testCases = generateVersionTestCases();
 
-    const mockLoadAgent = jest.fn().mockResolvedValue(agent);
-    const loadedAgent = await mockLoadAgent();
-    expect(loadedAgent).toBeDefined();
-    expect(loadedAgent.id).toBe(agentId);
+        for (const testCase of testCases) {
+          const testAgentId = `agent_${uuidv4()}`;
 
-    const nonExistentId = `agent_${uuidv4()}`;
-    const nonExistentAgent = await getAgent({ id: nonExistentId });
-    expect(nonExistentAgent).toBeNull();
+          await createAgent({
+            id: testAgentId,
+            provider: 'test',
+            model: 'test-model',
+            author: authorId,
+            ...testCase.initial,
+          });
 
-    const mockLoadAgentError = jest.fn().mockRejectedValue(new Error('No agent found with ID'));
-    await expect(mockLoadAgentError()).rejects.toThrow('No agent found with ID');
-  });
-});
+          await updateAgent({ id: testAgentId }, testCase.update);
 
-describe('Agent Version History', () => {
-  let mongoServer;
+          let error;
+          try {
+            await updateAgent({ id: testAgentId }, testCase.duplicate);
+          } catch (e) {
+            error = e;
+          }
 
-  beforeAll(async () => {
-    mongoServer = await MongoMemoryServer.create();
-    const mongoUri = mongoServer.getUri();
-    await mongoose.connect(mongoUri);
-  });
+          expect(error).toBeDefined();
+          expect(error.message).toContain('Duplicate version');
+          expect(error.statusCode).toBe(409);
+          expect(error.details).toBeDefined();
+          expect(error.details.duplicateVersion).toBeDefined();
 
-  afterAll(async () => {
-    await mongoose.disconnect();
-    await mongoServer.stop();
-  });
-
-  beforeEach(async () => {
-    await Agent.deleteMany({});
-  });
-
-  test('should create an agent with a single entry in versions array', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const agent = await createAgent({
-      id: agentId,
-      name: 'Test Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: new mongoose.Types.ObjectId(),
+          const agent = await getAgent({ id: testAgentId });
+          expect(agent.versions).toHaveLength(2);
+        }
+      } finally {
+        console.error = originalConsoleError;
+      }
     });
 
-    expect(agent.versions).toBeDefined();
-    expect(Array.isArray(agent.versions)).toBe(true);
-    expect(agent.versions).toHaveLength(1);
-    expect(agent.versions[0].name).toBe('Test Agent');
-    expect(agent.versions[0].provider).toBe('test');
-    expect(agent.versions[0].model).toBe('test-model');
-  });
+    test('should track updatedBy when a different user updates an agent', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const originalAuthor = new mongoose.Types.ObjectId();
+      const updatingUser = new mongoose.Types.ObjectId();
 
-  test('should accumulate version history across multiple updates', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const author = new mongoose.Types.ObjectId();
-    await createAgent({
-      id: agentId,
-      name: 'First Name',
-      provider: 'test',
-      model: 'test-model',
-      author,
-      description: 'First description',
+      await createAgent({
+        id: agentId,
+        name: 'Original Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: originalAuthor,
+        description: 'Original description',
+      });
+
+      const updatedAgent = await updateAgent(
+        { id: agentId },
+        { name: 'Updated Agent', description: 'Updated description' },
+        { updatingUserId: updatingUser.toString() },
+      );
+
+      expect(updatedAgent.versions).toHaveLength(2);
+      expect(updatedAgent.versions[1].updatedBy.toString()).toBe(updatingUser.toString());
+      expect(updatedAgent.author.toString()).toBe(originalAuthor.toString());
     });
 
-    await updateAgent({ id: agentId }, { name: 'Second Name', description: 'Second description' });
-    await updateAgent({ id: agentId }, { name: 'Third Name', model: 'new-model' });
-    const finalAgent = await updateAgent({ id: agentId }, { description: 'Final description' });
+    test('should include updatedBy even when the original author updates the agent', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const originalAuthor = new mongoose.Types.ObjectId();
 
-    expect(finalAgent.versions).toBeDefined();
-    expect(Array.isArray(finalAgent.versions)).toBe(true);
-    expect(finalAgent.versions).toHaveLength(4);
+      await createAgent({
+        id: agentId,
+        name: 'Original Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: originalAuthor,
+        description: 'Original description',
+      });
 
-    expect(finalAgent.versions[0].name).toBe('First Name');
-    expect(finalAgent.versions[0].description).toBe('First description');
-    expect(finalAgent.versions[0].model).toBe('test-model');
+      const updatedAgent = await updateAgent(
+        { id: agentId },
+        { name: 'Updated Agent', description: 'Updated description' },
+        { updatingUserId: originalAuthor.toString() },
+      );
 
-    expect(finalAgent.versions[1].name).toBe('Second Name');
-    expect(finalAgent.versions[1].description).toBe('Second description');
-    expect(finalAgent.versions[1].model).toBe('test-model');
-
-    expect(finalAgent.versions[2].name).toBe('Third Name');
-    expect(finalAgent.versions[2].description).toBe('Second description');
-    expect(finalAgent.versions[2].model).toBe('new-model');
-
-    expect(finalAgent.versions[3].name).toBe('Third Name');
-    expect(finalAgent.versions[3].description).toBe('Final description');
-    expect(finalAgent.versions[3].model).toBe('new-model');
-
-    expect(finalAgent.name).toBe('Third Name');
-    expect(finalAgent.description).toBe('Final description');
-    expect(finalAgent.model).toBe('new-model');
-  });
-
-  test('should not include metadata fields in version history', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    await createAgent({
-      id: agentId,
-      name: 'Test Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: new mongoose.Types.ObjectId(),
+      expect(updatedAgent.versions).toHaveLength(2);
+      expect(updatedAgent.versions[1].updatedBy.toString()).toBe(originalAuthor.toString());
+      expect(updatedAgent.author.toString()).toBe(originalAuthor.toString());
     });
 
-    const updatedAgent = await updateAgent({ id: agentId }, { description: 'New description' });
+    test('should track multiple different users updating the same agent', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const originalAuthor = new mongoose.Types.ObjectId();
+      const user1 = new mongoose.Types.ObjectId();
+      const user2 = new mongoose.Types.ObjectId();
+      const user3 = new mongoose.Types.ObjectId();
 
-    expect(updatedAgent.versions).toHaveLength(2);
-    expect(updatedAgent.versions[0]._id).toBeUndefined();
-    expect(updatedAgent.versions[0].__v).toBeUndefined();
-    expect(updatedAgent.versions[0].name).toBe('Test Agent');
-    expect(updatedAgent.versions[0].author).toBeUndefined();
+      await createAgent({
+        id: agentId,
+        name: 'Original Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: originalAuthor,
+        description: 'Original description',
+      });
 
-    expect(updatedAgent.versions[1]._id).toBeUndefined();
-    expect(updatedAgent.versions[1].__v).toBeUndefined();
-  });
+      // User 1 makes an update
+      await updateAgent(
+        { id: agentId },
+        { name: 'Updated by User 1', description: 'First update' },
+        { updatingUserId: user1.toString() },
+      );
 
-  test('should not recursively include previous versions', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    await createAgent({
-      id: agentId,
-      name: 'Test Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: new mongoose.Types.ObjectId(),
+      // Original author makes an update
+      await updateAgent(
+        { id: agentId },
+        { description: 'Updated by original author' },
+        { updatingUserId: originalAuthor.toString() },
+      );
+
+      // User 2 makes an update
+      await updateAgent(
+        { id: agentId },
+        { name: 'Updated by User 2', model: 'new-model' },
+        { updatingUserId: user2.toString() },
+      );
+
+      // User 3 makes an update
+      const finalAgent = await updateAgent(
+        { id: agentId },
+        { description: 'Final update by User 3' },
+        { updatingUserId: user3.toString() },
+      );
+
+      expect(finalAgent.versions).toHaveLength(5);
+      expect(finalAgent.author.toString()).toBe(originalAuthor.toString());
+
+      // Check that each version has the correct updatedBy
+      expect(finalAgent.versions[0].updatedBy).toBeUndefined(); // Initial creation has no updatedBy
+      expect(finalAgent.versions[1].updatedBy.toString()).toBe(user1.toString());
+      expect(finalAgent.versions[2].updatedBy.toString()).toBe(originalAuthor.toString());
+      expect(finalAgent.versions[3].updatedBy.toString()).toBe(user2.toString());
+      expect(finalAgent.versions[4].updatedBy.toString()).toBe(user3.toString());
+
+      // Verify the final state
+      expect(finalAgent.name).toBe('Updated by User 2');
+      expect(finalAgent.description).toBe('Final update by User 3');
+      expect(finalAgent.model).toBe('new-model');
     });
 
-    await updateAgent({ id: agentId }, { name: 'Updated Name 1' });
-    await updateAgent({ id: agentId }, { name: 'Updated Name 2' });
-    const finalAgent = await updateAgent({ id: agentId }, { name: 'Updated Name 3' });
+    test('should preserve original author during agent restoration', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const originalAuthor = new mongoose.Types.ObjectId();
+      const updatingUser = new mongoose.Types.ObjectId();
 
-    expect(finalAgent.versions).toHaveLength(4);
+      await createAgent({
+        id: agentId,
+        name: 'Original Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: originalAuthor,
+        description: 'Original description',
+      });
 
-    finalAgent.versions.forEach((version) => {
-      expect(version.versions).toBeUndefined();
-    });
-  });
+      await updateAgent(
+        { id: agentId },
+        { name: 'Updated Agent', description: 'Updated description' },
+        { updatingUserId: updatingUser.toString() },
+      );
 
-  test('should handle MongoDB operators and field updates correctly', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
-    const projectId = new mongoose.Types.ObjectId();
+      const { revertAgentVersion } = require('./Agent');
+      const revertedAgent = await revertAgentVersion({ id: agentId }, 0);
 
-    await createAgent({
-      id: agentId,
-      name: 'MongoDB Operator Test',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
-      tools: ['tool1'],
+      expect(revertedAgent.author.toString()).toBe(originalAuthor.toString());
+      expect(revertedAgent.name).toBe('Original Agent');
+      expect(revertedAgent.description).toBe('Original description');
     });
 
-    await updateAgent(
-      { id: agentId },
-      {
-        description: 'Updated description',
-        $push: { tools: 'tool2' },
-        $addToSet: { projectIds: projectId },
-      },
-    );
+    test('should detect action metadata changes and force version update', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+      const actionId = 'testActionId123';
 
-    const firstUpdate = await getAgent({ id: agentId });
-    expect(firstUpdate.description).toBe('Updated description');
-    expect(firstUpdate.tools).toContain('tool1');
-    expect(firstUpdate.tools).toContain('tool2');
-    expect(firstUpdate.projectIds.map((id) => id.toString())).toContain(projectId.toString());
-    expect(firstUpdate.versions).toHaveLength(2);
+      // Create agent with actions
+      await createAgent({
+        id: agentId,
+        name: 'Agent with Actions',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        actions: [`test.com_action_${actionId}`],
+        tools: ['listEvents_action_test.com', 'createEvent_action_test.com'],
+      });
 
-    await updateAgent(
-      { id: agentId },
-      {
-        tools: ['tool2', 'tool3'],
-      },
-    );
+      // First update with forceVersion should create a version
+      const firstUpdate = await updateAgent(
+        { id: agentId },
+        { tools: ['listEvents_action_test.com', 'createEvent_action_test.com'] },
+        { updatingUserId: authorId.toString(), forceVersion: true },
+      );
 
-    const secondUpdate = await getAgent({ id: agentId });
-    expect(secondUpdate.tools).toHaveLength(2);
-    expect(secondUpdate.tools).toContain('tool2');
-    expect(secondUpdate.tools).toContain('tool3');
-    expect(secondUpdate.tools).not.toContain('tool1');
-    expect(secondUpdate.versions).toHaveLength(3);
+      expect(firstUpdate.versions).toHaveLength(2);
 
-    await updateAgent(
-      { id: agentId },
-      {
-        $push: { tools: 'tool3' },
-      },
-    );
+      // Second update with same data but forceVersion should still create a version
+      const secondUpdate = await updateAgent(
+        { id: agentId },
+        { tools: ['listEvents_action_test.com', 'createEvent_action_test.com'] },
+        { updatingUserId: authorId.toString(), forceVersion: true },
+      );
 
-    const thirdUpdate = await getAgent({ id: agentId });
-    const toolCount = thirdUpdate.tools.filter((t) => t === 'tool3').length;
-    expect(toolCount).toBe(2);
-    expect(thirdUpdate.versions).toHaveLength(4);
-  });
+      expect(secondUpdate.versions).toHaveLength(3);
 
-  test('should handle parameter objects correctly', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
+      // Update without forceVersion and no changes should not create a version
+      let error;
+      try {
+        await updateAgent(
+          { id: agentId },
+          { tools: ['listEvents_action_test.com', 'createEvent_action_test.com'] },
+          { updatingUserId: authorId.toString(), forceVersion: false },
+        );
+      } catch (e) {
+        error = e;
+      }
 
-    await createAgent({
-      id: agentId,
-      name: 'Parameters Test',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
-      model_parameters: { temperature: 0.7 },
+      expect(error).toBeDefined();
+      expect(error.message).toContain('Duplicate version');
+      expect(error.statusCode).toBe(409);
     });
 
-    const updatedAgent = await updateAgent(
-      { id: agentId },
-      { model_parameters: { temperature: 0.8 } },
-    );
+    test('should handle isDuplicateVersion with arrays containing null/undefined values', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
 
-    expect(updatedAgent.versions).toHaveLength(2);
-    expect(updatedAgent.model_parameters.temperature).toBe(0.8);
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        tools: ['tool1', null, 'tool2', undefined],
+      });
 
-    await updateAgent(
-      { id: agentId },
-      {
-        model_parameters: {
-          temperature: 0.8,
-          max_tokens: 1000,
+      // Update with same array but different null/undefined arrangement
+      const updatedAgent = await updateAgent({ id: agentId }, { tools: ['tool1', 'tool2'] });
+
+      expect(updatedAgent.versions).toHaveLength(2);
+      expect(updatedAgent.tools).toEqual(['tool1', 'tool2']);
+    });
+
+    test('should handle isDuplicateVersion with empty objects in tool_kwargs', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        tool_kwargs: [
+          { tool: 'tool1', config: { setting: 'value' } },
+          {},
+          { tool: 'tool2', config: {} },
+        ],
+      });
+
+      // Try to update with reordered but equivalent tool_kwargs
+      const updatedAgent = await updateAgent(
+        { id: agentId },
+        {
+          tool_kwargs: [
+            { tool: 'tool2', config: {} },
+            { tool: 'tool1', config: { setting: 'value' } },
+            {},
+          ],
         },
-      },
-    );
+      );
 
-    const complexAgent = await getAgent({ id: agentId });
-    expect(complexAgent.versions).toHaveLength(3);
-    expect(complexAgent.model_parameters.temperature).toBe(0.8);
-    expect(complexAgent.model_parameters.max_tokens).toBe(1000);
+      // Should create new version as order matters for arrays
+      expect(updatedAgent.versions).toHaveLength(2);
+    });
 
-    await updateAgent({ id: agentId }, { model_parameters: {} });
+    test('should handle isDuplicateVersion with mixed primitive and object arrays', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
 
-    const emptyParamsAgent = await getAgent({ id: agentId });
-    expect(emptyParamsAgent.versions).toHaveLength(4);
-    expect(emptyParamsAgent.model_parameters).toEqual({});
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        mixed_array: [1, 'string', { key: 'value' }, true, null],
+      });
+
+      // Update with same values but different types
+      const updatedAgent = await updateAgent(
+        { id: agentId },
+        { mixed_array: ['1', 'string', { key: 'value' }, 'true', null] },
+      );
+
+      // Should create new version as types differ
+      expect(updatedAgent.versions).toHaveLength(2);
+    });
+
+    test('should handle isDuplicateVersion with deeply nested objects', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      const deepObject = {
+        level1: {
+          level2: {
+            level3: {
+              level4: {
+                value: 'deep',
+                array: [1, 2, { nested: true }],
+              },
+            },
+          },
+        },
+      };
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        model_parameters: deepObject,
+      });
+
+      // First create a version with changes
+      await updateAgent({ id: agentId }, { description: 'Updated' });
+
+      // Then try to create duplicate of the original version
+      await updateAgent(
+        { id: agentId },
+        {
+          model_parameters: deepObject,
+          description: undefined,
+        },
+      );
+
+      // Since we're updating back to the same model_parameters but with a different description,
+      // it should create a new version
+      const agent = await getAgent({ id: agentId });
+      expect(agent.versions).toHaveLength(3);
+    });
+
+    test('should handle version comparison with special field types', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+      const projectId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        projectIds: [projectId],
+        model_parameters: { temperature: 0.7 },
+      });
+
+      // Update with a real field change first
+      const firstUpdate = await updateAgent({ id: agentId }, { description: 'New description' });
+
+      expect(firstUpdate.versions).toHaveLength(2);
+
+      // Update with model parameters change
+      const secondUpdate = await updateAgent(
+        { id: agentId },
+        { model_parameters: { temperature: 0.8 } },
+      );
+
+      expect(secondUpdate.versions).toHaveLength(3);
+    });
+
+    describe('Edge Cases', () => {
+      test('should handle extremely large version history', async () => {
+        const agentId = `agent_${uuidv4()}`;
+        const authorId = new mongoose.Types.ObjectId();
+
+        await createAgent({
+          id: agentId,
+          name: 'Version Test',
+          provider: 'test',
+          model: 'test-model',
+          author: authorId,
+        });
+
+        for (let i = 0; i < 20; i++) {
+          await updateAgent({ id: agentId }, { description: `Version ${i}` });
+        }
+
+        const agent = await getAgent({ id: agentId });
+        expect(agent.versions).toHaveLength(21);
+        expect(agent.description).toBe('Version 19');
+      });
+
+      test('should handle revertAgentVersion with invalid version index', async () => {
+        const agentId = `agent_${uuidv4()}`;
+        const authorId = new mongoose.Types.ObjectId();
+
+        await createAgent({
+          id: agentId,
+          name: 'Test Agent',
+          provider: 'test',
+          model: 'test-model',
+          author: authorId,
+        });
+
+        await expect(revertAgentVersion({ id: agentId }, 5)).rejects.toThrow('Version 5 not found');
+      });
+
+      test('should handle revertAgentVersion with non-existent agent', async () => {
+        const nonExistentId = `agent_${uuidv4()}`;
+
+        await expect(revertAgentVersion({ id: nonExistentId }, 0)).rejects.toThrow(
+          'Agent not found',
+        );
+      });
+
+      test('should handle updateAgent with empty update object', async () => {
+        const agentId = `agent_${uuidv4()}`;
+        const authorId = new mongoose.Types.ObjectId();
+
+        await createAgent({
+          id: agentId,
+          name: 'Test Agent',
+          provider: 'test',
+          model: 'test-model',
+          author: authorId,
+        });
+
+        const updatedAgent = await updateAgent({ id: agentId }, {});
+
+        expect(updatedAgent).toBeDefined();
+        expect(updatedAgent.name).toBe('Test Agent');
+        expect(updatedAgent.versions).toHaveLength(1);
+      });
+    });
   });
 
-  test('should detect duplicate versions and reject updates', async () => {
-    const originalConsoleError = console.error;
-    console.error = jest.fn();
+  describe('Action Metadata and Hash Generation', () => {
+    let mongoServer;
 
-    try {
+    beforeAll(async () => {
+      mongoServer = await MongoMemoryServer.create();
+      const mongoUri = mongoServer.getUri();
+      await mongoose.connect(mongoUri);
+    });
+
+    afterAll(async () => {
+      await mongoose.disconnect();
+      await mongoServer.stop();
+    });
+
+    beforeEach(async () => {
+      await Agent.deleteMany({});
+    });
+
+    test('should generate consistent hash for same action metadata', async () => {
+      const actionIds = ['test.com_action_123', 'example.com_action_456'];
+      const actions = [
+        {
+          action_id: '123',
+          metadata: { version: '1.0', endpoints: ['GET /api/test'], schema: { type: 'object' } },
+        },
+        {
+          action_id: '456',
+          metadata: {
+            version: '2.0',
+            endpoints: ['POST /api/example'],
+            schema: { type: 'string' },
+          },
+        },
+      ];
+
+      const hash1 = await generateActionMetadataHash(actionIds, actions);
+      const hash2 = await generateActionMetadataHash(actionIds, actions);
+
+      expect(hash1).toBe(hash2);
+      expect(typeof hash1).toBe('string');
+      expect(hash1.length).toBe(64); // SHA-256 produces 64 character hex string
+    });
+
+    test('should generate different hashes for different action metadata', async () => {
+      const actionIds = ['test.com_action_123'];
+      const actions1 = [
+        { action_id: '123', metadata: { version: '1.0', endpoints: ['GET /api/test'] } },
+      ];
+      const actions2 = [
+        { action_id: '123', metadata: { version: '2.0', endpoints: ['GET /api/test'] } },
+      ];
+
+      const hash1 = await generateActionMetadataHash(actionIds, actions1);
+      const hash2 = await generateActionMetadataHash(actionIds, actions2);
+
+      expect(hash1).not.toBe(hash2);
+    });
+
+    test('should handle empty action arrays', async () => {
+      const hash = await generateActionMetadataHash([], []);
+      expect(hash).toBe('');
+    });
+
+    test('should handle null or undefined action arrays', async () => {
+      const hash1 = await generateActionMetadataHash(null, []);
+      const hash2 = await generateActionMetadataHash(undefined, []);
+
+      expect(hash1).toBe('');
+      expect(hash2).toBe('');
+    });
+
+    test('should handle missing action metadata gracefully', async () => {
+      const actionIds = ['test.com_action_123', 'missing.com_action_999'];
+      const actions = [
+        { action_id: '123', metadata: { version: '1.0' } },
+        // missing action with id '999'
+      ];
+
+      const hash = await generateActionMetadataHash(actionIds, actions);
+      expect(typeof hash).toBe('string');
+      expect(hash.length).toBe(64);
+    });
+
+    test('should sort action IDs for consistent hashing', async () => {
+      const actionIds1 = ['b.com_action_2', 'a.com_action_1'];
+      const actionIds2 = ['a.com_action_1', 'b.com_action_2'];
+      const actions = [
+        { action_id: '1', metadata: { version: '1.0' } },
+        { action_id: '2', metadata: { version: '2.0' } },
+      ];
+
+      const hash1 = await generateActionMetadataHash(actionIds1, actions);
+      const hash2 = await generateActionMetadataHash(actionIds2, actions);
+
+      expect(hash1).toBe(hash2);
+    });
+
+    test('should handle complex nested metadata objects', async () => {
+      const actionIds = ['complex.com_action_1'];
+      const actions = [
+        {
+          action_id: '1',
+          metadata: {
+            version: '1.0',
+            schema: {
+              type: 'object',
+              properties: {
+                name: { type: 'string' },
+                nested: {
+                  type: 'object',
+                  properties: {
+                    id: { type: 'number' },
+                    tags: { type: 'array', items: { type: 'string' } },
+                  },
+                },
+              },
+            },
+            endpoints: [
+              { path: '/api/test', method: 'GET', params: ['id'] },
+              { path: '/api/create', method: 'POST', body: true },
+            ],
+          },
+        },
+      ];
+
+      const hash = await generateActionMetadataHash(actionIds, actions);
+      expect(typeof hash).toBe('string');
+      expect(hash.length).toBe(64);
+    });
+
+    describe('Edge Cases', () => {
+      test('should handle generateActionMetadataHash with null metadata', async () => {
+        const hash = await generateActionMetadataHash(
+          ['test.com_action_1'],
+          [{ action_id: '1', metadata: null }],
+        );
+        expect(typeof hash).toBe('string');
+      });
+
+      test('should handle generateActionMetadataHash with deeply nested metadata', async () => {
+        const deepMetadata = {
+          level1: {
+            level2: {
+              level3: {
+                level4: {
+                  level5: 'deep value',
+                  array: [1, 2, { nested: true }],
+                },
+              },
+            },
+          },
+        };
+
+        const hash = await generateActionMetadataHash(
+          ['test.com_action_1'],
+          [{ action_id: '1', metadata: deepMetadata }],
+        );
+
+        expect(typeof hash).toBe('string');
+        expect(hash.length).toBe(64);
+      });
+
+      test('should handle generateActionMetadataHash with special characters', async () => {
+        const specialMetadata = {
+          unicode: '🚀🎉👍',
+          symbols: '!@#$%^&*()_+-=[]{}|;:,.<>?',
+          quotes: 'single\'s and "doubles"',
+          newlines: 'line1\nline2\r\nline3',
+        };
+
+        const hash = await generateActionMetadataHash(
+          ['test.com_action_1'],
+          [{ action_id: '1', metadata: specialMetadata }],
+        );
+
+        expect(typeof hash).toBe('string');
+        expect(hash.length).toBe(64);
+      });
+    });
+  });
+
+  describe('Load Agent Functionality', () => {
+    let mongoServer;
+
+    beforeAll(async () => {
+      mongoServer = await MongoMemoryServer.create();
+      const mongoUri = mongoServer.getUri();
+      await mongoose.connect(mongoUri);
+    });
+
+    afterAll(async () => {
+      await mongoose.disconnect();
+      await mongoServer.stop();
+    });
+
+    beforeEach(async () => {
+      await Agent.deleteMany({});
+    });
+
+    test('should return null when agent_id is not provided', async () => {
+      const mockReq = { user: { id: 'user123' } };
+      const result = await loadAgent({
+        req: mockReq,
+        agent_id: null,
+        endpoint: 'openai',
+        model_parameters: { model: 'gpt-4' },
+      });
+
+      expect(result).toBeNull();
+    });
+
+    test('should return null when agent_id is empty string', async () => {
+      const mockReq = { user: { id: 'user123' } };
+      const result = await loadAgent({
+        req: mockReq,
+        agent_id: '',
+        endpoint: 'openai',
+        model_parameters: { model: 'gpt-4' },
+      });
+
+      expect(result).toBeNull();
+    });
+
+    test('should test ephemeral agent loading logic', async () => {
+      const { EPHEMERAL_AGENT_ID } = require('librechat-data-provider').Constants;
+
+      const mockReq = {
+        user: { id: 'user123' },
+        body: {
+          promptPrefix: 'Test instructions',
+          ephemeralAgent: {
+            execute_code: true,
+            web_search: true,
+            mcp: ['server1', 'server2'],
+          },
+        },
+        app: {
+          locals: {
+            availableTools: {
+              tool1_mcp_server1: {},
+              tool2_mcp_server2: {},
+              another_tool: {},
+            },
+          },
+        },
+      };
+
+      const result = await loadAgent({
+        req: mockReq,
+        agent_id: EPHEMERAL_AGENT_ID,
+        endpoint: 'openai',
+        model_parameters: { model: 'gpt-4', temperature: 0.7 },
+      });
+
+      if (result) {
+        expect(result.id).toBe(EPHEMERAL_AGENT_ID);
+        expect(result.instructions).toBe('Test instructions');
+        expect(result.provider).toBe('openai');
+        expect(result.model).toBe('gpt-4');
+        expect(result.model_parameters.temperature).toBe(0.7);
+        expect(result.tools).toContain('execute_code');
+        expect(result.tools).toContain('web_search');
+        expect(result.tools).toContain('tool1_mcp_server1');
+        expect(result.tools).toContain('tool2_mcp_server2');
+      } else {
+        expect(result).toBeNull();
+      }
+    });
+
+    test('should return null for non-existent agent', async () => {
+      const mockReq = { user: { id: 'user123' } };
+      const result = await loadAgent({
+        req: mockReq,
+        agent_id: 'non_existent_agent',
+        endpoint: 'openai',
+        model_parameters: { model: 'gpt-4' },
+      });
+
+      expect(result).toBeNull();
+    });
+
+    test('should load agent when user is the author', async () => {
+      const userId = new mongoose.Types.ObjectId();
+      const agentId = `agent_${uuidv4()}`;
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'openai',
+        model: 'gpt-4',
+        author: userId,
+        description: 'Test description',
+        tools: ['web_search'],
+      });
+
+      const mockReq = { user: { id: userId.toString() } };
+      const result = await loadAgent({
+        req: mockReq,
+        agent_id: agentId,
+        endpoint: 'openai',
+        model_parameters: { model: 'gpt-4' },
+      });
+
+      expect(result).toBeDefined();
+      expect(result.id).toBe(agentId);
+      expect(result.name).toBe('Test Agent');
+      expect(result.author.toString()).toBe(userId.toString());
+      expect(result.version).toBe(1);
+    });
+
+    test('should return null when user is not author and agent has no projectIds', async () => {
+      const authorId = new mongoose.Types.ObjectId();
+      const userId = new mongoose.Types.ObjectId();
+      const agentId = `agent_${uuidv4()}`;
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'openai',
+        model: 'gpt-4',
+        author: authorId,
+      });
+
+      const mockReq = { user: { id: userId.toString() } };
+      const result = await loadAgent({
+        req: mockReq,
+        agent_id: agentId,
+        endpoint: 'openai',
+        model_parameters: { model: 'gpt-4' },
+      });
+
+      expect(result).toBeFalsy();
+    });
+
+    test('should handle ephemeral agent with no MCP servers', async () => {
+      const { EPHEMERAL_AGENT_ID } = require('librechat-data-provider').Constants;
+
+      const mockReq = {
+        user: { id: 'user123' },
+        body: {
+          promptPrefix: 'Simple instructions',
+          ephemeralAgent: {
+            execute_code: false,
+            web_search: false,
+            mcp: [],
+          },
+        },
+        app: {
+          locals: {
+            availableTools: {},
+          },
+        },
+      };
+
+      const result = await loadAgent({
+        req: mockReq,
+        agent_id: EPHEMERAL_AGENT_ID,
+        endpoint: 'openai',
+        model_parameters: { model: 'gpt-3.5-turbo' },
+      });
+
+      if (result) {
+        expect(result.tools).toEqual([]);
+        expect(result.instructions).toBe('Simple instructions');
+      } else {
+        expect(result).toBeFalsy();
+      }
+    });
+
+    test('should handle ephemeral agent with undefined ephemeralAgent in body', async () => {
+      const { EPHEMERAL_AGENT_ID } = require('librechat-data-provider').Constants;
+
+      const mockReq = {
+        user: { id: 'user123' },
+        body: {
+          promptPrefix: 'Basic instructions',
+        },
+        app: {
+          locals: {
+            availableTools: {},
+          },
+        },
+      };
+
+      const result = await loadAgent({
+        req: mockReq,
+        agent_id: EPHEMERAL_AGENT_ID,
+        endpoint: 'openai',
+        model_parameters: { model: 'gpt-4' },
+      });
+
+      if (result) {
+        expect(result.tools).toEqual([]);
+      } else {
+        expect(result).toBeFalsy();
+      }
+    });
+
+    describe('Edge Cases', () => {
+      test('should handle loadAgent with malformed req object', async () => {
+        const result = await loadAgent({
+          req: null,
+          agent_id: 'test',
+          endpoint: 'openai',
+          model_parameters: { model: 'gpt-4' },
+        });
+
+        expect(result).toBeNull();
+      });
+
+      test('should handle ephemeral agent with extremely large tool list', async () => {
+        const { EPHEMERAL_AGENT_ID } = require('librechat-data-provider').Constants;
+
+        const largeToolList = Array.from({ length: 100 }, (_, i) => `tool_${i}_mcp_server1`);
+        const mockReq = {
+          user: { id: 'user123' },
+          body: {
+            promptPrefix: 'Test',
+            ephemeralAgent: {
+              execute_code: true,
+              web_search: true,
+              mcp: ['server1'],
+            },
+          },
+          app: {
+            locals: {
+              availableTools: largeToolList.reduce((acc, tool) => {
+                acc[tool] = {};
+                return acc;
+              }, {}),
+            },
+          },
+        };
+
+        const result = await loadAgent({
+          req: mockReq,
+          agent_id: EPHEMERAL_AGENT_ID,
+          endpoint: 'openai',
+          model_parameters: { model: 'gpt-4' },
+        });
+
+        if (result) {
+          expect(result.tools.length).toBeGreaterThan(100);
+        }
+      });
+
+      test('should handle loadAgent with agent from different project', async () => {
+        const authorId = new mongoose.Types.ObjectId();
+        const userId = new mongoose.Types.ObjectId();
+        const agentId = `agent_${uuidv4()}`;
+        const projectId = new mongoose.Types.ObjectId();
+
+        await createAgent({
+          id: agentId,
+          name: 'Project Agent',
+          provider: 'openai',
+          model: 'gpt-4',
+          author: authorId,
+          projectIds: [projectId],
+        });
+
+        const mockReq = { user: { id: userId.toString() } };
+        const result = await loadAgent({
+          req: mockReq,
+          agent_id: agentId,
+          endpoint: 'openai',
+          model_parameters: { model: 'gpt-4' },
+        });
+
+        expect(result).toBeFalsy();
+      });
+    });
+  });
+
+  describe('Agent Edge Cases and Error Handling', () => {
+    let mongoServer;
+
+    beforeAll(async () => {
+      mongoServer = await MongoMemoryServer.create();
+      const mongoUri = mongoServer.getUri();
+      await mongoose.connect(mongoUri);
+    });
+
+    afterAll(async () => {
+      await mongoose.disconnect();
+      await mongoServer.stop();
+    });
+
+    beforeEach(async () => {
+      await Agent.deleteMany({});
+    });
+
+    test('should handle agent creation with minimal required fields', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      const agent = await createAgent({
+        id: agentId,
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+      });
+
+      expect(agent).toBeDefined();
+      expect(agent.id).toBe(agentId);
+      expect(agent.versions).toHaveLength(1);
+      expect(agent.versions[0].provider).toBe('test');
+      expect(agent.versions[0].model).toBe('test-model');
+    });
+
+    test('should handle agent creation with all optional fields', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+      const projectId = new mongoose.Types.ObjectId();
+
+      const agent = await createAgent({
+        id: agentId,
+        name: 'Complex Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        description: 'Complex description',
+        instructions: 'Complex instructions',
+        tools: ['tool1', 'tool2'],
+        actions: ['action1', 'action2'],
+        model_parameters: { temperature: 0.8, max_tokens: 1000 },
+        projectIds: [projectId],
+        avatar: 'https://example.com/avatar.png',
+        isCollaborative: true,
+        tool_resources: {
+          file_search: { file_ids: ['file1', 'file2'] },
+        },
+      });
+
+      expect(agent).toBeDefined();
+      expect(agent.name).toBe('Complex Agent');
+      expect(agent.description).toBe('Complex description');
+      expect(agent.instructions).toBe('Complex instructions');
+      expect(agent.tools).toEqual(['tool1', 'tool2']);
+      expect(agent.actions).toEqual(['action1', 'action2']);
+      expect(agent.model_parameters.temperature).toBe(0.8);
+      expect(agent.model_parameters.max_tokens).toBe(1000);
+      expect(agent.projectIds.map((id) => id.toString())).toContain(projectId.toString());
+      expect(agent.avatar).toBe('https://example.com/avatar.png');
+      expect(agent.isCollaborative).toBe(true);
+      expect(agent.tool_resources.file_search.file_ids).toEqual(['file1', 'file2']);
+    });
+
+    test('should handle updateAgent with empty update object', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+      });
+
+      const updatedAgent = await updateAgent({ id: agentId }, {});
+
+      expect(updatedAgent).toBeDefined();
+      expect(updatedAgent.name).toBe('Test Agent');
+      expect(updatedAgent.versions).toHaveLength(1); // No new version should be created
+    });
+
+    test('should handle concurrent updates to different agents', async () => {
+      const agent1Id = `agent_${uuidv4()}`;
+      const agent2Id = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agent1Id,
+        name: 'Agent 1',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+      });
+
+      await createAgent({
+        id: agent2Id,
+        name: 'Agent 2',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+      });
+
+      // Concurrent updates to different agents
+      const [updated1, updated2] = await Promise.all([
+        updateAgent({ id: agent1Id }, { description: 'Updated Agent 1' }),
+        updateAgent({ id: agent2Id }, { description: 'Updated Agent 2' }),
+      ]);
+
+      expect(updated1.description).toBe('Updated Agent 1');
+      expect(updated2.description).toBe('Updated Agent 2');
+      expect(updated1.versions).toHaveLength(2);
+      expect(updated2.versions).toHaveLength(2);
+    });
+
+    test('should handle agent deletion with non-existent ID', async () => {
+      const nonExistentId = `agent_${uuidv4()}`;
+      const result = await deleteAgent({ id: nonExistentId });
+
+      expect(result).toBeNull();
+    });
+
+    test('should handle getListAgents with no agents', async () => {
+      const authorId = new mongoose.Types.ObjectId();
+      const result = await getListAgents({ author: authorId.toString() });
+
+      expect(result).toBeDefined();
+      expect(result.data).toEqual([]);
+      expect(result.has_more).toBe(false);
+      expect(result.first_id).toBeNull();
+      expect(result.last_id).toBeNull();
+    });
+
+    test('should handle updateAgent with MongoDB operators mixed with direct updates', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        tools: ['tool1'],
+      });
+
+      // Test with $push and direct field update
+      const updatedAgent = await updateAgent(
+        { id: agentId },
+        {
+          name: 'Updated Name',
+          $push: { tools: 'tool2' },
+        },
+      );
+
+      expect(updatedAgent.name).toBe('Updated Name');
+      expect(updatedAgent.tools).toContain('tool1');
+      expect(updatedAgent.tools).toContain('tool2');
+      expect(updatedAgent.versions).toHaveLength(2);
+    });
+
+    test('should handle revertAgentVersion with invalid version index', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+      });
+
+      // Try to revert to non-existent version
+      await expect(revertAgentVersion({ id: agentId }, 5)).rejects.toThrow('Version 5 not found');
+    });
+
+    test('should handle revertAgentVersion with non-existent agent', async () => {
+      const nonExistentId = `agent_${uuidv4()}`;
+
+      await expect(revertAgentVersion({ id: nonExistentId }, 0)).rejects.toThrow('Agent not found');
+    });
+
+    test('should handle addAgentResourceFile with non-existent agent', async () => {
+      const nonExistentId = `agent_${uuidv4()}`;
+      const mockReq = { user: { id: 'user123' } };
+
+      await expect(
+        addAgentResourceFile({
+          req: mockReq,
+          agent_id: nonExistentId,
+          tool_resource: 'file_search',
+          file_id: 'file123',
+        }),
+      ).rejects.toThrow('Agent not found for adding resource file');
+    });
+
+    test('should handle removeAgentResourceFiles with non-existent agent', async () => {
+      const nonExistentId = `agent_${uuidv4()}`;
+
+      await expect(
+        removeAgentResourceFiles({
+          agent_id: nonExistentId,
+          files: [{ tool_resource: 'file_search', file_id: 'file123' }],
+        }),
+      ).rejects.toThrow('Agent not found for removing resource files');
+    });
+
+    test('should handle updateAgent with complex nested updates', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        model_parameters: { temperature: 0.5 },
+        tools: ['tool1'],
+      });
+
+      // First update with $push operation
+      const firstUpdate = await updateAgent(
+        { id: agentId },
+        {
+          $push: { tools: 'tool2' },
+        },
+      );
+
+      expect(firstUpdate.tools).toContain('tool1');
+      expect(firstUpdate.tools).toContain('tool2');
+
+      // Second update with direct field update and $addToSet
+      const secondUpdate = await updateAgent(
+        { id: agentId },
+        {
+          name: 'Updated Agent',
+          model_parameters: { temperature: 0.8, max_tokens: 500 },
+          $addToSet: { tools: 'tool3' },
+        },
+      );
+
+      expect(secondUpdate.name).toBe('Updated Agent');
+      expect(secondUpdate.model_parameters.temperature).toBe(0.8);
+      expect(secondUpdate.model_parameters.max_tokens).toBe(500);
+      expect(secondUpdate.tools).toContain('tool1');
+      expect(secondUpdate.tools).toContain('tool2');
+      expect(secondUpdate.tools).toContain('tool3');
+      expect(secondUpdate.versions).toHaveLength(3);
+    });
+
+    test('should preserve version order in versions array', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Version 1',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+      });
+
+      await updateAgent({ id: agentId }, { name: 'Version 2' });
+      await updateAgent({ id: agentId }, { name: 'Version 3' });
+      const finalAgent = await updateAgent({ id: agentId }, { name: 'Version 4' });
+
+      expect(finalAgent.versions).toHaveLength(4);
+      expect(finalAgent.versions[0].name).toBe('Version 1');
+      expect(finalAgent.versions[1].name).toBe('Version 2');
+      expect(finalAgent.versions[2].name).toBe('Version 3');
+      expect(finalAgent.versions[3].name).toBe('Version 4');
+      expect(finalAgent.name).toBe('Version 4');
+    });
+
+    test('should handle updateAgentProjects error scenarios', async () => {
+      const nonExistentId = `agent_${uuidv4()}`;
+      const userId = new mongoose.Types.ObjectId();
+      const projectId = new mongoose.Types.ObjectId();
+
+      // Test with non-existent agent
+      const result = await updateAgentProjects({
+        user: { id: userId.toString() },
+        agentId: nonExistentId,
+        projectIds: [projectId.toString()],
+      });
+
+      expect(result).toBeNull();
+    });
+
+    test('should handle revertAgentVersion properly', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Original Name',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        description: 'Original description',
+      });
+
+      await updateAgent(
+        { id: agentId },
+        { name: 'Updated Name', description: 'Updated description' },
+      );
+
+      const revertedAgent = await revertAgentVersion({ id: agentId }, 0);
+
+      expect(revertedAgent.name).toBe('Original Name');
+      expect(revertedAgent.description).toBe('Original description');
+      expect(revertedAgent.author.toString()).toBe(authorId.toString());
+    });
+
+    test('should handle action-related updates with getActions error', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      // Create agent with actions that might cause getActions to fail
+      await createAgent({
+        id: agentId,
+        name: 'Agent with Actions',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        actions: ['test.com_action_invalid_id'],
+      });
+
+      // Update should still work even if getActions fails
+      const updatedAgent = await updateAgent(
+        { id: agentId },
+        { description: 'Updated description' },
+      );
+
+      expect(updatedAgent).toBeDefined();
+      expect(updatedAgent.description).toBe('Updated description');
+      expect(updatedAgent.versions).toHaveLength(2);
+    });
+
+    test('should handle updateAgent with combined MongoDB operators', async () => {
       const agentId = `agent_${uuidv4()}`;
       const authorId = new mongoose.Types.ObjectId();
       const projectId1 = new mongoose.Types.ObjectId();
       const projectId2 = new mongoose.Types.ObjectId();
 
-      const testCases = [
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        tools: ['tool1'],
+        projectIds: [projectId1],
+      });
+
+      // Use multiple operators in single update - but avoid conflicting operations on same field
+      const updatedAgent = await updateAgent(
+        { id: agentId },
         {
-          name: 'simple field update',
-          initial: {
-            name: 'Test Agent',
-            description: 'Initial description',
-          },
-          update: { name: 'Updated Name' },
-          duplicate: { name: 'Updated Name' },
+          name: 'Updated Name',
+          $push: { tools: 'tool2' },
+          $addToSet: { projectIds: projectId2 },
         },
+      );
+
+      const finalAgent = await updateAgent(
+        { id: agentId },
         {
-          name: 'object field update',
-          initial: {
-            model_parameters: { temperature: 0.7 },
-          },
-          update: { model_parameters: { temperature: 0.8 } },
-          duplicate: { model_parameters: { temperature: 0.8 } },
-        },
-        {
-          name: 'array field update',
-          initial: {
-            tools: ['tool1', 'tool2'],
-          },
-          update: { tools: ['tool2', 'tool3'] },
-          duplicate: { tools: ['tool2', 'tool3'] },
-        },
-        {
-          name: 'projectIds update',
-          initial: {
-            projectIds: [projectId1],
-          },
-          update: { projectIds: [projectId1, projectId2] },
-          duplicate: { projectIds: [projectId2, projectId1] },
+          $pull: { projectIds: projectId1 },
         },
+      );
+
+      expect(updatedAgent).toBeDefined();
+      expect(updatedAgent.name).toBe('Updated Name');
+      expect(updatedAgent.tools).toContain('tool1');
+      expect(updatedAgent.tools).toContain('tool2');
+      expect(updatedAgent.projectIds.map((id) => id.toString())).toContain(projectId2.toString());
+
+      expect(finalAgent).toBeDefined();
+      expect(finalAgent.projectIds.map((id) => id.toString())).not.toContain(projectId1.toString());
+      expect(finalAgent.versions).toHaveLength(3);
+    });
+
+    test('should handle updateAgent when agent does not exist', async () => {
+      const nonExistentId = `agent_${uuidv4()}`;
+
+      const result = await updateAgent({ id: nonExistentId }, { name: 'New Name' });
+
+      expect(result).toBeNull();
+    });
+
+    test('should handle concurrent updates with database errors', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+      });
+
+      // Mock findOneAndUpdate to simulate database error
+      const cleanup = mockFindOneAndUpdateError(2);
+
+      // Concurrent updates where one fails
+      const promises = [
+        updateAgent({ id: agentId }, { name: 'Update 1' }),
+        updateAgent({ id: agentId }, { name: 'Update 2' }),
+        updateAgent({ id: agentId }, { name: 'Update 3' }),
       ];
 
-      for (const testCase of testCases) {
-        const testAgentId = `agent_${uuidv4()}`;
+      const results = await Promise.allSettled(promises);
 
-        await createAgent({
-          id: testAgentId,
-          provider: 'test',
-          model: 'test-model',
-          author: authorId,
-          ...testCase.initial,
+      cleanup();
+
+      const succeeded = results.filter((r) => r.status === 'fulfilled').length;
+      const failed = results.filter((r) => r.status === 'rejected').length;
+
+      expect(succeeded).toBe(2);
+      expect(failed).toBe(1);
+    });
+
+    test('should handle removeAgentResourceFiles when agent is deleted during operation', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        tool_resources: {
+          file_search: {
+            file_ids: ['file1', 'file2', 'file3'],
+          },
+        },
+      });
+
+      // Mock findOneAndUpdate to return null (simulating deletion)
+      const originalFindOneAndUpdate = Agent.findOneAndUpdate;
+      Agent.findOneAndUpdate = jest.fn().mockImplementation(() => ({
+        lean: jest.fn().mockResolvedValue(null),
+      }));
+
+      // Try to remove files from deleted agent
+      await expect(
+        removeAgentResourceFiles({
+          agent_id: agentId,
+          files: [
+            { tool_resource: 'file_search', file_id: 'file1' },
+            { tool_resource: 'file_search', file_id: 'file2' },
+          ],
+        }),
+      ).rejects.toThrow('Failed to update agent during file removal (pull step)');
+
+      Agent.findOneAndUpdate = originalFindOneAndUpdate;
+    });
+
+    test('should handle loadEphemeralAgent with malformed MCP tool names', async () => {
+      const { EPHEMERAL_AGENT_ID } = require('librechat-data-provider').Constants;
+
+      const mockReq = {
+        user: { id: 'user123' },
+        body: {
+          promptPrefix: 'Test instructions',
+          ephemeralAgent: {
+            execute_code: false,
+            web_search: false,
+            mcp: ['server1'],
+          },
+        },
+        app: {
+          locals: {
+            availableTools: {
+              malformed_tool_name: {}, // No mcp delimiter
+              tool__server1: {}, // Wrong delimiter
+              tool_mcp_server1: {}, // Correct format
+              tool_mcp_server2: {}, // Different server
+            },
+          },
+        },
+      };
+
+      const result = await loadAgent({
+        req: mockReq,
+        agent_id: EPHEMERAL_AGENT_ID,
+        endpoint: 'openai',
+        model_parameters: { model: 'gpt-4' },
+      });
+
+      if (result) {
+        expect(result.tools).toEqual(['tool_mcp_server1']);
+        expect(result.tools).not.toContain('malformed_tool_name');
+        expect(result.tools).not.toContain('tool__server1');
+        expect(result.tools).not.toContain('tool_mcp_server2');
+      }
+    });
+
+    test('should handle addAgentResourceFile when array initialization fails', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+      });
+
+      // Mock the updateOne operation to fail but let updateAgent succeed
+      const originalUpdateOne = Agent.updateOne;
+      let updateOneCalled = false;
+      Agent.updateOne = jest.fn().mockImplementation((...args) => {
+        if (!updateOneCalled) {
+          updateOneCalled = true;
+          return Promise.reject(new Error('Database error'));
+        }
+        return originalUpdateOne.apply(Agent, args);
+      });
+
+      try {
+        const result = await addAgentResourceFile({
+          agent_id: agentId,
+          tool_resource: 'new_tool',
+          file_id: 'file123',
         });
 
-        await updateAgent({ id: testAgentId }, testCase.update);
-
-        let error;
-        try {
-          await updateAgent({ id: testAgentId }, testCase.duplicate);
-        } catch (e) {
-          error = e;
-        }
-
-        expect(error).toBeDefined();
-        expect(error.message).toContain('Duplicate version');
-        expect(error.statusCode).toBe(409);
-        expect(error.details).toBeDefined();
-        expect(error.details.duplicateVersion).toBeDefined();
-
-        const agent = await getAgent({ id: testAgentId });
-        expect(agent.versions).toHaveLength(2);
+        expect(result).toBeDefined();
+        expect(result.tools).toContain('new_tool');
+      } catch (error) {
+        expect(error.message).toBe('Database error');
       }
-    } finally {
-      console.error = originalConsoleError;
-    }
-  });
 
-  test('should track updatedBy when a different user updates an agent', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const originalAuthor = new mongoose.Types.ObjectId();
-    const updatingUser = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'Original Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: originalAuthor,
-      description: 'Original description',
+      Agent.updateOne = originalUpdateOne;
     });
-
-    const updatedAgent = await updateAgent(
-      { id: agentId },
-      { name: 'Updated Agent', description: 'Updated description' },
-      { updatingUserId: updatingUser.toString() },
-    );
-
-    expect(updatedAgent.versions).toHaveLength(2);
-    expect(updatedAgent.versions[1].updatedBy.toString()).toBe(updatingUser.toString());
-    expect(updatedAgent.author.toString()).toBe(originalAuthor.toString());
-  });
-
-  test('should include updatedBy even when the original author updates the agent', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const originalAuthor = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'Original Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: originalAuthor,
-      description: 'Original description',
-    });
-
-    const updatedAgent = await updateAgent(
-      { id: agentId },
-      { name: 'Updated Agent', description: 'Updated description' },
-      { updatingUserId: originalAuthor.toString() },
-    );
-
-    expect(updatedAgent.versions).toHaveLength(2);
-    expect(updatedAgent.versions[1].updatedBy.toString()).toBe(originalAuthor.toString());
-    expect(updatedAgent.author.toString()).toBe(originalAuthor.toString());
-  });
-
-  test('should track multiple different users updating the same agent', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const originalAuthor = new mongoose.Types.ObjectId();
-    const user1 = new mongoose.Types.ObjectId();
-    const user2 = new mongoose.Types.ObjectId();
-    const user3 = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'Original Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: originalAuthor,
-      description: 'Original description',
-    });
-
-    // User 1 makes an update
-    await updateAgent(
-      { id: agentId },
-      { name: 'Updated by User 1', description: 'First update' },
-      { updatingUserId: user1.toString() },
-    );
-
-    // Original author makes an update
-    await updateAgent(
-      { id: agentId },
-      { description: 'Updated by original author' },
-      { updatingUserId: originalAuthor.toString() },
-    );
-
-    // User 2 makes an update
-    await updateAgent(
-      { id: agentId },
-      { name: 'Updated by User 2', model: 'new-model' },
-      { updatingUserId: user2.toString() },
-    );
-
-    // User 3 makes an update
-    const finalAgent = await updateAgent(
-      { id: agentId },
-      { description: 'Final update by User 3' },
-      { updatingUserId: user3.toString() },
-    );
-
-    expect(finalAgent.versions).toHaveLength(5);
-    expect(finalAgent.author.toString()).toBe(originalAuthor.toString());
-
-    // Check that each version has the correct updatedBy
-    expect(finalAgent.versions[0].updatedBy).toBeUndefined(); // Initial creation has no updatedBy
-    expect(finalAgent.versions[1].updatedBy.toString()).toBe(user1.toString());
-    expect(finalAgent.versions[2].updatedBy.toString()).toBe(originalAuthor.toString());
-    expect(finalAgent.versions[3].updatedBy.toString()).toBe(user2.toString());
-    expect(finalAgent.versions[4].updatedBy.toString()).toBe(user3.toString());
-
-    // Verify the final state
-    expect(finalAgent.name).toBe('Updated by User 2');
-    expect(finalAgent.description).toBe('Final update by User 3');
-    expect(finalAgent.model).toBe('new-model');
-  });
-
-  test('should preserve original author during agent restoration', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const originalAuthor = new mongoose.Types.ObjectId();
-    const updatingUser = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'Original Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: originalAuthor,
-      description: 'Original description',
-    });
-
-    await updateAgent(
-      { id: agentId },
-      { name: 'Updated Agent', description: 'Updated description' },
-      { updatingUserId: updatingUser.toString() },
-    );
-
-    const { revertAgentVersion } = require('./Agent');
-    const revertedAgent = await revertAgentVersion({ id: agentId }, 0);
-
-    expect(revertedAgent.author.toString()).toBe(originalAuthor.toString());
-    expect(revertedAgent.name).toBe('Original Agent');
-    expect(revertedAgent.description).toBe('Original description');
-  });
-
-  test('should detect action metadata changes and force version update', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
-    const actionId = 'testActionId123';
-
-    // Create agent with actions
-    await createAgent({
-      id: agentId,
-      name: 'Agent with Actions',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
-      actions: [`test.com_action_${actionId}`],
-      tools: ['listEvents_action_test.com', 'createEvent_action_test.com'],
-    });
-
-    // First update with forceVersion should create a version
-    const firstUpdate = await updateAgent(
-      { id: agentId },
-      { tools: ['listEvents_action_test.com', 'createEvent_action_test.com'] },
-      { updatingUserId: authorId.toString(), forceVersion: true },
-    );
-
-    expect(firstUpdate.versions).toHaveLength(2);
-
-    // Second update with same data but forceVersion should still create a version
-    const secondUpdate = await updateAgent(
-      { id: agentId },
-      { tools: ['listEvents_action_test.com', 'createEvent_action_test.com'] },
-      { updatingUserId: authorId.toString(), forceVersion: true },
-    );
-
-    expect(secondUpdate.versions).toHaveLength(3);
-
-    // Update without forceVersion and no changes should not create a version
-    let error;
-    try {
-      await updateAgent(
-        { id: agentId },
-        { tools: ['listEvents_action_test.com', 'createEvent_action_test.com'] },
-        { updatingUserId: authorId.toString(), forceVersion: false },
-      );
-    } catch (e) {
-      error = e;
-    }
-
-    expect(error).toBeDefined();
-    expect(error.message).toContain('Duplicate version');
-    expect(error.statusCode).toBe(409);
   });
 });
+
+function createBasicAgent(overrides = {}) {
+  const defaults = {
+    id: `agent_${uuidv4()}`,
+    name: 'Test Agent',
+    provider: 'test',
+    model: 'test-model',
+    author: new mongoose.Types.ObjectId(),
+  };
+  return createAgent({ ...defaults, ...overrides });
+}
+
+function createTestIds() {
+  return {
+    agentId: `agent_${uuidv4()}`,
+    authorId: new mongoose.Types.ObjectId(),
+    projectId: new mongoose.Types.ObjectId(),
+    fileId: uuidv4(),
+  };
+}
+
+function createFileOperations(agentId, fileIds, operation = 'add') {
+  return fileIds.map((fileId) =>
+    operation === 'add'
+      ? addAgentResourceFile({ agent_id: agentId, tool_resource: 'test_tool', file_id: fileId })
+      : removeAgentResourceFiles({
+          agent_id: agentId,
+          files: [{ tool_resource: 'test_tool', file_id: fileId }],
+        }),
+  );
+}
+
+function mockFindOneAndUpdateError(errorOnCall = 1) {
+  const original = Agent.findOneAndUpdate;
+  let callCount = 0;
+
+  Agent.findOneAndUpdate = jest.fn().mockImplementation((...args) => {
+    callCount++;
+    if (callCount === errorOnCall) {
+      throw new Error('Database connection lost');
+    }
+    return original.apply(Agent, args);
+  });
+
+  return () => {
+    Agent.findOneAndUpdate = original;
+  };
+}
+
+function generateVersionTestCases() {
+  const projectId1 = new mongoose.Types.ObjectId();
+  const projectId2 = new mongoose.Types.ObjectId();
+
+  return [
+    {
+      name: 'simple field update',
+      initial: {
+        name: 'Test Agent',
+        description: 'Initial description',
+      },
+      update: { name: 'Updated Name' },
+      duplicate: { name: 'Updated Name' },
+    },
+    {
+      name: 'object field update',
+      initial: {
+        model_parameters: { temperature: 0.7 },
+      },
+      update: { model_parameters: { temperature: 0.8 } },
+      duplicate: { model_parameters: { temperature: 0.8 } },
+    },
+    {
+      name: 'array field update',
+      initial: {
+        tools: ['tool1', 'tool2'],
+      },
+      update: { tools: ['tool2', 'tool3'] },
+      duplicate: { tools: ['tool2', 'tool3'] },
+    },
+    {
+      name: 'projectIds update',
+      initial: {
+        projectIds: [projectId1],
+      },
+      update: { projectIds: [projectId1, projectId2] },
+      duplicate: { projectIds: [projectId2, projectId1] },
+    },
+  ];
+}

From 830be18b901f066c9fce3fdfcbd8e268c50210d5 Mon Sep 17 00:00:00 2001
From: matt burnett <mawburn@users.noreply.github.com>
Date: Tue, 3 Jun 2025 22:05:26 -0400
Subject: [PATCH 06/49] =?UTF-8?q?=F0=9F=93=8F=20chore:=20Update=20ESLint?=
 =?UTF-8?q?=20Rules=20for=20Unused=20Variables=20(#7719)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eslint.config.mjs | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 7262ddb054..03f0a81b5e 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -121,9 +121,14 @@ export default [
       // common rules
       'no-nested-ternary': 'warn',
       'no-constant-binary-expression': 'warn',
-      // Also disable the core no-unused-vars rule globally.
-      'no-unused-vars': 'warn',
-
+      'no-unused-vars': [
+        'warn',
+        {
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_',
+        },
+      ],
       'no-console': 'off',
       'import/no-cycle': 'error',
       'import/no-self-import': 'error',
@@ -181,9 +186,6 @@ export default [
     files: ['api/**/*.js', 'config/**/*.js'],
     rules: {
       // API
-      // TODO: maybe later to error.
-      'no-unused-const': 'off',
-      'no-unused-vars': 'off',
       'no-async-promise-executor': 'off',
     },
   },
@@ -278,7 +280,14 @@ export default [
       ],
       //
       '@typescript-eslint/no-unused-expressions': 'off',
-      '@typescript-eslint/no-unused-vars': 'off',
+      '@typescript-eslint/no-unused-vars': [
+        'warn',
+        {
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_',
+        },
+      ],
       '@typescript-eslint/no-explicit-any': 'off',
       '@typescript-eslint/no-unnecessary-condition': 'off',
       '@typescript-eslint/strict-boolean-expressions': 'off',

From cbddd394a5b86c6ae910bb946f0d664b35b965bc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 3 Jun 2025 22:06:29 -0400
Subject: [PATCH 07/49] =?UTF-8?q?=F0=9F=8C=8D=20i18n:=20Update=20translati?=
 =?UTF-8?q?on.json=20with=20latest=20translations=20(#7692)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 client/src/locales/en/translation.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index df6e0d123d..52c190f1f8 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -709,6 +709,7 @@
   "com_ui_feedback_tag_other": "Other issue",
   "com_ui_feedback_tag_unjustified_refusal": "Refused without reason",
   "com_ui_field_required": "This field is required",
+  "com_ui_file_size": "File Size",
   "com_ui_files": "Files",
   "com_ui_filter_prompts": "Filter Prompts",
   "com_ui_filter_prompts_name": "Filter prompts by name",
@@ -742,6 +743,7 @@
   "com_ui_generate_backup": "Generate Backup Codes",
   "com_ui_generate_qrcode": "Generate QR Code",
   "com_ui_generating": "Generating...",
+  "com_ui_generation_settings": "Generation Settings",
   "com_ui_getting_started": "Getting Started",
   "com_ui_global_group": "something needs to go here. was empty",
   "com_ui_go_back": "Go back",
@@ -750,10 +752,12 @@
   "com_ui_good_evening": "Good evening",
   "com_ui_good_morning": "Good morning",
   "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_host": "Host",
   "com_ui_idea": "Ideas",
   "com_ui_image_created": "Image created",
+  "com_ui_image_details": "Image Details",
   "com_ui_image_edited": "Image edited",
   "com_ui_image_gen": "Image Gen",
   "com_ui_import": "Import",
@@ -824,6 +828,7 @@
   "com_ui_prompts_allow_share_global": "Allow sharing Prompts to all users",
   "com_ui_prompts_allow_use": "Allow using Prompts",
   "com_ui_provider": "Provider",
+  "com_ui_quality": "Quality",
   "com_ui_read_aloud": "Read aloud",
   "com_ui_redirecting_to_provider": "Redirecting to {{0}}, please wait...",
   "com_ui_refresh_link": "Refresh link",
@@ -882,16 +887,11 @@
   "com_ui_shop": "Shopping",
   "com_ui_show": "Show",
   "com_ui_show_all": "Show All",
+  "com_ui_show_image_details": "Show Image Details",
   "com_ui_show_qr": "Show QR Code",
   "com_ui_sign_in_to_domain": "Sign-in to {{0}}",
   "com_ui_simple": "Simple",
   "com_ui_size": "Size",
-  "com_ui_quality": "Quality",
-  "com_ui_generation_settings": "Generation Settings",
-  "com_ui_image_details": "Image Details",
-  "com_ui_show_image_details": "Show Image Details",
-  "com_ui_hide_image_details": "Hide Image Details",
-  "com_ui_file_size": "File Size",
   "com_ui_special_var_current_date": "Current Date",
   "com_ui_special_var_current_datetime": "Current Date & Time",
   "com_ui_special_var_current_user": "Current User",

From 6bb78247b34fa3efaf1892a2fad336ebc28be734 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Wed, 4 Jun 2025 00:13:28 -0400
Subject: [PATCH 08/49] =?UTF-8?q?=F0=9F=94=A7=20fix:=20Google=20Custom=20H?=
 =?UTF-8?q?eaders,=20Bookmarks=20Menu,=20Sources=20Dialog=20Close=20(#7722?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🔧 chore: fix ESLint warnings in AdminSettings

* fix: DropdownPopup for BookmarkMenu being affected by recent Header change

* fix: Replace button with OGDialogClose for proper dialog closing

* chore: linting in google client initialization

* chore: linting in getLLMConfig function

* chore: update @librechat/agents to version 2.4.38 to support Google GenAI Custom Headers
---
 api/package.json                              |   2 +-
 .../services/Endpoints/google/initialize.js   |   6 +-
 api/server/services/Endpoints/google/llm.js   |   6 +-
 .../components/Chat/Menus/BookmarkMenu.tsx    |   3 +-
 .../src/components/Prompts/AdminSettings.tsx  |   8 +-
 client/src/components/Web/Sources.tsx         |  22 +-
 package-lock.json                             | 653 +++++++++++++++++-
 7 files changed, 630 insertions(+), 70 deletions(-)

diff --git a/api/package.json b/api/package.json
index 3d3766bde8..6646c3a493 100644
--- a/api/package.json
+++ b/api/package.json
@@ -48,7 +48,7 @@
     "@langchain/google-genai": "^0.2.9",
     "@langchain/google-vertexai": "^0.2.9",
     "@langchain/textsplitters": "^0.1.0",
-    "@librechat/agents": "^2.4.37",
+    "@librechat/agents": "^2.4.38",
     "@librechat/data-schemas": "*",
     "@node-saml/passport-saml": "^5.0.0",
     "@waylaidwanderer/fetch-event-source": "^3.0.1",
diff --git a/api/server/services/Endpoints/google/initialize.js b/api/server/services/Endpoints/google/initialize.js
index b7419a8a87..b6bc2d6a79 100644
--- a/api/server/services/Endpoints/google/initialize.js
+++ b/api/server/services/Endpoints/google/initialize.js
@@ -25,9 +25,9 @@ const initializeClient = async ({ req, res, endpointOption, overrideModel, optio
   const credentials = isUserProvided
     ? userKey
     : {
-      [AuthKeys.GOOGLE_SERVICE_KEY]: serviceKey,
-      [AuthKeys.GOOGLE_API_KEY]: GOOGLE_KEY,
-    };
+        [AuthKeys.GOOGLE_SERVICE_KEY]: serviceKey,
+        [AuthKeys.GOOGLE_API_KEY]: GOOGLE_KEY,
+      };
 
   let clientOptions = {};
 
diff --git a/api/server/services/Endpoints/google/llm.js b/api/server/services/Endpoints/google/llm.js
index a64b33480b..235e1e3df9 100644
--- a/api/server/services/Endpoints/google/llm.js
+++ b/api/server/services/Endpoints/google/llm.js
@@ -94,7 +94,7 @@ function getLLMConfig(credentials, options = {}) {
   // Extract from credentials
   const serviceKeyRaw = creds[AuthKeys.GOOGLE_SERVICE_KEY] ?? {};
   const serviceKey =
-    typeof serviceKeyRaw === 'string' ? JSON.parse(serviceKeyRaw) : serviceKeyRaw ?? {};
+    typeof serviceKeyRaw === 'string' ? JSON.parse(serviceKeyRaw) : (serviceKeyRaw ?? {});
 
   const project_id = serviceKey?.project_id ?? null;
   const apiKey = creds[AuthKeys.GOOGLE_API_KEY] ?? null;
@@ -156,10 +156,6 @@ function getLLMConfig(credentials, options = {}) {
   }
 
   if (authHeader) {
-    /**
-     * NOTE: NOT SUPPORTED BY LANGCHAIN GENAI CLIENT,
-     * REQUIRES PR IN https://github.com/langchain-ai/langchainjs
-     */
     llmConfig.customHeaders = {
       Authorization: `Bearer ${apiKey}`,
     };
diff --git a/client/src/components/Chat/Menus/BookmarkMenu.tsx b/client/src/components/Chat/Menus/BookmarkMenu.tsx
index 58fcbfdd8f..1f31249bda 100644
--- a/client/src/components/Chat/Menus/BookmarkMenu.tsx
+++ b/client/src/components/Chat/Menus/BookmarkMenu.tsx
@@ -157,8 +157,9 @@ const BookmarkMenu: FC = () => {
   return (
     <BookmarkContext.Provider value={{ bookmarks: data || [] }}>
       <DropdownPopup
-        focusLoop={true}
+        portal={true}
         menuId={menuId}
+        focusLoop={true}
         isOpen={isMenuOpen}
         unmountOnHide={true}
         setIsOpen={setIsMenuOpen}
diff --git a/client/src/components/Prompts/AdminSettings.tsx b/client/src/components/Prompts/AdminSettings.tsx
index 8324c29e59..c281cc6bf8 100644
--- a/client/src/components/Prompts/AdminSettings.tsx
+++ b/client/src/components/Prompts/AdminSettings.tsx
@@ -81,7 +81,7 @@ const AdminSettings = () => {
 
   const defaultValues = useMemo(() => {
     if (roles?.[selectedRole]?.permissions) {
-      return roles[selectedRole].permissions[PermissionTypes.PROMPTS];
+      return roles[selectedRole]?.permissions[PermissionTypes.PROMPTS];
     }
     return roleDefaults[selectedRole].permissions[PermissionTypes.PROMPTS];
   }, [roles, selectedRole]);
@@ -99,11 +99,7 @@ const AdminSettings = () => {
   });
 
   useEffect(() => {
-    if (roles?.[selectedRole]?.permissions?.[PermissionTypes.PROMPTS]) {
-      reset(roles[selectedRole].permissions[PermissionTypes.PROMPTS]);
-    } else {
-      reset(roleDefaults[selectedRole].permissions[PermissionTypes.PROMPTS]);
-    }
+    reset(roles?.[selectedRole]?.permissions?.[PermissionTypes.PROMPTS]);
   }, [roles, selectedRole, reset]);
 
   if (user?.role !== SystemRoles.ADMIN) {
diff --git a/client/src/components/Web/Sources.tsx b/client/src/components/Web/Sources.tsx
index 46c781afb3..3acd106988 100644
--- a/client/src/components/Web/Sources.tsx
+++ b/client/src/components/Web/Sources.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import * as Ariakit from '@ariakit/react';
 import { VisuallyHidden } from '@ariakit/react';
-import { Globe, Newspaper, Image, ChevronDown } from 'lucide-react';
+import { X, Globe, Newspaper, Image, ChevronDown } from 'lucide-react';
 import type { ValidSource, ImageResult } from 'librechat-data-provider';
 import { FaviconImage, getCleanDomain } from '~/components/Web/SourceHovercard';
 import { useSearchContext } from '~/Providers';
@@ -9,6 +9,7 @@ import { AnimatedTabs } from '~/components/ui';
 import { useLocalize } from '~/hooks';
 import {
   OGDialog,
+  OGDialogClose,
   OGDialogTitle,
   OGDialogContent,
   OGDialogTrigger,
@@ -213,25 +214,12 @@ function SourcesGroup({ sources, limit = 3 }: { sources: ValidSource[]; limit?:
             <OGDialogTitle className="text-base font-medium">
               {localize('com_sources_title')}
             </OGDialogTitle>
-            <button
+            <OGDialogClose
               className="rounded-full p-1 text-text-secondary hover:bg-surface-tertiary hover:text-text-primary"
               aria-label={localize('com_ui_close')}
             >
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                width="20"
-                height="20"
-                viewBox="0 0 24 24"
-                fill="none"
-                stroke="currentColor"
-                strokeWidth="2"
-                strokeLinecap="round"
-                strokeLinejoin="round"
-              >
-                <line x1="18" y1="6" x2="6" y2="18"></line>
-                <line x1="6" y1="6" x2="18" y2="18"></line>
-              </svg>
-            </button>
+              <X className="h-4 w-4" />
+            </OGDialogClose>
           </div>
           <div className="flex-1 overflow-y-auto px-3 py-2">
             <div className="flex flex-col gap-2">
diff --git a/package-lock.json b/package-lock.json
index 2988897407..af0d6dbc9d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,7 +64,7 @@
         "@langchain/google-genai": "^0.2.9",
         "@langchain/google-vertexai": "^0.2.9",
         "@langchain/textsplitters": "^0.1.0",
-        "@librechat/agents": "^2.4.37",
+        "@librechat/agents": "^2.4.38",
         "@librechat/data-schemas": "*",
         "@node-saml/passport-saml": "^5.0.0",
         "@waylaidwanderer/fetch-event-source": "^3.0.1",
@@ -1344,33 +1344,6 @@
         "@langchain/core": ">=0.3.48 <0.4.0"
       }
     },
-    "api/node_modules/@librechat/agents": {
-      "version": "2.4.37",
-      "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-2.4.37.tgz",
-      "integrity": "sha512-joKKuNh5qWHspH9X4ZQdjyz4IBH6DGtKA4BAPXAvZyPyvadNcwFPEPqnvVtI9vwVVniqJD+t+4TGoGTC2P+19A==",
-      "license": "MIT",
-      "dependencies": {
-        "@langchain/anthropic": "^0.3.21",
-        "@langchain/aws": "^0.1.10",
-        "@langchain/community": "^0.3.44",
-        "@langchain/core": "^0.3.57",
-        "@langchain/deepseek": "^0.0.1",
-        "@langchain/google-genai": "^0.2.9",
-        "@langchain/google-vertexai": "^0.2.9",
-        "@langchain/langgraph": "^0.2.73",
-        "@langchain/mistralai": "^0.2.0",
-        "@langchain/ollama": "^0.2.0",
-        "@langchain/openai": "^0.5.11",
-        "@langchain/xai": "^0.0.2",
-        "cheerio": "^1.0.0",
-        "dotenv": "^16.4.7",
-        "https-proxy-agent": "^7.0.6",
-        "nanoid": "^3.3.7"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "api/node_modules/@smithy/abort-controller": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.2.tgz",
@@ -18998,9 +18971,9 @@
       }
     },
     "node_modules/@langchain/langgraph": {
-      "version": "0.2.73",
-      "resolved": "https://registry.npmjs.org/@langchain/langgraph/-/langgraph-0.2.73.tgz",
-      "integrity": "sha512-vw+IXV2Q7x/QaykNj3VE/Ak3aPlst3spkpM6zYtqwGkQlhLZU4Lb8PHHPjqNNYHSdOTDj9x4jIRUPZArGHx9Aw==",
+      "version": "0.2.74",
+      "resolved": "https://registry.npmjs.org/@langchain/langgraph/-/langgraph-0.2.74.tgz",
+      "integrity": "sha512-oHpEi5sTZTPaeZX1UnzfM2OAJ21QGQrwReTV6+QnX7h8nDCBzhtipAw1cK616S+X8zpcVOjgOtJuaJhXa4mN8w==",
       "license": "MIT",
       "dependencies": {
         "@langchain/langgraph-checkpoint": "~0.0.17",
@@ -19022,9 +18995,9 @@
       }
     },
     "node_modules/@langchain/langgraph-checkpoint": {
-      "version": "0.0.17",
-      "resolved": "https://registry.npmjs.org/@langchain/langgraph-checkpoint/-/langgraph-checkpoint-0.0.17.tgz",
-      "integrity": "sha512-6b3CuVVYx+7x0uWLG+7YXz9j2iBa+tn2AXvkLxzEvaAsLE6Sij++8PPbS2BZzC+S/FPJdWsz6I5bsrqL0BYrCA==",
+      "version": "0.0.18",
+      "resolved": "https://registry.npmjs.org/@langchain/langgraph-checkpoint/-/langgraph-checkpoint-0.0.18.tgz",
+      "integrity": "sha512-IS7zJj36VgY+4pf8ZjsVuUWef7oTwt1y9ylvwu0aLuOn1d0fg05Om9DLm3v2GZ2Df6bhLV1kfWAM0IAl9O5rQQ==",
       "license": "MIT",
       "dependencies": {
         "uuid": "^10.0.0"
@@ -19050,9 +19023,9 @@
       }
     },
     "node_modules/@langchain/langgraph-sdk": {
-      "version": "0.0.78",
-      "resolved": "https://registry.npmjs.org/@langchain/langgraph-sdk/-/langgraph-sdk-0.0.78.tgz",
-      "integrity": "sha512-skkUDmEhClWzlsr8jRaS1VpXVBISm5OFd0MUtS1jKRL5pn08K+IJRvHnlzgum9x7Dste9KXGcIGVoR7cNKJQrw==",
+      "version": "0.0.82",
+      "resolved": "https://registry.npmjs.org/@langchain/langgraph-sdk/-/langgraph-sdk-0.0.82.tgz",
+      "integrity": "sha512-QxhGtDArHkqsJAbO5RuZsCyvDmPWf4pUpkOpLDzPEQXCBuasrBRgB6pxQWof2l6kfMYCfrc6lp3jL6TAqapmjQ==",
       "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.15",
@@ -19271,6 +19244,612 @@
         "@lezer/common": "^1.0.0"
       }
     },
+    "node_modules/@librechat/agents": {
+      "version": "2.4.38",
+      "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-2.4.38.tgz",
+      "integrity": "sha512-GfQ36TpKrC60vesTM0MrBaE8aEC50yBp0CsT4ERHO9HbCjH8na+CA14Ldps1cGwinL4gtyDH2gB0nVuhgEtYAg==",
+      "license": "MIT",
+      "dependencies": {
+        "@langchain/anthropic": "^0.3.21",
+        "@langchain/aws": "^0.1.10",
+        "@langchain/community": "^0.3.44",
+        "@langchain/core": "^0.3.57",
+        "@langchain/deepseek": "^0.0.1",
+        "@langchain/google-genai": "^0.2.9",
+        "@langchain/google-vertexai": "^0.2.9",
+        "@langchain/langgraph": "^0.2.73",
+        "@langchain/mistralai": "^0.2.0",
+        "@langchain/ollama": "^0.2.0",
+        "@langchain/openai": "^0.5.11",
+        "@langchain/xai": "^0.0.2",
+        "cheerio": "^1.0.0",
+        "dotenv": "^16.4.7",
+        "https-proxy-agent": "^7.0.6",
+        "nanoid": "^3.3.7"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@librechat/agents/node_modules/@langchain/community": {
+      "version": "0.3.45",
+      "resolved": "https://registry.npmjs.org/@langchain/community/-/community-0.3.45.tgz",
+      "integrity": "sha512-KkAGmnP+w5tozLYsj/kGKwyfuPnCcA6MyDXfNF7oDo7L1TxhUgdEKhvNsY7ooLXz6Xh/LV5Kqp2B8U0jfYCQKQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@langchain/openai": ">=0.2.0 <0.6.0",
+        "@langchain/weaviate": "^0.2.0",
+        "binary-extensions": "^2.2.0",
+        "expr-eval": "^2.0.2",
+        "flat": "^5.0.2",
+        "js-yaml": "^4.1.0",
+        "langchain": ">=0.2.3 <0.3.0 || >=0.3.4 <0.4.0",
+        "langsmith": "^0.3.29",
+        "uuid": "^10.0.0",
+        "zod": "^3.22.3",
+        "zod-to-json-schema": "^3.22.5"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@arcjet/redact": "^v1.0.0-alpha.23",
+        "@aws-crypto/sha256-js": "^5.0.0",
+        "@aws-sdk/client-bedrock-agent-runtime": "^3.749.0",
+        "@aws-sdk/client-bedrock-runtime": "^3.749.0",
+        "@aws-sdk/client-dynamodb": "^3.749.0",
+        "@aws-sdk/client-kendra": "^3.749.0",
+        "@aws-sdk/client-lambda": "^3.749.0",
+        "@aws-sdk/client-s3": "^3.749.0",
+        "@aws-sdk/client-sagemaker-runtime": "^3.749.0",
+        "@aws-sdk/client-sfn": "^3.749.0",
+        "@aws-sdk/credential-provider-node": "^3.388.0",
+        "@azure/search-documents": "^12.0.0",
+        "@azure/storage-blob": "^12.15.0",
+        "@browserbasehq/sdk": "*",
+        "@browserbasehq/stagehand": "^1.0.0",
+        "@clickhouse/client": "^0.2.5",
+        "@cloudflare/ai": "*",
+        "@datastax/astra-db-ts": "^1.0.0",
+        "@elastic/elasticsearch": "^8.4.0",
+        "@getmetal/metal-sdk": "*",
+        "@getzep/zep-cloud": "^1.0.6",
+        "@getzep/zep-js": "^0.9.0",
+        "@gomomento/sdk": "^1.51.1",
+        "@gomomento/sdk-core": "^1.51.1",
+        "@google-ai/generativelanguage": "*",
+        "@google-cloud/storage": "^6.10.1 || ^7.7.0",
+        "@gradientai/nodejs-sdk": "^1.2.0",
+        "@huggingface/inference": "^2.6.4",
+        "@huggingface/transformers": "^3.2.3",
+        "@ibm-cloud/watsonx-ai": "*",
+        "@lancedb/lancedb": "^0.12.0",
+        "@langchain/core": ">=0.2.21 <0.4.0",
+        "@layerup/layerup-security": "^1.5.12",
+        "@libsql/client": "^0.14.0",
+        "@mendable/firecrawl-js": "^1.4.3",
+        "@mlc-ai/web-llm": "*",
+        "@mozilla/readability": "*",
+        "@neondatabase/serverless": "*",
+        "@notionhq/client": "^2.2.10",
+        "@opensearch-project/opensearch": "*",
+        "@pinecone-database/pinecone": "*",
+        "@planetscale/database": "^1.8.0",
+        "@premai/prem-sdk": "^0.3.25",
+        "@qdrant/js-client-rest": "^1.8.2",
+        "@raycast/api": "^1.55.2",
+        "@rockset/client": "^0.9.1",
+        "@smithy/eventstream-codec": "^2.0.5",
+        "@smithy/protocol-http": "^3.0.6",
+        "@smithy/signature-v4": "^2.0.10",
+        "@smithy/util-utf8": "^2.0.0",
+        "@spider-cloud/spider-client": "^0.0.21",
+        "@supabase/supabase-js": "^2.45.0",
+        "@tensorflow-models/universal-sentence-encoder": "*",
+        "@tensorflow/tfjs-converter": "*",
+        "@tensorflow/tfjs-core": "*",
+        "@upstash/ratelimit": "^1.1.3 || ^2.0.3",
+        "@upstash/redis": "^1.20.6",
+        "@upstash/vector": "^1.1.1",
+        "@vercel/kv": "*",
+        "@vercel/postgres": "*",
+        "@writerai/writer-sdk": "^0.40.2",
+        "@xata.io/client": "^0.28.0",
+        "@zilliz/milvus2-sdk-node": ">=2.3.5",
+        "apify-client": "^2.7.1",
+        "assemblyai": "^4.6.0",
+        "azion": "^1.11.1",
+        "better-sqlite3": ">=9.4.0 <12.0.0",
+        "cassandra-driver": "^4.7.2",
+        "cborg": "^4.1.1",
+        "cheerio": "^1.0.0-rc.12",
+        "chromadb": "*",
+        "closevector-common": "0.1.3",
+        "closevector-node": "0.1.6",
+        "closevector-web": "0.1.6",
+        "cohere-ai": "*",
+        "convex": "^1.3.1",
+        "crypto-js": "^4.2.0",
+        "d3-dsv": "^2.0.0",
+        "discord.js": "^14.14.1",
+        "dria": "^0.0.3",
+        "duck-duck-scrape": "^2.2.5",
+        "epub2": "^3.0.1",
+        "fast-xml-parser": "*",
+        "firebase-admin": "^11.9.0 || ^12.0.0",
+        "google-auth-library": "*",
+        "googleapis": "*",
+        "hnswlib-node": "^3.0.0",
+        "html-to-text": "^9.0.5",
+        "ibm-cloud-sdk-core": "*",
+        "ignore": "^5.2.0",
+        "interface-datastore": "^8.2.11",
+        "ioredis": "^5.3.2",
+        "it-all": "^3.0.4",
+        "jsdom": "*",
+        "jsonwebtoken": "^9.0.2",
+        "llmonitor": "^0.5.9",
+        "lodash": "^4.17.21",
+        "lunary": "^0.7.10",
+        "mammoth": "^1.6.0",
+        "mariadb": "^3.4.0",
+        "mem0ai": "^2.1.8",
+        "mongodb": ">=5.2.0",
+        "mysql2": "^3.9.8",
+        "neo4j-driver": "*",
+        "notion-to-md": "^3.1.0",
+        "officeparser": "^4.0.4",
+        "openai": "*",
+        "pdf-parse": "1.1.1",
+        "pg": "^8.11.0",
+        "pg-copy-streams": "^6.0.5",
+        "pickleparser": "^0.2.1",
+        "playwright": "^1.32.1",
+        "portkey-ai": "^0.1.11",
+        "puppeteer": "*",
+        "pyodide": ">=0.24.1 <0.27.0",
+        "redis": "*",
+        "replicate": "*",
+        "sonix-speech-recognition": "^2.1.1",
+        "srt-parser-2": "^1.2.3",
+        "typeorm": "^0.3.20",
+        "typesense": "^1.5.3",
+        "usearch": "^1.1.1",
+        "voy-search": "0.6.2",
+        "weaviate-client": "^3.5.2",
+        "web-auth-library": "^1.0.3",
+        "word-extractor": "*",
+        "ws": "^8.14.2",
+        "youtubei.js": "*"
+      },
+      "peerDependenciesMeta": {
+        "@arcjet/redact": {
+          "optional": true
+        },
+        "@aws-crypto/sha256-js": {
+          "optional": true
+        },
+        "@aws-sdk/client-bedrock-agent-runtime": {
+          "optional": true
+        },
+        "@aws-sdk/client-bedrock-runtime": {
+          "optional": true
+        },
+        "@aws-sdk/client-dynamodb": {
+          "optional": true
+        },
+        "@aws-sdk/client-kendra": {
+          "optional": true
+        },
+        "@aws-sdk/client-lambda": {
+          "optional": true
+        },
+        "@aws-sdk/client-s3": {
+          "optional": true
+        },
+        "@aws-sdk/client-sagemaker-runtime": {
+          "optional": true
+        },
+        "@aws-sdk/client-sfn": {
+          "optional": true
+        },
+        "@aws-sdk/credential-provider-node": {
+          "optional": true
+        },
+        "@aws-sdk/dsql-signer": {
+          "optional": true
+        },
+        "@azure/search-documents": {
+          "optional": true
+        },
+        "@azure/storage-blob": {
+          "optional": true
+        },
+        "@browserbasehq/sdk": {
+          "optional": true
+        },
+        "@clickhouse/client": {
+          "optional": true
+        },
+        "@cloudflare/ai": {
+          "optional": true
+        },
+        "@datastax/astra-db-ts": {
+          "optional": true
+        },
+        "@elastic/elasticsearch": {
+          "optional": true
+        },
+        "@getmetal/metal-sdk": {
+          "optional": true
+        },
+        "@getzep/zep-cloud": {
+          "optional": true
+        },
+        "@getzep/zep-js": {
+          "optional": true
+        },
+        "@gomomento/sdk": {
+          "optional": true
+        },
+        "@gomomento/sdk-core": {
+          "optional": true
+        },
+        "@google-ai/generativelanguage": {
+          "optional": true
+        },
+        "@google-cloud/storage": {
+          "optional": true
+        },
+        "@gradientai/nodejs-sdk": {
+          "optional": true
+        },
+        "@huggingface/inference": {
+          "optional": true
+        },
+        "@huggingface/transformers": {
+          "optional": true
+        },
+        "@lancedb/lancedb": {
+          "optional": true
+        },
+        "@layerup/layerup-security": {
+          "optional": true
+        },
+        "@libsql/client": {
+          "optional": true
+        },
+        "@mendable/firecrawl-js": {
+          "optional": true
+        },
+        "@mlc-ai/web-llm": {
+          "optional": true
+        },
+        "@mozilla/readability": {
+          "optional": true
+        },
+        "@neondatabase/serverless": {
+          "optional": true
+        },
+        "@notionhq/client": {
+          "optional": true
+        },
+        "@opensearch-project/opensearch": {
+          "optional": true
+        },
+        "@pinecone-database/pinecone": {
+          "optional": true
+        },
+        "@planetscale/database": {
+          "optional": true
+        },
+        "@premai/prem-sdk": {
+          "optional": true
+        },
+        "@qdrant/js-client-rest": {
+          "optional": true
+        },
+        "@raycast/api": {
+          "optional": true
+        },
+        "@rockset/client": {
+          "optional": true
+        },
+        "@smithy/eventstream-codec": {
+          "optional": true
+        },
+        "@smithy/protocol-http": {
+          "optional": true
+        },
+        "@smithy/signature-v4": {
+          "optional": true
+        },
+        "@smithy/util-utf8": {
+          "optional": true
+        },
+        "@spider-cloud/spider-client": {
+          "optional": true
+        },
+        "@supabase/supabase-js": {
+          "optional": true
+        },
+        "@tensorflow-models/universal-sentence-encoder": {
+          "optional": true
+        },
+        "@tensorflow/tfjs-converter": {
+          "optional": true
+        },
+        "@tensorflow/tfjs-core": {
+          "optional": true
+        },
+        "@upstash/ratelimit": {
+          "optional": true
+        },
+        "@upstash/redis": {
+          "optional": true
+        },
+        "@upstash/vector": {
+          "optional": true
+        },
+        "@vercel/kv": {
+          "optional": true
+        },
+        "@vercel/postgres": {
+          "optional": true
+        },
+        "@writerai/writer-sdk": {
+          "optional": true
+        },
+        "@xata.io/client": {
+          "optional": true
+        },
+        "@zilliz/milvus2-sdk-node": {
+          "optional": true
+        },
+        "apify-client": {
+          "optional": true
+        },
+        "assemblyai": {
+          "optional": true
+        },
+        "azion": {
+          "optional": true
+        },
+        "better-sqlite3": {
+          "optional": true
+        },
+        "cassandra-driver": {
+          "optional": true
+        },
+        "cborg": {
+          "optional": true
+        },
+        "cheerio": {
+          "optional": true
+        },
+        "chromadb": {
+          "optional": true
+        },
+        "closevector-common": {
+          "optional": true
+        },
+        "closevector-node": {
+          "optional": true
+        },
+        "closevector-web": {
+          "optional": true
+        },
+        "cohere-ai": {
+          "optional": true
+        },
+        "convex": {
+          "optional": true
+        },
+        "crypto-js": {
+          "optional": true
+        },
+        "d3-dsv": {
+          "optional": true
+        },
+        "discord.js": {
+          "optional": true
+        },
+        "dria": {
+          "optional": true
+        },
+        "duck-duck-scrape": {
+          "optional": true
+        },
+        "epub2": {
+          "optional": true
+        },
+        "fast-xml-parser": {
+          "optional": true
+        },
+        "firebase-admin": {
+          "optional": true
+        },
+        "google-auth-library": {
+          "optional": true
+        },
+        "googleapis": {
+          "optional": true
+        },
+        "hnswlib-node": {
+          "optional": true
+        },
+        "html-to-text": {
+          "optional": true
+        },
+        "ignore": {
+          "optional": true
+        },
+        "interface-datastore": {
+          "optional": true
+        },
+        "ioredis": {
+          "optional": true
+        },
+        "it-all": {
+          "optional": true
+        },
+        "jsdom": {
+          "optional": true
+        },
+        "jsonwebtoken": {
+          "optional": true
+        },
+        "llmonitor": {
+          "optional": true
+        },
+        "lodash": {
+          "optional": true
+        },
+        "lunary": {
+          "optional": true
+        },
+        "mammoth": {
+          "optional": true
+        },
+        "mariadb": {
+          "optional": true
+        },
+        "mem0ai": {
+          "optional": true
+        },
+        "mongodb": {
+          "optional": true
+        },
+        "mysql2": {
+          "optional": true
+        },
+        "neo4j-driver": {
+          "optional": true
+        },
+        "notion-to-md": {
+          "optional": true
+        },
+        "officeparser": {
+          "optional": true
+        },
+        "pdf-parse": {
+          "optional": true
+        },
+        "pg": {
+          "optional": true
+        },
+        "pg-copy-streams": {
+          "optional": true
+        },
+        "pickleparser": {
+          "optional": true
+        },
+        "playwright": {
+          "optional": true
+        },
+        "portkey-ai": {
+          "optional": true
+        },
+        "puppeteer": {
+          "optional": true
+        },
+        "pyodide": {
+          "optional": true
+        },
+        "redis": {
+          "optional": true
+        },
+        "replicate": {
+          "optional": true
+        },
+        "sonix-speech-recognition": {
+          "optional": true
+        },
+        "srt-parser-2": {
+          "optional": true
+        },
+        "typeorm": {
+          "optional": true
+        },
+        "typesense": {
+          "optional": true
+        },
+        "usearch": {
+          "optional": true
+        },
+        "voy-search": {
+          "optional": true
+        },
+        "weaviate-client": {
+          "optional": true
+        },
+        "web-auth-library": {
+          "optional": true
+        },
+        "word-extractor": {
+          "optional": true
+        },
+        "ws": {
+          "optional": true
+        },
+        "youtubei.js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@librechat/agents/node_modules/@langchain/openai": {
+      "version": "0.5.11",
+      "resolved": "https://registry.npmjs.org/@langchain/openai/-/openai-0.5.11.tgz",
+      "integrity": "sha512-DAp7x+NfjSqDvKVMle8yb85nzz+3ctP7zGJaeRS0vLmvkY9qf/jRkowsM0mcsIiEUKhG/AHzWqvxbhktb/jJ6Q==",
+      "license": "MIT",
+      "dependencies": {
+        "js-tiktoken": "^1.0.12",
+        "openai": "^4.96.0",
+        "zod": "^3.22.4",
+        "zod-to-json-schema": "^3.22.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@langchain/core": ">=0.3.48 <0.4.0"
+      }
+    },
+    "node_modules/@librechat/agents/node_modules/agent-base": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@librechat/agents/node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@librechat/agents/node_modules/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/@librechat/backend": {
       "resolved": "api",
       "link": true

From be4cf5846c569938f91ac01fc282cbc85aebbf37 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Wed, 4 Jun 2025 13:12:37 -0400
Subject: [PATCH 09/49] =?UTF-8?q?=F0=9F=93=A7=20feat:=20Mailgun=20API=20Em?=
 =?UTF-8?q?ail=20Configuration=20(#7742)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: add undefined password check in local user authentication

* fix: edge case - issue deleting user when no conversations in deleteUserController

* feat: Integrate Mailgun API for email sending functionality

* fix: undefined SESSION_EXPIRY handling and add tests

* fix: update import path for isEnabled utility in azureUtils.js to resolve circular dep.
---
 .env.example                                  |  12 ++
 api/models/userMethods.js                     |   4 +
 api/server/controllers/UserController.js      |   6 +-
 api/server/utils/index.js                     |  13 +-
 api/server/utils/sendEmail.js                 | 118 ++++++++++---
 api/strategies/localStrategy.js               |   6 +
 api/utils/azureUtils.js                       |   2 +-
 packages/data-schemas/jest.config.mjs         |   3 +-
 .../data-schemas/src/methods/user.test.ts     | 163 ++++++++++++++++++
 packages/data-schemas/src/methods/user.ts     |  13 +-
 10 files changed, 311 insertions(+), 29 deletions(-)
 create mode 100644 packages/data-schemas/src/methods/user.test.ts

diff --git a/.env.example b/.env.example
index f79b89a155..876535b345 100644
--- a/.env.example
+++ b/.env.example
@@ -515,6 +515,18 @@ EMAIL_PASSWORD=
 EMAIL_FROM_NAME=
 EMAIL_FROM=noreply@librechat.ai
 
+#========================#
+#      Mailgun API       #
+#========================#
+
+# MAILGUN_API_KEY=your-mailgun-api-key
+# MAILGUN_DOMAIN=mg.yourdomain.com
+# EMAIL_FROM=noreply@yourdomain.com
+# EMAIL_FROM_NAME="LibreChat"
+
+# # Optional: For EU region
+# MAILGUN_HOST=https://api.eu.mailgun.net
+
 #========================#
 # Firebase CDN           #
 #========================#
diff --git a/api/models/userMethods.js b/api/models/userMethods.js
index e8bf5e4784..a36409ebcf 100644
--- a/api/models/userMethods.js
+++ b/api/models/userMethods.js
@@ -12,6 +12,10 @@ const comparePassword = async (user, candidatePassword) => {
     throw new Error('No user provided');
   }
 
+  if (!user.password) {
+    throw new Error('No password, likely an email first registered via Social/OIDC login');
+  }
+
   return new Promise((resolve, reject) => {
     bcrypt.compare(candidatePassword, user.password, (err, isMatch) => {
       if (err) {
diff --git a/api/server/controllers/UserController.js b/api/server/controllers/UserController.js
index a2fbc3c485..4577d20159 100644
--- a/api/server/controllers/UserController.js
+++ b/api/server/controllers/UserController.js
@@ -163,7 +163,11 @@ const deleteUserController = async (req, res) => {
     await Balance.deleteMany({ user: user._id }); // delete user balances
     await deletePresets(user.id); // delete user presets
     /* TODO: Delete Assistant Threads */
-    await deleteConvos(user.id); // delete user convos
+    try {
+      await deleteConvos(user.id); // delete user convos
+    } catch (error) {
+      logger.error('[deleteUserController] Error deleting user convos, likely no convos', error);
+    }
     await deleteUserPluginAuth(user.id, null, true); // delete user plugin auth
     await deleteUserById(user.id); // delete user
     await deleteAllSharedLinks(user.id); // delete user shared links
diff --git a/api/server/utils/index.js b/api/server/utils/index.js
index b79b42f00d..aa432ec379 100644
--- a/api/server/utils/index.js
+++ b/api/server/utils/index.js
@@ -13,12 +13,19 @@ const math = require('./math');
  * @returns {Boolean}
  */
 function checkEmailConfig() {
-  return (
+  // Check if Mailgun is configured
+  const hasMailgunConfig =
+    !!process.env.MAILGUN_API_KEY && !!process.env.MAILGUN_DOMAIN && !!process.env.EMAIL_FROM;
+
+  // Check if SMTP is configured
+  const hasSMTPConfig =
     (!!process.env.EMAIL_SERVICE || !!process.env.EMAIL_HOST) &&
     !!process.env.EMAIL_USERNAME &&
     !!process.env.EMAIL_PASSWORD &&
-    !!process.env.EMAIL_FROM
-  );
+    !!process.env.EMAIL_FROM;
+
+  // Return true if either Mailgun or SMTP is properly configured
+  return hasMailgunConfig || hasSMTPConfig;
 }
 
 module.exports = {
diff --git a/api/server/utils/sendEmail.js b/api/server/utils/sendEmail.js
index 59d75830f4..42f99c78fc 100644
--- a/api/server/utils/sendEmail.js
+++ b/api/server/utils/sendEmail.js
@@ -1,10 +1,69 @@
 const fs = require('fs');
 const path = require('path');
+const axios = require('axios');
+const FormData = require('form-data');
 const nodemailer = require('nodemailer');
 const handlebars = require('handlebars');
 const { isEnabled } = require('~/server/utils/handleText');
+const { logAxiosError } = require('~/utils');
 const logger = require('~/config/winston');
 
+/**
+ * Sends an email using Mailgun API.
+ *
+ * @async
+ * @function sendEmailViaMailgun
+ * @param {Object} params - The parameters for sending the email.
+ * @param {string} params.to - The recipient's email address.
+ * @param {string} params.from - The sender's email address.
+ * @param {string} params.subject - The subject of the email.
+ * @param {string} params.html - The HTML content of the email.
+ * @returns {Promise<Object>} - A promise that resolves to the response from Mailgun API.
+ */
+const sendEmailViaMailgun = async ({ to, from, subject, html }) => {
+  const mailgunApiKey = process.env.MAILGUN_API_KEY;
+  const mailgunDomain = process.env.MAILGUN_DOMAIN;
+  const mailgunHost = process.env.MAILGUN_HOST || 'https://api.mailgun.net';
+
+  if (!mailgunApiKey || !mailgunDomain) {
+    throw new Error('Mailgun API key and domain are required');
+  }
+
+  const formData = new FormData();
+  formData.append('from', from);
+  formData.append('to', to);
+  formData.append('subject', subject);
+  formData.append('html', html);
+
+  try {
+    const response = await axios.post(`${mailgunHost}/v3/${mailgunDomain}/messages`, formData, {
+      headers: {
+        ...formData.getHeaders(),
+        Authorization: `Basic ${Buffer.from(`api:${mailgunApiKey}`).toString('base64')}`,
+      },
+    });
+
+    return response.data;
+  } catch (error) {
+    throw new Error(logAxiosError({ error, message: 'Failed to send email via Mailgun' }));
+  }
+};
+
+/**
+ * Sends an email using SMTP via Nodemailer.
+ *
+ * @async
+ * @function sendEmailViaSMTP
+ * @param {Object} params - The parameters for sending the email.
+ * @param {Object} params.transporterOptions - The transporter configuration options.
+ * @param {Object} params.mailOptions - The email options.
+ * @returns {Promise<Object>} - A promise that resolves to the info object of the sent email.
+ */
+const sendEmailViaSMTP = async ({ transporterOptions, mailOptions }) => {
+  const transporter = nodemailer.createTransport(transporterOptions);
+  return await transporter.sendMail(mailOptions);
+};
+
 /**
  * Sends an email using the specified template, subject, and payload.
  *
@@ -34,6 +93,30 @@ const logger = require('~/config/winston');
  */
 const sendEmail = async ({ email, subject, payload, template, throwError = true }) => {
   try {
+    // Read and compile the email template
+    const source = fs.readFileSync(path.join(__dirname, 'emails', template), 'utf8');
+    const compiledTemplate = handlebars.compile(source);
+    const html = compiledTemplate(payload);
+
+    // Prepare common email data
+    const fromName = process.env.EMAIL_FROM_NAME || process.env.APP_TITLE;
+    const fromEmail = process.env.EMAIL_FROM;
+    const fromAddress = `"${fromName}" <${fromEmail}>`;
+    const toAddress = `"${payload.name}" <${email}>`;
+
+    // Check if Mailgun is configured
+    if (process.env.MAILGUN_API_KEY && process.env.MAILGUN_DOMAIN) {
+      logger.debug('[sendEmail] Using Mailgun provider');
+      return await sendEmailViaMailgun({
+        from: fromAddress,
+        to: toAddress,
+        subject: subject,
+        html: html,
+      });
+    }
+
+    // Default to SMTP
+    logger.debug('[sendEmail] Using SMTP provider');
     const transporterOptions = {
       // Use STARTTLS by default instead of obligatory TLS
       secure: process.env.EMAIL_ENCRYPTION === 'tls',
@@ -62,30 +145,21 @@ const sendEmail = async ({ email, subject, payload, template, throwError = true
       transporterOptions.port = process.env.EMAIL_PORT ?? 25;
     }
 
-    const transporter = nodemailer.createTransport(transporterOptions);
-
-    const source = fs.readFileSync(path.join(__dirname, 'emails', template), 'utf8');
-    const compiledTemplate = handlebars.compile(source);
-    const options = () => {
-      return {
-        // Header address should contain name-addr
-        from:
-          `"${process.env.EMAIL_FROM_NAME || process.env.APP_TITLE}"` +
-          `<${process.env.EMAIL_FROM}>`,
-        to: `"${payload.name}" <${email}>`,
-        envelope: {
-          // Envelope from should contain addr-spec
-          // Mistake in the Nodemailer documentation?
-          from: process.env.EMAIL_FROM,
-          to: email,
-        },
-        subject: subject,
-        html: compiledTemplate(payload),
-      };
+    const mailOptions = {
+      // Header address should contain name-addr
+      from: fromAddress,
+      to: toAddress,
+      envelope: {
+        // Envelope from should contain addr-spec
+        // Mistake in the Nodemailer documentation?
+        from: fromEmail,
+        to: email,
+      },
+      subject: subject,
+      html: html,
     };
 
-    // Send email
-    return await transporter.sendMail(options());
+    return await sendEmailViaSMTP({ transporterOptions, mailOptions });
   } catch (error) {
     if (throwError) {
       throw error;
diff --git a/api/strategies/localStrategy.js b/api/strategies/localStrategy.js
index edc749ee9e..bc84e7c6b5 100644
--- a/api/strategies/localStrategy.js
+++ b/api/strategies/localStrategy.js
@@ -29,6 +29,12 @@ async function passportLogin(req, email, password, done) {
       return done(null, false, { message: 'Email does not exist.' });
     }
 
+    if (!user.password) {
+      logError('Passport Local Strategy - User has no password', { email });
+      logger.error(`[Login] [Login failed] [Username: ${email}] [Request-IP: ${req.ip}]`);
+      return done(null, false, { message: 'Email does not exist.' });
+    }
+
     const isMatch = await comparePassword(user, password);
     if (!isMatch) {
       logError('Passport Local Strategy - Password does not match', { isMatch });
diff --git a/api/utils/azureUtils.js b/api/utils/azureUtils.js
index 27396a8fc5..7adb133449 100644
--- a/api/utils/azureUtils.js
+++ b/api/utils/azureUtils.js
@@ -1,4 +1,4 @@
-const { isEnabled } = require('~/server/utils');
+const { isEnabled } = require('~/server/utils/handleText');
 
 /**
  * Sanitizes the model name to be used in the URL by removing or replacing disallowed characters.
diff --git a/packages/data-schemas/jest.config.mjs b/packages/data-schemas/jest.config.mjs
index f5fb1f20d7..b1fae43705 100644
--- a/packages/data-schemas/jest.config.mjs
+++ b/packages/data-schemas/jest.config.mjs
@@ -5,6 +5,7 @@ export default {
   testResultsProcessor: 'jest-junit',
   moduleNameMapper: {
     '^@src/(.*)$': '<rootDir>/src/$1',
+    '^~/(.*)$': '<rootDir>/src/$1',
   },
   // coverageThreshold: {
   //   global: {
@@ -16,4 +17,4 @@ export default {
   // },
   restoreMocks: true,
   testTimeout: 15000,
-};
\ No newline at end of file
+};
diff --git a/packages/data-schemas/src/methods/user.test.ts b/packages/data-schemas/src/methods/user.test.ts
new file mode 100644
index 0000000000..6dafd4e8fa
--- /dev/null
+++ b/packages/data-schemas/src/methods/user.test.ts
@@ -0,0 +1,163 @@
+import mongoose from 'mongoose';
+import { createUserMethods } from './user';
+import { signPayload } from '~/crypto';
+import type { IUser } from '~/types';
+
+jest.mock('~/crypto', () => ({
+  signPayload: jest.fn(),
+}));
+
+describe('User Methods', () => {
+  const mockSignPayload = signPayload as jest.MockedFunction<typeof signPayload>;
+  let userMethods: ReturnType<typeof createUserMethods>;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    userMethods = createUserMethods(mongoose);
+  });
+
+  describe('generateToken', () => {
+    const mockUser = {
+      _id: 'user123',
+      username: 'testuser',
+      provider: 'local',
+      email: 'test@example.com',
+      name: 'Test User',
+      avatar: '',
+      role: 'user',
+      emailVerified: false,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+    } as IUser;
+
+    afterEach(() => {
+      delete process.env.SESSION_EXPIRY;
+      delete process.env.JWT_SECRET;
+    });
+
+    it('should default to 15 minutes when SESSION_EXPIRY is not set', async () => {
+      process.env.JWT_SECRET = 'test-secret';
+      mockSignPayload.mockResolvedValue('mocked-token');
+
+      await userMethods.generateToken(mockUser);
+
+      expect(mockSignPayload).toHaveBeenCalledWith({
+        payload: {
+          id: mockUser._id,
+          username: mockUser.username,
+          provider: mockUser.provider,
+          email: mockUser.email,
+        },
+        secret: 'test-secret',
+        expirationTime: 900, // 15 minutes in seconds
+      });
+    });
+
+    it('should default to 15 minutes when SESSION_EXPIRY is empty string', async () => {
+      process.env.SESSION_EXPIRY = '';
+      process.env.JWT_SECRET = 'test-secret';
+      mockSignPayload.mockResolvedValue('mocked-token');
+
+      await userMethods.generateToken(mockUser);
+
+      expect(mockSignPayload).toHaveBeenCalledWith({
+        payload: {
+          id: mockUser._id,
+          username: mockUser.username,
+          provider: mockUser.provider,
+          email: mockUser.email,
+        },
+        secret: 'test-secret',
+        expirationTime: 900, // 15 minutes in seconds
+      });
+    });
+
+    it('should use custom expiry when SESSION_EXPIRY is set to a valid expression', async () => {
+      process.env.SESSION_EXPIRY = '1000 * 60 * 30'; // 30 minutes
+      process.env.JWT_SECRET = 'test-secret';
+      mockSignPayload.mockResolvedValue('mocked-token');
+
+      await userMethods.generateToken(mockUser);
+
+      expect(mockSignPayload).toHaveBeenCalledWith({
+        payload: {
+          id: mockUser._id,
+          username: mockUser.username,
+          provider: mockUser.provider,
+          email: mockUser.email,
+        },
+        secret: 'test-secret',
+        expirationTime: 1800, // 30 minutes in seconds
+      });
+    });
+
+    it('should default to 15 minutes when SESSION_EXPIRY evaluates to falsy value', async () => {
+      process.env.SESSION_EXPIRY = '0'; // This will evaluate to 0, which is falsy
+      process.env.JWT_SECRET = 'test-secret';
+      mockSignPayload.mockResolvedValue('mocked-token');
+
+      await userMethods.generateToken(mockUser);
+
+      expect(mockSignPayload).toHaveBeenCalledWith({
+        payload: {
+          id: mockUser._id,
+          username: mockUser.username,
+          provider: mockUser.provider,
+          email: mockUser.email,
+        },
+        secret: 'test-secret',
+        expirationTime: 900, // 15 minutes in seconds
+      });
+    });
+
+    it('should throw error when no user is provided', async () => {
+      process.env.JWT_SECRET = 'test-secret';
+
+      await expect(userMethods.generateToken(null as unknown as IUser)).rejects.toThrow(
+        'No user provided',
+      );
+    });
+
+    it('should return the token from signPayload', async () => {
+      process.env.SESSION_EXPIRY = '1000 * 60 * 60'; // 1 hour
+      process.env.JWT_SECRET = 'test-secret';
+      const expectedToken = 'generated-jwt-token';
+      mockSignPayload.mockResolvedValue(expectedToken);
+
+      const token = await userMethods.generateToken(mockUser);
+
+      expect(token).toBe(expectedToken);
+    });
+
+    it('should handle invalid SESSION_EXPIRY expressions gracefully', async () => {
+      process.env.SESSION_EXPIRY = 'invalid expression';
+      process.env.JWT_SECRET = 'test-secret';
+      mockSignPayload.mockResolvedValue('mocked-token');
+
+      // Mock console.warn to verify it's called
+      const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation();
+
+      await userMethods.generateToken(mockUser);
+
+      // Should use default value when eval fails
+      expect(mockSignPayload).toHaveBeenCalledWith({
+        payload: {
+          id: mockUser._id,
+          username: mockUser.username,
+          provider: mockUser.provider,
+          email: mockUser.email,
+        },
+        secret: 'test-secret',
+        expirationTime: 900, // 15 minutes in seconds (default)
+      });
+
+      // Verify warning was logged
+      expect(consoleWarnSpy).toHaveBeenCalledWith(
+        'Invalid SESSION_EXPIRY expression, using default:',
+        expect.any(SyntaxError),
+      );
+
+      consoleWarnSpy.mockRestore();
+    });
+  });
+});
diff --git a/packages/data-schemas/src/methods/user.ts b/packages/data-schemas/src/methods/user.ts
index 5c7b2e40d8..b3460faa72 100644
--- a/packages/data-schemas/src/methods/user.ts
+++ b/packages/data-schemas/src/methods/user.ts
@@ -145,7 +145,18 @@ export function createUserMethods(mongoose: typeof import('mongoose')) {
       throw new Error('No user provided');
     }
 
-    const expires = eval(process.env.SESSION_EXPIRY ?? '0') ?? 1000 * 60 * 15;
+    let expires = 1000 * 60 * 15;
+
+    if (process.env.SESSION_EXPIRY !== undefined && process.env.SESSION_EXPIRY !== '') {
+      try {
+        const evaluated = eval(process.env.SESSION_EXPIRY);
+        if (evaluated) {
+          expires = evaluated;
+        }
+      } catch (error) {
+        console.warn('Invalid SESSION_EXPIRY expression, using default:', error);
+      }
+    }
 
     return await signPayload({
       payload: {

From dff4fcac00939cf5a9b2077eba4cadcfe47c72eb Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Wed, 4 Jun 2025 23:11:34 -0400
Subject: [PATCH 10/49] =?UTF-8?q?=F0=9F=94=A7=20fix:=20Apply=20Mongoose=20?=
 =?UTF-8?q?Plugin=20at=20Model=20Creation=20(#7749)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: apply mongoMeili when models are created to use main runtime mongoose

* chore: update @librechat/data-schemas version to 0.0.8

* refactor: remove unused useDebounceCodeBlock

* fix: ensure setter function is stable and handle numeric conversion in useDebouncedInput

* refactor: replace useCallback with useMemo for stable debounced function in useDebouncedInput
---
 .../Artifacts/useDebounceCodeBlock.ts         | 37 -------------------
 .../hooks/Conversations/useDebouncedInput.ts  | 15 ++++----
 package-lock.json                             |  4 +-
 packages/data-schemas/package.json            |  2 +-
 packages/data-schemas/src/models/convo.ts     | 11 ++++++
 packages/data-schemas/src/models/message.ts   | 13 ++++++-
 .../src/models/plugins/mongoMeili.ts          | 10 +++--
 packages/data-schemas/src/schema/convo.ts     | 11 ------
 packages/data-schemas/src/schema/message.ts   | 10 -----
 9 files changed, 40 insertions(+), 73 deletions(-)
 delete mode 100644 client/src/components/Artifacts/useDebounceCodeBlock.ts

diff --git a/client/src/components/Artifacts/useDebounceCodeBlock.ts b/client/src/components/Artifacts/useDebounceCodeBlock.ts
deleted file mode 100644
index 27aaf5bc83..0000000000
--- a/client/src/components/Artifacts/useDebounceCodeBlock.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// client/src/hooks/useDebounceCodeBlock.ts
-import { useCallback, useEffect } from 'react';
-import debounce from 'lodash/debounce';
-import { useSetRecoilState } from 'recoil';
-import { codeBlocksState, codeBlockIdsState } from '~/store/artifacts';
-import type { CodeBlock } from '~/common';
-
-export function useDebounceCodeBlock() {
-  const setCodeBlocks = useSetRecoilState(codeBlocksState);
-  const setCodeBlockIds = useSetRecoilState(codeBlockIdsState);
-
-  const updateCodeBlock = useCallback((codeBlock: CodeBlock) => {
-    console.log('Updating code block:', codeBlock);
-    setCodeBlocks((prev) => ({
-      ...prev,
-      [codeBlock.id]: codeBlock,
-    }));
-    setCodeBlockIds((prev) =>
-      prev.includes(codeBlock.id) ? prev : [...prev, codeBlock.id],
-    );
-  }, [setCodeBlocks, setCodeBlockIds]);
-
-  const debouncedUpdateCodeBlock = useCallback(
-    debounce((codeBlock: CodeBlock) => {
-      updateCodeBlock(codeBlock);
-    }, 25),
-    [updateCodeBlock],
-  );
-
-  useEffect(() => {
-    return () => {
-      debouncedUpdateCodeBlock.cancel();
-    };
-  }, [debouncedUpdateCodeBlock]);
-
-  return debouncedUpdateCodeBlock;
-}
diff --git a/client/src/hooks/Conversations/useDebouncedInput.ts b/client/src/hooks/Conversations/useDebouncedInput.ts
index 56584769ce..73fbb66723 100644
--- a/client/src/hooks/Conversations/useDebouncedInput.ts
+++ b/client/src/hooks/Conversations/useDebouncedInput.ts
@@ -1,5 +1,5 @@
 import debounce from 'lodash/debounce';
-import React, { useState, useCallback } from 'react';
+import React, { useState, useCallback, useMemo } from 'react';
 import type { SetterOrUpdater } from 'recoil';
 import type { TSetOption } from '~/common';
 import { defaultDebouncedDelay } from '~/common';
@@ -29,10 +29,10 @@ function useDebouncedInput<T = unknown>({
 
   /** A debounced function to call the passed setOption with the optionKey and new value.
    *
-  Note: We use useCallback to ensure our debounced function is stable across renders. */
-  const setDebouncedOption = useCallback(
-    debounce(setOption && optionKey ? setOption(optionKey) : setter, delay),
-    [],
+  Note: We use useMemo to ensure our debounced function is stable across renders and properly typed. */
+  const setDebouncedOption = useMemo(
+    () => debounce(setOption && optionKey ? setOption(optionKey) : setter || (() => {}), delay),
+    [setOption, optionKey, setter, delay],
   );
 
   /** An onChange handler that updates the local state and the debounced option */
@@ -42,8 +42,9 @@ function useDebouncedInput<T = unknown>({
         typeof e !== 'object'
           ? e
           : ((e as React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>).target
-            .value as unknown as T);
-      if (numeric === true) {
+              .value as unknown as T);
+      // Handle numeric conversion only if value is not undefined and not empty string
+      if (numeric === true && newValue !== undefined && newValue !== '') {
         newValue = Number(newValue) as unknown as T;
       }
       setValue(newValue);
diff --git a/package-lock.json b/package-lock.json
index af0d6dbc9d..f53d7389ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46018,7 +46018,7 @@
         "passport-facebook": "^3.0.0"
       },
       "devDependencies": {
-        "@librechat/data-schemas": "^0.0.7",
+        "@librechat/data-schemas": "^0.0.8",
         "@rollup/plugin-alias": "^5.1.0",
         "@rollup/plugin-commonjs": "^25.0.2",
         "@rollup/plugin-json": "^6.1.0",
@@ -46186,7 +46186,7 @@
     },
     "packages/data-schemas": {
       "name": "@librechat/data-schemas",
-      "version": "0.0.7",
+      "version": "0.0.8",
       "license": "MIT",
       "devDependencies": {
         "@rollup/plugin-alias": "^5.1.0",
diff --git a/packages/data-schemas/package.json b/packages/data-schemas/package.json
index 9c2dddf0b5..8d625fa835 100644
--- a/packages/data-schemas/package.json
+++ b/packages/data-schemas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@librechat/data-schemas",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Mongoose schemas and models for LibreChat",
   "type": "module",
   "main": "dist/index.cjs",
diff --git a/packages/data-schemas/src/models/convo.ts b/packages/data-schemas/src/models/convo.ts
index 13a36e2069..da0a8c68cf 100644
--- a/packages/data-schemas/src/models/convo.ts
+++ b/packages/data-schemas/src/models/convo.ts
@@ -1,10 +1,21 @@
 import type * as t from '~/types';
+import mongoMeili from '~/models/plugins/mongoMeili';
 import convoSchema from '~/schema/convo';
 
 /**
  * Creates or returns the Conversation model using the provided mongoose instance and schema
  */
 export function createConversationModel(mongoose: typeof import('mongoose')) {
+  if (process.env.MEILI_HOST && process.env.MEILI_MASTER_KEY) {
+    convoSchema.plugin(mongoMeili, {
+      mongoose,
+      host: process.env.MEILI_HOST,
+      apiKey: process.env.MEILI_MASTER_KEY,
+      /** Note: Will get created automatically if it doesn't exist already */
+      indexName: 'convos',
+      primaryKey: 'conversationId',
+    });
+  }
   return (
     mongoose.models.Conversation || mongoose.model<t.IConversation>('Conversation', convoSchema)
   );
diff --git a/packages/data-schemas/src/models/message.ts b/packages/data-schemas/src/models/message.ts
index cb5bd9e7d3..3a81211e68 100644
--- a/packages/data-schemas/src/models/message.ts
+++ b/packages/data-schemas/src/models/message.ts
@@ -1,9 +1,20 @@
-import messageSchema from '~/schema/message';
 import type * as t from '~/types';
+import mongoMeili from '~/models/plugins/mongoMeili';
+import messageSchema from '~/schema/message';
 
 /**
  * Creates or returns the Message model using the provided mongoose instance and schema
  */
 export function createMessageModel(mongoose: typeof import('mongoose')) {
+  if (process.env.MEILI_HOST && process.env.MEILI_MASTER_KEY) {
+    messageSchema.plugin(mongoMeili, {
+      mongoose,
+      host: process.env.MEILI_HOST,
+      apiKey: process.env.MEILI_MASTER_KEY,
+      indexName: 'messages',
+      primaryKey: 'messageId',
+    });
+  }
+
   return mongoose.models.Message || mongoose.model<t.IMessage>('Message', messageSchema);
 }
diff --git a/packages/data-schemas/src/models/plugins/mongoMeili.ts b/packages/data-schemas/src/models/plugins/mongoMeili.ts
index 111f9e0bba..1956be9f30 100644
--- a/packages/data-schemas/src/models/plugins/mongoMeili.ts
+++ b/packages/data-schemas/src/models/plugins/mongoMeili.ts
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { MeiliSearch, Index } from 'meilisearch';
-import mongoose, { Schema, Document, Model, Query } from 'mongoose';
+import type { FilterQuery, Types, Schema, Document, Model, Query } from 'mongoose';
 import logger from '~/config/meiliLogger';
 
 interface MongoMeiliOptions {
@@ -8,6 +8,7 @@ interface MongoMeiliOptions {
   apiKey: string;
   indexName: string;
   primaryKey: string;
+  mongoose: typeof import('mongoose');
 }
 
 interface MeiliIndexable {
@@ -314,7 +315,7 @@ const createMeiliMongooseModel = ({
       }
 
       await this.collection.updateMany(
-        { _id: this._id as mongoose.Types.ObjectId },
+        { _id: this._id as Types.ObjectId },
         { $set: { _meiliIndex: true } },
       );
     }
@@ -398,6 +399,7 @@ const createMeiliMongooseModel = ({
  * @param options.primaryKey - The primary key field for indexing.
  */
 export default function mongoMeili(schema: Schema, options: MongoMeiliOptions): void {
+  const mongoose = options.mongoose;
   validateOptions(options);
 
   // Add _meiliIndex field to the schema to track if a document has been indexed in MeiliSearch.
@@ -452,7 +454,7 @@ export default function mongoMeili(schema: Schema, options: MongoMeiliOptions):
         const convoIndex = client.index('convos');
         const deletedConvos = await mongoose
           .model('Conversation')
-          .find(conditions as mongoose.FilterQuery<unknown>)
+          .find(conditions as FilterQuery<unknown>)
           .lean();
         const promises = deletedConvos.map((convo: Record<string, unknown>) =>
           convoIndex.deleteDocument(convo.conversationId as string),
@@ -464,7 +466,7 @@ export default function mongoMeili(schema: Schema, options: MongoMeiliOptions):
         const messageIndex = client.index('messages');
         const deletedMessages = await mongoose
           .model('Message')
-          .find(conditions as mongoose.FilterQuery<unknown>)
+          .find(conditions as FilterQuery<unknown>)
           .lean();
         const promises = deletedMessages.map((message: Record<string, unknown>) =>
           messageIndex.deleteDocument(message.messageId as string),
diff --git a/packages/data-schemas/src/schema/convo.ts b/packages/data-schemas/src/schema/convo.ts
index 8b0eb5b5c7..9680a49d9e 100644
--- a/packages/data-schemas/src/schema/convo.ts
+++ b/packages/data-schemas/src/schema/convo.ts
@@ -1,5 +1,4 @@
 import { Schema } from 'mongoose';
-import mongoMeili from '~/models/plugins/mongoMeili';
 import { conversationPreset } from './defaults';
 import { IConversation } from '~/types';
 
@@ -48,14 +47,4 @@ convoSchema.index({ expiredAt: 1 }, { expireAfterSeconds: 0 });
 convoSchema.index({ createdAt: 1, updatedAt: 1 });
 convoSchema.index({ conversationId: 1, user: 1 }, { unique: true });
 
-if (process.env.MEILI_HOST && process.env.MEILI_MASTER_KEY) {
-  convoSchema.plugin(mongoMeili, {
-    host: process.env.MEILI_HOST,
-    apiKey: process.env.MEILI_MASTER_KEY,
-    /** Note: Will get created automatically if it doesn't exist already */
-    indexName: 'convos',
-    primaryKey: 'conversationId',
-  });
-}
-
 export default convoSchema;
diff --git a/packages/data-schemas/src/schema/message.ts b/packages/data-schemas/src/schema/message.ts
index 4946d1e449..15a80ae80e 100644
--- a/packages/data-schemas/src/schema/message.ts
+++ b/packages/data-schemas/src/schema/message.ts
@@ -1,6 +1,5 @@
 import mongoose, { Schema } from 'mongoose';
 import type { IMessage } from '~/types/message';
-import mongoMeili from '~/models/plugins/mongoMeili';
 
 const messageSchema: Schema<IMessage> = new Schema(
   {
@@ -166,13 +165,4 @@ messageSchema.index({ expiredAt: 1 }, { expireAfterSeconds: 0 });
 messageSchema.index({ createdAt: 1 });
 messageSchema.index({ messageId: 1, user: 1 }, { unique: true });
 
-if (process.env.MEILI_HOST && process.env.MEILI_MASTER_KEY) {
-  messageSchema.plugin(mongoMeili, {
-    host: process.env.MEILI_HOST,
-    apiKey: process.env.MEILI_MASTER_KEY,
-    indexName: 'messages',
-    primaryKey: 'messageId',
-  });
-}
-
 export default messageSchema;

From 53df6a1a71dfa558f653f890b466072781c31cbe Mon Sep 17 00:00:00 2001
From: matt burnett <mawburn@users.noreply.github.com>
Date: Fri, 6 Jun 2025 16:43:39 -0400
Subject: [PATCH 11/49] =?UTF-8?q?=F0=9F=94=84=20fix:=20Update=20Agent=20Ve?=
 =?UTF-8?q?rsioning=20to=20Include=20`agent=5Fids`=20(#7762)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Removed agent_ids exclusion from version comparison in the Agent model.
* Added tests to ensure agent_ids changes trigger new version creation and handle duplicates correctly.
* Enhanced existing tests to validate agent_ids alongside other fields and preserve history.
---
 api/models/Agent.js      |   1 -
 api/models/Agent.spec.js | 172 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+), 1 deletion(-)

diff --git a/api/models/Agent.js b/api/models/Agent.js
index eb16e4d238..12b7a478af 100644
--- a/api/models/Agent.js
+++ b/api/models/Agent.js
@@ -170,7 +170,6 @@ const isDuplicateVersion = (updateData, currentData, versions, actionsHash = nul
     'created_at',
     'updated_at',
     '__v',
-    'agent_ids',
     'versions',
     'actionsHash', // Exclude actionsHash from direct comparison
   ];
diff --git a/api/models/Agent.spec.js b/api/models/Agent.spec.js
index 08ece95fb9..0e35ef36a7 100644
--- a/api/models/Agent.spec.js
+++ b/api/models/Agent.spec.js
@@ -662,6 +662,7 @@ describe('models/Agent', () => {
     beforeAll(async () => {
       mongoServer = await MongoMemoryServer.create();
       const mongoUri = mongoServer.getUri();
+      Agent = mongoose.models.Agent || mongoose.model('Agent', agentSchema);
       await mongoose.connect(mongoUri);
     });
 
@@ -1323,6 +1324,7 @@ describe('models/Agent', () => {
     beforeAll(async () => {
       mongoServer = await MongoMemoryServer.create();
       const mongoUri = mongoServer.getUri();
+      Agent = mongoose.models.Agent || mongoose.model('Agent', agentSchema);
       await mongoose.connect(mongoUri);
     });
 
@@ -1504,6 +1506,7 @@ describe('models/Agent', () => {
     beforeAll(async () => {
       mongoServer = await MongoMemoryServer.create();
       const mongoUri = mongoServer.getUri();
+      Agent = mongoose.models.Agent || mongoose.model('Agent', agentSchema);
       await mongoose.connect(mongoUri);
     });
 
@@ -1797,6 +1800,7 @@ describe('models/Agent', () => {
     beforeAll(async () => {
       mongoServer = await MongoMemoryServer.create();
       const mongoUri = mongoServer.getUri();
+      Agent = mongoose.models.Agent || mongoose.model('Agent', agentSchema);
       await mongoose.connect(mongoUri);
     });
 
@@ -2344,6 +2348,174 @@ describe('models/Agent', () => {
       Agent.updateOne = originalUpdateOne;
     });
   });
+
+  describe('Agent IDs Field in Version Detection', () => {
+    let mongoServer;
+
+    beforeAll(async () => {
+      mongoServer = await MongoMemoryServer.create();
+      const mongoUri = mongoServer.getUri();
+      Agent = mongoose.models.Agent || mongoose.model('Agent', agentSchema);
+      await mongoose.connect(mongoUri);
+    });
+
+    afterAll(async () => {
+      await mongoose.disconnect();
+      await mongoServer.stop();
+    });
+
+    beforeEach(async () => {
+      await Agent.deleteMany({});
+    });
+
+    test('should now create new version when agent_ids field changes', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      const agent = await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        agent_ids: ['agent1', 'agent2'],
+      });
+
+      expect(agent).toBeDefined();
+      expect(agent.versions).toHaveLength(1);
+
+      const updated = await updateAgent(
+        { id: agentId },
+        { agent_ids: ['agent1', 'agent2', 'agent3'] },
+      );
+
+      // Since agent_ids is no longer excluded, this should create a new version
+      expect(updated.versions).toHaveLength(2);
+      expect(updated.agent_ids).toEqual(['agent1', 'agent2', 'agent3']);
+    });
+
+    test('should detect duplicate version if agent_ids is updated to same value', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        agent_ids: ['agent1', 'agent2'],
+      });
+
+      await updateAgent({ id: agentId }, { agent_ids: ['agent1', 'agent2', 'agent3'] });
+
+      await expect(
+        updateAgent({ id: agentId }, { agent_ids: ['agent1', 'agent2', 'agent3'] }),
+      ).rejects.toThrow('Duplicate version');
+    });
+
+    test('should handle agent_ids field alongside other fields', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        description: 'Initial description',
+        agent_ids: ['agent1'],
+      });
+
+      const updated = await updateAgent(
+        { id: agentId },
+        {
+          agent_ids: ['agent1', 'agent2'],
+          description: 'Updated description',
+        },
+      );
+
+      expect(updated.versions).toHaveLength(2);
+      expect(updated.agent_ids).toEqual(['agent1', 'agent2']);
+      expect(updated.description).toBe('Updated description');
+
+      const updated2 = await updateAgent({ id: agentId }, { description: 'Another description' });
+
+      expect(updated2.versions).toHaveLength(3);
+      expect(updated2.agent_ids).toEqual(['agent1', 'agent2']);
+      expect(updated2.description).toBe('Another description');
+    });
+
+    test('should preserve agent_ids in version history', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        agent_ids: ['agent1'],
+      });
+
+      await updateAgent({ id: agentId }, { agent_ids: ['agent1', 'agent2'] });
+
+      await updateAgent({ id: agentId }, { agent_ids: ['agent3'] });
+
+      const finalAgent = await getAgent({ id: agentId });
+
+      expect(finalAgent.versions).toHaveLength(3);
+      expect(finalAgent.versions[0].agent_ids).toEqual(['agent1']);
+      expect(finalAgent.versions[1].agent_ids).toEqual(['agent1', 'agent2']);
+      expect(finalAgent.versions[2].agent_ids).toEqual(['agent3']);
+      expect(finalAgent.agent_ids).toEqual(['agent3']);
+    });
+
+    test('should handle empty agent_ids arrays', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        agent_ids: ['agent1', 'agent2'],
+      });
+
+      const updated = await updateAgent({ id: agentId }, { agent_ids: [] });
+
+      expect(updated.versions).toHaveLength(2);
+      expect(updated.agent_ids).toEqual([]);
+
+      await expect(updateAgent({ id: agentId }, { agent_ids: [] })).rejects.toThrow(
+        'Duplicate version',
+      );
+    });
+
+    test('should handle agent without agent_ids field', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+
+      const agent = await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+      });
+
+      expect(agent.agent_ids).toEqual([]);
+
+      const updated = await updateAgent({ id: agentId }, { agent_ids: ['agent1'] });
+
+      expect(updated.versions).toHaveLength(2);
+      expect(updated.agent_ids).toEqual(['agent1']);
+    });
+  });
 });
 
 function createBasicAgent(overrides = {}) {

From 2c39ccd2af9633128decbfe93e5f5281cd587a20 Mon Sep 17 00:00:00 2001
From: Ben Verhees <ben.verhees@iodigital.com>
Date: Fri, 6 Jun 2025 23:29:17 +0200
Subject: [PATCH 12/49] =?UTF-8?q?=F0=9F=92=89=20feat:=20Optionally=20Injec?=
 =?UTF-8?q?t=20MCP=20Server=20Instructions=20(#7660)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: Add MCP server instructions to context

* chore: remove async method as no async code is performed

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* chore: remove co-pilot promise resolution

---------

Co-authored-by: Danny Avila <danacordially@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 api/server/controllers/agents/client.js | 34 ++++++++-
 packages/data-provider/src/mcp.ts       |  7 ++
 packages/mcp/src/manager.ts             | 95 +++++++++++++++++++++++++
 3 files changed, 135 insertions(+), 1 deletion(-)

diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.js
index 31fd56930e..9631fe3801 100644
--- a/api/server/controllers/agents/client.js
+++ b/api/server/controllers/agents/client.js
@@ -32,11 +32,12 @@ const { getCustomEndpointConfig, checkCapability } = require('~/server/services/
 const { addCacheControl, createContextHandlers } = require('~/app/clients/prompts');
 const { spendTokens, spendStructuredTokens } = require('~/models/spendTokens');
 const { getBufferString, HumanMessage } = require('@langchain/core/messages');
+const { DynamicStructuredTool } = require('@langchain/core/tools');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
 const initOpenAI = require('~/server/services/Endpoints/openAI/initialize');
 const Tokenizer = require('~/server/services/Tokenizer');
 const BaseClient = require('~/app/clients/BaseClient');
-const { logger, sendEvent } = require('~/config');
+const { logger, sendEvent, getMCPManager } = require('~/config');
 const { createRun } = require('./run');
 
 /**
@@ -370,6 +371,37 @@ class AgentClient extends BaseClient {
       systemContent = this.augmentedPrompt + systemContent;
     }
 
+    // Inject MCP server instructions if available
+    const ephemeralAgent = this.options.req.body.ephemeralAgent;
+    let mcpServers = [];
+
+    // Check for ephemeral agent MCP servers
+    if (ephemeralAgent && ephemeralAgent.mcp && ephemeralAgent.mcp.length > 0) {
+      mcpServers = ephemeralAgent.mcp;
+    }
+    // Check for regular agent MCP tools
+    else if (this.options.agent && this.options.agent.tools) {
+      mcpServers = this.options.agent.tools
+        .filter(
+          (tool) =>
+            tool instanceof DynamicStructuredTool && tool.name.includes(Constants.mcp_delimiter),
+        )
+        .map((tool) => tool.name.split(Constants.mcp_delimiter).pop())
+        .filter(Boolean);
+    }
+
+    if (mcpServers.length > 0) {
+      try {
+        const mcpInstructions = await getMCPManager().formatInstructionsForContext(mcpServers);
+        if (mcpInstructions) {
+          systemContent = [systemContent, mcpInstructions].filter(Boolean).join('\n\n');
+          logger.debug('[AgentClient] Injected MCP instructions for servers:', mcpServers);
+        }
+      } catch (error) {
+        logger.error('[AgentClient] Failed to inject MCP instructions:', error);
+      }
+    }
+
     if (systemContent) {
       this.options.agent.instructions = systemContent;
     }
diff --git a/packages/data-provider/src/mcp.ts b/packages/data-provider/src/mcp.ts
index 258eb15ae3..1273274c54 100644
--- a/packages/data-provider/src/mcp.ts
+++ b/packages/data-provider/src/mcp.ts
@@ -7,6 +7,13 @@ const BaseOptionsSchema = z.object({
   initTimeout: z.number().optional(),
   /** Controls visibility in chat dropdown menu (MCPSelect) */
   chatMenu: z.boolean().optional(),
+  /** 
+   * Controls server instruction behavior:
+   * - undefined/not set: No instructions included (default)
+   * - true: Use server-provided instructions
+   * - string: Use custom instructions (overrides server-provided)
+   */
+  serverInstructions: z.union([z.boolean(), z.string()]).optional(),
 });
 
 export const StdioOptionsSchema = BaseOptionsSchema.extend({
diff --git a/packages/mcp/src/manager.ts b/packages/mcp/src/manager.ts
index 8fe9074b8f..0d8a1e4653 100644
--- a/packages/mcp/src/manager.ts
+++ b/packages/mcp/src/manager.ts
@@ -22,6 +22,8 @@ export class MCPManager {
   private readonly USER_CONNECTION_IDLE_TIMEOUT = 15 * 60 * 1000; // 15 minutes (TODO: make configurable)
   private mcpConfigs: t.MCPServers = {};
   private processMCPEnv?: (obj: MCPOptions, userId?: string) => MCPOptions; // Store the processing function
+  /** Store MCP server instructions */
+  private serverInstructions: Map<string, string> = new Map();
   private logger: Logger;
 
   private static getDefaultLogger(): Logger {
@@ -75,6 +77,42 @@ export class MCPManager {
             initializedServers.add(i);
             this.connections.set(serverName, connection); // Store in app-level map
 
+            // Handle unified serverInstructions configuration
+            const configInstructions = config.serverInstructions;
+
+            if (configInstructions !== undefined) {
+              if (typeof configInstructions === 'string') {
+                // Custom instructions provided
+                this.serverInstructions.set(serverName, configInstructions);
+                this.logger.info(
+                  `[MCP][${serverName}] Custom instructions stored for context inclusion: ${configInstructions}`,
+                );
+              } else if (configInstructions === true) {
+                // Use server-provided instructions
+                const serverInstructions = connection.client.getInstructions();
+
+                if (serverInstructions) {
+                  this.serverInstructions.set(serverName, serverInstructions);
+                  this.logger.info(
+                    `[MCP][${serverName}] Server instructions stored for context inclusion: ${serverInstructions}`,
+                  );
+                } else {
+                  this.logger.info(
+                    `[MCP][${serverName}] serverInstructions=true but no server instructions available`,
+                  );
+                }
+              } else {
+                // configInstructions is false - explicitly disabled
+                this.logger.info(
+                  `[MCP][${serverName}] Instructions explicitly disabled (serverInstructions=false)`,
+                );
+              }
+            } else {
+              this.logger.info(
+                `[MCP][${serverName}] Instructions not included (serverInstructions not configured)`,
+              );
+            }
+
             const serverCapabilities = connection.client.getServerCapabilities();
             this.logger.info(
               `[MCP][${serverName}] Capabilities: ${JSON.stringify(serverCapabilities)}`,
@@ -519,4 +557,61 @@ export class MCPManager {
       logger.info('[MCP] Manager instance destroyed.');
     }
   }
+
+  /**
+   * Get instructions for MCP servers
+   * @param serverNames Optional array of server names. If not provided or empty, returns all servers.
+   * @returns Object mapping server names to their instructions
+   */
+  public getInstructions(serverNames?: string[]): Record<string, string> {
+    const instructions: Record<string, string> = {};
+
+    if (!serverNames || serverNames.length === 0) {
+      // Return all instructions if no specific servers requested
+      for (const [serverName, serverInstructions] of this.serverInstructions.entries()) {
+        instructions[serverName] = serverInstructions;
+      }
+    } else {
+      // Return instructions for specific servers
+      for (const serverName of serverNames) {
+        const serverInstructions = this.serverInstructions.get(serverName);
+        if (serverInstructions) {
+          instructions[serverName] = serverInstructions;
+        }
+      }
+    }
+
+    return instructions;
+  }
+
+  /**
+   * Format MCP server instructions for injection into context
+   * @param serverNames Optional array of server names to include. If not provided, includes all servers.
+   * @returns Formatted instructions string ready for context injection
+   */
+  public formatInstructionsForContext(serverNames?: string[]): string {
+    /** Instructions for specified servers or all stored instructions */
+    const instructionsToInclude = this.getInstructions(serverNames);
+
+    if (Object.keys(instructionsToInclude).length === 0) {
+      return '';
+    }
+
+    // Format instructions for context injection
+    const formattedInstructions = Object.entries(instructionsToInclude)
+      .map(([serverName, instructions]) => {
+        return `## ${serverName} MCP Server Instructions
+
+${instructions}`;
+      })
+      .join('\n\n');
+
+    return `# MCP Server Instructions
+
+The following MCP servers are available with their specific instructions:
+
+${formattedInstructions}
+
+Please follow these instructions when using tools from the respective MCP servers.`;
+  }
 }

From c22d74d41e3254034613e8be154f5dd06e6b09b7 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Sat, 7 Jun 2025 00:49:41 -0400
Subject: [PATCH 13/49] fix: disable tracking clicks in Mailgun email
 configuration

---
 api/server/utils/sendEmail.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/server/utils/sendEmail.js b/api/server/utils/sendEmail.js
index 42f99c78fc..3c1f189c94 100644
--- a/api/server/utils/sendEmail.js
+++ b/api/server/utils/sendEmail.js
@@ -34,6 +34,7 @@ const sendEmailViaMailgun = async ({ to, from, subject, html }) => {
   formData.append('to', to);
   formData.append('subject', subject);
   formData.append('html', html);
+  formData.append('o:tracking-clicks', 'no');
 
   try {
     const response = await axios.post(`${mailgunHost}/v3/${mailgunDomain}/messages`, formData, {

From cd7dd576c1f945bb731a4415a04bc1b702b6f4e4 Mon Sep 17 00:00:00 2001
From: Marco Beretta <81851188+berry-13@users.noreply.github.com>
Date: Sun, 8 Jun 2025 00:22:08 +0200
Subject: [PATCH 14/49] =?UTF-8?q?=F0=9F=8E=A8=20style:=20Unify=20Styles=20?=
 =?UTF-8?q?across=20Themes=20and=20Improve=20Accessibility=20(#7783)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* style: update button styles for improved hover effects and accessibility

* style: enhance CustomMenuItem styling for improved visual feedback

* style: improved accessibility and visual consistency

* chore: add missing localization in ActionsPanel

---------

Co-authored-by: Danny Avila <danny@librechat.ai>
---
 .../Chat/Menus/Endpoints/CustomMenu.tsx       |  2 +-
 .../Chat/Messages/Content/DialogImage.tsx     | 18 ++++++------
 .../Parts/OpenAIImageGen/OpenAIImageGen.tsx   | 11 --------
 .../src/components/Chat/Messages/Feedback.tsx | 18 ++++--------
 client/src/components/Chat/Messages/Fork.tsx  |  8 ++----
 .../components/Chat/Messages/HoverButtons.tsx | 14 ++--------
 .../SidePanel/Agents/ActionsPanel.tsx         |  2 +-
 client/src/locales/en/translation.json        |  3 +-
 client/src/style.css                          | 28 +++++++++----------
 9 files changed, 38 insertions(+), 66 deletions(-)

diff --git a/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx b/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx
index d466698938..3563ae0a7b 100644
--- a/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx
@@ -159,7 +159,7 @@ export const CustomMenuItem = React.forwardRef<HTMLDivElement, CustomMenuItemPro
       blurOnHoverEnd: false,
       ...props,
       className: cn(
-        'flex cursor-default items-center gap-2 rounded-lg p-2 outline-none! scroll-m-1 scroll-mt-[calc(var(--combobox-height,0px)+var(--label-height,4px))] aria-disabled:opacity-25 border-l-2 border-transparent data-[active-item]:border-black data-[active-item]:rounded-l-none data-[active-item]:bg-black/[0.075] data-[active-item]:text-black dark:data-[active-item]:bg-white/10 dark:data-[active-item]:text-white dark:data-[active-item]:border-white sm:py-1 sm:text-sm min-w-0 w-full',
+        'relative flex cursor-default items-center gap-2 rounded-lg p-2 outline-none! scroll-m-1 scroll-mt-[calc(var(--combobox-height,0px)+var(--label-height,4px))] aria-disabled:opacity-25 data-[active-item]:bg-black/[0.075] data-[active-item]:text-black dark:data-[active-item]:bg-white/10 dark:data-[active-item]:text-white sm:py-1 sm:text-sm min-w-0 w-full before:absolute before:left-0 before:top-1 before:bottom-1 before:w-0.5 before:bg-transparent before:rounded-full data-[active-item]:before:bg-black dark:data-[active-item]:before:bg-white',
         props.className,
       ),
     };
diff --git a/client/src/components/Chat/Messages/Content/DialogImage.tsx b/client/src/components/Chat/Messages/Content/DialogImage.tsx
index d41f482eb0..907902f4ed 100644
--- a/client/src/components/Chat/Messages/Content/DialogImage.tsx
+++ b/client/src/components/Chat/Messages/Content/DialogImage.tsx
@@ -68,7 +68,7 @@ export default function DialogImage({ isOpen, onOpenChange, src = '', downloadIm
           />
           <div className="flex items-center gap-2">
             <TooltipAnchor
-              description={localize('com_ui_save')}
+              description={localize('com_ui_download')}
               render={
                 <Button onClick={() => downloadImage()} variant="ghost" className="h-10 w-10 p-0">
                   <ArrowDownToLine className="size-6" />
@@ -108,7 +108,7 @@ export default function DialogImage({ isOpen, onOpenChange, src = '', downloadIm
               alt="Image"
               className="max-h-full max-w-full object-contain"
               style={{
-                maxHeight: 'calc(100vh - 6rem)', // Account for header and padding
+                maxHeight: 'calc(100vh - 6rem)',
                 maxWidth: '100%',
               }}
             />
@@ -117,7 +117,7 @@ export default function DialogImage({ isOpen, onOpenChange, src = '', downloadIm
 
         {/* Side Panel */}
         <div
-          className={`shadow-l-lg fixed right-0 top-0 z-20 h-full w-80 transform rounded-l-2xl border-l border-border-light bg-surface-secondary transition-transform duration-500 ease-in-out ${
+          className={`shadow-l-lg fixed right-0 top-0 z-20 h-full w-80 transform rounded-l-2xl border-l border-border-light bg-surface-primary transition-transform duration-500 ease-in-out ${
             isPromptOpen ? 'translate-x-0' : 'translate-x-full'
           }`}
         >
@@ -132,7 +132,7 @@ export default function DialogImage({ isOpen, onOpenChange, src = '', downloadIm
             <div className="space-y-6">
               {/* Prompt Section */}
               <div>
-                <h4 className="mb-2 text-sm font-medium text-text-secondary">
+                <h4 className="mb-2 text-sm font-medium text-text-primary">
                   {localize('com_ui_prompt')}
                 </h4>
                 <div className="rounded-md bg-surface-tertiary p-3">
@@ -144,20 +144,18 @@ export default function DialogImage({ isOpen, onOpenChange, src = '', downloadIm
 
               {/* Generation Settings */}
               <div>
-                <h4 className="mb-3 text-sm font-medium text-text-secondary">
+                <h4 className="mb-3 text-sm font-medium text-text-primary">
                   {localize('com_ui_generation_settings')}
                 </h4>
                 <div className="space-y-3">
                   <div className="flex items-center justify-between">
-                    <span className="text-sm text-text-secondary">{localize('com_ui_size')}:</span>
+                    <span className="text-sm text-text-primary">{localize('com_ui_size')}:</span>
                     <span className="text-sm font-medium text-text-primary">
                       {args?.size || 'Unknown'}
                     </span>
                   </div>
                   <div className="flex items-center justify-between">
-                    <span className="text-sm text-text-secondary">
-                      {localize('com_ui_quality')}:
-                    </span>
+                    <span className="text-sm text-text-primary">{localize('com_ui_quality')}:</span>
                     <span
                       className={`rounded px-2 py-1 text-xs font-medium capitalize ${
                         args?.quality === 'high'
@@ -171,7 +169,7 @@ export default function DialogImage({ isOpen, onOpenChange, src = '', downloadIm
                     </span>
                   </div>
                   <div className="flex items-center justify-between">
-                    <span className="text-sm text-text-secondary">
+                    <span className="text-sm text-text-primary">
                       {localize('com_ui_file_size')}:
                     </span>
                     <span className="text-sm font-medium text-text-primary">
diff --git a/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx b/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx
index e13e68312d..ef24c3553e 100644
--- a/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx
@@ -178,17 +178,6 @@ export default function OpenAIImageGen({
       <div className="relative my-2.5 flex size-5 shrink-0 items-center gap-2.5">
         <ProgressText progress={progress} error={cancelled} toolName={toolName} />
       </div>
-
-      {/* {showInfo && hasInfo && (
-              <ToolCallInfo
-                key="tool-call-info"
-                input={args ?? ''}
-                output={output}
-                function_name={function_name}
-                pendingAuth={authDomain.length > 0 && !cancelled && initialProgress < 1}
-              />
-            )} */}
-
       <div className="relative mb-2 flex w-full justify-start">
         <div ref={containerRef} className="w-full max-w-lg">
           {dimensions.width !== 'auto' && progress < 1 && (
diff --git a/client/src/components/Chat/Messages/Feedback.tsx b/client/src/components/Chat/Messages/Feedback.tsx
index cf7ccadbab..4879808d90 100644
--- a/client/src/components/Chat/Messages/Feedback.tsx
+++ b/client/src/components/Chat/Messages/Feedback.tsx
@@ -216,18 +216,12 @@ function FeedbackButtons({
 
 function buttonClasses(isActive: boolean, isLast: boolean) {
   return cn(
-    'hover-button rounded-lg p-1.5',
-    'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-black dark:focus-visible:ring-white',
-    'hover:bg-gray-100 hover:text-gray-500',
-    'data-[state=open]:active data-[state=open]:bg-gray-100 data-[state=open]:text-gray-500',
-    isActive ? 'text-gray-500 dark:text-gray-200 font-bold' : 'dark:text-gray-400/70',
-    'dark:hover:bg-gray-700 dark:hover:text-gray-200',
-    'data-[state=open]:dark:bg-gray-700 data-[state=open]:dark:text-gray-200',
-    'disabled:dark:hover:text-gray-400',
-    isLast
-      ? ''
-      : 'data-[state=open]:opacity-100 md:opacity-0 md:group-focus-within:opacity-100 md:group-hover:opacity-100',
-    'md:group-focus-within:visible md:group-hover:visible md:group-[.final-completion]:visible',
+    'hover-button rounded-lg p-1.5 text-text-secondary-alt transition-colors duration-200',
+    'hover:text-text-primary hover:bg-surface-hover',
+    'md:group-hover:visible md:group-focus-within:visible md:group-[.final-completion]:visible',
+    !isLast && 'md:opacity-0 md:group-hover:opacity-100 md:group-focus-within:opacity-100',
+    'focus-visible:ring-2 focus-visible:ring-black dark:focus-visible:ring-white focus-visible:outline-none',
+    isActive && 'active text-text-primary bg-surface-hover',
   );
 }
 
diff --git a/client/src/components/Chat/Messages/Fork.tsx b/client/src/components/Chat/Messages/Fork.tsx
index 5bc0bd8839..1cc319c3dd 100644
--- a/client/src/components/Chat/Messages/Fork.tsx
+++ b/client/src/components/Chat/Messages/Fork.tsx
@@ -211,14 +211,12 @@ export default function Fork({
   });
 
   const buttonStyle = cn(
-    'hover-button rounded-lg p-1.5',
-    'hover:bg-gray-100 hover:text-gray-500',
-    'dark:text-gray-400/70 dark:hover:bg-gray-700 dark:hover:text-gray-200',
-    'disabled:dark:hover:text-gray-400',
+    'hover-button rounded-lg p-1.5 text-text-secondary-alt transition-colors duration-200',
+    'hover:text-text-primary hover:bg-surface-hover',
     'md:group-hover:visible md:group-focus-within:visible md:group-[.final-completion]:visible',
     !isLast && 'md:opacity-0 md:group-hover:opacity-100 md:group-focus-within:opacity-100',
     'focus-visible:ring-2 focus-visible:ring-black dark:focus-visible:ring-white focus-visible:outline-none',
-    isActive && 'active text-gray-700 dark:text-gray-200 bg-gray-100 bg-gray-700',
+    isActive && 'active text-text-primary bg-surface-hover',
   );
 
   const forkConvo = useForkConvoMutation({
diff --git a/client/src/components/Chat/Messages/HoverButtons.tsx b/client/src/components/Chat/Messages/HoverButtons.tsx
index 5783540bb8..644852c0b4 100644
--- a/client/src/components/Chat/Messages/HoverButtons.tsx
+++ b/client/src/components/Chat/Messages/HoverButtons.tsx
@@ -77,21 +77,13 @@ const HoverButton = memo(
     className = '',
   }: HoverButtonProps) => {
     const buttonStyle = cn(
-      'hover-button rounded-lg p-1.5',
-
-      'hover:bg-gray-100 hover:text-gray-500',
-
-      'dark:text-gray-400/70 dark:hover:bg-gray-700 dark:hover:text-gray-200',
-      'disabled:dark:hover:text-gray-400',
-
+      'hover-button rounded-lg p-1.5 text-text-secondary-alt transition-colors duration-200',
+      'hover:text-text-primary hover:bg-surface-hover',
       'md:group-hover:visible md:group-focus-within:visible md:group-[.final-completion]:visible',
       !isLast && 'md:opacity-0 md:group-hover:opacity-100 md:group-focus-within:opacity-100',
       !isVisible && 'opacity-0',
-
       'focus-visible:ring-2 focus-visible:ring-black dark:focus-visible:ring-white focus-visible:outline-none',
-
-      isActive && isVisible && 'active text-gray-700 dark:text-gray-200 bg-gray-100 bg-gray-700',
-
+      isActive && isVisible && 'active text-text-primary bg-surface-hover',
       className,
     );
 
diff --git a/client/src/components/SidePanel/Agents/ActionsPanel.tsx b/client/src/components/SidePanel/Agents/ActionsPanel.tsx
index 514e1b61eb..0ae564b05a 100644
--- a/client/src/components/SidePanel/Agents/ActionsPanel.tsx
+++ b/client/src/components/SidePanel/Agents/ActionsPanel.tsx
@@ -128,7 +128,7 @@ export default function ActionsPanel({
                     selectHandler: () => {
                       if (!agent_id) {
                         return showToast({
-                          message: 'No agent_id found, is the agent created?',
+                          message: localize('com_agents_no_agent_id_error'),
                           status: 'error',
                         });
                       }
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index 52c190f1f8..284117ffe4 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -20,6 +20,7 @@
   "com_agents_missing_provider_model": "Please select a provider and model before creating an agent.",
   "com_agents_name_placeholder": "Optional: The name of the agent",
   "com_agents_no_access": "You don't have access to edit this agent.",
+  "com_agents_no_agent_id_error": "No agent ID found. Please ensure the agent is created first.",
   "com_agents_not_available": "Agent Not Available",
   "com_agents_search_info": "When enabled, allows your agent to search the web for up-to-date information. Requires a valid API key.",
   "com_agents_search_name": "Search agents by name",
@@ -970,4 +971,4 @@
   "com_ui_zoom": "Zoom",
   "com_user_message": "You",
   "com_warning_resubmit_unsupported": "Resubmitting the AI message is not supported for this endpoint."
-}
\ No newline at end of file
+}
diff --git a/client/src/style.css b/client/src/style.css
index a91b1b49d2..438f197a55 100644
--- a/client/src/style.css
+++ b/client/src/style.css
@@ -2720,6 +2720,20 @@ html {
 .shimmer {
   display: inline-block;
   position: relative;
+  background: linear-gradient(
+    90deg,
+    rgb(33, 33, 33) 25%,
+    rgba(129, 130, 134, 0.18) 50%,
+    rgb(33, 33, 33) 75%
+  );
+  background-size: 200% 100%;
+  background-clip: text;
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+  animation: shimmer 4s linear infinite;
+}
+
+.dark .shimmer {
   background: linear-gradient(
     90deg,
     rgba(255, 255, 255, 0.8) 25%,
@@ -2733,20 +2747,6 @@ html {
   animation: shimmer 4s linear infinite;
 }
 
-:global(.dark) .shimmer {
-  background: linear-gradient(
-    90deg,
-    rgba(255, 255, 255) 25%,
-    rgba(129, 130, 134, 0.18) 50%,
-    rgb(255, 255, 255) 75%
-  );
-  background-size: 200% 100%;
-  background-clip: text;
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-  animation: shimmer 4s linear infinite;
-}
-
 .custom-style-2 {
   padding: 12px;
 }

From 29ef91b4dd53d500c7d5536e37ad6072514099fc Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Sat, 7 Jun 2025 18:52:22 -0400
Subject: [PATCH 15/49] =?UTF-8?q?=F0=9F=A7=A0=20feat:=20User=20Memories=20?=
 =?UTF-8?q?for=20Conversational=20Context=20(#7760)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🧠 feat: User Memories for Conversational Context

chore: mcp typing, use `t`

WIP: first pass, Memories UI

- Added MemoryViewer component for displaying, editing, and deleting user memories.
- Integrated data provider hooks for fetching, updating, and deleting memories.
- Implemented pagination and loading states for better user experience.
- Created unit tests for MemoryViewer to ensure functionality and interaction with data provider.
- Updated translation files to include new UI strings related to memories.

chore: move mcp-related files to own directory

chore: rename librechat-mcp to librechat-api

WIP: first pass, memory processing and data schemas

chore: linting in fileSearch.js query description

chore: rename librechat-api to @librechat/api across the project

WIP: first pass, functional memory agent

feat: add MemoryEditDialog and MemoryViewer components for managing user memories

- Introduced MemoryEditDialog for editing memory entries with validation and toast notifications.
- Updated MemoryViewer to support editing and deleting memories, including pagination and loading states.
- Enhanced data provider to handle memory updates with optional original key for better management.
- Added new localization strings for memory-related UI elements.

feat: add memory permissions management

- Implemented memory permissions in the backend, allowing roles to have specific permissions for using, creating, updating, and reading memories.
- Added new API endpoints for updating memory permissions associated with roles.
- Created a new AdminSettings component for managing memory permissions in the frontend.
- Integrated memory permissions into the existing roles and permissions schemas.
- Updated the interface to include memory settings and permissions.
- Enhanced the MemoryViewer component to conditionally render admin settings based on user roles.
- Added localization support for memory permissions in the translation files.

feat: move AdminSettings component to a new position in MemoryViewer for better visibility

refactor: clean up commented code in MemoryViewer component

feat: enhance MemoryViewer with search functionality and improve MemoryEditDialog integration

- Added a search input to filter memories in the MemoryViewer component.
- Refactored MemoryEditDialog to accept children for better customization.
- Updated MemoryViewer to utilize the new EditMemoryButton and DeleteMemoryButton components for editing and deleting memories.
- Improved localization support by adding new strings for memory filtering and deletion confirmation.

refactor: optimize memory filtering in MemoryViewer using match-sorter

- Replaced manual filtering logic with match-sorter for improved search functionality.
- Enhanced performance and readability of the filteredMemories computation.

feat: enhance MemoryEditDialog with triggerRef and improve updateMemory mutation handling

feat: implement access control for MemoryEditDialog and MemoryViewer components

refactor: remove commented out code and create runMemory method

refactor: rename role based files

feat: implement access control for memory usage in AgentClient

refactor: simplify checkVisionRequest method in AgentClient by removing commented-out code

refactor: make `agents` dir in api package

refactor: migrate Azure utilities to TypeScript and consolidate imports

refactor: move sanitizeFilename function to a new file and update imports, add related tests

refactor: update LLM configuration types and consolidate Azure options in the API package

chore: linting

chore: import order

refactor: replace getLLMConfig with getOpenAIConfig and remove unused LLM configuration file

chore: update winston-daily-rotate-file to version 5.0.0 and add object-hash dependency in package-lock.json

refactor: move primeResources and optionalChainWithEmptyCheck functions to resources.ts and update imports

refactor: move createRun function to a new run.ts file and update related imports

fix: ensure safeAttachments is correctly typed as an array of TFile

chore: add node-fetch dependency and refactor fetch-related functions into packages/api/utils, removing the old generators file

refactor: enhance TEndpointOption type by using Pick to streamline endpoint fields and add new properties for model parameters and client options

feat: implement initializeOpenAIOptions function and update OpenAI types for enhanced configuration handling

fix: update types due to new TEndpointOption typing

fix: ensure safe access to group parameters in initializeOpenAIOptions function

fix: remove redundant API key validation comment in initializeOpenAIOptions function

refactor: rename initializeOpenAIOptions to initializeOpenAI for consistency and update related documentation

refactor: decouple req.body fields and tool loading from initializeAgentOptions

chore: linting

refactor: adjust column widths in MemoryViewer for improved layout

refactor: simplify agent initialization by creating loadAgent function and removing unused code

feat: add memory configuration loading and validation functions

WIP: first pass, memory processing with config

feat: implement memory callback and artifact handling

feat: implement memory artifacts display and processing updates

feat: add memory configuration options and schema validation for validKeys

fix: update MemoryEditDialog and MemoryViewer to handle memory state and display improvements

refactor: remove padding from BookmarkTable and MemoryViewer headers for consistent styling

WIP: initial tokenLimit config and move Tokenizer to @librechat/api

refactor: update mongoMeili plugin methods to use callback for better error handling

feat: enhance memory management with token tracking and usage metrics

- Added token counting for memory entries to enforce limits and provide usage statistics.
- Updated memory retrieval and update routes to include total token usage and limit.
- Enhanced MemoryEditDialog and MemoryViewer components to display memory usage and token information.
- Refactored memory processing functions to handle token limits and provide feedback on memory capacity.

feat: implement memory artifact handling in attachment handler

- Enhanced useAttachmentHandler to process memory artifacts when receiving updates.
- Introduced handleMemoryArtifact utility to manage memory updates and deletions.
- Updated query client to reflect changes in memory state based on incoming data.

refactor: restructure web search key extraction logic

- Moved the logic for extracting API keys from the webSearchAuth configuration into a dedicated function, getWebSearchKeys.
- Updated webSearchKeys to utilize the new function for improved clarity and maintainability.
- Prevents build time errors

feat: add personalization settings and memory preferences management

- Introduced a new Personalization tab in settings to manage user memory preferences.
- Implemented API endpoints and client-side logic for updating memory preferences.
- Enhanced user interface components to reflect personalization options and memory usage.
- Updated permissions to allow users to opt out of memory features.
- Added localization support for new settings and messages related to personalization.

style: personalization switch class

feat: add PersonalizationIcon and align Side Panel UI

feat: implement memory creation functionality

- Added a new API endpoint for creating memory entries, including validation for key and value.
- Introduced MemoryCreateDialog component for user interface to facilitate memory creation.
- Integrated token limit checks to prevent exceeding user memory capacity.
- Updated MemoryViewer to include a button for opening the memory creation dialog.
- Enhanced localization support for new messages related to memory creation.

feat: enhance message processing with configurable window size

- Updated AgentClient to use a configurable message window size for processing messages.
- Introduced messageWindowSize option in memory configuration schema with a default value of 5.
- Improved logic for selecting messages to process based on the configured window size.

chore: update librechat-data-provider version to 0.7.87 in package.json and package-lock.json

chore: remove OpenAPIPlugin and its associated tests

chore: remove MIGRATION_README.md as migration tasks are completed

ci: fix backend tests

chore: remove unused translation keys from localization file

chore: remove problematic test file and unused var in AgentClient

chore: remove unused import and import directly for JSDoc

* feat: add api package build stage in Dockerfile for improved modularity

* docs: reorder build steps in contributing guide for clarity
---
 .github/CONTRIBUTING.md                       |   4 +-
 .github/workflows/backend-review.yml          |  11 +-
 Dockerfile.multi                              |  23 +-
 api/app/clients/AnthropicClient.js            |   3 +-
 api/app/clients/ChatGPTClient.js              |   3 +-
 api/app/clients/GoogleClient.js               |   2 +-
 api/app/clients/OpenAIClient.js               |  20 +-
 api/app/clients/generators.js                 |  71 --
 api/app/clients/llm/createLLM.js              |   3 +-
 api/app/clients/specs/BaseClient.test.js      |   2 +
 .../clients/tools/dynamic/OpenAPIPlugin.js    | 184 -----
 .../tools/dynamic/OpenAPIPlugin.spec.js       |  72 --
 api/app/clients/tools/structured/DALLE3.js    |   4 +-
 .../tools/structured/specs/DALLE3.spec.js     |  28 +-
 api/app/clients/tools/util/fileSearch.js      |   2 +-
 api/config/index.js                           |   4 +-
 api/package.json                              |   5 +-
 api/server/cleanup.js                         |   3 +
 api/server/controllers/agents/callbacks.js    |   5 +-
 api/server/controllers/agents/client.js       | 357 ++++-----
 api/server/controllers/agents/run.js          |  94 ---
 api/server/index.js                           |   2 +-
 .../{generateCheckAccess.js => access.js}     |   0
 .../roles/{checkAdmin.js => admin.js}         |   0
 api/server/middleware/roles/index.js          |   4 +-
 api/server/routes/files/multer.js             |   2 +-
 api/server/routes/index.js                    |   2 +
 api/server/routes/memories.js                 | 231 ++++++
 api/server/routes/roles.js                    |  40 +
 api/server/services/ActionService.js          |   4 +-
 api/server/services/AppService.js             |   3 +
 api/server/services/Endpoints/agents/agent.js | 196 +++++
 .../services/Endpoints/agents/initialize.js   | 327 ++------
 .../Endpoints/azureAssistants/initialize.js   |   3 +-
 .../services/Endpoints/bedrock/options.js     |   2 +-
 .../services/Endpoints/custom/initialize.js   |   5 +-
 .../Endpoints/gptPlugins/initialize.js        |   5 +-
 .../Endpoints/gptPlugins/initialize.spec.js   |  10 +-
 .../services/Endpoints/openAI/initialize.js   |  13 +-
 api/server/services/Endpoints/openAI/llm.js   | 170 -----
 api/server/services/Files/Audio/STTService.js |   2 +-
 api/server/services/Files/Audio/TTSService.js |   2 +-
 api/server/services/MCP.js                    |   2 +-
 api/server/services/start/interface.js        |  18 +
 api/server/services/start/interface.spec.js   |  20 +
 api/server/utils/handleText.js                |  35 -
 api/server/utils/handleText.spec.js           | 103 ---
 api/typedefs.js                               |  14 +-
 api/utils/index.js                            |   2 -
 .../Chat/Messages/Content/ContentParts.tsx    |   3 +
 .../Chat/Messages/Content/MemoryArtifacts.tsx | 143 ++++
 .../Chat/Messages/Content/MemoryInfo.tsx      |  61 ++
 client/src/components/Nav/Settings.tsx        |  49 +-
 .../Nav/SettingsTabs/Personalization.tsx      |  87 +++
 .../src/components/Nav/SettingsTabs/index.ts  |   1 +
 .../Prompts/Groups/FilterPrompts.tsx          |  10 +-
 .../Prompts/Groups/GroupSidePanel.tsx         |  20 +-
 .../Prompts/Groups/PanelNavigation.tsx        |  14 +-
 .../components/Prompts/PromptsAccordion.tsx   |   8 +-
 .../SidePanel/Bookmarks/BookmarkTable.tsx     |   6 +-
 .../SidePanel/Memories/AdminSettings.tsx      | 212 ++++++
 .../SidePanel/Memories/MemoryCreateDialog.tsx | 147 ++++
 .../SidePanel/Memories/MemoryEditDialog.tsx   | 179 +++++
 .../SidePanel/Memories/MemoryViewer.tsx       | 428 +++++++++++
 .../components/SidePanel/Memories/index.ts    |   2 +
 .../components/svg/PersonalizationIcon.tsx    |  19 +
 client/src/components/svg/index.ts            |   1 +
 client/src/components/ui/OriginalDialog.tsx   |   2 +-
 client/src/components/ui/Table.tsx            |   8 +-
 client/src/data-provider/Memories/index.ts    |   2 +
 client/src/data-provider/Memories/queries.ts  | 116 +++
 .../data-provider/__tests__/memories.test.ts  |  19 +
 client/src/data-provider/index.ts             |   2 +
 client/src/data-provider/roles.ts             |  45 +-
 client/src/hooks/Nav/useSideNavLinks.ts       |  23 +-
 client/src/hooks/SSE/useAttachmentHandler.ts  |  17 +-
 client/src/hooks/usePersonalizationAccess.ts  |  16 +
 client/src/locales/en/translation.json        |  39 +-
 client/src/utils/memory.ts                    |  90 +++
 config/packages.js                            |   4 +-
 config/update.js                              |   8 +-
 eslint.config.mjs                             |  12 +-
 librechat.example.yaml                        |  22 +
 package-lock.json                             | 381 +++++-----
 package.json                                  |   6 +-
 packages/{mcp => api}/.gitignore              |   0
 packages/{mcp => api}/babel.config.cjs        |   0
 packages/{mcp => api}/jest.config.mjs         |   0
 packages/{mcp => api}/package.json            |  17 +-
 packages/{mcp => api}/rollup.config.js        |   0
 packages/api/src/agents/index.ts              |   3 +
 packages/api/src/agents/memory.ts             | 468 ++++++++++++
 packages/api/src/agents/resources.test.ts     | 543 ++++++++++++++
 packages/api/src/agents/resources.ts          | 114 +++
 packages/api/src/agents/run.ts                |  90 +++
 packages/api/src/endpoints/index.ts           |   1 +
 packages/api/src/endpoints/openai/index.ts    |   2 +
 .../api/src/endpoints/openai/initialize.ts    | 176 +++++
 packages/api/src/endpoints/openai/llm.ts      | 156 ++++
 .../{mcp => api}/src/flow/manager.spec.ts     |   0
 packages/{mcp => api}/src/flow/manager.ts     |   0
 packages/{mcp => api}/src/flow/types.ts       |   0
 packages/api/src/index.ts                     |  14 +
 .../{mcp/src => api/src/mcp}/connection.ts    |   4 +-
 packages/{mcp/src => api/src/mcp}/enum.ts     |   0
 packages/{mcp/src => api/src/mcp}/manager.ts  |   2 +-
 packages/{mcp/src => api/src/mcp}/parsers.ts  |   2 +-
 .../mcp.ts => api/src/mcp/types/index.ts}     |   5 +-
 .../{mcp/src => api/src/mcp}/utils.test.ts    |   0
 packages/{mcp/src => api/src/mcp}/utils.ts    |   0
 packages/api/src/types/azure.ts               |  19 +
 packages/api/src/types/events.ts              |   4 +
 packages/api/src/types/index.ts               |   4 +
 packages/api/src/types/openai.ts              |  97 +++
 packages/api/src/types/run.ts                 |  10 +
 .../api/src/utils/azure.spec.ts               |  15 +-
 .../api/src/utils/azure.ts                    |  99 +--
 packages/api/src/utils/common.spec.ts         |  55 ++
 packages/api/src/utils/common.ts              |  48 ++
 packages/api/src/utils/events.ts              |  16 +
 packages/api/src/utils/files.spec.ts          | 115 +++
 packages/api/src/utils/files.ts               |  33 +
 packages/api/src/utils/generators.ts          |  75 ++
 packages/api/src/utils/index.ts               |   5 +
 .../api/src/utils/tokenizer.spec.ts           |  21 +-
 .../api/src/utils/tokenizer.ts                |  34 +-
 .../{mcp => api}/tsconfig-paths-bootstrap.mjs |   0
 packages/{mcp => api}/tsconfig.json           |   5 +-
 packages/{mcp => api}/tsconfig.spec.json      |   0
 packages/data-provider/package.json           |   2 +-
 packages/data-provider/src/api-endpoints.ts   |   6 +
 packages/data-provider/src/config.ts          |  30 +
 packages/data-provider/src/createPayload.ts   |   5 +-
 packages/data-provider/src/data-service.ts    |  36 +
 packages/data-provider/src/index.ts           |   2 +
 packages/data-provider/src/keys.ts            |   3 +
 packages/data-provider/src/memory.ts          |  62 ++
 packages/data-provider/src/parsers.ts         |   4 +-
 packages/data-provider/src/permissions.ts     |  16 +
 packages/data-provider/src/roles.ts           |  16 +
 packages/data-provider/src/schemas.ts         |   8 +
 packages/data-provider/src/types.ts           |  98 ++-
 .../data-provider/src/types/assistants.ts     |   1 +
 packages/data-provider/src/types/mutations.ts |   9 +-
 packages/data-provider/src/types/queries.ts   |  15 +
 packages/data-provider/src/web.ts             |  28 +-
 packages/data-schemas/README.md               | 114 ---
 packages/data-schemas/src/index.ts            |   1 +
 packages/data-schemas/src/methods/index.ts    |   6 +-
 packages/data-schemas/src/methods/memory.ts   | 168 +++++
 packages/data-schemas/src/methods/user.ts     |  30 +
 packages/data-schemas/src/models/index.ts     |   2 +
 packages/data-schemas/src/models/memory.ts    |   6 +
 .../src/models/plugins/mongoMeili.ts          | 125 +++-
 packages/data-schemas/src/schema/index.ts     |   1 +
 packages/data-schemas/src/schema/memory.ts    |  33 +
 packages/data-schemas/src/schema/role.ts      |  13 +
 packages/data-schemas/src/schema/user.ts      |   9 +
 packages/data-schemas/src/types/index.ts      |   5 +
 packages/data-schemas/src/types/memory.ts     |  48 ++
 packages/data-schemas/src/types/role.ts       |   6 +
 packages/data-schemas/src/types/user.ts       |   3 +
 packages/mcp/src/demo/everything.ts           | 231 ------
 packages/mcp/src/demo/filesystem.ts           | 211 ------
 packages/mcp/src/demo/servers.ts              | 226 ------
 .../mcp/src/examples/everything/everything.ts | 426 -----------
 packages/mcp/src/examples/everything/index.ts |  23 -
 packages/mcp/src/examples/everything/sse.ts   |  24 -
 packages/mcp/src/examples/filesystem.ts       | 700 ------------------
 packages/mcp/src/index.ts                     |   9 -
 170 files changed, 5700 insertions(+), 3632 deletions(-)
 delete mode 100644 api/app/clients/generators.js
 delete mode 100644 api/app/clients/tools/dynamic/OpenAPIPlugin.js
 delete mode 100644 api/app/clients/tools/dynamic/OpenAPIPlugin.spec.js
 delete mode 100644 api/server/controllers/agents/run.js
 rename api/server/middleware/roles/{generateCheckAccess.js => access.js} (100%)
 rename api/server/middleware/roles/{checkAdmin.js => admin.js} (100%)
 create mode 100644 api/server/routes/memories.js
 create mode 100644 api/server/services/Endpoints/agents/agent.js
 delete mode 100644 api/server/services/Endpoints/openAI/llm.js
 delete mode 100644 api/server/utils/handleText.spec.js
 create mode 100644 client/src/components/Chat/Messages/Content/MemoryArtifacts.tsx
 create mode 100644 client/src/components/Chat/Messages/Content/MemoryInfo.tsx
 create mode 100644 client/src/components/Nav/SettingsTabs/Personalization.tsx
 create mode 100644 client/src/components/SidePanel/Memories/AdminSettings.tsx
 create mode 100644 client/src/components/SidePanel/Memories/MemoryCreateDialog.tsx
 create mode 100644 client/src/components/SidePanel/Memories/MemoryEditDialog.tsx
 create mode 100644 client/src/components/SidePanel/Memories/MemoryViewer.tsx
 create mode 100644 client/src/components/SidePanel/Memories/index.ts
 create mode 100644 client/src/components/svg/PersonalizationIcon.tsx
 create mode 100644 client/src/data-provider/Memories/index.ts
 create mode 100644 client/src/data-provider/Memories/queries.ts
 create mode 100644 client/src/data-provider/__tests__/memories.test.ts
 create mode 100644 client/src/hooks/usePersonalizationAccess.ts
 create mode 100644 client/src/utils/memory.ts
 rename packages/{mcp => api}/.gitignore (100%)
 rename packages/{mcp => api}/babel.config.cjs (100%)
 rename packages/{mcp => api}/jest.config.mjs (100%)
 rename packages/{mcp => api}/package.json (90%)
 rename packages/{mcp => api}/rollup.config.js (100%)
 create mode 100644 packages/api/src/agents/index.ts
 create mode 100644 packages/api/src/agents/memory.ts
 create mode 100644 packages/api/src/agents/resources.test.ts
 create mode 100644 packages/api/src/agents/resources.ts
 create mode 100644 packages/api/src/agents/run.ts
 create mode 100644 packages/api/src/endpoints/index.ts
 create mode 100644 packages/api/src/endpoints/openai/index.ts
 create mode 100644 packages/api/src/endpoints/openai/initialize.ts
 create mode 100644 packages/api/src/endpoints/openai/llm.ts
 rename packages/{mcp => api}/src/flow/manager.spec.ts (100%)
 rename packages/{mcp => api}/src/flow/manager.ts (100%)
 rename packages/{mcp => api}/src/flow/types.ts (100%)
 create mode 100644 packages/api/src/index.ts
 rename packages/{mcp/src => api/src/mcp}/connection.ts (99%)
 rename packages/{mcp/src => api/src/mcp}/enum.ts (100%)
 rename packages/{mcp/src => api/src/mcp}/manager.ts (99%)
 rename packages/{mcp/src => api/src/mcp}/parsers.ts (99%)
 rename packages/{mcp/src/types/mcp.ts => api/src/mcp/types/index.ts} (92%)
 rename packages/{mcp/src => api/src/mcp}/utils.test.ts (100%)
 rename packages/{mcp/src => api/src/mcp}/utils.ts (100%)
 create mode 100644 packages/api/src/types/azure.ts
 create mode 100644 packages/api/src/types/events.ts
 create mode 100644 packages/api/src/types/index.ts
 create mode 100644 packages/api/src/types/openai.ts
 create mode 100644 packages/api/src/types/run.ts
 rename api/utils/azureUtils.spec.js => packages/api/src/utils/azure.spec.ts (97%)
 rename api/utils/azureUtils.js => packages/api/src/utils/azure.ts (50%)
 create mode 100644 packages/api/src/utils/common.spec.ts
 create mode 100644 packages/api/src/utils/common.ts
 create mode 100644 packages/api/src/utils/events.ts
 create mode 100644 packages/api/src/utils/files.spec.ts
 create mode 100644 packages/api/src/utils/files.ts
 create mode 100644 packages/api/src/utils/generators.ts
 create mode 100644 packages/api/src/utils/index.ts
 rename api/server/services/Tokenizer.spec.js => packages/api/src/utils/tokenizer.spec.ts (90%)
 rename api/server/services/Tokenizer.js => packages/api/src/utils/tokenizer.ts (56%)
 rename packages/{mcp => api}/tsconfig-paths-bootstrap.mjs (100%)
 rename packages/{mcp => api}/tsconfig.json (92%)
 rename packages/{mcp => api}/tsconfig.spec.json (100%)
 create mode 100644 packages/data-provider/src/memory.ts
 delete mode 100644 packages/data-schemas/README.md
 create mode 100644 packages/data-schemas/src/methods/memory.ts
 create mode 100644 packages/data-schemas/src/models/memory.ts
 create mode 100644 packages/data-schemas/src/schema/memory.ts
 create mode 100644 packages/data-schemas/src/types/memory.ts
 delete mode 100644 packages/mcp/src/demo/everything.ts
 delete mode 100644 packages/mcp/src/demo/filesystem.ts
 delete mode 100644 packages/mcp/src/demo/servers.ts
 delete mode 100644 packages/mcp/src/examples/everything/everything.ts
 delete mode 100644 packages/mcp/src/examples/everything/index.ts
 delete mode 100644 packages/mcp/src/examples/everything/sse.ts
 delete mode 100644 packages/mcp/src/examples/filesystem.ts
 delete mode 100644 packages/mcp/src/index.ts

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 09444a1b44..207aa17e66 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -30,8 +30,8 @@ Project maintainers have the right and responsibility to remove, edit, or reject
 2. Install typescript globally: `npm i -g typescript`.
 3. Run `npm ci` to install dependencies.
 4. Build the data provider: `npm run build:data-provider`.
-5. Build MCP: `npm run build:mcp`.
-6. Build data schemas: `npm run build:data-schemas`.
+5. Build data schemas: `npm run build:data-schemas`.
+6. Build API methods: `npm run build:api`.
 7. Setup and run unit tests:
     - Copy `.env.test`: `cp api/test/.env.test.example api/test/.env.test`.
     - Run backend unit tests: `npm run test:api`.
diff --git a/.github/workflows/backend-review.yml b/.github/workflows/backend-review.yml
index b7bccecae8..0c593eac18 100644
--- a/.github/workflows/backend-review.yml
+++ b/.github/workflows/backend-review.yml
@@ -7,6 +7,7 @@ on:
       - release/*
     paths:
       - 'api/**'
+      - 'packages/api/**'
 jobs:
   tests_Backend:
     name: Run Backend unit tests
@@ -36,12 +37,12 @@ jobs:
       - name: Install Data Provider Package
         run: npm run build:data-provider
 
-      - name: Install MCP Package
-        run: npm run build:mcp
-
       - name: Install Data Schemas Package
         run: npm run build:data-schemas
 
+      - name: Install API Package
+        run: npm run build:api
+
       - name: Create empty auth.json file
         run: |
           mkdir -p api/data
@@ -66,5 +67,5 @@ jobs:
       - name: Run librechat-data-provider unit tests
         run: cd packages/data-provider && npm run test:ci
 
-      - name: Run librechat-mcp unit tests
-        run: cd packages/mcp && npm run test:ci
\ No newline at end of file
+      - name: Run librechat-api unit tests
+        run: cd packages/api && npm run test:ci
\ No newline at end of file
diff --git a/Dockerfile.multi b/Dockerfile.multi
index 991f805bec..26c5705376 100644
--- a/Dockerfile.multi
+++ b/Dockerfile.multi
@@ -14,7 +14,7 @@ RUN npm config set fetch-retry-maxtimeout 600000 && \
     npm config set fetch-retry-mintimeout 15000
 COPY package*.json ./
 COPY packages/data-provider/package*.json ./packages/data-provider/
-COPY packages/mcp/package*.json ./packages/mcp/
+COPY packages/api/package*.json ./packages/api/
 COPY packages/data-schemas/package*.json ./packages/data-schemas/
 COPY client/package*.json ./client/
 COPY api/package*.json ./api/
@@ -24,26 +24,27 @@ FROM base-min AS base
 WORKDIR /app
 RUN npm ci
 
-# Build data-provider
+# Build `data-provider` package
 FROM base AS data-provider-build
 WORKDIR /app/packages/data-provider
 COPY packages/data-provider ./
 RUN npm run build
 
-# Build mcp package
-FROM base AS mcp-build
-WORKDIR /app/packages/mcp
-COPY packages/mcp ./
-COPY --from=data-provider-build /app/packages/data-provider/dist /app/packages/data-provider/dist
-RUN npm run build
-
-# Build data-schemas
+# Build `data-schemas` package
 FROM base AS data-schemas-build
 WORKDIR /app/packages/data-schemas
 COPY packages/data-schemas ./
 COPY --from=data-provider-build /app/packages/data-provider/dist /app/packages/data-provider/dist
 RUN npm run build
 
+# Build `api` package
+FROM base AS api-build
+WORKDIR /app/packages/api
+COPY packages/api ./
+COPY --from=data-provider-build /app/packages/data-provider/dist /app/packages/data-provider/dist
+COPY --from=data-schemas-build /app/packages/data-schemas/dist /app/packages/data-schemas/dist
+RUN npm run build
+
 # Client build
 FROM base AS client-build
 WORKDIR /app/client
@@ -63,8 +64,8 @@ RUN npm ci --omit=dev
 COPY api ./api
 COPY config ./config
 COPY --from=data-provider-build /app/packages/data-provider/dist ./packages/data-provider/dist
-COPY --from=mcp-build /app/packages/mcp/dist ./packages/mcp/dist
 COPY --from=data-schemas-build /app/packages/data-schemas/dist ./packages/data-schemas/dist
+COPY --from=api-build /app/packages/api/dist ./packages/api/dist
 COPY --from=client-build /app/client/dist ./client/dist
 WORKDIR /app/api
 EXPOSE 3080
diff --git a/api/app/clients/AnthropicClient.js b/api/app/clients/AnthropicClient.js
index 0da331ced5..037f1e7c46 100644
--- a/api/app/clients/AnthropicClient.js
+++ b/api/app/clients/AnthropicClient.js
@@ -10,6 +10,7 @@ const {
   validateVisionModel,
 } = require('librechat-data-provider');
 const { SplitStreamHandler: _Handler } = require('@librechat/agents');
+const { Tokenizer, createFetch, createStreamEventHandlers } = require('@librechat/api');
 const {
   truncateText,
   formatMessage,
@@ -26,8 +27,6 @@ const {
 const { getModelMaxTokens, getModelMaxOutputTokens, matchModelName } = require('~/utils');
 const { spendTokens, spendStructuredTokens } = require('~/models/spendTokens');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
-const { createFetch, createStreamEventHandlers } = require('./generators');
-const Tokenizer = require('~/server/services/Tokenizer');
 const { sleep } = require('~/server/utils');
 const BaseClient = require('./BaseClient');
 const { logger } = require('~/config');
diff --git a/api/app/clients/ChatGPTClient.js b/api/app/clients/ChatGPTClient.js
index 36a3f4936a..555028dc3f 100644
--- a/api/app/clients/ChatGPTClient.js
+++ b/api/app/clients/ChatGPTClient.js
@@ -2,6 +2,7 @@ const { Keyv } = require('keyv');
 const crypto = require('crypto');
 const { CohereClient } = require('cohere-ai');
 const { fetchEventSource } = require('@waylaidwanderer/fetch-event-source');
+const { constructAzureURL, genAzureChatCompletion } = require('@librechat/api');
 const { encoding_for_model: encodingForModel, get_encoding: getEncoding } = require('tiktoken');
 const {
   ImageDetail,
@@ -10,9 +11,9 @@ const {
   CohereConstants,
   mapModelToAzureConfig,
 } = require('librechat-data-provider');
-const { extractBaseURL, constructAzureURL, genAzureChatCompletion } = require('~/utils');
 const { createContextHandlers } = require('./prompts');
 const { createCoherePayload } = require('./llm');
+const { extractBaseURL } = require('~/utils');
 const BaseClient = require('./BaseClient');
 const { logger } = require('~/config');
 
diff --git a/api/app/clients/GoogleClient.js b/api/app/clients/GoogleClient.js
index 4151e6663a..2ded0657c7 100644
--- a/api/app/clients/GoogleClient.js
+++ b/api/app/clients/GoogleClient.js
@@ -1,4 +1,5 @@
 const { google } = require('googleapis');
+const { Tokenizer } = require('@librechat/api');
 const { concat } = require('@langchain/core/utils/stream');
 const { ChatVertexAI } = require('@langchain/google-vertexai');
 const { ChatGoogleGenerativeAI } = require('@langchain/google-genai');
@@ -19,7 +20,6 @@ const {
 } = require('librechat-data-provider');
 const { getSafetySettings } = require('~/server/services/Endpoints/google/llm');
 const { encodeAndFormat } = require('~/server/services/Files/images');
-const Tokenizer = require('~/server/services/Tokenizer');
 const { spendTokens } = require('~/models/spendTokens');
 const { getModelMaxTokens } = require('~/utils');
 const { sleep } = require('~/server/utils');
diff --git a/api/app/clients/OpenAIClient.js b/api/app/clients/OpenAIClient.js
index 280db89284..f3a7e67c12 100644
--- a/api/app/clients/OpenAIClient.js
+++ b/api/app/clients/OpenAIClient.js
@@ -1,6 +1,14 @@
 const { OllamaClient } = require('./OllamaClient');
 const { HttpsProxyAgent } = require('https-proxy-agent');
 const { SplitStreamHandler, CustomOpenAIClient: OpenAI } = require('@librechat/agents');
+const {
+  isEnabled,
+  Tokenizer,
+  createFetch,
+  constructAzureURL,
+  genAzureChatCompletion,
+  createStreamEventHandlers,
+} = require('@librechat/api');
 const {
   Constants,
   ImageDetail,
@@ -16,13 +24,6 @@ const {
   validateVisionModel,
   mapModelToAzureConfig,
 } = require('librechat-data-provider');
-const {
-  extractBaseURL,
-  constructAzureURL,
-  getModelMaxTokens,
-  genAzureChatCompletion,
-  getModelMaxOutputTokens,
-} = require('~/utils');
 const {
   truncateText,
   formatMessage,
@@ -30,10 +31,9 @@ const {
   titleInstruction,
   createContextHandlers,
 } = require('./prompts');
+const { extractBaseURL, getModelMaxTokens, getModelMaxOutputTokens } = require('~/utils');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
-const { createFetch, createStreamEventHandlers } = require('./generators');
-const { addSpaceIfNeeded, isEnabled, sleep } = require('~/server/utils');
-const Tokenizer = require('~/server/services/Tokenizer');
+const { addSpaceIfNeeded, sleep } = require('~/server/utils');
 const { spendTokens } = require('~/models/spendTokens');
 const { handleOpenAIErrors } = require('./tools/util');
 const { createLLM, RunManager } = require('./llm');
diff --git a/api/app/clients/generators.js b/api/app/clients/generators.js
deleted file mode 100644
index 9814cac7a5..0000000000
--- a/api/app/clients/generators.js
+++ /dev/null
@@ -1,71 +0,0 @@
-const fetch = require('node-fetch');
-const { GraphEvents } = require('@librechat/agents');
-const { logger, sendEvent } = require('~/config');
-const { sleep } = require('~/server/utils');
-
-/**
- * Makes a function to make HTTP request and logs the process.
- * @param {Object} params
- * @param {boolean} [params.directEndpoint] - Whether to use a direct endpoint.
- * @param {string} [params.reverseProxyUrl] - The reverse proxy URL to use for the request.
- * @returns {Promise<Response>} - A promise that resolves to the response of the fetch request.
- */
-function createFetch({ directEndpoint = false, reverseProxyUrl = '' }) {
-  /**
-   * Makes an HTTP request and logs the process.
-   * @param {RequestInfo} url - The URL to make the request to. Can be a string or a Request object.
-   * @param {RequestInit} [init] - Optional init options for the request.
-   * @returns {Promise<Response>} - A promise that resolves to the response of the fetch request.
-   */
-  return async (_url, init) => {
-    let url = _url;
-    if (directEndpoint) {
-      url = reverseProxyUrl;
-    }
-    logger.debug(`Making request to ${url}`);
-    if (typeof Bun !== 'undefined') {
-      return await fetch(url, init);
-    }
-    return await fetch(url, init);
-  };
-}
-
-// Add this at the module level outside the class
-/**
- * Creates event handlers for stream events that don't capture client references
- * @param {Object} res - The response object to send events to
- * @returns {Object} Object containing handler functions
- */
-function createStreamEventHandlers(res) {
-  return {
-    [GraphEvents.ON_RUN_STEP]: (event) => {
-      if (res) {
-        sendEvent(res, event);
-      }
-    },
-    [GraphEvents.ON_MESSAGE_DELTA]: (event) => {
-      if (res) {
-        sendEvent(res, event);
-      }
-    },
-    [GraphEvents.ON_REASONING_DELTA]: (event) => {
-      if (res) {
-        sendEvent(res, event);
-      }
-    },
-  };
-}
-
-function createHandleLLMNewToken(streamRate) {
-  return async () => {
-    if (streamRate) {
-      await sleep(streamRate);
-    }
-  };
-}
-
-module.exports = {
-  createFetch,
-  createHandleLLMNewToken,
-  createStreamEventHandlers,
-};
diff --git a/api/app/clients/llm/createLLM.js b/api/app/clients/llm/createLLM.js
index c8d6666bce..846c4d8e9c 100644
--- a/api/app/clients/llm/createLLM.js
+++ b/api/app/clients/llm/createLLM.js
@@ -1,6 +1,5 @@
 const { ChatOpenAI } = require('@langchain/openai');
-const { sanitizeModelName, constructAzureURL } = require('~/utils');
-const { isEnabled } = require('~/server/utils');
+const { isEnabled, sanitizeModelName, constructAzureURL } = require('@librechat/api');
 
 /**
  * Creates a new instance of a language model (LLM) for chat interactions.
diff --git a/api/app/clients/specs/BaseClient.test.js b/api/app/clients/specs/BaseClient.test.js
index 0ba77db6fa..6d44915804 100644
--- a/api/app/clients/specs/BaseClient.test.js
+++ b/api/app/clients/specs/BaseClient.test.js
@@ -33,7 +33,9 @@ jest.mock('~/models', () => ({
 const { getConvo, saveConvo } = require('~/models');
 
 jest.mock('@librechat/agents', () => {
+  const { Providers } = jest.requireActual('@librechat/agents');
   return {
+    Providers,
     ChatOpenAI: jest.fn().mockImplementation(() => {
       return {};
     }),
diff --git a/api/app/clients/tools/dynamic/OpenAPIPlugin.js b/api/app/clients/tools/dynamic/OpenAPIPlugin.js
deleted file mode 100644
index acc3a64d32..0000000000
--- a/api/app/clients/tools/dynamic/OpenAPIPlugin.js
+++ /dev/null
@@ -1,184 +0,0 @@
-require('dotenv').config();
-const fs = require('fs');
-const { z } = require('zod');
-const path = require('path');
-const yaml = require('js-yaml');
-const { createOpenAPIChain } = require('langchain/chains');
-const { DynamicStructuredTool } = require('@langchain/core/tools');
-const { ChatPromptTemplate, HumanMessagePromptTemplate } = require('@langchain/core/prompts');
-const { logger } = require('~/config');
-
-function addLinePrefix(text, prefix = '// ') {
-  return text
-    .split('\n')
-    .map((line) => prefix + line)
-    .join('\n');
-}
-
-function createPrompt(name, functions) {
-  const prefix = `// The ${name} tool has the following functions. Determine the desired or most optimal function for the user's query:`;
-  const functionDescriptions = functions
-    .map((func) => `// - ${func.name}: ${func.description}`)
-    .join('\n');
-  return `${prefix}\n${functionDescriptions}
-// You are an expert manager and scrum master. You must provide a detailed intent to better execute the function.
-// Always format as such: {{"func": "function_name", "intent": "intent and expected result"}}`;
-}
-
-const AuthBearer = z
-  .object({
-    type: z.string().includes('service_http'),
-    authorization_type: z.string().includes('bearer'),
-    verification_tokens: z.object({
-      openai: z.string(),
-    }),
-  })
-  .catch(() => false);
-
-const AuthDefinition = z
-  .object({
-    type: z.string(),
-    authorization_type: z.string(),
-    verification_tokens: z.object({
-      openai: z.string(),
-    }),
-  })
-  .catch(() => false);
-
-async function readSpecFile(filePath) {
-  try {
-    const fileContents = await fs.promises.readFile(filePath, 'utf8');
-    if (path.extname(filePath) === '.json') {
-      return JSON.parse(fileContents);
-    }
-    return yaml.load(fileContents);
-  } catch (e) {
-    logger.error('[readSpecFile] error', e);
-    return false;
-  }
-}
-
-async function getSpec(url) {
-  const RegularUrl = z
-    .string()
-    .url()
-    .catch(() => false);
-
-  if (RegularUrl.parse(url) && path.extname(url) === '.json') {
-    const response = await fetch(url);
-    return await response.json();
-  }
-
-  const ValidSpecPath = z
-    .string()
-    .url()
-    .catch(async () => {
-      const spec = path.join(__dirname, '..', '.well-known', 'openapi', url);
-      if (!fs.existsSync(spec)) {
-        return false;
-      }
-
-      return await readSpecFile(spec);
-    });
-
-  return ValidSpecPath.parse(url);
-}
-
-async function createOpenAPIPlugin({ data, llm, user, message, memory, signal }) {
-  let spec;
-  try {
-    spec = await getSpec(data.api.url);
-  } catch (error) {
-    logger.error('[createOpenAPIPlugin] getSpec error', error);
-    return null;
-  }
-
-  if (!spec) {
-    logger.warn('[createOpenAPIPlugin] No spec found');
-    return null;
-  }
-
-  const headers = {};
-  const { auth, name_for_model, description_for_model, description_for_human } = data;
-  if (auth && AuthDefinition.parse(auth)) {
-    logger.debug('[createOpenAPIPlugin] auth detected', auth);
-    const { openai } = auth.verification_tokens;
-    if (AuthBearer.parse(auth)) {
-      headers.authorization = `Bearer ${openai}`;
-      logger.debug('[createOpenAPIPlugin] added auth bearer', headers);
-    }
-  }
-
-  const chainOptions = { llm };
-
-  if (data.headers && data.headers['librechat_user_id']) {
-    logger.debug('[createOpenAPIPlugin] id detected', headers);
-    headers[data.headers['librechat_user_id']] = user;
-  }
-
-  if (Object.keys(headers).length > 0) {
-    logger.debug('[createOpenAPIPlugin] headers detected', headers);
-    chainOptions.headers = headers;
-  }
-
-  if (data.params) {
-    logger.debug('[createOpenAPIPlugin] params detected', data.params);
-    chainOptions.params = data.params;
-  }
-
-  let history = '';
-  if (memory) {
-    logger.debug('[createOpenAPIPlugin] openAPI chain: memory detected', memory);
-    const { history: chat_history } = await memory.loadMemoryVariables({});
-    history = chat_history?.length > 0 ? `\n\n## Chat History:\n${chat_history}\n` : '';
-  }
-
-  chainOptions.prompt = ChatPromptTemplate.fromMessages([
-    HumanMessagePromptTemplate.fromTemplate(
-      `# Use the provided API's to respond to this query:\n\n{query}\n\n## Instructions:\n${addLinePrefix(
-        description_for_model,
-      )}${history}`,
-    ),
-  ]);
-
-  const chain = await createOpenAPIChain(spec, chainOptions);
-
-  const { functions } = chain.chains[0].lc_kwargs.llmKwargs;
-
-  return new DynamicStructuredTool({
-    name: name_for_model,
-    description_for_model: `${addLinePrefix(description_for_human)}${createPrompt(
-      name_for_model,
-      functions,
-    )}`,
-    description: `${description_for_human}`,
-    schema: z.object({
-      func: z
-        .string()
-        .describe(
-          `The function to invoke. The functions available are: ${functions
-            .map((func) => func.name)
-            .join(', ')}`,
-        ),
-      intent: z
-        .string()
-        .describe('Describe your intent with the function and your expected result'),
-    }),
-    func: async ({ func = '', intent = '' }) => {
-      const filteredFunctions = functions.filter((f) => f.name === func);
-      chain.chains[0].lc_kwargs.llmKwargs.functions = filteredFunctions;
-      const query = `${message}${func?.length > 0 ? `\n// Intent: ${intent}` : ''}`;
-      const result = await chain.call({
-        query,
-        signal,
-      });
-      return result.response;
-    },
-  });
-}
-
-module.exports = {
-  getSpec,
-  readSpecFile,
-  createOpenAPIPlugin,
-};
diff --git a/api/app/clients/tools/dynamic/OpenAPIPlugin.spec.js b/api/app/clients/tools/dynamic/OpenAPIPlugin.spec.js
deleted file mode 100644
index 83bc5e9397..0000000000
--- a/api/app/clients/tools/dynamic/OpenAPIPlugin.spec.js
+++ /dev/null
@@ -1,72 +0,0 @@
-const fs = require('fs');
-const { createOpenAPIPlugin, getSpec, readSpecFile } = require('./OpenAPIPlugin');
-
-global.fetch = jest.fn().mockImplementationOnce(() => {
-  return new Promise((resolve) => {
-    resolve({
-      ok: true,
-      json: () => Promise.resolve({ key: 'value' }),
-    });
-  });
-});
-jest.mock('fs', () => ({
-  promises: {
-    readFile: jest.fn(),
-  },
-  existsSync: jest.fn(),
-}));
-
-describe('readSpecFile', () => {
-  it('reads JSON file correctly', async () => {
-    fs.promises.readFile.mockResolvedValue(JSON.stringify({ test: 'value' }));
-    const result = await readSpecFile('test.json');
-    expect(result).toEqual({ test: 'value' });
-  });
-
-  it('reads YAML file correctly', async () => {
-    fs.promises.readFile.mockResolvedValue('test: value');
-    const result = await readSpecFile('test.yaml');
-    expect(result).toEqual({ test: 'value' });
-  });
-
-  it('handles error correctly', async () => {
-    fs.promises.readFile.mockRejectedValue(new Error('test error'));
-    const result = await readSpecFile('test.json');
-    expect(result).toBe(false);
-  });
-});
-
-describe('getSpec', () => {
-  it('fetches spec from url correctly', async () => {
-    const parsedJson = await getSpec('https://www.instacart.com/.well-known/ai-plugin.json');
-    const isObject = typeof parsedJson === 'object';
-    expect(isObject).toEqual(true);
-  });
-
-  it('reads spec from file correctly', async () => {
-    fs.existsSync.mockReturnValue(true);
-    fs.promises.readFile.mockResolvedValue(JSON.stringify({ test: 'value' }));
-    const result = await getSpec('test.json');
-    expect(result).toEqual({ test: 'value' });
-  });
-
-  it('returns false when file does not exist', async () => {
-    fs.existsSync.mockReturnValue(false);
-    const result = await getSpec('test.json');
-    expect(result).toBe(false);
-  });
-});
-
-describe('createOpenAPIPlugin', () => {
-  it('returns null when getSpec throws an error', async () => {
-    const result = await createOpenAPIPlugin({ data: { api: { url: 'invalid' } } });
-    expect(result).toBe(null);
-  });
-
-  it('returns null when no spec is found', async () => {
-    const result = await createOpenAPIPlugin({});
-    expect(result).toBe(null);
-  });
-
-  // Add more tests here for different scenarios
-});
diff --git a/api/app/clients/tools/structured/DALLE3.js b/api/app/clients/tools/structured/DALLE3.js
index fc0f1851f6..7c2a56fe71 100644
--- a/api/app/clients/tools/structured/DALLE3.js
+++ b/api/app/clients/tools/structured/DALLE3.js
@@ -8,10 +8,10 @@ const { HttpsProxyAgent } = require('https-proxy-agent');
 const { FileContext, ContentTypes } = require('librechat-data-provider');
 const { getImageBasename } = require('~/server/services/Files/images');
 const extractBaseURL = require('~/utils/extractBaseURL');
-const { logger } = require('~/config');
+const logger = require('~/config/winston');
 
 const displayMessage =
-  'DALL-E displayed an image. All generated images are already plainly visible, so don\'t repeat the descriptions in detail. Do not list download links as they are available in the UI already. The user may download the images by clicking on them, but do not mention anything about downloading to the user.';
+  "DALL-E displayed an image. All generated images are already plainly visible, so don't repeat the descriptions in detail. Do not list download links as they are available in the UI already. The user may download the images by clicking on them, but do not mention anything about downloading to the user.";
 class DALLE3 extends Tool {
   constructor(fields = {}) {
     super();
diff --git a/api/app/clients/tools/structured/specs/DALLE3.spec.js b/api/app/clients/tools/structured/specs/DALLE3.spec.js
index 1b28de2faf..2def575fb3 100644
--- a/api/app/clients/tools/structured/specs/DALLE3.spec.js
+++ b/api/app/clients/tools/structured/specs/DALLE3.spec.js
@@ -1,10 +1,29 @@
 const OpenAI = require('openai');
 const DALLE3 = require('../DALLE3');
-
-const { logger } = require('~/config');
+const logger = require('~/config/winston');
 
 jest.mock('openai');
 
+jest.mock('@librechat/data-schemas', () => {
+  return {
+    logger: {
+      info: jest.fn(),
+      warn: jest.fn(),
+      debug: jest.fn(),
+      error: jest.fn(),
+    },
+  };
+});
+
+jest.mock('tiktoken', () => {
+  return {
+    encoding_for_model: jest.fn().mockReturnValue({
+      encode: jest.fn(),
+      decode: jest.fn(),
+    }),
+  };
+});
+
 const processFileURL = jest.fn();
 
 jest.mock('~/server/services/Files/images', () => ({
@@ -37,6 +56,11 @@ jest.mock('fs', () => {
   return {
     existsSync: jest.fn(),
     mkdirSync: jest.fn(),
+    promises: {
+      writeFile: jest.fn(),
+      readFile: jest.fn(),
+      unlink: jest.fn(),
+    },
   };
 });
 
diff --git a/api/app/clients/tools/util/fileSearch.js b/api/app/clients/tools/util/fileSearch.js
index 54da483362..19d3a79edb 100644
--- a/api/app/clients/tools/util/fileSearch.js
+++ b/api/app/clients/tools/util/fileSearch.js
@@ -135,7 +135,7 @@ const createFileSearchTool = async ({ req, files, entity_id }) => {
         query: z
           .string()
           .describe(
-            'A natural language query to search for relevant information in the files. Be specific and use keywords related to the information you\'re looking for. The query will be used for semantic similarity matching against the file contents.',
+            "A natural language query to search for relevant information in the files. Be specific and use keywords related to the information you're looking for. The query will be used for semantic similarity matching against the file contents.",
           ),
       }),
     },
diff --git a/api/config/index.js b/api/config/index.js
index e238f700be..8f24581be2 100644
--- a/api/config/index.js
+++ b/api/config/index.js
@@ -1,7 +1,7 @@
 const axios = require('axios');
 const { EventSource } = require('eventsource');
-const { Time, CacheKeys } = require('librechat-data-provider');
-const { MCPManager, FlowStateManager } = require('librechat-mcp');
+const { Time } = require('librechat-data-provider');
+const { MCPManager, FlowStateManager } = require('@librechat/api');
 const logger = require('./winston');
 
 global.EventSource = EventSource;
diff --git a/api/package.json b/api/package.json
index 6646c3a493..22be4f18e9 100644
--- a/api/package.json
+++ b/api/package.json
@@ -49,6 +49,7 @@
     "@langchain/google-vertexai": "^0.2.9",
     "@langchain/textsplitters": "^0.1.0",
     "@librechat/agents": "^2.4.38",
+    "@librechat/api": "*",
     "@librechat/data-schemas": "*",
     "@node-saml/passport-saml": "^5.0.0",
     "@waylaidwanderer/fetch-event-source": "^3.0.1",
@@ -81,7 +82,6 @@
     "keyv-file": "^5.1.2",
     "klona": "^2.0.6",
     "librechat-data-provider": "*",
-    "librechat-mcp": "*",
     "lodash": "^4.17.21",
     "meilisearch": "^0.38.0",
     "memorystore": "^1.6.7",
@@ -90,6 +90,7 @@
     "mongoose": "^8.12.1",
     "multer": "^2.0.0",
     "nanoid": "^3.3.7",
+    "node-fetch": "^2.7.0",
     "nodemailer": "^6.9.15",
     "ollama": "^0.5.0",
     "openai": "^4.96.2",
@@ -110,7 +111,7 @@
     "traverse": "^0.6.7",
     "ua-parser-js": "^1.0.36",
     "winston": "^3.11.0",
-    "winston-daily-rotate-file": "^4.7.1",
+    "winston-daily-rotate-file": "^5.0.0",
     "youtube-transcript": "^1.2.1",
     "zod": "^3.22.4"
   },
diff --git a/api/server/cleanup.js b/api/server/cleanup.js
index 5bf336eed5..de7450cea0 100644
--- a/api/server/cleanup.js
+++ b/api/server/cleanup.js
@@ -220,6 +220,9 @@ function disposeClient(client) {
     if (client.maxResponseTokens) {
       client.maxResponseTokens = null;
     }
+    if (client.processMemory) {
+      client.processMemory = null;
+    }
     if (client.run) {
       // Break circular references in run
       if (client.run.Graph) {
diff --git a/api/server/controllers/agents/callbacks.js b/api/server/controllers/agents/callbacks.js
index cedfc6bd62..60e68b5f2d 100644
--- a/api/server/controllers/agents/callbacks.js
+++ b/api/server/controllers/agents/callbacks.js
@@ -1,4 +1,6 @@
 const { nanoid } = require('nanoid');
+const { sendEvent } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const { Tools, StepTypes, FileContext } = require('librechat-data-provider');
 const {
   EnvVar,
@@ -12,7 +14,6 @@ const {
 const { processCodeOutput } = require('~/server/services/Files/Code/process');
 const { loadAuthValues } = require('~/server/services/Tools/credentials');
 const { saveBase64Image } = require('~/server/services/Files/process');
-const { logger, sendEvent } = require('~/config');
 
 class ModelEndHandler {
   /**
@@ -240,9 +241,7 @@ function createToolEndCallback({ req, res, artifactPromises }) {
     if (output.artifact[Tools.web_search]) {
       artifactPromises.push(
         (async () => {
-          const name = `${output.name}_${output.tool_call_id}_${nanoid()}`;
           const attachment = {
-            name,
             type: Tools.web_search,
             messageId: metadata.run_id,
             toolCallId: output.tool_call_id,
diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.js
index 9631fe3801..7c8a375a9f 100644
--- a/api/server/controllers/agents/client.js
+++ b/api/server/controllers/agents/client.js
@@ -1,13 +1,12 @@
-// const { HttpsProxyAgent } = require('https-proxy-agent');
-// const {
-// Constants,
-// ImageDetail,
-// EModelEndpoint,
-// resolveHeaders,
-// validateVisionModel,
-// mapModelToAzureConfig,
-// } = require('librechat-data-provider');
 require('events').EventEmitter.defaultMaxListeners = 100;
+const { logger } = require('@librechat/data-schemas');
+const {
+  sendEvent,
+  createRun,
+  Tokenizer,
+  memoryInstructions,
+  createMemoryProcessor,
+} = require('@librechat/api');
 const {
   Callback,
   GraphEvents,
@@ -19,26 +18,30 @@ const {
 } = require('@librechat/agents');
 const {
   Constants,
+  Permissions,
   VisionModes,
   ContentTypes,
   EModelEndpoint,
   KnownEndpoints,
+  PermissionTypes,
   isAgentsEndpoint,
   AgentCapabilities,
   bedrockInputSchema,
   removeNullishValues,
 } = require('librechat-data-provider');
+const { DynamicStructuredTool } = require('@langchain/core/tools');
+const { getBufferString, HumanMessage } = require('@langchain/core/messages');
 const { getCustomEndpointConfig, checkCapability } = require('~/server/services/Config');
 const { addCacheControl, createContextHandlers } = require('~/app/clients/prompts');
+const { initializeAgent } = require('~/server/services/Endpoints/agents/agent');
 const { spendTokens, spendStructuredTokens } = require('~/models/spendTokens');
-const { getBufferString, HumanMessage } = require('@langchain/core/messages');
-const { DynamicStructuredTool } = require('@langchain/core/tools');
+const { setMemory, deleteMemory, getFormattedMemories } = require('~/models');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
 const initOpenAI = require('~/server/services/Endpoints/openAI/initialize');
-const Tokenizer = require('~/server/services/Tokenizer');
+const { checkAccess } = require('~/server/middleware/roles/access');
 const BaseClient = require('~/app/clients/BaseClient');
-const { logger, sendEvent, getMCPManager } = require('~/config');
-const { createRun } = require('./run');
+const { loadAgent } = require('~/models/Agent');
+const { getMCPManager } = require('~/config');
 
 /**
  * @param {ServerRequest} req
@@ -58,12 +61,8 @@ const legacyContentEndpoints = new Set([KnownEndpoints.groq, KnownEndpoints.deep
 
 const noSystemModelRegex = [/\b(o1-preview|o1-mini|amazon\.titan-text)\b/gi];
 
-// const { processMemory, memoryInstructions } = require('~/server/services/Endpoints/agents/memory');
-// const { getFormattedMemories } = require('~/models/Memory');
-// const { getCurrentDateTime } = require('~/utils');
-
 function createTokenCounter(encoding) {
-  return (message) => {
+  return function (message) {
     const countTokens = (text) => Tokenizer.getTokenCount(text, encoding);
     return getTokenCountForMessage(message, countTokens);
   };
@@ -124,6 +123,8 @@ class AgentClient extends BaseClient {
     this.usage;
     /** @type {Record<string, number>} */
     this.indexTokenCountMap = {};
+    /** @type {(messages: BaseMessage[]) => Promise<void>} */
+    this.processMemory;
   }
 
   /**
@@ -138,55 +139,10 @@ class AgentClient extends BaseClient {
   }
 
   /**
-   *
-   * Checks if the model is a vision model based on request attachments and sets the appropriate options:
-   * - Sets `this.modelOptions.model` to `gpt-4-vision-preview` if the request is a vision request.
-   * - Sets `this.isVisionModel` to `true` if vision request.
-   * - Deletes `this.modelOptions.stop` if vision request.
+   * `AgentClient` is not opinionated about vision requests, so we don't do anything here
    * @param {MongoFile[]} attachments
    */
-  checkVisionRequest(attachments) {
-    // if (!attachments) {
-    //   return;
-    // }
-    // const availableModels = this.options.modelsConfig?.[this.options.endpoint];
-    // if (!availableModels) {
-    //   return;
-    // }
-    // let visionRequestDetected = false;
-    // for (const file of attachments) {
-    //   if (file?.type?.includes('image')) {
-    //     visionRequestDetected = true;
-    //     break;
-    //   }
-    // }
-    // if (!visionRequestDetected) {
-    //   return;
-    // }
-    // this.isVisionModel = validateVisionModel({ model: this.modelOptions.model, availableModels });
-    // if (this.isVisionModel) {
-    //   delete this.modelOptions.stop;
-    //   return;
-    // }
-    // for (const model of availableModels) {
-    //   if (!validateVisionModel({ model, availableModels })) {
-    //     continue;
-    //   }
-    //   this.modelOptions.model = model;
-    //   this.isVisionModel = true;
-    //   delete this.modelOptions.stop;
-    //   return;
-    // }
-    // if (!availableModels.includes(this.defaultVisionModel)) {
-    //   return;
-    // }
-    // if (!validateVisionModel({ model: this.defaultVisionModel, availableModels })) {
-    //   return;
-    // }
-    // this.modelOptions.model = this.defaultVisionModel;
-    // this.isVisionModel = true;
-    // delete this.modelOptions.stop;
-  }
+  checkVisionRequest() {}
 
   getSaveOptions() {
     // TODO:
@@ -270,24 +226,6 @@ class AgentClient extends BaseClient {
       .filter(Boolean)
       .join('\n')
       .trim();
-    // this.systemMessage = getCurrentDateTime();
-    // const { withKeys, withoutKeys } = await getFormattedMemories({
-    //   userId: this.options.req.user.id,
-    // });
-    // processMemory({
-    //   userId: this.options.req.user.id,
-    //   message: this.options.req.body.text,
-    //   parentMessageId,
-    //   memory: withKeys,
-    //   thread_id: this.conversationId,
-    // }).catch((error) => {
-    //   logger.error('Memory Agent failed to process memory', error);
-    // });
-
-    // this.systemMessage += '\n\n' + memoryInstructions;
-    // if (withoutKeys) {
-    //   this.systemMessage += `\n\n# Existing memory about the user:\n${withoutKeys}`;
-    // }
 
     if (this.options.attachments) {
       const attachments = await this.options.attachments;
@@ -431,9 +369,150 @@ class AgentClient extends BaseClient {
       opts.getReqData({ promptTokens });
     }
 
+    const withoutKeys = await this.useMemory();
+    if (withoutKeys) {
+      systemContent += `${memoryInstructions}\n\n# Existing memory about the user:\n${withoutKeys}`;
+    }
+
+    if (systemContent) {
+      this.options.agent.instructions = systemContent;
+    }
+
     return result;
   }
 
+  /**
+   * @returns {Promise<string | undefined>}
+   */
+  async useMemory() {
+    const user = this.options.req.user;
+    if (user.personalization?.memories === false) {
+      return;
+    }
+    const hasAccess = await checkAccess(user, PermissionTypes.MEMORIES, [Permissions.USE]);
+
+    if (!hasAccess) {
+      logger.debug(
+        `[api/server/controllers/agents/client.js #useMemory] User ${user.id} does not have USE permission for memories`,
+      );
+      return;
+    }
+    /** @type {TCustomConfig['memory']} */
+    const memoryConfig = this.options.req?.app?.locals?.memory;
+    if (!memoryConfig || memoryConfig.disabled === true) {
+      return;
+    }
+
+    /** @type {Agent} */
+    let prelimAgent;
+    const allowedProviders = new Set(
+      this.options.req?.app?.locals?.[EModelEndpoint.agents]?.allowedProviders,
+    );
+    try {
+      if (memoryConfig.agent?.id != null && memoryConfig.agent.id !== this.options.agent.id) {
+        prelimAgent = await loadAgent({
+          req: this.options.req,
+          agent_id: memoryConfig.agent.id,
+          endpoint: EModelEndpoint.agents,
+        });
+      } else if (
+        memoryConfig.agent?.id == null &&
+        memoryConfig.agent?.model != null &&
+        memoryConfig.agent?.provider != null
+      ) {
+        prelimAgent = { id: Constants.EPHEMERAL_AGENT_ID, ...memoryConfig.agent };
+      }
+    } catch (error) {
+      logger.error(
+        '[api/server/controllers/agents/client.js #useMemory] Error loading agent for memory',
+        error,
+      );
+    }
+
+    const agent = await initializeAgent({
+      req: this.options.req,
+      res: this.options.res,
+      agent: prelimAgent,
+      allowedProviders,
+    });
+
+    if (!agent) {
+      logger.warn(
+        '[api/server/controllers/agents/client.js #useMemory] No agent found for memory',
+        memoryConfig,
+      );
+      return;
+    }
+
+    const llmConfig = Object.assign(
+      {
+        provider: agent.provider,
+        model: agent.model,
+      },
+      agent.model_parameters,
+    );
+
+    /** @type {import('@librechat/api').MemoryConfig} */
+    const config = {
+      validKeys: memoryConfig.validKeys,
+      instructions: agent.instructions,
+      llmConfig,
+      tokenLimit: memoryConfig.tokenLimit,
+    };
+
+    const userId = this.options.req.user.id + '';
+    const messageId = this.responseMessageId + '';
+    const conversationId = this.conversationId + '';
+    const [withoutKeys, processMemory] = await createMemoryProcessor({
+      userId,
+      config,
+      messageId,
+      conversationId,
+      memoryMethods: {
+        setMemory,
+        deleteMemory,
+        getFormattedMemories,
+      },
+      res: this.options.res,
+    });
+
+    this.processMemory = processMemory;
+    return withoutKeys;
+  }
+
+  /**
+   * @param {BaseMessage[]} messages
+   * @returns {Promise<void | (TAttachment | null)[]>}
+   */
+  async runMemory(messages) {
+    try {
+      if (this.processMemory == null) {
+        return;
+      }
+      /** @type {TCustomConfig['memory']} */
+      const memoryConfig = this.options.req?.app?.locals?.memory;
+      const messageWindowSize = memoryConfig?.messageWindowSize ?? 5;
+
+      let messagesToProcess = [...messages];
+      if (messages.length > messageWindowSize) {
+        for (let i = messages.length - messageWindowSize; i >= 0; i--) {
+          const potentialWindow = messages.slice(i, i + messageWindowSize);
+          if (potentialWindow[0]?.role === 'user') {
+            messagesToProcess = [...potentialWindow];
+            break;
+          }
+        }
+
+        if (messagesToProcess.length === messages.length) {
+          messagesToProcess = [...messages.slice(-messageWindowSize)];
+        }
+      }
+      return await this.processMemory(messagesToProcess);
+    } catch (error) {
+      logger.error('Memory Agent failed to process memory', error);
+    }
+  }
+
   /** @type {sendCompletion} */
   async sendCompletion(payload, opts = {}) {
     await this.chatCompletion({
@@ -576,100 +655,13 @@ class AgentClient extends BaseClient {
     let config;
     /** @type {ReturnType<createRun>} */
     let run;
+    /** @type {Promise<(TAttachment | null)[] | undefined>} */
+    let memoryPromise;
     try {
       if (!abortController) {
         abortController = new AbortController();
       }
 
-      // if (this.options.headers) {
-      //   opts.defaultHeaders = { ...opts.defaultHeaders, ...this.options.headers };
-      // }
-
-      // if (this.options.proxy) {
-      //   opts.httpAgent = new HttpsProxyAgent(this.options.proxy);
-      // }
-
-      // if (this.isVisionModel) {
-      //   modelOptions.max_tokens = 4000;
-      // }
-
-      // /** @type {TAzureConfig | undefined} */
-      // const azureConfig = this.options?.req?.app?.locals?.[EModelEndpoint.azureOpenAI];
-
-      // if (
-      //   (this.azure && this.isVisionModel && azureConfig) ||
-      //   (azureConfig && this.isVisionModel && this.options.endpoint === EModelEndpoint.azureOpenAI)
-      // ) {
-      //   const { modelGroupMap, groupMap } = azureConfig;
-      //   const {
-      //     azureOptions,
-      //     baseURL,
-      //     headers = {},
-      //     serverless,
-      //   } = mapModelToAzureConfig({
-      //     modelName: modelOptions.model,
-      //     modelGroupMap,
-      //     groupMap,
-      //   });
-      //   opts.defaultHeaders = resolveHeaders(headers);
-      //   this.langchainProxy = extractBaseURL(baseURL);
-      //   this.apiKey = azureOptions.azureOpenAIApiKey;
-
-      //   const groupName = modelGroupMap[modelOptions.model].group;
-      //   this.options.addParams = azureConfig.groupMap[groupName].addParams;
-      //   this.options.dropParams = azureConfig.groupMap[groupName].dropParams;
-      //   // Note: `forcePrompt` not re-assigned as only chat models are vision models
-
-      //   this.azure = !serverless && azureOptions;
-      //   this.azureEndpoint =
-      //     !serverless && genAzureChatCompletion(this.azure, modelOptions.model, this);
-      // }
-
-      // if (this.azure || this.options.azure) {
-      //   /* Azure Bug, extremely short default `max_tokens` response */
-      //   if (!modelOptions.max_tokens && modelOptions.model === 'gpt-4-vision-preview') {
-      //     modelOptions.max_tokens = 4000;
-      //   }
-
-      //   /* Azure does not accept `model` in the body, so we need to remove it. */
-      //   delete modelOptions.model;
-
-      //   opts.baseURL = this.langchainProxy
-      //     ? constructAzureURL({
-      //       baseURL: this.langchainProxy,
-      //       azureOptions: this.azure,
-      //     })
-      //     : this.azureEndpoint.split(/(?<!\/)\/(chat|completion)\//)[0];
-
-      //   opts.defaultQuery = { 'api-version': this.azure.azureOpenAIApiVersion };
-      //   opts.defaultHeaders = { ...opts.defaultHeaders, 'api-key': this.apiKey };
-      // }
-
-      // if (process.env.OPENAI_ORGANIZATION) {
-      //   opts.organization = process.env.OPENAI_ORGANIZATION;
-      // }
-
-      // if (this.options.addParams && typeof this.options.addParams === 'object') {
-      //   modelOptions = {
-      //     ...modelOptions,
-      //     ...this.options.addParams,
-      //   };
-      //   logger.debug('[api/server/controllers/agents/client.js #chatCompletion] added params', {
-      //     addParams: this.options.addParams,
-      //     modelOptions,
-      //   });
-      // }
-
-      // if (this.options.dropParams && Array.isArray(this.options.dropParams)) {
-      //   this.options.dropParams.forEach((param) => {
-      //     delete modelOptions[param];
-      //   });
-      //   logger.debug('[api/server/controllers/agents/client.js #chatCompletion] dropped params', {
-      //     dropParams: this.options.dropParams,
-      //     modelOptions,
-      //   });
-      // }
-
       /** @type {TCustomConfig['endpoints']['agents']} */
       const agentsEConfig = this.options.req.app.locals[EModelEndpoint.agents];
 
@@ -766,6 +758,10 @@ class AgentClient extends BaseClient {
           messages = addCacheControl(messages);
         }
 
+        if (i === 0) {
+          memoryPromise = this.runMemory(messages);
+        }
+
         run = await createRun({
           agent,
           req: this.options.req,
@@ -801,10 +797,9 @@ class AgentClient extends BaseClient {
           run.Graph.contentData = contentData;
         }
 
-        const encoding = this.getEncoding();
         await run.processStream({ messages }, config, {
           keepContent: i !== 0,
-          tokenCounter: createTokenCounter(encoding),
+          tokenCounter: createTokenCounter(this.getEncoding()),
           indexTokenCountMap: currentIndexCountMap,
           maxContextTokens: agent.maxContextTokens,
           callbacks: {
@@ -919,6 +914,12 @@ class AgentClient extends BaseClient {
       });
 
       try {
+        if (memoryPromise) {
+          const attachments = await memoryPromise;
+          if (attachments && attachments.length > 0) {
+            this.artifactPromises.push(...attachments);
+          }
+        }
         await this.recordCollectedUsage({ context: 'message' });
       } catch (err) {
         logger.error(
@@ -927,6 +928,12 @@ class AgentClient extends BaseClient {
         );
       }
     } catch (err) {
+      if (memoryPromise) {
+        const attachments = await memoryPromise;
+        if (attachments && attachments.length > 0) {
+          this.artifactPromises.push(...attachments);
+        }
+      }
       logger.error(
         '[api/server/controllers/agents/client.js #sendCompletion] Operation aborted',
         err,
diff --git a/api/server/controllers/agents/run.js b/api/server/controllers/agents/run.js
deleted file mode 100644
index 2452e66233..0000000000
--- a/api/server/controllers/agents/run.js
+++ /dev/null
@@ -1,94 +0,0 @@
-const { Run, Providers } = require('@librechat/agents');
-const { providerEndpointMap, KnownEndpoints } = require('librechat-data-provider');
-
-/**
- * @typedef {import('@librechat/agents').t} t
- * @typedef {import('@librechat/agents').StandardGraphConfig} StandardGraphConfig
- * @typedef {import('@librechat/agents').StreamEventData} StreamEventData
- * @typedef {import('@librechat/agents').EventHandler} EventHandler
- * @typedef {import('@librechat/agents').GraphEvents} GraphEvents
- * @typedef {import('@librechat/agents').LLMConfig} LLMConfig
- * @typedef {import('@librechat/agents').IState} IState
- */
-
-const customProviders = new Set([
-  Providers.XAI,
-  Providers.OLLAMA,
-  Providers.DEEPSEEK,
-  Providers.OPENROUTER,
-]);
-
-/**
- * Creates a new Run instance with custom handlers and configuration.
- *
- * @param {Object} options - The options for creating the Run instance.
- * @param {ServerRequest} [options.req] - The server request.
- * @param {string | undefined} [options.runId] - Optional run ID; otherwise, a new run ID will be generated.
- * @param {Agent} options.agent - The agent for this run.
- * @param {AbortSignal} options.signal - The signal for this run.
- * @param {Record<GraphEvents, EventHandler> | undefined} [options.customHandlers] - Custom event handlers.
- * @param {boolean} [options.streaming=true] - Whether to use streaming.
- * @param {boolean} [options.streamUsage=true] - Whether to stream usage information.
- * @returns {Promise<Run<IState>>} A promise that resolves to a new Run instance.
- */
-async function createRun({
-  runId,
-  agent,
-  signal,
-  customHandlers,
-  streaming = true,
-  streamUsage = true,
-}) {
-  const provider = providerEndpointMap[agent.provider] ?? agent.provider;
-  /** @type {LLMConfig} */
-  const llmConfig = Object.assign(
-    {
-      provider,
-      streaming,
-      streamUsage,
-    },
-    agent.model_parameters,
-  );
-
-  /** Resolves issues with new OpenAI usage field */
-  if (
-    customProviders.has(agent.provider) ||
-    (agent.provider === Providers.OPENAI && agent.endpoint !== agent.provider)
-  ) {
-    llmConfig.streamUsage = false;
-    llmConfig.usage = true;
-  }
-
-  /** @type {'reasoning_content' | 'reasoning'} */
-  let reasoningKey;
-  if (
-    llmConfig.configuration?.baseURL?.includes(KnownEndpoints.openrouter) ||
-    (agent.endpoint && agent.endpoint.toLowerCase().includes(KnownEndpoints.openrouter))
-  ) {
-    reasoningKey = 'reasoning';
-  }
-
-  /** @type {StandardGraphConfig} */
-  const graphConfig = {
-    signal,
-    llmConfig,
-    reasoningKey,
-    tools: agent.tools,
-    instructions: agent.instructions,
-    additional_instructions: agent.additional_instructions,
-    // toolEnd: agent.end_after_tools,
-  };
-
-  // TEMPORARY FOR TESTING
-  if (agent.provider === Providers.ANTHROPIC || agent.provider === Providers.BEDROCK) {
-    graphConfig.streamBuffer = 2000;
-  }
-
-  return Run.create({
-    runId,
-    graphConfig,
-    customHandlers,
-  });
-}
-
-module.exports = { createRun };
diff --git a/api/server/index.js b/api/server/index.js
index ed770f7703..a04c339b0f 100644
--- a/api/server/index.js
+++ b/api/server/index.js
@@ -117,7 +117,7 @@ const startServer = async () => {
   app.use('/api/agents', routes.agents);
   app.use('/api/banner', routes.banner);
   app.use('/api/bedrock', routes.bedrock);
-
+  app.use('/api/memories', routes.memories);
   app.use('/api/tags', routes.tags);
 
   app.use((req, res) => {
diff --git a/api/server/middleware/roles/generateCheckAccess.js b/api/server/middleware/roles/access.js
similarity index 100%
rename from api/server/middleware/roles/generateCheckAccess.js
rename to api/server/middleware/roles/access.js
diff --git a/api/server/middleware/roles/checkAdmin.js b/api/server/middleware/roles/admin.js
similarity index 100%
rename from api/server/middleware/roles/checkAdmin.js
rename to api/server/middleware/roles/admin.js
diff --git a/api/server/middleware/roles/index.js b/api/server/middleware/roles/index.js
index a9fc5b2a08..ebc0043f2f 100644
--- a/api/server/middleware/roles/index.js
+++ b/api/server/middleware/roles/index.js
@@ -1,5 +1,5 @@
-const checkAdmin = require('./checkAdmin');
-const { checkAccess, generateCheckAccess } = require('./generateCheckAccess');
+const checkAdmin = require('./admin');
+const { checkAccess, generateCheckAccess } = require('./access');
 
 module.exports = {
   checkAdmin,
diff --git a/api/server/routes/files/multer.js b/api/server/routes/files/multer.js
index f23ecd2823..257c309fa2 100644
--- a/api/server/routes/files/multer.js
+++ b/api/server/routes/files/multer.js
@@ -2,8 +2,8 @@ const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
 const multer = require('multer');
+const { sanitizeFilename } = require('@librechat/api');
 const { fileConfig: defaultFileConfig, mergeFileConfig } = require('librechat-data-provider');
-const { sanitizeFilename } = require('~/server/utils/handleText');
 const { getCustomConfig } = require('~/server/services/Config');
 
 const storage = multer.diskStorage({
diff --git a/api/server/routes/index.js b/api/server/routes/index.js
index 449759383d..06e39d3671 100644
--- a/api/server/routes/index.js
+++ b/api/server/routes/index.js
@@ -4,6 +4,7 @@ const tokenizer = require('./tokenizer');
 const endpoints = require('./endpoints');
 const staticRoute = require('./static');
 const messages = require('./messages');
+const memories = require('./memories');
 const presets = require('./presets');
 const prompts = require('./prompts');
 const balance = require('./balance');
@@ -51,6 +52,7 @@ module.exports = {
   presets,
   balance,
   messages,
+  memories,
   endpoints,
   tokenizer,
   assistants,
diff --git a/api/server/routes/memories.js b/api/server/routes/memories.js
new file mode 100644
index 0000000000..86065fecaa
--- /dev/null
+++ b/api/server/routes/memories.js
@@ -0,0 +1,231 @@
+const express = require('express');
+const { Tokenizer } = require('@librechat/api');
+const { PermissionTypes, Permissions } = require('librechat-data-provider');
+const {
+  getAllUserMemories,
+  toggleUserMemories,
+  createMemory,
+  setMemory,
+  deleteMemory,
+} = require('~/models');
+const { requireJwtAuth, generateCheckAccess } = require('~/server/middleware');
+
+const router = express.Router();
+
+const checkMemoryRead = generateCheckAccess(PermissionTypes.MEMORIES, [
+  Permissions.USE,
+  Permissions.READ,
+]);
+const checkMemoryCreate = generateCheckAccess(PermissionTypes.MEMORIES, [
+  Permissions.USE,
+  Permissions.CREATE,
+]);
+const checkMemoryUpdate = generateCheckAccess(PermissionTypes.MEMORIES, [
+  Permissions.USE,
+  Permissions.UPDATE,
+]);
+const checkMemoryDelete = generateCheckAccess(PermissionTypes.MEMORIES, [
+  Permissions.USE,
+  Permissions.UPDATE,
+]);
+const checkMemoryOptOut = generateCheckAccess(PermissionTypes.MEMORIES, [
+  Permissions.USE,
+  Permissions.OPT_OUT,
+]);
+
+router.use(requireJwtAuth);
+
+/**
+ * GET /memories
+ * Returns all memories for the authenticated user, sorted by updated_at (newest first).
+ * Also includes memory usage percentage based on token limit.
+ */
+router.get('/', checkMemoryRead, async (req, res) => {
+  try {
+    const memories = await getAllUserMemories(req.user.id);
+
+    const sortedMemories = memories.sort(
+      (a, b) => new Date(b.updated_at).getTime() - new Date(a.updated_at).getTime(),
+    );
+
+    const totalTokens = memories.reduce((sum, memory) => {
+      return sum + (memory.tokenCount || 0);
+    }, 0);
+
+    const memoryConfig = req.app.locals?.memory;
+    const tokenLimit = memoryConfig?.tokenLimit;
+
+    let usagePercentage = null;
+    if (tokenLimit && tokenLimit > 0) {
+      usagePercentage = Math.min(100, Math.round((totalTokens / tokenLimit) * 100));
+    }
+
+    res.json({
+      memories: sortedMemories,
+      totalTokens,
+      tokenLimit: tokenLimit || null,
+      usagePercentage,
+    });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+/**
+ * POST /memories
+ * Creates a new memory entry for the authenticated user.
+ * Body: { key: string, value: string }
+ * Returns 201 and { created: true, memory: <createdDoc> } when successful.
+ */
+router.post('/', checkMemoryCreate, async (req, res) => {
+  const { key, value } = req.body;
+
+  if (typeof key !== 'string' || key.trim() === '') {
+    return res.status(400).json({ error: 'Key is required and must be a non-empty string.' });
+  }
+
+  if (typeof value !== 'string' || value.trim() === '') {
+    return res.status(400).json({ error: 'Value is required and must be a non-empty string.' });
+  }
+
+  try {
+    const tokenCount = Tokenizer.getTokenCount(value, 'o200k_base');
+
+    const memories = await getAllUserMemories(req.user.id);
+
+    // Check token limit
+    const memoryConfig = req.app.locals?.memory;
+    const tokenLimit = memoryConfig?.tokenLimit;
+
+    if (tokenLimit) {
+      const currentTotalTokens = memories.reduce(
+        (sum, memory) => sum + (memory.tokenCount || 0),
+        0,
+      );
+      if (currentTotalTokens + tokenCount > tokenLimit) {
+        return res.status(400).json({
+          error: `Adding this memory would exceed the token limit of ${tokenLimit}. Current usage: ${currentTotalTokens} tokens.`,
+        });
+      }
+    }
+
+    const result = await createMemory({
+      userId: req.user.id,
+      key: key.trim(),
+      value: value.trim(),
+      tokenCount,
+    });
+
+    if (!result.ok) {
+      return res.status(500).json({ error: 'Failed to create memory.' });
+    }
+
+    const updatedMemories = await getAllUserMemories(req.user.id);
+    const newMemory = updatedMemories.find((m) => m.key === key.trim());
+
+    res.status(201).json({ created: true, memory: newMemory });
+  } catch (error) {
+    if (error.message && error.message.includes('already exists')) {
+      return res.status(409).json({ error: 'Memory with this key already exists.' });
+    }
+    res.status(500).json({ error: error.message });
+  }
+});
+
+/**
+ * PATCH /memories/preferences
+ * Updates the user's memory preferences (e.g., enabling/disabling memories).
+ * Body: { memories: boolean }
+ * Returns 200 and { updated: true, preferences: { memories: boolean } } when successful.
+ */
+router.patch('/preferences', checkMemoryOptOut, async (req, res) => {
+  const { memories } = req.body;
+
+  if (typeof memories !== 'boolean') {
+    return res.status(400).json({ error: 'memories must be a boolean value.' });
+  }
+
+  try {
+    const updatedUser = await toggleUserMemories(req.user.id, memories);
+
+    if (!updatedUser) {
+      return res.status(404).json({ error: 'User not found.' });
+    }
+
+    res.json({
+      updated: true,
+      preferences: {
+        memories: updatedUser.personalization?.memories ?? true,
+      },
+    });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+/**
+ * PATCH /memories/:key
+ * Updates the value of an existing memory entry for the authenticated user.
+ * Body: { value: string }
+ * Returns 200 and { updated: true, memory: <updatedDoc> } when successful.
+ */
+router.patch('/:key', checkMemoryUpdate, async (req, res) => {
+  const { key } = req.params;
+  const { value } = req.body || {};
+
+  if (typeof value !== 'string' || value.trim() === '') {
+    return res.status(400).json({ error: 'Value is required and must be a non-empty string.' });
+  }
+
+  try {
+    const tokenCount = Tokenizer.getTokenCount(value, 'o200k_base');
+
+    const memories = await getAllUserMemories(req.user.id);
+    const existingMemory = memories.find((m) => m.key === key);
+
+    if (!existingMemory) {
+      return res.status(404).json({ error: 'Memory not found.' });
+    }
+
+    const result = await setMemory({
+      userId: req.user.id,
+      key,
+      value,
+      tokenCount,
+    });
+
+    if (!result.ok) {
+      return res.status(500).json({ error: 'Failed to update memory.' });
+    }
+
+    const updatedMemories = await getAllUserMemories(req.user.id);
+    const updatedMemory = updatedMemories.find((m) => m.key === key);
+
+    res.json({ updated: true, memory: updatedMemory });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+/**
+ * DELETE /memories/:key
+ * Deletes a memory entry for the authenticated user.
+ * Returns 200 and { deleted: true } when successful.
+ */
+router.delete('/:key', checkMemoryDelete, async (req, res) => {
+  const { key } = req.params;
+
+  try {
+    const result = await deleteMemory({ userId: req.user.id, key });
+
+    if (!result.ok) {
+      return res.status(404).json({ error: 'Memory not found.' });
+    }
+
+    res.json({ deleted: true });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+module.exports = router;
diff --git a/api/server/routes/roles.js b/api/server/routes/roles.js
index 17768c7de6..aefbfcec0c 100644
--- a/api/server/routes/roles.js
+++ b/api/server/routes/roles.js
@@ -1,6 +1,7 @@
 const express = require('express');
 const {
   promptPermissionsSchema,
+  memoryPermissionsSchema,
   agentPermissionsSchema,
   PermissionTypes,
   roleDefaults,
@@ -118,4 +119,43 @@ router.put('/:roleName/agents', checkAdmin, async (req, res) => {
   }
 });
 
+/**
+ * PUT /api/roles/:roleName/memories
+ * Update memory permissions for a specific role
+ */
+router.put('/:roleName/memories', checkAdmin, async (req, res) => {
+  const { roleName: _r } = req.params;
+  // TODO: TEMP, use a better parsing for roleName
+  const roleName = _r.toUpperCase();
+  /** @type {TRole['permissions']['MEMORIES']} */
+  const updates = req.body;
+
+  try {
+    const parsedUpdates = memoryPermissionsSchema.partial().parse(updates);
+
+    const role = await getRoleByName(roleName);
+    if (!role) {
+      return res.status(404).send({ message: 'Role not found' });
+    }
+
+    const currentPermissions =
+      role.permissions?.[PermissionTypes.MEMORIES] || role[PermissionTypes.MEMORIES] || {};
+
+    const mergedUpdates = {
+      permissions: {
+        ...role.permissions,
+        [PermissionTypes.MEMORIES]: {
+          ...currentPermissions,
+          ...parsedUpdates,
+        },
+      },
+    };
+
+    const updatedRole = await updateRoleByName(roleName, mergedUpdates);
+    res.status(200).send(updatedRole);
+  } catch (error) {
+    return res.status(400).send({ message: 'Invalid memory permissions.', error: error.errors });
+  }
+});
+
 module.exports = router;
diff --git a/api/server/services/ActionService.js b/api/server/services/ActionService.js
index a35c74ad74..ed9b0c447d 100644
--- a/api/server/services/ActionService.js
+++ b/api/server/services/ActionService.js
@@ -1,6 +1,8 @@
 const jwt = require('jsonwebtoken');
 const { nanoid } = require('nanoid');
+const { sendEvent } = require('@librechat/api');
 const { tool } = require('@langchain/core/tools');
+const { logger } = require('@librechat/data-schemas');
 const { GraphEvents, sleep } = require('@librechat/agents');
 const {
   Time,
@@ -13,10 +15,10 @@ const {
   actionDomainSeparator,
 } = require('librechat-data-provider');
 const { refreshAccessToken } = require('~/server/services/TokenService');
-const { logger, getFlowStateManager, sendEvent } = require('~/config');
 const { encryptV2, decryptV2 } = require('~/server/utils/crypto');
 const { getActions, deleteActions } = require('~/models/Action');
 const { deleteAssistant } = require('~/models/Assistant');
+const { getFlowStateManager } = require('~/config');
 const { logAxiosError } = require('~/utils');
 const { getLogStores } = require('~/cache');
 const { findToken } = require('~/models');
diff --git a/api/server/services/AppService.js b/api/server/services/AppService.js
index 4bb8c51d00..dc686d6294 100644
--- a/api/server/services/AppService.js
+++ b/api/server/services/AppService.js
@@ -3,6 +3,7 @@ const {
   loadOCRConfig,
   processMCPEnv,
   EModelEndpoint,
+  loadMemoryConfig,
   getConfigDefaults,
   loadWebSearchConfig,
 } = require('librechat-data-provider');
@@ -44,6 +45,7 @@ const AppService = async (app) => {
   const ocr = loadOCRConfig(config.ocr);
   const webSearch = loadWebSearchConfig(config.webSearch);
   checkWebSearchConfig(webSearch);
+  const memory = loadMemoryConfig(config.memory);
   const filteredTools = config.filteredTools;
   const includedTools = config.includedTools;
   const fileStrategy = config.fileStrategy ?? configDefaults.fileStrategy;
@@ -88,6 +90,7 @@ const AppService = async (app) => {
   const defaultLocals = {
     ocr,
     paths,
+    memory,
     webSearch,
     fileStrategy,
     socialLogins,
diff --git a/api/server/services/Endpoints/agents/agent.js b/api/server/services/Endpoints/agents/agent.js
new file mode 100644
index 0000000000..13a42140db
--- /dev/null
+++ b/api/server/services/Endpoints/agents/agent.js
@@ -0,0 +1,196 @@
+const { Providers } = require('@librechat/agents');
+const { primeResources, optionalChainWithEmptyCheck } = require('@librechat/api');
+const {
+  ErrorTypes,
+  EModelEndpoint,
+  EToolResources,
+  replaceSpecialVars,
+  providerEndpointMap,
+} = require('librechat-data-provider');
+const initAnthropic = require('~/server/services/Endpoints/anthropic/initialize');
+const getBedrockOptions = require('~/server/services/Endpoints/bedrock/options');
+const initOpenAI = require('~/server/services/Endpoints/openAI/initialize');
+const initCustom = require('~/server/services/Endpoints/custom/initialize');
+const initGoogle = require('~/server/services/Endpoints/google/initialize');
+const generateArtifactsPrompt = require('~/app/clients/prompts/artifacts');
+const { getCustomEndpointConfig } = require('~/server/services/Config');
+const { processFiles } = require('~/server/services/Files/process');
+const { getConvoFiles } = require('~/models/Conversation');
+const { getToolFilesByIds } = require('~/models/File');
+const { getModelMaxTokens } = require('~/utils');
+const { getFiles } = require('~/models/File');
+
+const providerConfigMap = {
+  [Providers.XAI]: initCustom,
+  [Providers.OLLAMA]: initCustom,
+  [Providers.DEEPSEEK]: initCustom,
+  [Providers.OPENROUTER]: initCustom,
+  [EModelEndpoint.openAI]: initOpenAI,
+  [EModelEndpoint.google]: initGoogle,
+  [EModelEndpoint.azureOpenAI]: initOpenAI,
+  [EModelEndpoint.anthropic]: initAnthropic,
+  [EModelEndpoint.bedrock]: getBedrockOptions,
+};
+
+/**
+ * @param {object} params
+ * @param {ServerRequest} params.req
+ * @param {ServerResponse} params.res
+ * @param {Agent} params.agent
+ * @param {string | null} [params.conversationId]
+ * @param {Array<IMongoFile>} [params.requestFiles]
+ * @param {typeof import('~/server/services/ToolService').loadAgentTools | undefined} [params.loadTools]
+ * @param {TEndpointOption} [params.endpointOption]
+ * @param {Set<string>} [params.allowedProviders]
+ * @param {boolean} [params.isInitialAgent]
+ * @returns {Promise<Agent & { tools: StructuredTool[], attachments: Array<MongoFile>, toolContextMap: Record<string, unknown>, maxContextTokens: number }>}
+ */
+const initializeAgent = async ({
+  req,
+  res,
+  agent,
+  loadTools,
+  requestFiles,
+  conversationId,
+  endpointOption,
+  allowedProviders,
+  isInitialAgent = false,
+}) => {
+  if (allowedProviders.size > 0 && !allowedProviders.has(agent.provider)) {
+    throw new Error(
+      `{ "type": "${ErrorTypes.INVALID_AGENT_PROVIDER}", "info": "${agent.provider}" }`,
+    );
+  }
+  let currentFiles;
+
+  if (
+    isInitialAgent &&
+    conversationId != null &&
+    (agent.model_parameters?.resendFiles ?? true) === true
+  ) {
+    const fileIds = (await getConvoFiles(conversationId)) ?? [];
+    /** @type {Set<EToolResources>} */
+    const toolResourceSet = new Set();
+    for (const tool of agent.tools) {
+      if (EToolResources[tool]) {
+        toolResourceSet.add(EToolResources[tool]);
+      }
+    }
+    const toolFiles = await getToolFilesByIds(fileIds, toolResourceSet);
+    if (requestFiles.length || toolFiles.length) {
+      currentFiles = await processFiles(requestFiles.concat(toolFiles));
+    }
+  } else if (isInitialAgent && requestFiles.length) {
+    currentFiles = await processFiles(requestFiles);
+  }
+
+  const { attachments, tool_resources } = await primeResources({
+    req,
+    getFiles,
+    attachments: currentFiles,
+    tool_resources: agent.tool_resources,
+    requestFileSet: new Set(requestFiles?.map((file) => file.file_id)),
+  });
+
+  const provider = agent.provider;
+  const { tools, toolContextMap } =
+    (await loadTools?.({
+      req,
+      res,
+      provider,
+      agentId: agent.id,
+      tools: agent.tools,
+      model: agent.model,
+      tool_resources,
+    })) ?? {};
+
+  agent.endpoint = provider;
+  let getOptions = providerConfigMap[provider];
+  if (!getOptions && providerConfigMap[provider.toLowerCase()] != null) {
+    agent.provider = provider.toLowerCase();
+    getOptions = providerConfigMap[agent.provider];
+  } else if (!getOptions) {
+    const customEndpointConfig = await getCustomEndpointConfig(provider);
+    if (!customEndpointConfig) {
+      throw new Error(`Provider ${provider} not supported`);
+    }
+    getOptions = initCustom;
+    agent.provider = Providers.OPENAI;
+  }
+  const model_parameters = Object.assign(
+    {},
+    agent.model_parameters ?? { model: agent.model },
+    isInitialAgent === true ? endpointOption?.model_parameters : {},
+  );
+  const _endpointOption =
+    isInitialAgent === true
+      ? Object.assign({}, endpointOption, { model_parameters })
+      : { model_parameters };
+
+  const options = await getOptions({
+    req,
+    res,
+    optionsOnly: true,
+    overrideEndpoint: provider,
+    overrideModel: agent.model,
+    endpointOption: _endpointOption,
+  });
+
+  if (
+    agent.endpoint === EModelEndpoint.azureOpenAI &&
+    options.llmConfig?.azureOpenAIApiInstanceName == null
+  ) {
+    agent.provider = Providers.OPENAI;
+  }
+
+  if (options.provider != null) {
+    agent.provider = options.provider;
+  }
+
+  /** @type {import('@librechat/agents').ClientOptions} */
+  agent.model_parameters = Object.assign(model_parameters, options.llmConfig);
+  if (options.configOptions) {
+    agent.model_parameters.configuration = options.configOptions;
+  }
+
+  if (!agent.model_parameters.model) {
+    agent.model_parameters.model = agent.model;
+  }
+
+  if (agent.instructions && agent.instructions !== '') {
+    agent.instructions = replaceSpecialVars({
+      text: agent.instructions,
+      user: req.user,
+    });
+  }
+
+  if (typeof agent.artifacts === 'string' && agent.artifacts !== '') {
+    agent.additional_instructions = generateArtifactsPrompt({
+      endpoint: agent.provider,
+      artifacts: agent.artifacts,
+    });
+  }
+
+  const tokensModel =
+    agent.provider === EModelEndpoint.azureOpenAI ? agent.model : agent.model_parameters.model;
+  const maxTokens = optionalChainWithEmptyCheck(
+    agent.model_parameters.maxOutputTokens,
+    agent.model_parameters.maxTokens,
+    0,
+  );
+  const maxContextTokens = optionalChainWithEmptyCheck(
+    agent.model_parameters.maxContextTokens,
+    agent.max_context_tokens,
+    getModelMaxTokens(tokensModel, providerEndpointMap[provider]),
+    4096,
+  );
+  return {
+    ...agent,
+    tools,
+    attachments,
+    toolContextMap,
+    maxContextTokens: (maxContextTokens - maxTokens) * 0.9,
+  };
+};
+
+module.exports = { initializeAgent };
diff --git a/api/server/services/Endpoints/agents/initialize.js b/api/server/services/Endpoints/agents/initialize.js
index c9e363e815..e3154fe13a 100644
--- a/api/server/services/Endpoints/agents/initialize.js
+++ b/api/server/services/Endpoints/agents/initialize.js
@@ -1,294 +1,41 @@
-const { createContentAggregator, Providers } = require('@librechat/agents');
-const {
-  Constants,
-  ErrorTypes,
-  EModelEndpoint,
-  EToolResources,
-  getResponseSender,
-  AgentCapabilities,
-  replaceSpecialVars,
-  providerEndpointMap,
-} = require('librechat-data-provider');
+const { logger } = require('@librechat/data-schemas');
+const { createContentAggregator } = require('@librechat/agents');
+const { Constants, EModelEndpoint, getResponseSender } = require('librechat-data-provider');
 const {
   getDefaultHandlers,
   createToolEndCallback,
 } = require('~/server/controllers/agents/callbacks');
-const initAnthropic = require('~/server/services/Endpoints/anthropic/initialize');
-const getBedrockOptions = require('~/server/services/Endpoints/bedrock/options');
-const initOpenAI = require('~/server/services/Endpoints/openAI/initialize');
-const initCustom = require('~/server/services/Endpoints/custom/initialize');
-const initGoogle = require('~/server/services/Endpoints/google/initialize');
-const generateArtifactsPrompt = require('~/app/clients/prompts/artifacts');
-const { getCustomEndpointConfig } = require('~/server/services/Config');
-const { processFiles } = require('~/server/services/Files/process');
+const { initializeAgent } = require('~/server/services/Endpoints/agents/agent');
 const { loadAgentTools } = require('~/server/services/ToolService');
 const AgentClient = require('~/server/controllers/agents/client');
-const { getConvoFiles } = require('~/models/Conversation');
-const { getToolFilesByIds } = require('~/models/File');
-const { getModelMaxTokens } = require('~/utils');
 const { getAgent } = require('~/models/Agent');
-const { getFiles } = require('~/models/File');
-const { logger } = require('~/config');
 
-const providerConfigMap = {
-  [Providers.XAI]: initCustom,
-  [Providers.OLLAMA]: initCustom,
-  [Providers.DEEPSEEK]: initCustom,
-  [Providers.OPENROUTER]: initCustom,
-  [EModelEndpoint.openAI]: initOpenAI,
-  [EModelEndpoint.google]: initGoogle,
-  [EModelEndpoint.azureOpenAI]: initOpenAI,
-  [EModelEndpoint.anthropic]: initAnthropic,
-  [EModelEndpoint.bedrock]: getBedrockOptions,
-};
-
-/**
- * @param {Object} params
- * @param {ServerRequest} params.req
- * @param {Promise<Array<MongoFile | null>> | undefined} [params.attachments]
- * @param {Set<string>} params.requestFileSet
- * @param {AgentToolResources | undefined} [params.tool_resources]
- * @returns {Promise<{ attachments: Array<MongoFile | undefined> | undefined, tool_resources: AgentToolResources | undefined }>}
- */
-const primeResources = async ({
-  req,
-  attachments: _attachments,
-  tool_resources: _tool_resources,
-  requestFileSet,
-}) => {
-  try {
-    /** @type {Array<MongoFile | undefined> | undefined} */
-    let attachments;
-    const tool_resources = _tool_resources ?? {};
-    const isOCREnabled = (req.app.locals?.[EModelEndpoint.agents]?.capabilities ?? []).includes(
-      AgentCapabilities.ocr,
-    );
-    if (tool_resources[EToolResources.ocr]?.file_ids && isOCREnabled) {
-      const context = await getFiles(
-        {
-          file_id: { $in: tool_resources.ocr.file_ids },
-        },
-        {},
-        {},
-      );
-      attachments = (attachments ?? []).concat(context);
+function createToolLoader() {
+  /**
+   * @param {object} params
+   * @param {ServerRequest} params.req
+   * @param {ServerResponse} params.res
+   * @param {string} params.agentId
+   * @param {string[]} params.tools
+   * @param {string} params.provider
+   * @param {string} params.model
+   * @param {AgentToolResources} params.tool_resources
+   * @returns {Promise<{ tools: StructuredTool[], toolContextMap: Record<string, unknown> } | undefined>}
+   */
+  return async function loadTools({ req, res, agentId, tools, provider, model, tool_resources }) {
+    const agent = { id: agentId, tools, provider, model };
+    try {
+      return await loadAgentTools({
+        req,
+        res,
+        agent,
+        tool_resources,
+      });
+    } catch (error) {
+      logger.error('Error loading tools for agent ' + agentId, error);
     }
-    if (!_attachments) {
-      return { attachments, tool_resources };
-    }
-    /** @type {Array<MongoFile | undefined> | undefined} */
-    const files = await _attachments;
-    if (!attachments) {
-      /** @type {Array<MongoFile | undefined>} */
-      attachments = [];
-    }
-
-    for (const file of files) {
-      if (!file) {
-        continue;
-      }
-      if (file.metadata?.fileIdentifier) {
-        const execute_code = tool_resources[EToolResources.execute_code] ?? {};
-        if (!execute_code.files) {
-          tool_resources[EToolResources.execute_code] = { ...execute_code, files: [] };
-        }
-        tool_resources[EToolResources.execute_code].files.push(file);
-      } else if (file.embedded === true) {
-        const file_search = tool_resources[EToolResources.file_search] ?? {};
-        if (!file_search.files) {
-          tool_resources[EToolResources.file_search] = { ...file_search, files: [] };
-        }
-        tool_resources[EToolResources.file_search].files.push(file);
-      } else if (
-        requestFileSet.has(file.file_id) &&
-        file.type.startsWith('image') &&
-        file.height &&
-        file.width
-      ) {
-        const image_edit = tool_resources[EToolResources.image_edit] ?? {};
-        if (!image_edit.files) {
-          tool_resources[EToolResources.image_edit] = { ...image_edit, files: [] };
-        }
-        tool_resources[EToolResources.image_edit].files.push(file);
-      }
-
-      attachments.push(file);
-    }
-    return { attachments, tool_resources };
-  } catch (error) {
-    logger.error('Error priming resources', error);
-    return { attachments: _attachments, tool_resources: _tool_resources };
-  }
-};
-
-/**
- * @param  {...string | number} values
- * @returns {string | number | undefined}
- */
-function optionalChainWithEmptyCheck(...values) {
-  for (const value of values) {
-    if (value !== undefined && value !== null && value !== '') {
-      return value;
-    }
-  }
-  return values[values.length - 1];
-}
-
-/**
- * @param {object} params
- * @param {ServerRequest} params.req
- * @param {ServerResponse} params.res
- * @param {Agent} params.agent
- * @param {Set<string>} [params.allowedProviders]
- * @param {object} [params.endpointOption]
- * @param {boolean} [params.isInitialAgent]
- * @returns {Promise<Agent>}
- */
-const initializeAgentOptions = async ({
-  req,
-  res,
-  agent,
-  endpointOption,
-  allowedProviders,
-  isInitialAgent = false,
-}) => {
-  if (allowedProviders.size > 0 && !allowedProviders.has(agent.provider)) {
-    throw new Error(
-      `{ "type": "${ErrorTypes.INVALID_AGENT_PROVIDER}", "info": "${agent.provider}" }`,
-    );
-  }
-  let currentFiles;
-  /** @type {Array<MongoFile>} */
-  const requestFiles = req.body.files ?? [];
-  if (
-    isInitialAgent &&
-    req.body.conversationId != null &&
-    (agent.model_parameters?.resendFiles ?? true) === true
-  ) {
-    const fileIds = (await getConvoFiles(req.body.conversationId)) ?? [];
-    /** @type {Set<EToolResources>} */
-    const toolResourceSet = new Set();
-    for (const tool of agent.tools) {
-      if (EToolResources[tool]) {
-        toolResourceSet.add(EToolResources[tool]);
-      }
-    }
-    const toolFiles = await getToolFilesByIds(fileIds, toolResourceSet);
-    if (requestFiles.length || toolFiles.length) {
-      currentFiles = await processFiles(requestFiles.concat(toolFiles));
-    }
-  } else if (isInitialAgent && requestFiles.length) {
-    currentFiles = await processFiles(requestFiles);
-  }
-
-  const { attachments, tool_resources } = await primeResources({
-    req,
-    attachments: currentFiles,
-    tool_resources: agent.tool_resources,
-    requestFileSet: new Set(requestFiles.map((file) => file.file_id)),
-  });
-
-  const provider = agent.provider;
-  const { tools, toolContextMap } = await loadAgentTools({
-    req,
-    res,
-    agent: {
-      id: agent.id,
-      tools: agent.tools,
-      provider,
-      model: agent.model,
-    },
-    tool_resources,
-  });
-
-  agent.endpoint = provider;
-  let getOptions = providerConfigMap[provider];
-  if (!getOptions && providerConfigMap[provider.toLowerCase()] != null) {
-    agent.provider = provider.toLowerCase();
-    getOptions = providerConfigMap[agent.provider];
-  } else if (!getOptions) {
-    const customEndpointConfig = await getCustomEndpointConfig(provider);
-    if (!customEndpointConfig) {
-      throw new Error(`Provider ${provider} not supported`);
-    }
-    getOptions = initCustom;
-    agent.provider = Providers.OPENAI;
-  }
-  const model_parameters = Object.assign(
-    {},
-    agent.model_parameters ?? { model: agent.model },
-    isInitialAgent === true ? endpointOption?.model_parameters : {},
-  );
-  const _endpointOption =
-    isInitialAgent === true
-      ? Object.assign({}, endpointOption, { model_parameters })
-      : { model_parameters };
-
-  const options = await getOptions({
-    req,
-    res,
-    optionsOnly: true,
-    overrideEndpoint: provider,
-    overrideModel: agent.model,
-    endpointOption: _endpointOption,
-  });
-
-  if (
-    agent.endpoint === EModelEndpoint.azureOpenAI &&
-    options.llmConfig?.azureOpenAIApiInstanceName == null
-  ) {
-    agent.provider = Providers.OPENAI;
-  }
-
-  if (options.provider != null) {
-    agent.provider = options.provider;
-  }
-
-  /** @type {import('@librechat/agents').ClientOptions} */
-  agent.model_parameters = Object.assign(model_parameters, options.llmConfig);
-  if (options.configOptions) {
-    agent.model_parameters.configuration = options.configOptions;
-  }
-
-  if (!agent.model_parameters.model) {
-    agent.model_parameters.model = agent.model;
-  }
-
-  if (agent.instructions && agent.instructions !== '') {
-    agent.instructions = replaceSpecialVars({
-      text: agent.instructions,
-      user: req.user,
-    });
-  }
-
-  if (typeof agent.artifacts === 'string' && agent.artifacts !== '') {
-    agent.additional_instructions = generateArtifactsPrompt({
-      endpoint: agent.provider,
-      artifacts: agent.artifacts,
-    });
-  }
-
-  const tokensModel =
-    agent.provider === EModelEndpoint.azureOpenAI ? agent.model : agent.model_parameters.model;
-  const maxTokens = optionalChainWithEmptyCheck(
-    agent.model_parameters.maxOutputTokens,
-    agent.model_parameters.maxTokens,
-    0,
-  );
-  const maxContextTokens = optionalChainWithEmptyCheck(
-    agent.model_parameters.maxContextTokens,
-    agent.max_context_tokens,
-    getModelMaxTokens(tokensModel, providerEndpointMap[provider]),
-    4096,
-  );
-  return {
-    ...agent,
-    tools,
-    attachments,
-    toolContextMap,
-    maxContextTokens: (maxContextTokens - maxTokens) * 0.9,
   };
-};
+}
 
 const initializeClient = async ({ req, res, endpointOption }) => {
   if (!endpointOption) {
@@ -313,7 +60,6 @@ const initializeClient = async ({ req, res, endpointOption }) => {
     throw new Error('No agent promise provided');
   }
 
-  // Initialize primary agent
   const primaryAgent = await endpointOption.agent;
   if (!primaryAgent) {
     throw new Error('Agent not found');
@@ -323,10 +69,18 @@ const initializeClient = async ({ req, res, endpointOption }) => {
   /** @type {Set<string>} */
   const allowedProviders = new Set(req?.app?.locals?.[EModelEndpoint.agents]?.allowedProviders);
 
-  // Handle primary agent
-  const primaryConfig = await initializeAgentOptions({
+  const loadTools = createToolLoader();
+  /** @type {Array<MongoFile>} */
+  const requestFiles = req.body.files ?? [];
+  /** @type {string} */
+  const conversationId = req.body.conversationId;
+
+  const primaryConfig = await initializeAgent({
     req,
     res,
+    loadTools,
+    requestFiles,
+    conversationId,
     agent: primaryAgent,
     endpointOption,
     allowedProviders,
@@ -340,10 +94,13 @@ const initializeClient = async ({ req, res, endpointOption }) => {
       if (!agent) {
         throw new Error(`Agent ${agentId} not found`);
       }
-      const config = await initializeAgentOptions({
+      const config = await initializeAgent({
         req,
         res,
         agent,
+        loadTools,
+        requestFiles,
+        conversationId,
         endpointOption,
         allowedProviders,
       });
diff --git a/api/server/services/Endpoints/azureAssistants/initialize.js b/api/server/services/Endpoints/azureAssistants/initialize.js
index fc8024af07..88acef23e5 100644
--- a/api/server/services/Endpoints/azureAssistants/initialize.js
+++ b/api/server/services/Endpoints/azureAssistants/initialize.js
@@ -1,5 +1,6 @@
 const OpenAI = require('openai');
 const { HttpsProxyAgent } = require('https-proxy-agent');
+const { constructAzureURL, isUserProvided } = require('@librechat/api');
 const {
   ErrorTypes,
   EModelEndpoint,
@@ -12,8 +13,6 @@ const {
   checkUserKeyExpiry,
 } = require('~/server/services/UserService');
 const OpenAIClient = require('~/app/clients/OpenAIClient');
-const { isUserProvided } = require('~/server/utils');
-const { constructAzureURL } = require('~/utils');
 
 class Files {
   constructor(client) {
diff --git a/api/server/services/Endpoints/bedrock/options.js b/api/server/services/Endpoints/bedrock/options.js
index da332060e9..fc5536abbf 100644
--- a/api/server/services/Endpoints/bedrock/options.js
+++ b/api/server/services/Endpoints/bedrock/options.js
@@ -1,4 +1,5 @@
 const { HttpsProxyAgent } = require('https-proxy-agent');
+const { createHandleLLMNewToken } = require('@librechat/api');
 const {
   AuthType,
   Constants,
@@ -8,7 +9,6 @@ const {
   removeNullishValues,
 } = require('librechat-data-provider');
 const { getUserKey, checkUserKeyExpiry } = require('~/server/services/UserService');
-const { createHandleLLMNewToken } = require('~/app/clients/generators');
 
 const getOptions = async ({ req, overrideModel, endpointOption }) => {
   const {
diff --git a/api/server/services/Endpoints/custom/initialize.js b/api/server/services/Endpoints/custom/initialize.js
index 39def8d0d5..754abef5a8 100644
--- a/api/server/services/Endpoints/custom/initialize.js
+++ b/api/server/services/Endpoints/custom/initialize.js
@@ -6,10 +6,9 @@ const {
   extractEnvVariable,
 } = require('librechat-data-provider');
 const { Providers } = require('@librechat/agents');
+const { getOpenAIConfig, createHandleLLMNewToken } = require('@librechat/api');
 const { getUserKeyValues, checkUserKeyExpiry } = require('~/server/services/UserService');
-const { getLLMConfig } = require('~/server/services/Endpoints/openAI/llm');
 const { getCustomEndpointConfig } = require('~/server/services/Config');
-const { createHandleLLMNewToken } = require('~/app/clients/generators');
 const { fetchModels } = require('~/server/services/ModelService');
 const OpenAIClient = require('~/app/clients/OpenAIClient');
 const { isUserProvided } = require('~/server/utils');
@@ -144,7 +143,7 @@ const initializeClient = async ({ req, res, endpointOption, optionsOnly, overrid
         clientOptions,
       );
       clientOptions.modelOptions.user = req.user.id;
-      const options = getLLMConfig(apiKey, clientOptions, endpoint);
+      const options = getOpenAIConfig(apiKey, clientOptions, endpoint);
       if (!customOptions.streamRate) {
         return options;
       }
diff --git a/api/server/services/Endpoints/gptPlugins/initialize.js b/api/server/services/Endpoints/gptPlugins/initialize.js
index 7bfb43f004..d2af6c757e 100644
--- a/api/server/services/Endpoints/gptPlugins/initialize.js
+++ b/api/server/services/Endpoints/gptPlugins/initialize.js
@@ -1,11 +1,10 @@
 const {
   EModelEndpoint,
-  mapModelToAzureConfig,
   resolveHeaders,
+  mapModelToAzureConfig,
 } = require('librechat-data-provider');
+const { isEnabled, isUserProvided, getAzureCredentials } = require('@librechat/api');
 const { getUserKeyValues, checkUserKeyExpiry } = require('~/server/services/UserService');
-const { isEnabled, isUserProvided } = require('~/server/utils');
-const { getAzureCredentials } = require('~/utils');
 const { PluginsClient } = require('~/app');
 
 const initializeClient = async ({ req, res, endpointOption }) => {
diff --git a/api/server/services/Endpoints/gptPlugins/initialize.spec.js b/api/server/services/Endpoints/gptPlugins/initialize.spec.js
index 02199c9397..f9cb2750a4 100644
--- a/api/server/services/Endpoints/gptPlugins/initialize.spec.js
+++ b/api/server/services/Endpoints/gptPlugins/initialize.spec.js
@@ -114,11 +114,11 @@ describe('gptPlugins/initializeClient', () => {
   test('should initialize PluginsClient with Azure credentials when PLUGINS_USE_AZURE is true', async () => {
     process.env.AZURE_API_KEY = 'test-azure-api-key';
     (process.env.AZURE_OPENAI_API_INSTANCE_NAME = 'some-value'),
-    (process.env.AZURE_OPENAI_API_DEPLOYMENT_NAME = 'some-value'),
-    (process.env.AZURE_OPENAI_API_VERSION = 'some-value'),
-    (process.env.AZURE_OPENAI_API_COMPLETIONS_DEPLOYMENT_NAME = 'some-value'),
-    (process.env.AZURE_OPENAI_API_EMBEDDINGS_DEPLOYMENT_NAME = 'some-value'),
-    (process.env.PLUGINS_USE_AZURE = 'true');
+      (process.env.AZURE_OPENAI_API_DEPLOYMENT_NAME = 'some-value'),
+      (process.env.AZURE_OPENAI_API_VERSION = 'some-value'),
+      (process.env.AZURE_OPENAI_API_COMPLETIONS_DEPLOYMENT_NAME = 'some-value'),
+      (process.env.AZURE_OPENAI_API_EMBEDDINGS_DEPLOYMENT_NAME = 'some-value'),
+      (process.env.PLUGINS_USE_AZURE = 'true');
     process.env.DEBUG_PLUGINS = 'false';
     process.env.OPENAI_SUMMARIZE = 'false';
 
diff --git a/api/server/services/Endpoints/openAI/initialize.js b/api/server/services/Endpoints/openAI/initialize.js
index 714ed5a1e6..bc0907b3de 100644
--- a/api/server/services/Endpoints/openAI/initialize.js
+++ b/api/server/services/Endpoints/openAI/initialize.js
@@ -4,12 +4,15 @@ const {
   resolveHeaders,
   mapModelToAzureConfig,
 } = require('librechat-data-provider');
+const {
+  isEnabled,
+  isUserProvided,
+  getOpenAIConfig,
+  getAzureCredentials,
+  createHandleLLMNewToken,
+} = require('@librechat/api');
 const { getUserKeyValues, checkUserKeyExpiry } = require('~/server/services/UserService');
-const { getLLMConfig } = require('~/server/services/Endpoints/openAI/llm');
-const { createHandleLLMNewToken } = require('~/app/clients/generators');
-const { isEnabled, isUserProvided } = require('~/server/utils');
 const OpenAIClient = require('~/app/clients/OpenAIClient');
-const { getAzureCredentials } = require('~/utils');
 
 const initializeClient = async ({
   req,
@@ -140,7 +143,7 @@ const initializeClient = async ({
     modelOptions.model = modelName;
     clientOptions = Object.assign({ modelOptions }, clientOptions);
     clientOptions.modelOptions.user = req.user.id;
-    const options = getLLMConfig(apiKey, clientOptions);
+    const options = getOpenAIConfig(apiKey, clientOptions);
     const streamRate = clientOptions.streamRate;
     if (!streamRate) {
       return options;
diff --git a/api/server/services/Endpoints/openAI/llm.js b/api/server/services/Endpoints/openAI/llm.js
deleted file mode 100644
index c1fd090b28..0000000000
--- a/api/server/services/Endpoints/openAI/llm.js
+++ /dev/null
@@ -1,170 +0,0 @@
-const { HttpsProxyAgent } = require('https-proxy-agent');
-const { KnownEndpoints } = require('librechat-data-provider');
-const { sanitizeModelName, constructAzureURL } = require('~/utils');
-const { isEnabled } = require('~/server/utils');
-
-/**
- * Generates configuration options for creating a language model (LLM) instance.
- * @param {string} apiKey - The API key for authentication.
- * @param {Object} options - Additional options for configuring the LLM.
- * @param {Object} [options.modelOptions] - Model-specific options.
- * @param {string} [options.modelOptions.model] - The name of the model to use.
- * @param {string} [options.modelOptions.user] - The user ID
- * @param {number} [options.modelOptions.temperature] - Controls randomness in output generation (0-2).
- * @param {number} [options.modelOptions.top_p] - Controls diversity via nucleus sampling (0-1).
- * @param {number} [options.modelOptions.frequency_penalty] - Reduces repetition of token sequences (-2 to 2).
- * @param {number} [options.modelOptions.presence_penalty] - Encourages discussing new topics (-2 to 2).
- * @param {number} [options.modelOptions.max_tokens] - The maximum number of tokens to generate.
- * @param {string[]} [options.modelOptions.stop] - Sequences where the API will stop generating further tokens.
- * @param {string} [options.reverseProxyUrl] - URL for a reverse proxy, if used.
- * @param {boolean} [options.useOpenRouter] - Flag to use OpenRouter API.
- * @param {Object} [options.headers] - Additional headers for API requests.
- * @param {string} [options.proxy] - Proxy server URL.
- * @param {Object} [options.azure] - Azure-specific configurations.
- * @param {boolean} [options.streaming] - Whether to use streaming mode.
- * @param {Object} [options.addParams] - Additional parameters to add to the model options.
- * @param {string[]} [options.dropParams] - Parameters to remove from the model options.
- * @param {string|null} [endpoint=null] - The endpoint name
- * @returns {Object} Configuration options for creating an LLM instance.
- */
-function getLLMConfig(apiKey, options = {}, endpoint = null) {
-  let {
-    modelOptions = {},
-    reverseProxyUrl,
-    defaultQuery,
-    headers,
-    proxy,
-    azure,
-    streaming = true,
-    addParams,
-    dropParams,
-  } = options;
-
-  /** @type {OpenAIClientOptions} */
-  let llmConfig = {
-    streaming,
-  };
-
-  Object.assign(llmConfig, modelOptions);
-
-  if (addParams && typeof addParams === 'object') {
-    Object.assign(llmConfig, addParams);
-  }
-  /** Note: OpenAI Web Search models do not support any known parameters besdies `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',
-    ];
-
-    dropParams = dropParams || [];
-    dropParams = [...new Set([...dropParams, ...searchExcludeParams])];
-  }
-
-  if (dropParams && Array.isArray(dropParams)) {
-    dropParams.forEach((param) => {
-      if (llmConfig[param]) {
-        llmConfig[param] = undefined;
-      }
-    });
-  }
-
-  let useOpenRouter;
-  /** @type {OpenAIClientOptions['configuration']} */
-  const configOptions = {};
-  if (
-    (reverseProxyUrl && reverseProxyUrl.includes(KnownEndpoints.openrouter)) ||
-    (endpoint && endpoint.toLowerCase().includes(KnownEndpoints.openrouter))
-  ) {
-    useOpenRouter = true;
-    llmConfig.include_reasoning = true;
-    configOptions.baseURL = reverseProxyUrl;
-    configOptions.defaultHeaders = Object.assign(
-      {
-        'HTTP-Referer': 'https://librechat.ai',
-        'X-Title': 'LibreChat',
-      },
-      headers,
-    );
-  } else if (reverseProxyUrl) {
-    configOptions.baseURL = reverseProxyUrl;
-    if (headers) {
-      configOptions.defaultHeaders = headers;
-    }
-  }
-
-  if (defaultQuery) {
-    configOptions.defaultQuery = defaultQuery;
-  }
-
-  if (proxy) {
-    const proxyAgent = new HttpsProxyAgent(proxy);
-    Object.assign(configOptions, {
-      httpAgent: proxyAgent,
-      httpsAgent: proxyAgent,
-    });
-  }
-
-  if (azure) {
-    const useModelName = isEnabled(process.env.AZURE_USE_MODEL_AS_DEPLOYMENT_NAME);
-    azure.azureOpenAIApiDeploymentName = useModelName
-      ? sanitizeModelName(llmConfig.model)
-      : azure.azureOpenAIApiDeploymentName;
-
-    if (process.env.AZURE_OPENAI_DEFAULT_MODEL) {
-      llmConfig.model = process.env.AZURE_OPENAI_DEFAULT_MODEL;
-    }
-
-    if (configOptions.baseURL) {
-      const azureURL = constructAzureURL({
-        baseURL: configOptions.baseURL,
-        azureOptions: azure,
-      });
-      azure.azureOpenAIBasePath = azureURL.split(`/${azure.azureOpenAIApiDeploymentName}`)[0];
-    }
-
-    Object.assign(llmConfig, azure);
-    llmConfig.model = llmConfig.azureOpenAIApiDeploymentName;
-  } else {
-    llmConfig.apiKey = apiKey;
-    // Object.assign(llmConfig, {
-    //   configuration: { apiKey },
-    // });
-  }
-
-  if (process.env.OPENAI_ORGANIZATION && this.azure) {
-    llmConfig.organization = process.env.OPENAI_ORGANIZATION;
-  }
-
-  if (useOpenRouter && llmConfig.reasoning_effort != null) {
-    llmConfig.reasoning = {
-      effort: llmConfig.reasoning_effort,
-    };
-    delete llmConfig.reasoning_effort;
-  }
-
-  if (llmConfig?.['max_tokens'] != null) {
-    /** @type {number} */
-    llmConfig.maxTokens = llmConfig['max_tokens'];
-    delete llmConfig['max_tokens'];
-  }
-
-  return {
-    /** @type {OpenAIClientOptions} */
-    llmConfig,
-    /** @type {OpenAIClientOptions['configuration']} */
-    configOptions,
-  };
-}
-
-module.exports = { getLLMConfig };
diff --git a/api/server/services/Files/Audio/STTService.js b/api/server/services/Files/Audio/STTService.js
index d6c8cc4146..49a800336b 100644
--- a/api/server/services/Files/Audio/STTService.js
+++ b/api/server/services/Files/Audio/STTService.js
@@ -2,9 +2,9 @@ const axios = require('axios');
 const fs = require('fs').promises;
 const FormData = require('form-data');
 const { Readable } = require('stream');
+const { genAzureEndpoint } = require('@librechat/api');
 const { extractEnvVariable, STTProviders } = require('librechat-data-provider');
 const { getCustomConfig } = require('~/server/services/Config');
-const { genAzureEndpoint } = require('~/utils');
 const { logger } = require('~/config');
 
 /**
diff --git a/api/server/services/Files/Audio/TTSService.js b/api/server/services/Files/Audio/TTSService.js
index cd718fdfc1..34d8202156 100644
--- a/api/server/services/Files/Audio/TTSService.js
+++ b/api/server/services/Files/Audio/TTSService.js
@@ -1,8 +1,8 @@
 const axios = require('axios');
+const { genAzureEndpoint } = require('@librechat/api');
 const { extractEnvVariable, TTSProviders } = require('librechat-data-provider');
 const { getRandomVoiceId, createChunkProcessor, splitTextIntoChunks } = require('./streamAudio');
 const { getCustomConfig } = require('~/server/services/Config');
-const { genAzureEndpoint } = require('~/utils');
 const { logger } = require('~/config');
 
 /**
diff --git a/api/server/services/MCP.js b/api/server/services/MCP.js
index b9baef462e..dc3d3f0037 100644
--- a/api/server/services/MCP.js
+++ b/api/server/services/MCP.js
@@ -1,6 +1,6 @@
 const { z } = require('zod');
 const { tool } = require('@langchain/core/tools');
-const { normalizeServerName } = require('librechat-mcp');
+const { normalizeServerName } = require('@librechat/api');
 const { Constants: AgentConstants, Providers } = require('@librechat/agents');
 const {
   Constants,
diff --git a/api/server/services/start/interface.js b/api/server/services/start/interface.js
index 7578c036b2..c98fdb60bc 100644
--- a/api/server/services/start/interface.js
+++ b/api/server/services/start/interface.js
@@ -2,6 +2,7 @@ const {
   SystemRoles,
   Permissions,
   PermissionTypes,
+  isMemoryEnabled,
   removeNullishValues,
 } = require('librechat-data-provider');
 const { updateAccessPermissions } = require('~/models/Role');
@@ -20,6 +21,14 @@ async function loadDefaultInterface(config, configDefaults, roleName = SystemRol
   const hasModelSpecs = config?.modelSpecs?.list?.length > 0;
   const includesAddedEndpoints = config?.modelSpecs?.addedEndpoints?.length > 0;
 
+  const memoryConfig = config?.memory;
+  const memoryEnabled = isMemoryEnabled(memoryConfig);
+  /** Only disable memories if memory config is present but disabled/invalid */
+  const shouldDisableMemories = memoryConfig && !memoryEnabled;
+  /** Check if personalization is enabled (defaults to true if memory is configured and enabled) */
+  const isPersonalizationEnabled =
+    memoryConfig && memoryEnabled && memoryConfig.personalize !== false;
+
   /** @type {TCustomConfig['interface']} */
   const loadedInterface = removeNullishValues({
     endpointsMenu:
@@ -33,6 +42,7 @@ async function loadDefaultInterface(config, configDefaults, roleName = SystemRol
     privacyPolicy: interfaceConfig?.privacyPolicy ?? defaults.privacyPolicy,
     termsOfService: interfaceConfig?.termsOfService ?? defaults.termsOfService,
     bookmarks: interfaceConfig?.bookmarks ?? defaults.bookmarks,
+    memories: shouldDisableMemories ? false : (interfaceConfig?.memories ?? defaults.memories),
     prompts: interfaceConfig?.prompts ?? defaults.prompts,
     multiConvo: interfaceConfig?.multiConvo ?? defaults.multiConvo,
     agents: interfaceConfig?.agents ?? defaults.agents,
@@ -45,6 +55,10 @@ async function loadDefaultInterface(config, configDefaults, roleName = SystemRol
   await updateAccessPermissions(roleName, {
     [PermissionTypes.PROMPTS]: { [Permissions.USE]: loadedInterface.prompts },
     [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: loadedInterface.bookmarks },
+    [PermissionTypes.MEMORIES]: {
+      [Permissions.USE]: loadedInterface.memories,
+      [Permissions.OPT_OUT]: isPersonalizationEnabled,
+    },
     [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: loadedInterface.multiConvo },
     [PermissionTypes.AGENTS]: { [Permissions.USE]: loadedInterface.agents },
     [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: loadedInterface.temporaryChat },
@@ -54,6 +68,10 @@ async function loadDefaultInterface(config, configDefaults, roleName = SystemRol
   await updateAccessPermissions(SystemRoles.ADMIN, {
     [PermissionTypes.PROMPTS]: { [Permissions.USE]: loadedInterface.prompts },
     [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: loadedInterface.bookmarks },
+    [PermissionTypes.MEMORIES]: {
+      [Permissions.USE]: loadedInterface.memories,
+      [Permissions.OPT_OUT]: isPersonalizationEnabled,
+    },
     [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: loadedInterface.multiConvo },
     [PermissionTypes.AGENTS]: { [Permissions.USE]: loadedInterface.agents },
     [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: loadedInterface.temporaryChat },
diff --git a/api/server/services/start/interface.spec.js b/api/server/services/start/interface.spec.js
index d0dcfaf55f..1a05c9cf12 100644
--- a/api/server/services/start/interface.spec.js
+++ b/api/server/services/start/interface.spec.js
@@ -12,6 +12,7 @@ describe('loadDefaultInterface', () => {
       interface: {
         prompts: true,
         bookmarks: true,
+        memories: true,
         multiConvo: true,
         agents: true,
         temporaryChat: true,
@@ -26,6 +27,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: true },
+      [PermissionTypes.MEMORIES]: { [Permissions.USE]: true },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: true },
       [PermissionTypes.AGENTS]: { [Permissions.USE]: true },
       [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: true },
@@ -39,6 +41,7 @@ describe('loadDefaultInterface', () => {
       interface: {
         prompts: false,
         bookmarks: false,
+        memories: false,
         multiConvo: false,
         agents: false,
         temporaryChat: false,
@@ -53,6 +56,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: false },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: false },
+      [PermissionTypes.MEMORIES]: { [Permissions.USE]: false },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: false },
       [PermissionTypes.AGENTS]: { [Permissions.USE]: false },
       [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: false },
@@ -70,6 +74,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
+      [PermissionTypes.MEMORIES]: { [Permissions.USE]: undefined },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
       [PermissionTypes.AGENTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: undefined },
@@ -83,6 +88,7 @@ describe('loadDefaultInterface', () => {
       interface: {
         prompts: undefined,
         bookmarks: undefined,
+        memories: undefined,
         multiConvo: undefined,
         agents: undefined,
         temporaryChat: undefined,
@@ -97,6 +103,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
+      [PermissionTypes.MEMORIES]: { [Permissions.USE]: undefined },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
       [PermissionTypes.AGENTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: undefined },
@@ -110,6 +117,7 @@ describe('loadDefaultInterface', () => {
       interface: {
         prompts: true,
         bookmarks: false,
+        memories: true,
         multiConvo: undefined,
         agents: true,
         temporaryChat: undefined,
@@ -124,6 +132,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: false },
+      [PermissionTypes.MEMORIES]: { [Permissions.USE]: true },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
       [PermissionTypes.AGENTS]: { [Permissions.USE]: true },
       [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: undefined },
@@ -138,6 +147,7 @@ describe('loadDefaultInterface', () => {
       interface: {
         prompts: true,
         bookmarks: true,
+        memories: true,
         multiConvo: true,
         agents: true,
         temporaryChat: true,
@@ -151,6 +161,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: true },
+      [PermissionTypes.MEMORIES]: { [Permissions.USE]: true },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: true },
       [PermissionTypes.AGENTS]: { [Permissions.USE]: true },
       [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: true },
@@ -168,6 +179,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
+      [PermissionTypes.MEMORIES]: { [Permissions.USE]: undefined },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: true },
       [PermissionTypes.AGENTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: undefined },
@@ -185,6 +197,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
+      [PermissionTypes.MEMORIES]: { [Permissions.USE]: undefined },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: false },
       [PermissionTypes.AGENTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: undefined },
@@ -202,6 +215,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
+      [PermissionTypes.MEMORIES]: { [Permissions.USE]: undefined },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
       [PermissionTypes.AGENTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: undefined },
@@ -215,6 +229,7 @@ describe('loadDefaultInterface', () => {
       interface: {
         prompts: true,
         bookmarks: false,
+        memories: true,
         multiConvo: true,
         agents: false,
         temporaryChat: true,
@@ -228,6 +243,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: false },
+      [PermissionTypes.MEMORIES]: { [Permissions.USE]: true },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: true },
       [PermissionTypes.AGENTS]: { [Permissions.USE]: false },
       [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: true },
@@ -242,6 +258,7 @@ describe('loadDefaultInterface', () => {
       interface: {
         prompts: true,
         bookmarks: true,
+        memories: false,
         multiConvo: false,
         agents: undefined,
         temporaryChat: undefined,
@@ -255,6 +272,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: true },
+      [PermissionTypes.MEMORIES]: { [Permissions.USE]: false },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: false },
       [PermissionTypes.AGENTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: undefined },
@@ -268,6 +286,7 @@ describe('loadDefaultInterface', () => {
       interface: {
         prompts: true,
         bookmarks: false,
+        memories: true,
         multiConvo: true,
         agents: false,
         temporaryChat: true,
@@ -281,6 +300,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: false },
+      [PermissionTypes.MEMORIES]: { [Permissions.USE]: true },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: true },
       [PermissionTypes.AGENTS]: { [Permissions.USE]: false },
       [PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: true },
diff --git a/api/server/utils/handleText.js b/api/server/utils/handleText.js
index 86c17f1dda..680da5da44 100644
--- a/api/server/utils/handleText.js
+++ b/api/server/utils/handleText.js
@@ -1,5 +1,3 @@
-const path = require('path');
-const crypto = require('crypto');
 const {
   Capabilities,
   EModelEndpoint,
@@ -218,38 +216,6 @@ function normalizeEndpointName(name = '') {
   return name.toLowerCase() === Providers.OLLAMA ? Providers.OLLAMA : name;
 }
 
-/**
- * Sanitize a filename by removing any directory components, replacing non-alphanumeric characters
- * @param {string} inputName
- * @returns {string}
- */
-function sanitizeFilename(inputName) {
-  // Remove any directory components
-  let name = path.basename(inputName);
-
-  // Replace any non-alphanumeric characters except for '.' and '-'
-  name = name.replace(/[^a-zA-Z0-9.-]/g, '_');
-
-  // Ensure the name doesn't start with a dot (hidden file in Unix-like systems)
-  if (name.startsWith('.') || name === '') {
-    name = '_' + name;
-  }
-
-  // Limit the length of the filename
-  const MAX_LENGTH = 255;
-  if (name.length > MAX_LENGTH) {
-    const ext = path.extname(name);
-    const nameWithoutExt = path.basename(name, ext);
-    name =
-      nameWithoutExt.slice(0, MAX_LENGTH - ext.length - 7) +
-      '-' +
-      crypto.randomBytes(3).toString('hex') +
-      ext;
-  }
-
-  return name;
-}
-
 module.exports = {
   isEnabled,
   handleText,
@@ -260,6 +226,5 @@ module.exports = {
   generateConfig,
   addSpaceIfNeeded,
   createOnProgress,
-  sanitizeFilename,
   normalizeEndpointName,
 };
diff --git a/api/server/utils/handleText.spec.js b/api/server/utils/handleText.spec.js
deleted file mode 100644
index 2cd6c51f91..0000000000
--- a/api/server/utils/handleText.spec.js
+++ /dev/null
@@ -1,103 +0,0 @@
-const { isEnabled, sanitizeFilename } = require('./handleText');
-
-describe('isEnabled', () => {
-  test('should return true when input is "true"', () => {
-    expect(isEnabled('true')).toBe(true);
-  });
-
-  test('should return true when input is "TRUE"', () => {
-    expect(isEnabled('TRUE')).toBe(true);
-  });
-
-  test('should return true when input is true', () => {
-    expect(isEnabled(true)).toBe(true);
-  });
-
-  test('should return false when input is "false"', () => {
-    expect(isEnabled('false')).toBe(false);
-  });
-
-  test('should return false when input is false', () => {
-    expect(isEnabled(false)).toBe(false);
-  });
-
-  test('should return false when input is null', () => {
-    expect(isEnabled(null)).toBe(false);
-  });
-
-  test('should return false when input is undefined', () => {
-    expect(isEnabled()).toBe(false);
-  });
-
-  test('should return false when input is an empty string', () => {
-    expect(isEnabled('')).toBe(false);
-  });
-
-  test('should return false when input is a whitespace string', () => {
-    expect(isEnabled('   ')).toBe(false);
-  });
-
-  test('should return false when input is a number', () => {
-    expect(isEnabled(123)).toBe(false);
-  });
-
-  test('should return false when input is an object', () => {
-    expect(isEnabled({})).toBe(false);
-  });
-
-  test('should return false when input is an array', () => {
-    expect(isEnabled([])).toBe(false);
-  });
-});
-
-jest.mock('crypto', () => {
-  const actualModule = jest.requireActual('crypto');
-  return {
-    ...actualModule,
-    randomBytes: jest.fn().mockReturnValue(Buffer.from('abc123', 'hex')),
-  };
-});
-
-describe('sanitizeFilename', () => {
-  test('removes directory components (1/2)', () => {
-    expect(sanitizeFilename('/path/to/file.txt')).toBe('file.txt');
-  });
-
-  test('removes directory components (2/2)', () => {
-    expect(sanitizeFilename('../../../../file.txt')).toBe('file.txt');
-  });
-
-  test('replaces non-alphanumeric characters', () => {
-    expect(sanitizeFilename('file name@#$.txt')).toBe('file_name___.txt');
-  });
-
-  test('preserves dots and hyphens', () => {
-    expect(sanitizeFilename('file-name.with.dots.txt')).toBe('file-name.with.dots.txt');
-  });
-
-  test('prepends underscore to filenames starting with a dot', () => {
-    expect(sanitizeFilename('.hiddenfile')).toBe('_.hiddenfile');
-  });
-
-  test('truncates long filenames', () => {
-    const longName = 'a'.repeat(300) + '.txt';
-    const result = sanitizeFilename(longName);
-    expect(result.length).toBe(255);
-    expect(result).toMatch(/^a+-abc123\.txt$/);
-  });
-
-  test('handles filenames with no extension', () => {
-    const longName = 'a'.repeat(300);
-    const result = sanitizeFilename(longName);
-    expect(result.length).toBe(255);
-    expect(result).toMatch(/^a+-abc123$/);
-  });
-
-  test('handles empty input', () => {
-    expect(sanitizeFilename('')).toBe('_');
-  });
-
-  test('handles input with only special characters', () => {
-    expect(sanitizeFilename('@#$%^&*')).toBe('_______');
-  });
-});
diff --git a/api/typedefs.js b/api/typedefs.js
index 8da5b34809..5bc7ebf664 100644
--- a/api/typedefs.js
+++ b/api/typedefs.js
@@ -1073,7 +1073,7 @@
 
 /**
  * @exports MCPServers
- * @typedef {import('librechat-mcp').MCPServers} MCPServers
+ * @typedef {import('@librechat/api').MCPServers} MCPServers
  * @memberof typedefs
  */
 
@@ -1085,31 +1085,31 @@
 
 /**
  * @exports MCPManager
- * @typedef {import('librechat-mcp').MCPManager} MCPManager
+ * @typedef {import('@librechat/api').MCPManager} MCPManager
  * @memberof typedefs
  */
 
 /**
  * @exports FlowStateManager
- * @typedef {import('librechat-mcp').FlowStateManager} FlowStateManager
+ * @typedef {import('@librechat/api').FlowStateManager} FlowStateManager
  * @memberof typedefs
  */
 
 /**
  * @exports LCAvailableTools
- * @typedef {import('librechat-mcp').LCAvailableTools} LCAvailableTools
+ * @typedef {import('@librechat/api').LCAvailableTools} LCAvailableTools
  * @memberof typedefs
  */
 
 /**
  * @exports LCTool
- * @typedef {import('librechat-mcp').LCTool} LCTool
+ * @typedef {import('@librechat/api').LCTool} LCTool
  * @memberof typedefs
  */
 
 /**
  * @exports FormattedContent
- * @typedef {import('librechat-mcp').FormattedContent} FormattedContent
+ * @typedef {import('@librechat/api').FormattedContent} FormattedContent
  * @memberof typedefs
  */
 
@@ -1232,7 +1232,7 @@
  * @typedef {Object} AgentClientOptions
  * @property {Agent} agent - The agent configuration object
  * @property {string} endpoint - The endpoint identifier for the agent
- * @property {Object} req - The request object
+ * @property {ServerRequest} req - The request object
  * @property {string} [name] - The username
  * @property {string} [modelLabel] - The label for the model being used
  * @property {number} [maxContextTokens] - Maximum number of tokens allowed in context
diff --git a/api/utils/index.js b/api/utils/index.js
index 62d61586bf..6a304efd6d 100644
--- a/api/utils/index.js
+++ b/api/utils/index.js
@@ -1,7 +1,6 @@
 const loadYaml = require('./loadYaml');
 const axiosHelpers = require('./axios');
 const tokenHelpers = require('./tokens');
-const azureUtils = require('./azureUtils');
 const deriveBaseURL = require('./deriveBaseURL');
 const extractBaseURL = require('./extractBaseURL');
 const findMessageContent = require('./findMessageContent');
@@ -10,7 +9,6 @@ module.exports = {
   loadYaml,
   deriveBaseURL,
   extractBaseURL,
-  ...azureUtils,
   ...axiosHelpers,
   ...tokenHelpers,
   findMessageContent,
diff --git a/client/src/components/Chat/Messages/Content/ContentParts.tsx b/client/src/components/Chat/Messages/Content/ContentParts.tsx
index 8c1ff2ebb5..0a1b4616a0 100644
--- a/client/src/components/Chat/Messages/Content/ContentParts.tsx
+++ b/client/src/components/Chat/Messages/Content/ContentParts.tsx
@@ -9,6 +9,7 @@ import type {
 } from 'librechat-data-provider';
 import { ThinkingButton } from '~/components/Artifacts/Thinking';
 import { MessageContext, SearchContext } from '~/Providers';
+import MemoryArtifacts from './MemoryArtifacts';
 import Sources from '~/components/Web/Sources';
 import useLocalize from '~/hooks/useLocalize';
 import { mapAttachments } from '~/utils/map';
@@ -72,6 +73,7 @@ const ContentParts = memo(
 
       return hasThinkPart && allThinkPartsHaveContent;
     }, [content]);
+
     if (!content) {
       return null;
     }
@@ -103,6 +105,7 @@ const ContentParts = memo(
     return (
       <>
         <SearchContext.Provider value={{ searchResults }}>
+          <MemoryArtifacts attachments={attachments} />
           <Sources />
           {hasReasoningParts && (
             <div className="mb-5">
diff --git a/client/src/components/Chat/Messages/Content/MemoryArtifacts.tsx b/client/src/components/Chat/Messages/Content/MemoryArtifacts.tsx
new file mode 100644
index 0000000000..7af4e9fcdd
--- /dev/null
+++ b/client/src/components/Chat/Messages/Content/MemoryArtifacts.tsx
@@ -0,0 +1,143 @@
+import { Tools } from 'librechat-data-provider';
+import { useState, useRef, useMemo, useLayoutEffect, useEffect } from 'react';
+import type { MemoryArtifact, TAttachment } from 'librechat-data-provider';
+import MemoryInfo from './MemoryInfo';
+import { useLocalize } from '~/hooks';
+import { cn } from '~/utils';
+
+export default function MemoryArtifacts({ attachments }: { attachments?: TAttachment[] }) {
+  const localize = useLocalize();
+  const [showInfo, setShowInfo] = useState(false);
+  const contentRef = useRef<HTMLDivElement>(null);
+  const [contentHeight, setContentHeight] = useState<number | undefined>(0);
+  const [isAnimating, setIsAnimating] = useState(false);
+  const prevShowInfoRef = useRef<boolean>(showInfo);
+
+  const memoryArtifacts = useMemo(() => {
+    const result: MemoryArtifact[] = [];
+    for (const attachment of attachments ?? []) {
+      if (attachment?.[Tools.memory] != null) {
+        result.push(attachment[Tools.memory]);
+      }
+    }
+    return result;
+  }, [attachments]);
+
+  useLayoutEffect(() => {
+    if (showInfo !== prevShowInfoRef.current) {
+      prevShowInfoRef.current = showInfo;
+      setIsAnimating(true);
+
+      if (showInfo && contentRef.current) {
+        requestAnimationFrame(() => {
+          if (contentRef.current) {
+            const height = contentRef.current.scrollHeight;
+            setContentHeight(height + 4);
+          }
+        });
+      } else {
+        setContentHeight(0);
+      }
+
+      const timer = setTimeout(() => {
+        setIsAnimating(false);
+      }, 400);
+
+      return () => clearTimeout(timer);
+    }
+  }, [showInfo]);
+
+  useEffect(() => {
+    if (!contentRef.current) {
+      return;
+    }
+    const resizeObserver = new ResizeObserver((entries) => {
+      if (showInfo && !isAnimating) {
+        for (const entry of entries) {
+          if (entry.target === contentRef.current) {
+            setContentHeight(entry.contentRect.height + 4);
+          }
+        }
+      }
+    });
+    resizeObserver.observe(contentRef.current);
+    return () => {
+      resizeObserver.disconnect();
+    };
+  }, [showInfo, isAnimating]);
+
+  if (!memoryArtifacts || memoryArtifacts.length === 0) {
+    return null;
+  }
+
+  return (
+    <>
+      <div className="flex items-center">
+        <div className="inline-block">
+          <button
+            className="outline-hidden my-1 flex items-center gap-1 text-sm font-semibold text-text-secondary-alt transition-colors hover:text-text-primary"
+            type="button"
+            onClick={() => setShowInfo((prev) => !prev)}
+            aria-expanded={showInfo}
+            aria-label={localize('com_ui_memory_updated')}
+          >
+            <svg
+              width="18"
+              height="18"
+              viewBox="0 0 18 18"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+              className="mb-[-1px]"
+            >
+              <path
+                d="M6 3C4.89543 3 4 3.89543 4 5V13C4 14.1046 4.89543 15 6 15L6 3Z"
+                fill="currentColor"
+              />
+              <path
+                d="M7 3V15H8.18037L8.4899 13.4523C8.54798 13.1619 8.69071 12.8952 8.90012 12.6858L12.2931 9.29289C12.7644 8.82153 13.3822 8.58583 14 8.58578V3.5C14 3.22386 13.7761 3 13.5 3H7Z"
+                fill="currentColor"
+              />
+              <path
+                d="M11.3512 15.5297L9.73505 15.8529C9.38519 15.9229 9.07673 15.6144 9.14671 15.2646L9.46993 13.6484C9.48929 13.5517 9.53687 13.4628 9.60667 13.393L12.9996 10C13.5519 9.44771 14.4473 9.44771 14.9996 10C15.5519 10.5523 15.5519 11.4477 14.9996 12L11.6067 15.393C11.5369 15.4628 11.448 15.5103 11.3512 15.5297Z"
+                fill="currentColor"
+              />
+            </svg>
+            {localize('com_ui_memory_updated')}
+          </button>
+        </div>
+      </div>
+      <div
+        className="relative"
+        style={{
+          height: showInfo ? contentHeight : 0,
+          overflow: 'hidden',
+          transition:
+            'height 0.4s cubic-bezier(0.16, 1, 0.3, 1), opacity 0.4s cubic-bezier(0.16, 1, 0.3, 1)',
+          opacity: showInfo ? 1 : 0,
+          transformOrigin: 'top',
+          willChange: 'height, opacity',
+          perspective: '1000px',
+          backfaceVisibility: 'hidden',
+          WebkitFontSmoothing: 'subpixel-antialiased',
+        }}
+      >
+        <div
+          className={cn(
+            'overflow-hidden rounded-xl border border-border-light bg-surface-primary-alt shadow-md',
+            showInfo && 'shadow-lg',
+          )}
+          style={{
+            transform: showInfo ? 'translateY(0) scale(1)' : 'translateY(-8px) scale(0.98)',
+            opacity: showInfo ? 1 : 0,
+            transition:
+              'transform 0.4s cubic-bezier(0.16, 1, 0.3, 1), opacity 0.4s cubic-bezier(0.16, 1, 0.3, 1)',
+          }}
+        >
+          <div ref={contentRef}>
+            {showInfo && <MemoryInfo key="memory-info" memoryArtifacts={memoryArtifacts} />}
+          </div>
+        </div>
+      </div>
+    </>
+  );
+}
diff --git a/client/src/components/Chat/Messages/Content/MemoryInfo.tsx b/client/src/components/Chat/Messages/Content/MemoryInfo.tsx
new file mode 100644
index 0000000000..574c2e8f5f
--- /dev/null
+++ b/client/src/components/Chat/Messages/Content/MemoryInfo.tsx
@@ -0,0 +1,61 @@
+import type { MemoryArtifact } from 'librechat-data-provider';
+import { useLocalize } from '~/hooks';
+
+export default function MemoryInfo({ memoryArtifacts }: { memoryArtifacts: MemoryArtifact[] }) {
+  const localize = useLocalize();
+  if (memoryArtifacts.length === 0) {
+    return null;
+  }
+
+  // Group artifacts by type
+  const updatedMemories = memoryArtifacts.filter((artifact) => artifact.type === 'update');
+  const deletedMemories = memoryArtifacts.filter((artifact) => artifact.type === 'delete');
+
+  if (updatedMemories.length === 0 && deletedMemories.length === 0) {
+    return null;
+  }
+
+  return (
+    <div className="space-y-4 p-4">
+      {updatedMemories.length > 0 && (
+        <div>
+          <h4 className="mb-2 text-sm font-semibold text-text-primary">
+            {localize('com_ui_memory_updated_items')}
+          </h4>
+          <div className="space-y-2">
+            {updatedMemories.map((artifact, index) => (
+              <div key={`update-${index}`} className="rounded-lg p-3">
+                <div className="mb-1 text-xs font-medium uppercase tracking-wide text-text-secondary">
+                  {artifact.key}
+                </div>
+                <div className="whitespace-pre-wrap text-sm text-text-primary">
+                  {artifact.value}
+                </div>
+              </div>
+            ))}
+          </div>
+        </div>
+      )}
+
+      {deletedMemories.length > 0 && (
+        <div>
+          <h4 className="mb-2 text-sm font-semibold text-text-primary">
+            {localize('com_ui_memory_deleted_items')}
+          </h4>
+          <div className="space-y-2">
+            {deletedMemories.map((artifact, index) => (
+              <div key={`delete-${index}`} className="rounded-lg p-3 opacity-60">
+                <div className="mb-1 text-xs font-medium uppercase tracking-wide text-text-secondary">
+                  {artifact.key}
+                </div>
+                <div className="text-sm italic text-text-secondary">
+                  {localize('com_ui_memory_deleted')}
+                </div>
+              </div>
+            ))}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/client/src/components/Nav/Settings.tsx b/client/src/components/Nav/Settings.tsx
index 7bc1a8e75f..23d7a456b9 100644
--- a/client/src/components/Nav/Settings.tsx
+++ b/client/src/components/Nav/Settings.tsx
@@ -5,9 +5,27 @@ import { SettingsTabValues } from 'librechat-data-provider';
 import { useGetStartupConfig } from '~/data-provider';
 import type { TDialogProps } from '~/common';
 import { Dialog, DialogPanel, DialogTitle, Transition, TransitionChild } from '@headlessui/react';
-import { GearIcon, DataIcon, SpeechIcon, UserIcon, ExperimentIcon } from '~/components/svg';
-import { General, Chat, Speech, Beta, Commands, Data, Account, Balance } from './SettingsTabs';
+import {
+  GearIcon,
+  DataIcon,
+  SpeechIcon,
+  UserIcon,
+  ExperimentIcon,
+  PersonalizationIcon,
+} from '~/components/svg';
+import {
+  General,
+  Chat,
+  Speech,
+  Beta,
+  Commands,
+  Data,
+  Account,
+  Balance,
+  Personalization,
+} from './SettingsTabs';
 import { useMediaQuery, useLocalize, TranslationKeys } from '~/hooks';
+import usePersonalizationAccess from '~/hooks/usePersonalizationAccess';
 import { cn } from '~/utils';
 
 export default function Settings({ open, onOpenChange }: TDialogProps) {
@@ -16,6 +34,7 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {
   const localize = useLocalize();
   const [activeTab, setActiveTab] = useState(SettingsTabValues.GENERAL);
   const tabRefs = useRef({});
+  const { hasAnyPersonalizationFeature, hasMemoryOptOut } = usePersonalizationAccess();
 
   const handleKeyDown = (event: React.KeyboardEvent) => {
     const tabs: SettingsTabValues[] = [
@@ -24,6 +43,7 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {
       SettingsTabValues.BETA,
       SettingsTabValues.COMMANDS,
       SettingsTabValues.SPEECH,
+      ...(hasAnyPersonalizationFeature ? [SettingsTabValues.PERSONALIZATION] : []),
       SettingsTabValues.DATA,
       ...(startupConfig?.balance?.enabled ? [SettingsTabValues.BALANCE] : []),
       SettingsTabValues.ACCOUNT,
@@ -80,6 +100,15 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {
       icon: <SpeechIcon className="icon-sm" />,
       label: 'com_nav_setting_speech',
     },
+    ...(hasAnyPersonalizationFeature
+      ? [
+          {
+            value: SettingsTabValues.PERSONALIZATION,
+            icon: <PersonalizationIcon />,
+            label: 'com_nav_setting_personalization' as TranslationKeys,
+          },
+        ]
+      : []),
     {
       value: SettingsTabValues.DATA,
       icon: <DataIcon />,
@@ -87,11 +116,11 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {
     },
     ...(startupConfig?.balance?.enabled
       ? [
-        {
-          value: SettingsTabValues.BALANCE,
+          {
+            value: SettingsTabValues.BALANCE,
             icon: <DollarSign size={18} />,
-          label: 'com_nav_setting_balance' as TranslationKeys,
-        },
+            label: 'com_nav_setting_balance' as TranslationKeys,
+          },
         ]
       : ([] as { value: SettingsTabValues; icon: React.JSX.Element; label: TranslationKeys }[])),
     {
@@ -213,6 +242,14 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {
                     <Tabs.Content value={SettingsTabValues.SPEECH}>
                       <Speech />
                     </Tabs.Content>
+                    {hasAnyPersonalizationFeature && (
+                      <Tabs.Content value={SettingsTabValues.PERSONALIZATION}>
+                        <Personalization
+                          hasMemoryOptOut={hasMemoryOptOut}
+                          hasAnyPersonalizationFeature={hasAnyPersonalizationFeature}
+                        />
+                      </Tabs.Content>
+                    )}
                     <Tabs.Content value={SettingsTabValues.DATA}>
                       <Data />
                     </Tabs.Content>
diff --git a/client/src/components/Nav/SettingsTabs/Personalization.tsx b/client/src/components/Nav/SettingsTabs/Personalization.tsx
new file mode 100644
index 0000000000..929646a440
--- /dev/null
+++ b/client/src/components/Nav/SettingsTabs/Personalization.tsx
@@ -0,0 +1,87 @@
+import { useState, useEffect } from 'react';
+import { useGetUserQuery, useUpdateMemoryPreferencesMutation } from '~/data-provider';
+import { useToastContext } from '~/Providers';
+import { Switch } from '~/components/ui';
+import { useLocalize } from '~/hooks';
+
+interface PersonalizationProps {
+  hasMemoryOptOut: boolean;
+  hasAnyPersonalizationFeature: boolean;
+}
+
+export default function Personalization({
+  hasMemoryOptOut,
+  hasAnyPersonalizationFeature,
+}: PersonalizationProps) {
+  const localize = useLocalize();
+  const { showToast } = useToastContext();
+  const { data: user } = useGetUserQuery();
+  const [referenceSavedMemories, setReferenceSavedMemories] = useState(true);
+
+  const updateMemoryPreferencesMutation = useUpdateMemoryPreferencesMutation({
+    onSuccess: () => {
+      showToast({
+        message: localize('com_ui_preferences_updated'),
+        status: 'success',
+      });
+    },
+    onError: () => {
+      showToast({
+        message: localize('com_ui_error_updating_preferences'),
+        status: 'error',
+      });
+      // Revert the toggle on error
+      setReferenceSavedMemories((prev) => !prev);
+    },
+  });
+
+  // Initialize state from user data
+  useEffect(() => {
+    if (user?.personalization?.memories !== undefined) {
+      setReferenceSavedMemories(user.personalization.memories);
+    }
+  }, [user?.personalization?.memories]);
+
+  const handleMemoryToggle = (checked: boolean) => {
+    setReferenceSavedMemories(checked);
+    updateMemoryPreferencesMutation.mutate({ memories: checked });
+  };
+
+  if (!hasAnyPersonalizationFeature) {
+    return (
+      <div className="flex flex-col gap-3 text-sm text-text-primary">
+        <div className="text-text-secondary">{localize('com_ui_no_personalization_available')}</div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex flex-col gap-3 text-sm text-text-primary">
+      {/* Memory Settings Section */}
+      {hasMemoryOptOut && (
+        <>
+          <div className="border-b border-border-medium pb-3">
+            <div className="text-base font-semibold">{localize('com_ui_memory')}</div>
+          </div>
+
+          <div className="flex items-center justify-between">
+            <div>
+              <div className="flex items-center gap-2">
+                {localize('com_ui_reference_saved_memories')}
+              </div>
+              <div className="mt-1 text-xs text-text-secondary">
+                {localize('com_ui_reference_saved_memories_description')}
+              </div>
+            </div>
+            <Switch
+              checked={referenceSavedMemories}
+              onCheckedChange={handleMemoryToggle}
+              disabled={updateMemoryPreferencesMutation.isLoading}
+              aria-label={localize('com_ui_reference_saved_memories')}
+            />
+          </div>
+        </>
+      )}
+    </div>
+  );
+}
diff --git a/client/src/components/Nav/SettingsTabs/index.ts b/client/src/components/Nav/SettingsTabs/index.ts
index 380d9a7a6d..b3398431f5 100644
--- a/client/src/components/Nav/SettingsTabs/index.ts
+++ b/client/src/components/Nav/SettingsTabs/index.ts
@@ -7,3 +7,4 @@ export { RevokeKeysButton } from './Data/RevokeKeysButton';
 export { default as Account } from './Account/Account';
 export { default as Balance } from './Balance/Balance';
 export { default as Speech } from './Speech/Speech';
+export { default as Personalization } from './Personalization';
diff --git a/client/src/components/Prompts/Groups/FilterPrompts.tsx b/client/src/components/Prompts/Groups/FilterPrompts.tsx
index 0d0ab9a2fc..19d2cde1f9 100644
--- a/client/src/components/Prompts/Groups/FilterPrompts.tsx
+++ b/client/src/components/Prompts/Groups/FilterPrompts.tsx
@@ -44,11 +44,11 @@ export default function FilterPrompts({
     const categoryOptions = categories
       ? [...categories]
       : [
-        {
-          value: SystemCategories.NO_CATEGORY,
-          label: localize('com_ui_no_category'),
-        },
-      ];
+          {
+            value: SystemCategories.NO_CATEGORY,
+            label: localize('com_ui_no_category'),
+          },
+        ];
 
     return [...baseOptions, ...categoryOptions];
   }, [categories, localize]);
diff --git a/client/src/components/Prompts/Groups/GroupSidePanel.tsx b/client/src/components/Prompts/Groups/GroupSidePanel.tsx
index 5cfd77ec2a..e359d13ea0 100644
--- a/client/src/components/Prompts/Groups/GroupSidePanel.tsx
+++ b/client/src/components/Prompts/Groups/GroupSidePanel.tsx
@@ -1,6 +1,7 @@
 import { useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
 import PanelNavigation from '~/components/Prompts/Groups/PanelNavigation';
+import ManagePrompts from '~/components/Prompts/ManagePrompts';
 import { useMediaQuery, usePromptGroupsNav } from '~/hooks';
 import List from '~/components/Prompts/Groups/List';
 import { cn } from '~/utils';
@@ -38,14 +39,17 @@ export default function GroupSidePanel({
       <div className="flex-grow overflow-y-auto">
         <List groups={promptGroups} isChatRoute={isChatRoute} isLoading={!!groupsQuery.isLoading} />
       </div>
-      <PanelNavigation
-        nextPage={nextPage}
-        prevPage={prevPage}
-        isFetching={isFetching}
-        hasNextPage={hasNextPage}
-        isChatRoute={isChatRoute}
-        hasPreviousPage={hasPreviousPage}
-      />
+      <div className="flex items-center justify-between">
+        {isChatRoute && <ManagePrompts className="select-none" />}
+        <PanelNavigation
+          nextPage={nextPage}
+          prevPage={prevPage}
+          isFetching={isFetching}
+          hasNextPage={hasNextPage}
+          isChatRoute={isChatRoute}
+          hasPreviousPage={hasPreviousPage}
+        />
+      </div>
     </div>
   );
 }
diff --git a/client/src/components/Prompts/Groups/PanelNavigation.tsx b/client/src/components/Prompts/Groups/PanelNavigation.tsx
index 76395e842d..5600415d7e 100644
--- a/client/src/components/Prompts/Groups/PanelNavigation.tsx
+++ b/client/src/components/Prompts/Groups/PanelNavigation.tsx
@@ -19,11 +19,13 @@ function PanelNavigation({
 }) {
   const localize = useLocalize();
   return (
-    <div className="my-1 flex justify-between">
-      <div className="mb-2 flex gap-2">
-        {!isChatRoute && <ThemeSelector returnThemeOnly={true} />}
-      </div>
-      <div className="mb-2 flex gap-2">
+    <>
+      <div className="flex gap-2">{!isChatRoute && <ThemeSelector returnThemeOnly={true} />}</div>
+      <div
+        className="flex items-center justify-between gap-2"
+        role="navigation"
+        aria-label="Pagination"
+      >
         <Button variant="outline" size="sm" onClick={() => prevPage()} disabled={!hasPreviousPage}>
           {localize('com_ui_prev')}
         </Button>
@@ -36,7 +38,7 @@ function PanelNavigation({
           {localize('com_ui_next')}
         </Button>
       </div>
-    </div>
+    </>
   );
 }
 
diff --git a/client/src/components/Prompts/PromptsAccordion.tsx b/client/src/components/Prompts/PromptsAccordion.tsx
index 444646c5ee..6bc84005c4 100644
--- a/client/src/components/Prompts/PromptsAccordion.tsx
+++ b/client/src/components/Prompts/PromptsAccordion.tsx
@@ -1,19 +1,17 @@
 import PromptSidePanel from '~/components/Prompts/Groups/GroupSidePanel';
 import AutoSendPrompt from '~/components/Prompts/Groups/AutoSendPrompt';
 import FilterPrompts from '~/components/Prompts/Groups/FilterPrompts';
-import ManagePrompts from '~/components/Prompts/ManagePrompts';
 import { usePromptGroupsNav } from '~/hooks';
 
 export default function PromptsAccordion() {
   const groupsNav = usePromptGroupsNav();
   return (
     <div className="flex h-full w-full flex-col">
-      <PromptSidePanel className="lg:w-full xl:w-full" {...groupsNav}>
-        <div className="flex w-full flex-row items-center justify-between pt-2">
-          <ManagePrompts className="select-none" />
+      <PromptSidePanel className="mt-2 space-y-2 lg:w-full xl:w-full" {...groupsNav}>
+        <FilterPrompts setName={groupsNav.setName} className="items-center justify-center" />
+        <div className="flex w-full flex-row items-center justify-end">
           <AutoSendPrompt className="text-xs dark:text-white" />
         </div>
-        <FilterPrompts setName={groupsNav.setName} className="items-center justify-center" />
       </PromptSidePanel>
     </div>
   );
diff --git a/client/src/components/SidePanel/Bookmarks/BookmarkTable.tsx b/client/src/components/SidePanel/Bookmarks/BookmarkTable.tsx
index 12de8b452d..0506b3b0dd 100644
--- a/client/src/components/SidePanel/Bookmarks/BookmarkTable.tsx
+++ b/client/src/components/SidePanel/Bookmarks/BookmarkTable.tsx
@@ -80,13 +80,13 @@ const BookmarkTable = () => {
             <TableHeader>
               <TableRow className="border-b border-border-light">
                 <TableHead className="w-[70%] bg-surface-secondary py-3 text-left text-sm font-medium text-text-secondary">
-                  <div className="px-4">{localize('com_ui_bookmarks_title')}</div>
+                  <div>{localize('com_ui_bookmarks_title')}</div>
                 </TableHead>
                 <TableHead className="w-[30%] bg-surface-secondary py-3 text-left text-sm font-medium text-text-secondary">
-                  <div className="px-4">{localize('com_ui_bookmarks_count')}</div>
+                  <div>{localize('com_ui_bookmarks_count')}</div>
                 </TableHead>
                 <TableHead className="w-[40%] bg-surface-secondary py-3 text-left text-sm font-medium text-text-secondary">
-                  <div className="px-4">{localize('com_assistants_actions')}</div>
+                  <div>{localize('com_assistants_actions')}</div>
                 </TableHead>
               </TableRow>
             </TableHeader>
diff --git a/client/src/components/SidePanel/Memories/AdminSettings.tsx b/client/src/components/SidePanel/Memories/AdminSettings.tsx
new file mode 100644
index 0000000000..fcb347228d
--- /dev/null
+++ b/client/src/components/SidePanel/Memories/AdminSettings.tsx
@@ -0,0 +1,212 @@
+import * as Ariakit from '@ariakit/react';
+import { useMemo, useEffect, useState } from 'react';
+import { ShieldEllipsis } from 'lucide-react';
+import { useForm, Controller } from 'react-hook-form';
+import { Permissions, SystemRoles, roleDefaults, PermissionTypes } from 'librechat-data-provider';
+import type { Control, UseFormSetValue, UseFormGetValues } from 'react-hook-form';
+import { OGDialog, OGDialogTitle, OGDialogContent, OGDialogTrigger } from '~/components/ui';
+import { useUpdateMemoryPermissionsMutation } from '~/data-provider';
+import { Button, Switch, DropdownPopup } from '~/components/ui';
+import { useLocalize, useAuthContext } from '~/hooks';
+import { useToastContext } from '~/Providers';
+
+type FormValues = Record<Permissions, boolean>;
+
+type LabelControllerProps = {
+  label: string;
+  memoryPerm: Permissions;
+  control: Control<FormValues, unknown, FormValues>;
+  setValue: UseFormSetValue<FormValues>;
+  getValues: UseFormGetValues<FormValues>;
+};
+
+const LabelController: React.FC<LabelControllerProps> = ({ control, memoryPerm, label }) => (
+  <div className="mb-4 flex items-center justify-between gap-2">
+    {label}
+    <Controller
+      name={memoryPerm}
+      control={control}
+      render={({ field }) => (
+        <Switch
+          {...field}
+          checked={field.value}
+          onCheckedChange={field.onChange}
+          value={field.value.toString()}
+        />
+      )}
+    />
+  </div>
+);
+
+const AdminSettings = () => {
+  const localize = useLocalize();
+  const { user, roles } = useAuthContext();
+  const { showToast } = useToastContext();
+  const { mutate, isLoading } = useUpdateMemoryPermissionsMutation({
+    onSuccess: () => {
+      showToast({ status: 'success', message: localize('com_ui_saved') });
+    },
+    onError: () => {
+      showToast({ status: 'error', message: localize('com_ui_error_save_admin_settings') });
+    },
+  });
+
+  const [isRoleMenuOpen, setIsRoleMenuOpen] = useState(false);
+  const [selectedRole, setSelectedRole] = useState<SystemRoles>(SystemRoles.USER);
+
+  const defaultValues = useMemo(() => {
+    if (roles?.[selectedRole]?.permissions) {
+      return roles?.[selectedRole]?.permissions?.[PermissionTypes.MEMORIES];
+    }
+    return roleDefaults[selectedRole].permissions[PermissionTypes.MEMORIES];
+  }, [roles, selectedRole]);
+
+  const {
+    reset,
+    control,
+    setValue,
+    getValues,
+    handleSubmit,
+    formState: { isSubmitting },
+  } = useForm<FormValues>({
+    mode: 'onChange',
+    defaultValues,
+  });
+
+  useEffect(() => {
+    if (roles?.[selectedRole]?.permissions?.[PermissionTypes.MEMORIES]) {
+      reset(roles?.[selectedRole]?.permissions?.[PermissionTypes.MEMORIES]);
+    } else {
+      reset(roleDefaults[selectedRole].permissions[PermissionTypes.MEMORIES]);
+    }
+  }, [roles, selectedRole, reset]);
+
+  if (user?.role !== SystemRoles.ADMIN) {
+    return null;
+  }
+
+  const labelControllerData = [
+    {
+      memoryPerm: Permissions.USE,
+      label: localize('com_ui_memories_allow_use'),
+    },
+    {
+      memoryPerm: Permissions.CREATE,
+      label: localize('com_ui_memories_allow_create'),
+    },
+    {
+      memoryPerm: Permissions.UPDATE,
+      label: localize('com_ui_memories_allow_update'),
+    },
+    {
+      memoryPerm: Permissions.READ,
+      label: localize('com_ui_memories_allow_read'),
+    },
+    {
+      memoryPerm: Permissions.OPT_OUT,
+      label: localize('com_ui_memories_allow_opt_out'),
+    },
+  ];
+
+  const onSubmit = (data: FormValues) => {
+    mutate({ roleName: selectedRole, updates: data });
+  };
+
+  const roleDropdownItems = [
+    {
+      label: SystemRoles.USER,
+      onClick: () => {
+        setSelectedRole(SystemRoles.USER);
+      },
+    },
+    {
+      label: SystemRoles.ADMIN,
+      onClick: () => {
+        setSelectedRole(SystemRoles.ADMIN);
+      },
+    },
+  ];
+
+  return (
+    <OGDialog>
+      <OGDialogTrigger asChild>
+        <Button
+          size={'sm'}
+          variant={'outline'}
+          className="btn btn-neutral border-token-border-light relative h-9 w-full gap-1 rounded-lg font-medium"
+        >
+          <ShieldEllipsis className="cursor-pointer" aria-hidden="true" />
+          {localize('com_ui_admin_settings')}
+        </Button>
+      </OGDialogTrigger>
+      <OGDialogContent className="w-1/4 border-border-light bg-surface-primary text-text-primary">
+        <OGDialogTitle>{`${localize('com_ui_admin_settings')} - ${localize(
+          'com_ui_memories',
+        )}`}</OGDialogTitle>
+        <div className="p-2">
+          {/* Role selection dropdown */}
+          <div className="flex items-center gap-2">
+            <span className="font-medium">{localize('com_ui_role_select')}:</span>
+            <DropdownPopup
+              unmountOnHide={true}
+              menuId="memory-role-dropdown"
+              isOpen={isRoleMenuOpen}
+              setIsOpen={setIsRoleMenuOpen}
+              trigger={
+                <Ariakit.MenuButton className="inline-flex w-1/4 items-center justify-center rounded-lg border border-border-light bg-transparent px-2 py-1 text-text-primary transition-all ease-in-out hover:bg-surface-tertiary">
+                  {selectedRole}
+                </Ariakit.MenuButton>
+              }
+              items={roleDropdownItems}
+              itemClassName="items-center justify-center"
+              sameWidth={true}
+            />
+          </div>
+          {/* Permissions form */}
+          <form onSubmit={handleSubmit(onSubmit)}>
+            <div className="py-5">
+              {labelControllerData.map(({ memoryPerm, label }) => (
+                <div key={memoryPerm}>
+                  <LabelController
+                    control={control}
+                    memoryPerm={memoryPerm}
+                    label={label}
+                    getValues={getValues}
+                    setValue={setValue}
+                  />
+                  {selectedRole === SystemRoles.ADMIN && memoryPerm === Permissions.USE && (
+                    <>
+                      <div className="mb-2 max-w-full whitespace-normal break-words text-sm text-red-600">
+                        <span>{localize('com_ui_admin_access_warning')}</span>
+                        {'\n'}
+                        <a
+                          href="https://www.librechat.ai/docs/configuration/librechat_yaml/object_structure/interface"
+                          target="_blank"
+                          rel="noreferrer"
+                          className="text-blue-500 underline"
+                        >
+                          {localize('com_ui_more_info')}
+                        </a>
+                      </div>
+                    </>
+                  )}
+                </div>
+              ))}
+            </div>
+            <div className="flex justify-end">
+              <button
+                type="submit"
+                disabled={isSubmitting || isLoading}
+                className="btn rounded bg-green-500 font-bold text-white transition-all hover:bg-green-600"
+              >
+                {localize('com_ui_save')}
+              </button>
+            </div>
+          </form>
+        </div>
+      </OGDialogContent>
+    </OGDialog>
+  );
+};
+
+export default AdminSettings;
diff --git a/client/src/components/SidePanel/Memories/MemoryCreateDialog.tsx b/client/src/components/SidePanel/Memories/MemoryCreateDialog.tsx
new file mode 100644
index 0000000000..1670ba6f60
--- /dev/null
+++ b/client/src/components/SidePanel/Memories/MemoryCreateDialog.tsx
@@ -0,0 +1,147 @@
+import React, { useState } from 'react';
+import { PermissionTypes, Permissions } from 'librechat-data-provider';
+import { OGDialog, OGDialogTemplate, Button, Label, Input } from '~/components/ui';
+import { useCreateMemoryMutation } from '~/data-provider';
+import { useLocalize, useHasAccess } from '~/hooks';
+import { useToastContext } from '~/Providers';
+import { Spinner } from '~/components/svg';
+
+interface MemoryCreateDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  children: React.ReactNode;
+  triggerRef?: React.MutableRefObject<HTMLButtonElement | null>;
+}
+
+export default function MemoryCreateDialog({
+  open,
+  onOpenChange,
+  children,
+  triggerRef,
+}: MemoryCreateDialogProps) {
+  const localize = useLocalize();
+  const { showToast } = useToastContext();
+
+  const hasCreateAccess = useHasAccess({
+    permissionType: PermissionTypes.MEMORIES,
+    permission: Permissions.CREATE,
+  });
+
+  const { mutate: createMemory, isLoading } = useCreateMemoryMutation({
+    onSuccess: () => {
+      showToast({
+        message: localize('com_ui_memory_created'),
+        status: 'success',
+      });
+      onOpenChange(false);
+      setKey('');
+      setValue('');
+      setTimeout(() => {
+        triggerRef?.current?.focus();
+      }, 0);
+    },
+    onError: (error: Error) => {
+      let errorMessage = localize('com_ui_error');
+
+      if (error && typeof error === 'object' && 'response' in error) {
+        const axiosError = error as any;
+        if (axiosError.response?.data?.error) {
+          errorMessage = axiosError.response.data.error;
+
+          // Check for duplicate key error
+          if (axiosError.response?.status === 409 || errorMessage.includes('already exists')) {
+            errorMessage = localize('com_ui_memory_key_exists');
+          }
+        }
+      } else if (error.message) {
+        errorMessage = error.message;
+      }
+
+      showToast({
+        message: errorMessage,
+        status: 'error',
+      });
+    },
+  });
+
+  const [key, setKey] = useState('');
+  const [value, setValue] = useState('');
+
+  const handleSave = () => {
+    if (!hasCreateAccess) {
+      return;
+    }
+
+    if (!key.trim() || !value.trim()) {
+      showToast({
+        message: localize('com_ui_field_required'),
+        status: 'error',
+      });
+      return;
+    }
+
+    createMemory({
+      key: key.trim(),
+      value: value.trim(),
+    });
+  };
+
+  const handleKeyPress = (e: React.KeyboardEvent) => {
+    if (e.key === 'Enter' && e.ctrlKey && hasCreateAccess) {
+      handleSave();
+    }
+  };
+
+  return (
+    <OGDialog open={open} onOpenChange={onOpenChange} triggerRef={triggerRef}>
+      {children}
+      <OGDialogTemplate
+        title={localize('com_ui_create_memory')}
+        showCloseButton={false}
+        className="w-11/12 md:max-w-lg"
+        main={
+          <div className="space-y-4">
+            <div className="space-y-2">
+              <Label htmlFor="memory-key" className="text-sm font-medium">
+                {localize('com_ui_key')}
+              </Label>
+              <Input
+                id="memory-key"
+                value={key}
+                onChange={(e) => setKey(e.target.value)}
+                onKeyDown={handleKeyPress}
+                placeholder={localize('com_ui_enter_key')}
+                className="w-full"
+              />
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor="memory-value" className="text-sm font-medium">
+                {localize('com_ui_value')}
+              </Label>
+              <textarea
+                id="memory-value"
+                value={value}
+                onChange={(e) => setValue(e.target.value)}
+                onKeyDown={handleKeyPress}
+                placeholder={localize('com_ui_enter_value')}
+                className="flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"
+                rows={3}
+              />
+            </div>
+          </div>
+        }
+        buttons={
+          <Button
+            type="button"
+            variant="submit"
+            onClick={handleSave}
+            disabled={isLoading || !key.trim() || !value.trim()}
+            className="text-white"
+          >
+            {isLoading ? <Spinner className="size-4" /> : localize('com_ui_create')}
+          </Button>
+        }
+      />
+    </OGDialog>
+  );
+}
diff --git a/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx b/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx
new file mode 100644
index 0000000000..60eedb02fa
--- /dev/null
+++ b/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx
@@ -0,0 +1,179 @@
+import React, { useState, useEffect } from 'react';
+import { PermissionTypes, Permissions } from 'librechat-data-provider';
+import type { TUserMemory } from 'librechat-data-provider';
+import { OGDialog, OGDialogTemplate, Button, Label, Input } from '~/components/ui';
+import { useUpdateMemoryMutation, useMemoriesQuery } from '~/data-provider';
+import { useLocalize, useHasAccess } from '~/hooks';
+import { useToastContext } from '~/Providers';
+import { Spinner } from '~/components/svg';
+
+interface MemoryEditDialogProps {
+  memory: TUserMemory | null;
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  children: React.ReactNode;
+  triggerRef?: React.MutableRefObject<HTMLButtonElement | null>;
+}
+
+export default function MemoryEditDialog({
+  memory,
+  open,
+  onOpenChange,
+  children,
+  triggerRef,
+}: MemoryEditDialogProps) {
+  const localize = useLocalize();
+  const { showToast } = useToastContext();
+  const { data: memData } = useMemoriesQuery();
+
+  const hasUpdateAccess = useHasAccess({
+    permissionType: PermissionTypes.MEMORIES,
+    permission: Permissions.UPDATE,
+  });
+
+  const { mutate: updateMemory, isLoading } = useUpdateMemoryMutation({
+    onMutate: () => {
+      onOpenChange(false);
+      setTimeout(() => {
+        triggerRef?.current?.focus();
+      }, 0);
+    },
+    onSuccess: () => {
+      showToast({
+        message: localize('com_ui_saved'),
+        status: 'success',
+      });
+    },
+    onError: () => {
+      showToast({
+        message: localize('com_ui_error'),
+        status: 'error',
+      });
+    },
+  });
+
+  const [key, setKey] = useState('');
+  const [value, setValue] = useState('');
+  const [originalKey, setOriginalKey] = useState('');
+
+  useEffect(() => {
+    if (memory) {
+      setKey(memory.key);
+      setValue(memory.value);
+      setOriginalKey(memory.key);
+    }
+  }, [memory]);
+
+  const handleSave = () => {
+    if (!hasUpdateAccess || !memory) {
+      return;
+    }
+
+    if (!key.trim() || !value.trim()) {
+      showToast({
+        message: localize('com_ui_field_required'),
+        status: 'error',
+      });
+      return;
+    }
+
+    updateMemory({
+      key: key.trim(),
+      value: value.trim(),
+      ...(originalKey !== key.trim() && { originalKey }),
+    });
+  };
+
+  const handleKeyPress = (e: React.KeyboardEvent) => {
+    if (e.key === 'Enter' && e.ctrlKey && hasUpdateAccess) {
+      handleSave();
+    }
+  };
+
+  return (
+    <OGDialog open={open} onOpenChange={onOpenChange} triggerRef={triggerRef}>
+      {children}
+      <OGDialogTemplate
+        title={hasUpdateAccess ? localize('com_ui_edit_memory') : localize('com_ui_view_memory')}
+        showCloseButton={false}
+        className="w-11/12 md:max-w-lg"
+        main={
+          <div className="space-y-4">
+            {memory && (
+              <div className="space-y-2">
+                <div className="flex items-center justify-between text-xs text-text-secondary">
+                  <div>
+                    {localize('com_ui_date')}:{' '}
+                    {new Date(memory.updated_at).toLocaleDateString(undefined, {
+                      month: 'short',
+                      day: 'numeric',
+                      year: 'numeric',
+                      hour: '2-digit',
+                      minute: '2-digit',
+                    })}
+                  </div>
+                  {/* Token Information */}
+                  {memory.tokenCount !== undefined && (
+                    <div>
+                      {memory.tokenCount.toLocaleString()}
+                      {memData?.tokenLimit && ` / ${memData.tokenLimit.toLocaleString()}`}{' '}
+                      {localize('com_ui_tokens')}
+                    </div>
+                  )}
+                </div>
+                {/* Overall Memory Usage */}
+                {memData?.tokenLimit && memData?.usagePercentage !== null && (
+                  <div className="text-xs text-text-secondary">
+                    {localize('com_ui_usage')}: {memData.usagePercentage}%{' '}
+                  </div>
+                )}
+              </div>
+            )}
+            <div className="space-y-2">
+              <Label htmlFor="memory-key" className="text-sm font-medium">
+                {localize('com_ui_key')}
+              </Label>
+              <Input
+                id="memory-key"
+                value={key}
+                onChange={(e) => hasUpdateAccess && setKey(e.target.value)}
+                onKeyDown={handleKeyPress}
+                placeholder={localize('com_ui_enter_key')}
+                className="w-full"
+                disabled={!hasUpdateAccess}
+              />
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor="memory-value" className="text-sm font-medium">
+                {localize('com_ui_value')}
+              </Label>
+              <textarea
+                id="memory-value"
+                value={value}
+                onChange={(e) => hasUpdateAccess && setValue(e.target.value)}
+                onKeyDown={handleKeyPress}
+                placeholder={localize('com_ui_enter_value')}
+                className="flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"
+                rows={3}
+                disabled={!hasUpdateAccess}
+              />
+            </div>
+          </div>
+        }
+        buttons={
+          hasUpdateAccess ? (
+            <Button
+              type="button"
+              variant="submit"
+              onClick={handleSave}
+              disabled={isLoading || !key.trim() || !value.trim()}
+              className="text-white"
+            >
+              {isLoading ? <Spinner className="size-4" /> : localize('com_ui_save')}
+            </Button>
+          ) : null
+        }
+      />
+    </OGDialog>
+  );
+}
diff --git a/client/src/components/SidePanel/Memories/MemoryViewer.tsx b/client/src/components/SidePanel/Memories/MemoryViewer.tsx
new file mode 100644
index 0000000000..66f3fee8e6
--- /dev/null
+++ b/client/src/components/SidePanel/Memories/MemoryViewer.tsx
@@ -0,0 +1,428 @@
+/* Memories */
+import { useMemo, useState, useRef, useEffect } from 'react';
+import { Plus } from 'lucide-react';
+import { matchSorter } from 'match-sorter';
+import { SystemRoles, PermissionTypes, Permissions } from 'librechat-data-provider';
+import type { TUserMemory } from 'librechat-data-provider';
+import {
+  Table,
+  Input,
+  Label,
+  Button,
+  Switch,
+  TableRow,
+  OGDialog,
+  TableHead,
+  TableBody,
+  TableCell,
+  TableHeader,
+  TooltipAnchor,
+  OGDialogTrigger,
+} from '~/components/ui';
+import {
+  useGetUserQuery,
+  useMemoriesQuery,
+  useDeleteMemoryMutation,
+  useUpdateMemoryPreferencesMutation,
+} from '~/data-provider';
+import { useLocalize, useAuthContext, useHasAccess } from '~/hooks';
+import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
+import { EditIcon, TrashIcon } from '~/components/svg';
+import MemoryCreateDialog from './MemoryCreateDialog';
+import MemoryEditDialog from './MemoryEditDialog';
+import Spinner from '~/components/svg/Spinner';
+import { useToastContext } from '~/Providers';
+import AdminSettings from './AdminSettings';
+
+export default function MemoryViewer() {
+  const localize = useLocalize();
+  const { user } = useAuthContext();
+  const { data: userData } = useGetUserQuery();
+  const { data: memData, isLoading } = useMemoriesQuery();
+  const { mutate: deleteMemory } = useDeleteMemoryMutation();
+  const { showToast } = useToastContext();
+  const [pageIndex, setPageIndex] = useState(0);
+  const [searchQuery, setSearchQuery] = useState('');
+  const pageSize = 10;
+  const [createDialogOpen, setCreateDialogOpen] = useState(false);
+  const [deletingKey, setDeletingKey] = useState<string | null>(null);
+  const [referenceSavedMemories, setReferenceSavedMemories] = useState(true);
+
+  const updateMemoryPreferencesMutation = useUpdateMemoryPreferencesMutation({
+    onSuccess: () => {
+      showToast({
+        message: localize('com_ui_preferences_updated'),
+        status: 'success',
+      });
+    },
+    onError: () => {
+      showToast({
+        message: localize('com_ui_error_updating_preferences'),
+        status: 'error',
+      });
+      setReferenceSavedMemories((prev) => !prev);
+    },
+  });
+
+  useEffect(() => {
+    if (userData?.personalization?.memories !== undefined) {
+      setReferenceSavedMemories(userData.personalization.memories);
+    }
+  }, [userData?.personalization?.memories]);
+
+  const handleMemoryToggle = (checked: boolean) => {
+    setReferenceSavedMemories(checked);
+    updateMemoryPreferencesMutation.mutate({ memories: checked });
+  };
+
+  const hasReadAccess = useHasAccess({
+    permissionType: PermissionTypes.MEMORIES,
+    permission: Permissions.READ,
+  });
+
+  const hasUpdateAccess = useHasAccess({
+    permissionType: PermissionTypes.MEMORIES,
+    permission: Permissions.UPDATE,
+  });
+
+  const hasCreateAccess = useHasAccess({
+    permissionType: PermissionTypes.MEMORIES,
+    permission: Permissions.CREATE,
+  });
+
+  const hasOptOutAccess = useHasAccess({
+    permissionType: PermissionTypes.MEMORIES,
+    permission: Permissions.OPT_OUT,
+  });
+
+  const memories: TUserMemory[] = useMemo(() => memData?.memories ?? [], [memData]);
+
+  const filteredMemories = useMemo(() => {
+    return matchSorter(memories, searchQuery, {
+      keys: ['key', 'value'],
+    });
+  }, [memories, searchQuery]);
+
+  const currentRows = useMemo(() => {
+    return filteredMemories.slice(pageIndex * pageSize, (pageIndex + 1) * pageSize);
+  }, [filteredMemories, pageIndex]);
+
+  const getProgressBarColor = (percentage: number): string => {
+    if (percentage > 90) {
+      return 'stroke-red-500';
+    }
+    if (percentage > 75) {
+      return 'stroke-yellow-500';
+    }
+    return 'stroke-green-500';
+  };
+
+  const EditMemoryButton = ({ memory }: { memory: TUserMemory }) => {
+    const [open, setOpen] = useState(false);
+    const triggerRef = useRef<HTMLDivElement>(null);
+
+    const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
+      if (event.key === 'Enter' || event.key === ' ') {
+        event.preventDefault();
+        setOpen(!open);
+      }
+    };
+
+    // Only show edit button if user has UPDATE permission
+    if (!hasUpdateAccess) {
+      return null;
+    }
+
+    return (
+      <MemoryEditDialog
+        open={open}
+        memory={memory}
+        onOpenChange={setOpen}
+        triggerRef={triggerRef as React.MutableRefObject<HTMLButtonElement | null>}
+      >
+        <OGDialogTrigger asChild>
+          <TooltipAnchor
+            ref={triggerRef}
+            role="button"
+            aria-label={localize('com_ui_edit')}
+            description={localize('com_ui_edit')}
+            tabIndex={0}
+            onClick={() => setOpen(!open)}
+            className="flex size-7 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-hover"
+            onKeyDown={handleKeyDown}
+          >
+            <EditIcon />
+          </TooltipAnchor>
+        </OGDialogTrigger>
+      </MemoryEditDialog>
+    );
+  };
+
+  const DeleteMemoryButton = ({ memory }: { memory: TUserMemory }) => {
+    const [open, setOpen] = useState(false);
+
+    const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
+      if (event.key === 'Enter' || event.key === ' ') {
+        event.preventDefault();
+        event.stopPropagation();
+        setOpen(!open);
+      }
+    };
+
+    if (!hasUpdateAccess) {
+      return null;
+    }
+
+    const confirmDelete = async () => {
+      setDeletingKey(memory.key);
+      deleteMemory(memory.key, {
+        onSuccess: () => {
+          showToast({
+            message: localize('com_ui_deleted'),
+            status: 'success',
+          });
+          setOpen(false);
+        },
+        onError: () =>
+          showToast({
+            message: localize('com_ui_error'),
+            status: 'error',
+          }),
+        onSettled: () => setDeletingKey(null),
+      });
+    };
+
+    return (
+      <OGDialog open={open} onOpenChange={setOpen}>
+        <OGDialogTrigger asChild>
+          <TooltipAnchor
+            role="button"
+            aria-label={localize('com_ui_delete')}
+            description={localize('com_ui_delete')}
+            className="flex size-7 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-hover"
+            tabIndex={0}
+            onClick={() => setOpen(!open)}
+            onKeyDown={handleKeyDown}
+          >
+            {deletingKey === memory.key ? (
+              <Spinner className="size-4 animate-spin" />
+            ) : (
+              <TrashIcon className="size-4" />
+            )}
+          </TooltipAnchor>
+        </OGDialogTrigger>
+        <OGDialogTemplate
+          showCloseButton={false}
+          title={localize('com_ui_delete_memory')}
+          className="w-11/12 max-w-lg"
+          main={
+            <Label className="text-left text-sm font-medium">
+              {localize('com_ui_delete_confirm')} &quot;{memory.key}&quot;?
+            </Label>
+          }
+          selection={{
+            selectHandler: confirmDelete,
+            selectClasses:
+              'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 text-white',
+            selectText: localize('com_ui_delete'),
+          }}
+        />
+      </OGDialog>
+    );
+  };
+
+  if (isLoading) {
+    return (
+      <div className="flex h-full w-full items-center justify-center p-4">
+        <Spinner />
+      </div>
+    );
+  }
+
+  if (!hasReadAccess) {
+    return (
+      <div className="flex h-full w-full items-center justify-center p-4">
+        <div className="text-center">
+          <p className="text-sm text-text-secondary">{localize('com_ui_no_read_access')}</p>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex h-full w-full flex-col overflow-hidden">
+      <div role="region" aria-label={localize('com_ui_memories')} className="mt-2 space-y-2">
+        <div className="flex items-center gap-4">
+          <Input
+            placeholder={localize('com_ui_memories_filter')}
+            value={searchQuery}
+            onChange={(e) => setSearchQuery(e.target.value)}
+            aria-label={localize('com_ui_memories_filter')}
+          />
+        </div>
+        {/* Memory Usage and Toggle Display */}
+        {(memData?.tokenLimit || hasOptOutAccess) && (
+          <div className="flex items-center justify-between rounded-lg">
+            {/* Usage Display */}
+            {memData?.tokenLimit && (
+              <div className="flex items-center gap-2">
+                <div className="relative size-10">
+                  <svg className="size-10 -rotate-90 transform">
+                    <circle
+                      cx="20"
+                      cy="20"
+                      r="16"
+                      stroke="currentColor"
+                      strokeWidth="3"
+                      fill="none"
+                      className="text-gray-200 dark:text-gray-700"
+                    />
+                    <circle
+                      cx="20"
+                      cy="20"
+                      r="16"
+                      strokeWidth="3"
+                      fill="none"
+                      strokeDasharray={`${2 * Math.PI * 16}`}
+                      strokeDashoffset={`${2 * Math.PI * 16 * (1 - (memData.usagePercentage ?? 0) / 100)}`}
+                      className={`transition-all ${getProgressBarColor(memData.usagePercentage ?? 0)}`}
+                      strokeLinecap="round"
+                    />
+                  </svg>
+                  <div className="absolute inset-0 flex items-center justify-center">
+                    <span className="text-xs font-medium">{memData.usagePercentage}%</span>
+                  </div>
+                </div>
+                <div className="text-sm text-text-secondary">{localize('com_ui_usage')}</div>
+              </div>
+            )}
+
+            {/* Memory Toggle */}
+            {hasOptOutAccess && (
+              <div className="flex items-center gap-2 text-xs">
+                <span>{localize('com_ui_use_memory')}</span>
+                <Switch
+                  checked={referenceSavedMemories}
+                  onCheckedChange={handleMemoryToggle}
+                  aria-label={localize('com_ui_reference_saved_memories')}
+                  disabled={updateMemoryPreferencesMutation.isLoading}
+                />
+              </div>
+            )}
+          </div>
+        )}
+        {/* Create Memory Button */}
+        {hasCreateAccess && (
+          <div className="flex w-full justify-end">
+            <MemoryCreateDialog open={createDialogOpen} onOpenChange={setCreateDialogOpen}>
+              <OGDialogTrigger asChild>
+                <Button variant="outline" className="w-full bg-transparent">
+                  <Plus className="size-4" aria-hidden />
+                  {localize('com_ui_create_memory')}
+                </Button>
+              </OGDialogTrigger>
+            </MemoryCreateDialog>
+          </div>
+        )}
+        <div className="rounded-lg border border-border-light bg-transparent shadow-sm transition-colors">
+          <Table className="w-full table-fixed">
+            <TableHeader>
+              <TableRow className="border-b border-border-light hover:bg-surface-secondary">
+                <TableHead
+                  className={`${
+                    hasUpdateAccess ? 'w-[75%]' : 'w-[100%]'
+                  } bg-surface-secondary py-3 text-left text-sm font-medium text-text-secondary`}
+                >
+                  <div>{localize('com_ui_memory')}</div>
+                </TableHead>
+                {hasUpdateAccess && (
+                  <TableHead className="w-[25%] bg-surface-secondary py-3 text-center text-sm font-medium text-text-secondary">
+                    <div>{localize('com_assistants_actions')}</div>
+                  </TableHead>
+                )}
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {currentRows.length ? (
+                currentRows.map((memory: TUserMemory, idx: number) => (
+                  <TableRow
+                    key={idx}
+                    className="border-b border-border-light hover:bg-surface-secondary"
+                  >
+                    <TableCell className={`${hasUpdateAccess ? 'w-[75%]' : 'w-[100%]'} px-4 py-4`}>
+                      <div
+                        className="overflow-hidden text-ellipsis whitespace-nowrap text-sm text-text-primary"
+                        title={memory.value}
+                      >
+                        {memory.value}
+                      </div>
+                    </TableCell>
+                    {hasUpdateAccess && (
+                      <TableCell className="w-[25%] px-4 py-4">
+                        <div className="flex justify-center gap-2">
+                          <EditMemoryButton memory={memory} />
+                          <DeleteMemoryButton memory={memory} />
+                        </div>
+                      </TableCell>
+                    )}
+                  </TableRow>
+                ))
+              ) : (
+                <TableRow>
+                  <TableCell
+                    colSpan={hasUpdateAccess ? 2 : 1}
+                    className="h-24 text-center text-sm text-text-secondary"
+                  >
+                    {localize('com_ui_no_data')}
+                  </TableCell>
+                </TableRow>
+              )}
+            </TableBody>
+          </Table>
+        </div>
+
+        {/* Pagination controls */}
+        {filteredMemories.length > pageSize && (
+          <div
+            className="flex items-center justify-end gap-2"
+            role="navigation"
+            aria-label="Pagination"
+          >
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => setPageIndex((prev) => Math.max(prev - 1, 0))}
+              disabled={pageIndex === 0}
+              aria-label={localize('com_ui_prev')}
+            >
+              {localize('com_ui_prev')}
+            </Button>
+            <div className="text-sm" aria-live="polite">
+              {`${pageIndex + 1} / ${Math.ceil(filteredMemories.length / pageSize)}`}
+            </div>
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() =>
+                setPageIndex((prev) =>
+                  (prev + 1) * pageSize < filteredMemories.length ? prev + 1 : prev,
+                )
+              }
+              disabled={(pageIndex + 1) * pageSize >= filteredMemories.length}
+              aria-label={localize('com_ui_next')}
+            >
+              {localize('com_ui_next')}
+            </Button>
+          </div>
+        )}
+
+        {/* Admin Settings */}
+        {user?.role === SystemRoles.ADMIN && (
+          <div className="mt-4">
+            <AdminSettings />
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/client/src/components/SidePanel/Memories/index.ts b/client/src/components/SidePanel/Memories/index.ts
new file mode 100644
index 0000000000..2169cae7e3
--- /dev/null
+++ b/client/src/components/SidePanel/Memories/index.ts
@@ -0,0 +1,2 @@
+export { default as MemoryViewer } from './MemoryViewer';
+export { default as MemoryEditDialog } from './MemoryEditDialog';
diff --git a/client/src/components/svg/PersonalizationIcon.tsx b/client/src/components/svg/PersonalizationIcon.tsx
new file mode 100644
index 0000000000..e67e84b221
--- /dev/null
+++ b/client/src/components/svg/PersonalizationIcon.tsx
@@ -0,0 +1,19 @@
+export default function PersonalizationIcon({ className = '' }: { className?: string }) {
+  return (
+    <svg
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      className={`icon-sm ${className}`}
+    >
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M12 4C10.3431 4 9 5.34315 9 7C9 8.65685 10.3431 10 12 10C13.6569 10 15 8.65685 15 7C15 5.34315 13.6569 4 12 4ZM7 7C7 4.23858 9.23858 2 12 2C14.7614 2 17 4.23858 17 7C17 9.76142 14.7614 12 12 12C9.23858 12 7 9.76142 7 7ZM19.0277 15.6255C18.6859 15.5646 18.1941 15.6534 17.682 16.1829C17.4936 16.3777 17.2342 16.4877 16.9632 16.4877C16.6922 16.4877 16.4328 16.3777 16.2444 16.1829C15.7322 15.6534 15.2405 15.5646 14.8987 15.6255C14.5381 15.6897 14.2179 15.9384 14.0623 16.3275C13.8048 16.9713 13.9014 18.662 16.9632 20.4617C20.0249 18.662 20.1216 16.9713 19.864 16.3275C19.7084 15.9384 19.3882 15.6897 19.0277 15.6255ZM21.721 15.5847C22.5748 17.7191 21.2654 20.429 17.437 22.4892C17.1412 22.6484 16.7852 22.6484 16.4893 22.4892C12.6609 20.4291 11.3516 17.7191 12.2053 15.5847C12.6117 14.5689 13.4917 13.8446 14.5481 13.6565C15.3567 13.5125 16.2032 13.6915 16.9632 14.1924C17.7232 13.6915 18.5697 13.5125 19.3783 13.6565C20.4347 13.8446 21.3147 14.5689 21.721 15.5847ZM9.92597 14.2049C10.1345 14.7163 9.889 15.2999 9.3776 15.5084C7.06131 16.453 5.5 18.5813 5.5 20.9999C5.5 21.5522 5.05228 21.9999 4.5 21.9999C3.94772 21.9999 3.5 21.5522 3.5 20.9999C3.5 17.6777 5.641 14.8723 8.6224 13.6565C9.1338 13.448 9.71743 13.6935 9.92597 14.2049Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
diff --git a/client/src/components/svg/index.ts b/client/src/components/svg/index.ts
index 10068a1d47..73aad266d8 100644
--- a/client/src/components/svg/index.ts
+++ b/client/src/components/svg/index.ts
@@ -61,3 +61,4 @@ export { default as BedrockIcon } from './BedrockIcon';
 export { default as ThumbUpIcon } from './ThumbUpIcon';
 export { default as ThumbDownIcon } from './ThumbDownIcon';
 export { default as XAIcon } from './XAIcon';
+export { default as PersonalizationIcon } from './PersonalizationIcon';
diff --git a/client/src/components/ui/OriginalDialog.tsx b/client/src/components/ui/OriginalDialog.tsx
index 28a8177817..4e1ff3bd48 100644
--- a/client/src/components/ui/OriginalDialog.tsx
+++ b/client/src/components/ui/OriginalDialog.tsx
@@ -4,7 +4,7 @@ import { X } from 'lucide-react';
 import { cn } from '~/utils';
 
 interface OGDialogProps extends DialogPrimitive.DialogProps {
-  triggerRef?: React.RefObject<HTMLButtonElement | HTMLInputElement>;
+  triggerRef?: React.RefObject<HTMLButtonElement | HTMLInputElement | null>;
 }
 
 const Dialog = React.forwardRef<HTMLDivElement, OGDialogProps>(
diff --git a/client/src/components/ui/Table.tsx b/client/src/components/ui/Table.tsx
index cf7a23389f..6dac6d54ff 100644
--- a/client/src/components/ui/Table.tsx
+++ b/client/src/components/ui/Table.tsx
@@ -32,7 +32,7 @@ const TableFooter = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <tfoot
     ref={ref}
-    className={cn('bg-muted/50 border-t font-medium [&>tr]:last:border-b-0', className)}
+    className={cn('border-t bg-muted/50 font-medium [&>tr]:last:border-b-0', className)}
     {...props}
   />
 ));
@@ -43,7 +43,7 @@ const TableRow = React.forwardRef<HTMLTableRowElement, React.HTMLAttributes<HTML
     <tr
       ref={ref}
       className={cn(
-        'hover:bg-muted/50 data-[state=selected]:bg-muted border-b border-border-light transition-colors',
+        'border-b border-border-light transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted',
         className,
       )}
       {...props}
@@ -59,7 +59,7 @@ const TableHead = React.forwardRef<
   <th
     ref={ref}
     className={cn(
-      'text-muted-foreground h-12 px-4 text-left align-middle font-medium [&:has([role=checkbox])]:pr-0',
+      'h-12 px-4 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0',
       className,
     )}
     {...props}
@@ -83,7 +83,7 @@ const TableCaption = React.forwardRef<
   HTMLTableCaptionElement,
   React.HTMLAttributes<HTMLTableCaptionElement>
 >(({ className, ...props }, ref) => (
-  <caption ref={ref} className={cn('text-muted-foreground mt-4 text-sm', className)} {...props} />
+  <caption ref={ref} className={cn('mt-4 text-sm text-muted-foreground', className)} {...props} />
 ));
 TableCaption.displayName = 'TableCaption';
 
diff --git a/client/src/data-provider/Memories/index.ts b/client/src/data-provider/Memories/index.ts
new file mode 100644
index 0000000000..27669d3c14
--- /dev/null
+++ b/client/src/data-provider/Memories/index.ts
@@ -0,0 +1,2 @@
+/* Memories */
+export * from './queries';
diff --git a/client/src/data-provider/Memories/queries.ts b/client/src/data-provider/Memories/queries.ts
new file mode 100644
index 0000000000..53c2025228
--- /dev/null
+++ b/client/src/data-provider/Memories/queries.ts
@@ -0,0 +1,116 @@
+/* Memories */
+import { QueryKeys, MutationKeys, dataService } from 'librechat-data-provider';
+import { useQuery, useQueryClient, useMutation } from '@tanstack/react-query';
+import type {
+  UseQueryOptions,
+  UseMutationOptions,
+  QueryObserverResult,
+} from '@tanstack/react-query';
+import type { TUserMemory, MemoriesResponse } from 'librechat-data-provider';
+
+export const useMemoriesQuery = (
+  config?: UseQueryOptions<MemoriesResponse>,
+): QueryObserverResult<MemoriesResponse> => {
+  return useQuery<MemoriesResponse>([QueryKeys.memories], () => dataService.getMemories(), {
+    refetchOnWindowFocus: false,
+    refetchOnReconnect: false,
+    refetchOnMount: false,
+    ...config,
+  });
+};
+
+export const useDeleteMemoryMutation = () => {
+  const queryClient = useQueryClient();
+  return useMutation((key: string) => dataService.deleteMemory(key), {
+    onSuccess: () => {
+      queryClient.invalidateQueries([QueryKeys.memories]);
+    },
+  });
+};
+
+export type UpdateMemoryParams = { key: string; value: string; originalKey?: string };
+export const useUpdateMemoryMutation = (
+  options?: UseMutationOptions<TUserMemory, Error, UpdateMemoryParams>,
+) => {
+  const queryClient = useQueryClient();
+  return useMutation(
+    ({ key, value, originalKey }: UpdateMemoryParams) =>
+      dataService.updateMemory(key, value, originalKey),
+    {
+      ...options,
+      onSuccess: (...params) => {
+        queryClient.invalidateQueries([QueryKeys.memories]);
+        options?.onSuccess?.(...params);
+      },
+    },
+  );
+};
+
+export type UpdateMemoryPreferencesParams = { memories: boolean };
+export type UpdateMemoryPreferencesResponse = {
+  updated: boolean;
+  preferences: { memories: boolean };
+};
+
+export const useUpdateMemoryPreferencesMutation = (
+  options?: UseMutationOptions<
+    UpdateMemoryPreferencesResponse,
+    Error,
+    UpdateMemoryPreferencesParams
+  >,
+) => {
+  const queryClient = useQueryClient();
+  return useMutation<UpdateMemoryPreferencesResponse, Error, UpdateMemoryPreferencesParams>(
+    [MutationKeys.updateMemoryPreferences],
+    (preferences: UpdateMemoryPreferencesParams) =>
+      dataService.updateMemoryPreferences(preferences),
+    {
+      ...options,
+      onSuccess: (...params) => {
+        queryClient.invalidateQueries([QueryKeys.user]);
+        options?.onSuccess?.(...params);
+      },
+    },
+  );
+};
+
+export type CreateMemoryParams = { key: string; value: string };
+export type CreateMemoryResponse = { created: boolean; memory: TUserMemory };
+
+export const useCreateMemoryMutation = (
+  options?: UseMutationOptions<CreateMemoryResponse, Error, CreateMemoryParams>,
+) => {
+  const queryClient = useQueryClient();
+  return useMutation<CreateMemoryResponse, Error, CreateMemoryParams>(
+    ({ key, value }: CreateMemoryParams) => dataService.createMemory({ key, value }),
+    {
+      ...options,
+      onSuccess: (data, variables, context) => {
+        queryClient.setQueryData<MemoriesResponse>([QueryKeys.memories], (oldData) => {
+          if (!oldData) return oldData;
+
+          const newMemories = [...oldData.memories, data.memory];
+          const totalTokens = newMemories.reduce(
+            (sum, memory) => sum + (memory.tokenCount || 0),
+            0,
+          );
+          const tokenLimit = oldData.tokenLimit;
+          let usagePercentage = oldData.usagePercentage;
+
+          if (tokenLimit && tokenLimit > 0) {
+            usagePercentage = Math.min(100, Math.round((totalTokens / tokenLimit) * 100));
+          }
+
+          return {
+            ...oldData,
+            memories: newMemories,
+            totalTokens,
+            usagePercentage,
+          };
+        });
+
+        options?.onSuccess?.(data, variables, context);
+      },
+    },
+  );
+};
diff --git a/client/src/data-provider/__tests__/memories.test.ts b/client/src/data-provider/__tests__/memories.test.ts
new file mode 100644
index 0000000000..553ef227bd
--- /dev/null
+++ b/client/src/data-provider/__tests__/memories.test.ts
@@ -0,0 +1,19 @@
+import { dataService as _dataService } from 'librechat-data-provider';
+import axios from 'axios';
+
+jest.mock('axios');
+
+const mockedAxios = axios as jest.Mocked<typeof axios>;
+
+describe('getMemories', () => {
+  it('should fetch memories from /api/memories', async () => {
+    const mockData = [{ key: 'foo', value: 'bar', updated_at: '2024-05-01T00:00:00Z' }];
+
+    mockedAxios.get.mockResolvedValueOnce({ data: mockData } as any);
+
+    const result = await (_dataService as any).getMemories();
+
+    expect(mockedAxios.get).toHaveBeenCalledWith('/api/memories', expect.any(Object));
+    expect(result).toEqual(mockData);
+  });
+});
diff --git a/client/src/data-provider/index.ts b/client/src/data-provider/index.ts
index 0c476fd11c..1b1ceed19f 100644
--- a/client/src/data-provider/index.ts
+++ b/client/src/data-provider/index.ts
@@ -2,6 +2,8 @@ export * from './Auth';
 export * from './Agents';
 export * from './Endpoints';
 export * from './Files';
+/* Memories */
+export * from './Memories';
 export * from './Messages';
 export * from './Misc';
 export * from './Tools';
diff --git a/client/src/data-provider/roles.ts b/client/src/data-provider/roles.ts
index d038440d43..cdabc4c20c 100644
--- a/client/src/data-provider/roles.ts
+++ b/client/src/data-provider/roles.ts
@@ -1,10 +1,15 @@
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import {
+  QueryKeys,
+  dataService,
+  promptPermissionsSchema,
+  memoryPermissionsSchema,
+} from 'librechat-data-provider';
 import type {
+  UseQueryOptions,
   UseMutationResult,
   QueryObserverResult,
-  UseQueryOptions,
 } from '@tanstack/react-query';
-import { QueryKeys, dataService, promptPermissionsSchema } from 'librechat-data-provider';
 import type * as t from 'librechat-data-provider';
 
 export const useGetRole = (
@@ -91,3 +96,39 @@ export const useUpdateAgentPermissionsMutation = (
     },
   );
 };
+
+export const useUpdateMemoryPermissionsMutation = (
+  options?: t.UpdateMemoryPermOptions,
+): UseMutationResult<
+  t.UpdatePermResponse,
+  t.TError | undefined,
+  t.UpdateMemoryPermVars,
+  unknown
+> => {
+  const queryClient = useQueryClient();
+  const { onMutate, onSuccess, onError } = options ?? {};
+  return useMutation(
+    (variables) => {
+      memoryPermissionsSchema.partial().parse(variables.updates);
+      return dataService.updateMemoryPermissions(variables);
+    },
+    {
+      onSuccess: (data, variables, context) => {
+        queryClient.invalidateQueries([QueryKeys.roles, variables.roleName]);
+        if (onSuccess) {
+          onSuccess(data, variables, context);
+        }
+      },
+      onError: (...args) => {
+        const error = args[0];
+        if (error != null) {
+          console.error('Failed to update memory permissions:', error);
+        }
+        if (onError) {
+          onError(...args);
+        }
+      },
+      onMutate,
+    },
+  );
+};
diff --git a/client/src/hooks/Nav/useSideNavLinks.ts b/client/src/hooks/Nav/useSideNavLinks.ts
index c5516b9477..822bde3ace 100644
--- a/client/src/hooks/Nav/useSideNavLinks.ts
+++ b/client/src/hooks/Nav/useSideNavLinks.ts
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { MessageSquareQuote, ArrowRightToLine, Settings2, Bookmark } from 'lucide-react';
+import { MessageSquareQuote, ArrowRightToLine, Settings2, Database, Bookmark } from 'lucide-react';
 import {
   isAssistantsEndpoint,
   isAgentsEndpoint,
@@ -12,6 +12,7 @@ import type { TInterfaceConfig, TEndpointsConfig } from 'librechat-data-provider
 import type { NavLink } from '~/common';
 import AgentPanelSwitch from '~/components/SidePanel/Agents/AgentPanelSwitch';
 import BookmarkPanel from '~/components/SidePanel/Bookmarks/BookmarkPanel';
+import MemoryViewer from '~/components/SidePanel/Memories/MemoryViewer';
 import PanelSwitch from '~/components/SidePanel/Builder/PanelSwitch';
 import PromptsAccordion from '~/components/Prompts/PromptsAccordion';
 import Parameters from '~/components/SidePanel/Parameters/Panel';
@@ -42,6 +43,14 @@ export default function useSideNavLinks({
     permissionType: PermissionTypes.BOOKMARKS,
     permission: Permissions.USE,
   });
+  const hasAccessToMemories = useHasAccess({
+    permissionType: PermissionTypes.MEMORIES,
+    permission: Permissions.USE,
+  });
+  const hasAccessToReadMemories = useHasAccess({
+    permissionType: PermissionTypes.MEMORIES,
+    permission: Permissions.READ,
+  });
   const hasAccessToAgents = useHasAccess({
     permissionType: PermissionTypes.AGENTS,
     permission: Permissions.USE,
@@ -97,6 +106,16 @@ export default function useSideNavLinks({
       });
     }
 
+    if (hasAccessToMemories && hasAccessToReadMemories) {
+      links.push({
+        title: 'com_ui_memories',
+        label: '',
+        icon: Database,
+        id: 'memories',
+        Component: MemoryViewer,
+      });
+    }
+
     if (
       interfaceConfig.parameters === true &&
       isParamEndpoint(endpoint ?? '', endpointType ?? '') === true &&
@@ -147,6 +166,8 @@ export default function useSideNavLinks({
     endpoint,
     hasAccessToAgents,
     hasAccessToPrompts,
+    hasAccessToMemories,
+    hasAccessToReadMemories,
     hasAccessToBookmarks,
     hasAccessToCreateAgents,
     hidePanel,
diff --git a/client/src/hooks/SSE/useAttachmentHandler.ts b/client/src/hooks/SSE/useAttachmentHandler.ts
index cd511defd2..d9711718b1 100644
--- a/client/src/hooks/SSE/useAttachmentHandler.ts
+++ b/client/src/hooks/SSE/useAttachmentHandler.ts
@@ -1,7 +1,8 @@
 import { useSetRecoilState } from 'recoil';
-import { QueryKeys } from 'librechat-data-provider';
 import type { QueryClient } from '@tanstack/react-query';
-import type { TAttachment, EventSubmission } from 'librechat-data-provider';
+import { QueryKeys, Tools } from 'librechat-data-provider';
+import type { TAttachment, EventSubmission, MemoriesResponse } from 'librechat-data-provider';
+import { handleMemoryArtifact } from '~/utils/memory';
 import store from '~/store';
 
 export default function useAttachmentHandler(queryClient?: QueryClient) {
@@ -16,6 +17,18 @@ export default function useAttachmentHandler(queryClient?: QueryClient) {
       });
     }
 
+    if (queryClient && data.type === Tools.memory && data[Tools.memory]) {
+      const memoryArtifact = data[Tools.memory];
+
+      queryClient.setQueryData([QueryKeys.memories], (oldData: MemoriesResponse | undefined) => {
+        if (!oldData) {
+          return oldData;
+        }
+
+        return handleMemoryArtifact({ memoryArtifact, currentData: oldData }) || oldData;
+      });
+    }
+
     setAttachmentsMap((prevMap) => {
       const messageAttachments =
         (prevMap as Record<string, TAttachment[] | undefined>)[messageId] || [];
diff --git a/client/src/hooks/usePersonalizationAccess.ts b/client/src/hooks/usePersonalizationAccess.ts
new file mode 100644
index 0000000000..9a419f4a63
--- /dev/null
+++ b/client/src/hooks/usePersonalizationAccess.ts
@@ -0,0 +1,16 @@
+import { PermissionTypes, Permissions } from 'librechat-data-provider';
+import useHasAccess from './Roles/useHasAccess';
+
+export default function usePersonalizationAccess() {
+  const hasMemoryOptOut = useHasAccess({
+    permissionType: PermissionTypes.MEMORIES,
+    permission: Permissions.OPT_OUT,
+  });
+
+  const hasAnyPersonalizationFeature = hasMemoryOptOut;
+
+  return {
+    hasMemoryOptOut,
+    hasAnyPersonalizationFeature,
+  };
+}
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index 284117ffe4..b235330c20 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -446,6 +446,7 @@
   "com_nav_setting_data": "Data controls",
   "com_nav_setting_general": "General",
   "com_nav_setting_speech": "Speech",
+  "com_nav_setting_personalization": "Personalization",
   "com_nav_settings": "Settings",
   "com_nav_shared_links": "Shared links",
   "com_nav_show_code": "Always show code when using code interpreter",
@@ -659,10 +660,12 @@
   "com_ui_delete_confirm": "This will delete",
   "com_ui_delete_confirm_prompt_version_var": "This will delete the selected version for \"{{0}}.\" If no other versions exist, the prompt will be deleted.",
   "com_ui_delete_conversation": "Delete chat?",
+  "com_ui_delete_memory": "Delete Memory",
   "com_ui_delete_prompt": "Delete Prompt?",
   "com_ui_delete_shared_link": "Delete shared link?",
   "com_ui_delete_tool": "Delete Tool",
   "com_ui_delete_tool_confirm": "Are you sure you want to delete this tool?",
+  "com_ui_deleted": "Deleted",
   "com_ui_descending": "Desc",
   "com_ui_description": "Description",
   "com_ui_description_placeholder": "Optional: Enter a description to display for the prompt",
@@ -770,6 +773,7 @@
   "com_ui_include_shadcnui_agent": "Include shadcn/ui instructions",
   "com_ui_input": "Input",
   "com_ui_instructions": "Instructions",
+  "com_ui_key": "Key",
   "com_ui_late_night": "Happy late night",
   "com_ui_latest_footer": "Every AI for Everyone.",
   "com_ui_latest_production_version": "Latest production version",
@@ -783,6 +787,17 @@
   "com_ui_manage": "Manage",
   "com_ui_max_tags": "Maximum number allowed is {{0}}, using latest values.",
   "com_ui_mcp_servers": "MCP Servers",
+  "com_ui_memories": "Memories",
+  "com_ui_memories_filter": "Filter memories...",
+  "com_ui_memories_allow_use": "Allow using Memories",
+  "com_ui_memories_allow_create": "Allow creating Memories",
+  "com_ui_memories_allow_update": "Allow updating Memories",
+  "com_ui_memories_allow_read": "Allow reading Memories",
+  "com_ui_memories_allow_opt_out": "Allow users to opt out of Memories",
+  "com_ui_memory": "Memory",
+  "com_ui_usage": "Usage",
+  "com_ui_current": "Current",
+  "com_ui_tokens": "tokens",
   "com_ui_mention": "Mention an endpoint, assistant, or preset to quickly switch to it",
   "com_ui_min_tags": "Cannot remove more values, a minimum of {{0}} are required.",
   "com_ui_misc": "Misc.",
@@ -800,7 +815,7 @@
   "com_ui_no_bookmarks": "it seems like you have no bookmarks yet. Click on a chat and add a new one",
   "com_ui_no_category": "No category",
   "com_ui_no_changes": "No changes to update",
-  "com_ui_no_data": "something needs to go here. was empty",
+  "com_ui_no_data": "No data available",
   "com_ui_no_terms_content": "No terms and conditions content to display",
   "com_ui_no_valid_items": "something needs to go here. was empty",
   "com_ui_none": "None",
@@ -944,6 +959,8 @@
   "com_ui_version_var": "Version {{0}}",
   "com_ui_versions": "Versions",
   "com_ui_view_source": "View source chat",
+  "com_ui_view_memory": "View Memory",
+  "com_ui_no_read_access": "You don't have permission to view memories",
   "com_ui_web_search": "Web Search",
   "com_ui_web_search_api_subtitle": "Search the web for up-to-date information",
   "com_ui_web_search_cohere_key": "Enter Cohere API Key",
@@ -970,5 +987,23 @@
   "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_warning_resubmit_unsupported": "Resubmitting the AI message is not supported for this endpoint.",
+  "com_ui_value": "Value",
+  "com_ui_edit_memory": "Edit Memory",
+  "com_ui_enter_key": "Enter key",
+  "com_ui_enter_value": "Enter value",
+  "com_ui_memory_updated": "Updated saved memory",
+  "com_ui_memory_updated_items": "Updated Memories",
+  "com_ui_memory_deleted_items": "Deleted Memories",
+  "com_ui_memory_deleted": "Memory deleted",
+  "com_ui_reference_saved_memories": "Reference saved memories",
+  "com_ui_reference_saved_memories_description": "Allow the assistant to reference and use your saved memories when responding",
+  "com_ui_no_personalization_available": "No personalization options are currently available",
+  "com_ui_preferences_updated": "Preferences updated successfully",
+  "com_ui_error_updating_preferences": "Error updating preferences",
+  "com_ui_use_memory": "Use memory",
+  "com_ui_create_memory": "Create Memory",
+  "com_ui_memory_created": "Memory created successfully",
+  "com_ui_memory_key_exists": "A memory with this key already exists. Please use a different key."
 }
+
diff --git a/client/src/utils/memory.ts b/client/src/utils/memory.ts
new file mode 100644
index 0000000000..49b383e9e4
--- /dev/null
+++ b/client/src/utils/memory.ts
@@ -0,0 +1,90 @@
+import type { MemoriesResponse, TUserMemory, MemoryArtifact } from 'librechat-data-provider';
+
+type HandleMemoryArtifactParams = {
+  memoryArtifact: MemoryArtifact;
+  currentData: MemoriesResponse;
+};
+
+/**
+ * Pure function to handle memory artifact updates
+ * @param params - Object containing memoryArtifact and currentData
+ * @returns Updated MemoriesResponse or undefined if no update needed
+ */
+export function handleMemoryArtifact({
+  memoryArtifact,
+  currentData,
+}: HandleMemoryArtifactParams): MemoriesResponse | undefined {
+  const { type, key, value, tokenCount = 0 } = memoryArtifact;
+
+  if (type === 'update' && !value) {
+    return undefined;
+  }
+
+  const memories = currentData.memories;
+  const existingIndex = memories.findIndex((m) => m.key === key);
+
+  if (type === 'delete') {
+    if (existingIndex === -1) {
+      return undefined;
+    }
+
+    const deletedMemory = memories[existingIndex];
+    const newMemories = [...memories];
+    newMemories.splice(existingIndex, 1);
+
+    const totalTokens = currentData.totalTokens - (deletedMemory.tokenCount || 0);
+    const usagePercentage = currentData.tokenLimit
+      ? Math.min(100, Math.round((totalTokens / currentData.tokenLimit) * 100))
+      : null;
+
+    return {
+      ...currentData,
+      memories: newMemories,
+      totalTokens,
+      usagePercentage,
+    };
+  }
+
+  if (type === 'update') {
+    const timestamp = new Date().toISOString();
+    let totalTokens = currentData.totalTokens;
+    let newMemories: TUserMemory[];
+
+    if (existingIndex >= 0) {
+      const oldTokenCount = memories[existingIndex].tokenCount || 0;
+      totalTokens = totalTokens - oldTokenCount + tokenCount;
+
+      newMemories = [...memories];
+      newMemories[existingIndex] = {
+        key,
+        value: value!,
+        tokenCount,
+        updated_at: timestamp,
+      };
+    } else {
+      totalTokens = totalTokens + tokenCount;
+      newMemories = [
+        ...memories,
+        {
+          key,
+          value: value!,
+          tokenCount,
+          updated_at: timestamp,
+        },
+      ];
+    }
+
+    const usagePercentage = currentData.tokenLimit
+      ? Math.min(100, Math.round((totalTokens / currentData.tokenLimit) * 100))
+      : null;
+
+    return {
+      ...currentData,
+      memories: newMemories,
+      totalTokens,
+      usagePercentage,
+    };
+  }
+
+  return undefined;
+}
diff --git a/config/packages.js b/config/packages.js
index 2ca187d5b9..e2a3b06b06 100644
--- a/config/packages.js
+++ b/config/packages.js
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
@@ -10,7 +12,7 @@ const directories = [
   rootDir,
   path.resolve(rootDir, 'packages', 'data-provider'),
   path.resolve(rootDir, 'packages', 'data-schemas'),
-  path.resolve(rootDir, 'packages', 'mcp'),
+  path.resolve(rootDir, 'packages', 'api'),
   path.resolve(rootDir, 'client'),
   path.resolve(rootDir, 'api'),
 ];
diff --git a/config/update.js b/config/update.js
index 55867fedd6..e0dba111e5 100644
--- a/config/update.js
+++ b/config/update.js
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 const path = require('path');
 const { execSync } = require('child_process');
 const { askQuestion, isDockerRunning, deleteNodeModules, silentExit } = require('./helpers');
@@ -17,7 +19,7 @@ const directories = [
   rootDir,
   path.resolve(rootDir, 'packages', 'data-provider'),
   path.resolve(rootDir, 'packages', 'data-schemas'),
-  path.resolve(rootDir, 'packages', 'mcp'),
+  path.resolve(rootDir, 'packages', 'api'),
   path.resolve(rootDir, 'client'),
   path.resolve(rootDir, 'api'),
 ];
@@ -128,7 +130,7 @@ async function validateDockerRunning() {
   console.green('Your LibreChat app is now up to date! Start the app with the following command:');
   console.purple(startCommand);
   console.orange(
-    'Note: it\'s also recommended to clear your browser cookies and localStorage for LibreChat to assure a fully clean installation.',
+    "Note: it's also recommended to clear your browser cookies and localStorage for LibreChat to assure a fully clean installation.",
   );
-  console.orange('Also: Don\'t worry, your data is safe :)');
+  console.orange("Also: Don't worry, your data is safe :)");
 })();
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 03f0a81b5e..b602303047 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -31,9 +31,9 @@ export default [
       'client/public/**/*',
       'client/coverage/**/*',
       'e2e/playwright-report/**/*',
-      'packages/mcp/types/**/*',
-      'packages/mcp/dist/**/*',
-      'packages/mcp/test_bundle/**/*',
+      'packages/api/types/**/*',
+      'packages/api/dist/**/*',
+      'packages/api/test_bundle/**/*',
       'api/demo/**/*',
       'packages/data-provider/types/**/*',
       'packages/data-provider/dist/**/*',
@@ -317,7 +317,7 @@ export default [
     files: ['./api/demo/**/*.ts'],
   },
   {
-    files: ['./packages/mcp/**/*.ts'],
+    files: ['./packages/api/**/*.ts'],
   },
   {
     files: ['./config/translations/**/*.ts'],
@@ -351,12 +351,12 @@ export default [
     },
   },
   {
-    files: ['./packages/mcp/specs/**/*.ts'],
+    files: ['./packages/api/specs/**/*.ts'],
     languageOptions: {
       ecmaVersion: 5,
       sourceType: 'script',
       parserOptions: {
-        project: './packages/mcp/tsconfig.spec.json',
+        project: './packages/api/tsconfig.spec.json',
       },
     },
   },
diff --git a/librechat.example.yaml b/librechat.example.yaml
index 38cb26eb4d..fbe2612722 100644
--- a/librechat.example.yaml
+++ b/librechat.example.yaml
@@ -299,3 +299,25 @@ endpoints:
 #     px: 1024
 # # See the Custom Configuration Guide for more information on Assistants Config:
 # # https://www.librechat.ai/docs/configuration/librechat_yaml/object_structure/assistants_endpoint
+
+# Memory configuration for user memories
+# memory:
+#   # (optional) Disable memory functionality
+#   disabled: false
+#   # (optional) Restrict memory keys to specific values to limit memory storage and improve consistency
+#   validKeys: ["preferences", "work_info", "personal_info", "skills", "interests", "context"]
+#   # (optional) Maximum token limit for memory storage (not yet implemented for token counting)
+#   tokenLimit: 10000
+#   # (optional) Enable personalization features (defaults to true if memory is configured)
+#   # When false, users will not see the Personalization tab in settings
+#   personalize: true
+#   # Memory agent configuration - either use an existing agent by ID or define inline
+#   agent:
+#     # Option 1: Use existing agent by ID
+#     id: "your-memory-agent-id"
+#     # Option 2: Define agent inline
+#     # provider: "openai"
+#     # model: "gpt-4o-mini"
+#     # instructions: "You are a memory management assistant. Store and manage user information accurately."
+#     # model_parameters:
+#     #   temperature: 0.1
diff --git a/package-lock.json b/package-lock.json
index f53d7389ee..35a5a388ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -65,6 +65,7 @@
         "@langchain/google-vertexai": "^0.2.9",
         "@langchain/textsplitters": "^0.1.0",
         "@librechat/agents": "^2.4.38",
+        "@librechat/api": "*",
         "@librechat/data-schemas": "*",
         "@node-saml/passport-saml": "^5.0.0",
         "@waylaidwanderer/fetch-event-source": "^3.0.1",
@@ -97,7 +98,6 @@
         "keyv-file": "^5.1.2",
         "klona": "^2.0.6",
         "librechat-data-provider": "*",
-        "librechat-mcp": "*",
         "lodash": "^4.17.21",
         "meilisearch": "^0.38.0",
         "memorystore": "^1.6.7",
@@ -106,6 +106,7 @@
         "mongoose": "^8.12.1",
         "multer": "^2.0.0",
         "nanoid": "^3.3.7",
+        "node-fetch": "^2.7.0",
         "nodemailer": "^6.9.15",
         "ollama": "^0.5.0",
         "openai": "^4.96.2",
@@ -126,7 +127,7 @@
         "traverse": "^0.6.7",
         "ua-parser-js": "^1.0.36",
         "winston": "^3.11.0",
-        "winston-daily-rotate-file": "^4.7.1",
+        "winston-daily-rotate-file": "^5.0.0",
         "youtube-transcript": "^1.2.1",
         "zod": "^3.22.4"
       },
@@ -2372,23 +2373,13 @@
         "node": ">= 10.16.0"
       }
     },
-    "api/node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
+    "api/node_modules/object-hash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+      "license": "MIT",
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "node": ">= 6"
       }
     },
     "api/node_modules/openid-client": {
@@ -2442,11 +2433,6 @@
         "@img/sharp-win32-x64": "0.33.5"
       }
     },
-    "api/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
     "api/node_modules/uuid": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
@@ -2459,18 +2445,22 @@
         "uuid": "dist/bin/uuid"
       }
     },
-    "api/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "api/node_modules/whatwg-url": {
+    "api/node_modules/winston-daily-rotate-file": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-5.0.0.tgz",
+      "integrity": "sha512-JDjiXXkM5qvwY06733vf09I2wnMXpZEhxEVOSPenZMii+g7pcDcTBt2MRugnoi8BwVSuCT2jfRXBUy+n1Zz/Yw==",
+      "license": "MIT",
       "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+        "file-stream-rotator": "^0.6.1",
+        "object-hash": "^3.0.0",
+        "triple-beam": "^1.4.1",
+        "winston-transport": "^4.7.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "peerDependencies": {
+        "winston": "^3"
       }
     },
     "client": {
@@ -19850,6 +19840,10 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/@librechat/api": {
+      "resolved": "packages/api",
+      "link": true
+    },
     "node_modules/@librechat/backend": {
       "resolved": "api",
       "link": true
@@ -20107,6 +20101,7 @@
       "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.2.tgz",
       "integrity": "sha512-H9vwztj5OAqHg9GockCQC06k1natgcxWQSRpQcPJf6i5+MWBzfKkRtxGbjQf0X2ihii0ffLZCRGbYV2f2bjNCQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "content-type": "^1.0.5",
         "cors": "^2.8.5",
@@ -20128,6 +20123,7 @@
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
       "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "mime-types": "^3.0.0",
         "negotiator": "^1.0.0"
@@ -20141,6 +20137,7 @@
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
       "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "bytes": "^3.1.2",
         "content-type": "^1.0.5",
@@ -20161,6 +20158,7 @@
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
       "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "safe-buffer": "5.2.1"
       },
@@ -20173,6 +20171,7 @@
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
       "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6.6.0"
       }
@@ -20182,6 +20181,7 @@
       "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
       "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "accepts": "^2.0.0",
         "body-parser": "^2.2.0",
@@ -20224,6 +20224,7 @@
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz",
       "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "debug": "^4.4.0",
         "encodeurl": "^2.0.0",
@@ -20241,6 +20242,7 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
       "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -20250,6 +20252,7 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -20262,6 +20265,7 @@
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
       "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 0.8"
       }
@@ -20271,6 +20275,7 @@
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
       "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -20283,6 +20288,7 @@
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
       "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -20292,6 +20298,7 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
       "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "mime-db": "^1.54.0"
       },
@@ -20304,6 +20311,7 @@
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
       "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -20313,6 +20321,7 @@
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
       "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "side-channel": "^1.1.0"
       },
@@ -20328,6 +20337,7 @@
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz",
       "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -20343,6 +20353,7 @@
       "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz",
       "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "debug": "^4.3.5",
         "encodeurl": "^2.0.0",
@@ -20365,6 +20376,7 @@
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz",
       "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "encodeurl": "^2.0.0",
         "escape-html": "^1.0.3",
@@ -20380,6 +20392,7 @@
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
       "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "content-type": "^1.0.5",
         "media-typer": "^1.1.0",
@@ -25236,6 +25249,16 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/bun": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@types/bun/-/bun-1.2.15.tgz",
+      "integrity": "sha512-U1ljPdBEphF0nw1MIk0hI7kPg7dFdPyM7EenHsp6W5loNHl7zqy6JQf/RKCgnUn2KDzUpkBwHPnEJEjII594bA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bun-types": "1.2.15"
+      }
+    },
     "node_modules/@types/connect": {
       "version": "3.4.38",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
@@ -27280,6 +27303,16 @@
       "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
       "dev": true
     },
+    "node_modules/bun-types": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/bun-types/-/bun-types-1.2.15.tgz",
+      "integrity": "sha512-NarRIaS+iOaQU1JPfyKhZm4AsUOrwUOqRNHY0XxI8GI8jYxiLXLcdjYMG9UKS+fwWasc1uw1htV9AX24dD+p4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/bundle-name": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
@@ -28881,6 +28914,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
       "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==",
+      "peer": true,
       "engines": {
         "node": ">=0.3.1"
       }
@@ -30431,6 +30465,7 @@
       "version": "7.5.0",
       "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.0.tgz",
       "integrity": "sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==",
+      "peer": true,
       "engines": {
         "node": ">= 16"
       },
@@ -33004,7 +33039,8 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
       "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/is-reference": {
       "version": "1.2.1",
@@ -34656,10 +34692,6 @@
       "resolved": "packages/data-provider",
       "link": true
     },
-    "node_modules/librechat-mcp": {
-      "resolved": "packages/mcp",
-      "link": true
-    },
     "node_modules/lilconfig": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
@@ -37152,6 +37184,7 @@
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
       "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "license": "MIT",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -37170,17 +37203,20 @@
     "node_modules/node-fetch/node_modules/tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "license": "MIT"
     },
     "node_modules/node-fetch/node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "license": "BSD-2-Clause"
     },
     "node_modules/node-fetch/node_modules/whatwg-url": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
       "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
       "dependencies": {
         "tr46": "~0.0.3",
         "webidl-conversions": "^3.0.0"
@@ -37453,14 +37489,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-hash": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz",
-      "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/object-inspect": {
       "version": "1.13.4",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
@@ -38173,6 +38201,7 @@
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
       "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=16"
       }
@@ -38267,6 +38296,7 @@
       "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz",
       "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=16.20.0"
       }
@@ -41716,6 +41746,7 @@
       "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz",
       "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "debug": "^4.4.0",
         "depd": "^2.0.0",
@@ -45120,23 +45151,6 @@
         "node": ">= 12.0.0"
       }
     },
-    "node_modules/winston-daily-rotate-file": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.7.1.tgz",
-      "integrity": "sha512-7LGPiYGBPNyGHLn9z33i96zx/bd71pjBn9tqQzO3I4Tayv94WPmBNwKC7CO1wPHdP9uvu+Md/1nr6VSH9h0iaA==",
-      "dependencies": {
-        "file-stream-rotator": "^0.6.1",
-        "object-hash": "^2.0.1",
-        "triple-beam": "^1.3.0",
-        "winston-transport": "^4.4.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "peerDependencies": {
-        "winston": "^3"
-      }
-    },
     "node_modules/winston-transport": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz",
@@ -46004,6 +46018,126 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "packages/api": {
+      "name": "@librechat/api",
+      "version": "1.2.2",
+      "license": "ISC",
+      "devDependencies": {
+        "@babel/preset-env": "^7.21.5",
+        "@babel/preset-react": "^7.18.6",
+        "@babel/preset-typescript": "^7.21.0",
+        "@rollup/plugin-alias": "^5.1.0",
+        "@rollup/plugin-commonjs": "^25.0.2",
+        "@rollup/plugin-json": "^6.1.0",
+        "@rollup/plugin-node-resolve": "^15.1.0",
+        "@rollup/plugin-replace": "^5.0.5",
+        "@rollup/plugin-terser": "^0.4.4",
+        "@rollup/plugin-typescript": "^12.1.2",
+        "@types/bun": "^1.2.15",
+        "@types/diff": "^6.0.0",
+        "@types/express": "^5.0.0",
+        "@types/jest": "^29.5.2",
+        "@types/node": "^20.3.0",
+        "@types/react": "^18.2.18",
+        "@types/winston": "^2.4.4",
+        "jest": "^29.5.0",
+        "jest-junit": "^16.0.0",
+        "librechat-data-provider": "*",
+        "rimraf": "^5.0.1",
+        "rollup": "^4.22.4",
+        "rollup-plugin-generate-package-json": "^3.2.0",
+        "rollup-plugin-peer-deps-external": "^2.2.4",
+        "ts-node": "^10.9.2",
+        "typescript": "^5.0.4"
+      },
+      "peerDependencies": {
+        "@librechat/agents": "^2.4.37",
+        "@librechat/data-schemas": "*",
+        "@modelcontextprotocol/sdk": "^1.11.2",
+        "diff": "^7.0.0",
+        "eventsource": "^3.0.2",
+        "express": "^4.21.2",
+        "keyv": "^5.3.2",
+        "librechat-data-provider": "*",
+        "node-fetch": "2.7.0",
+        "tiktoken": "^1.0.15",
+        "zod": "^3.22.4"
+      }
+    },
+    "packages/api/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "packages/api/node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "packages/api/node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "packages/api/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "packages/api/node_modules/rimraf": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
+      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^10.3.7"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "packages/auth": {
       "name": "@librechat/auth",
       "version": "0.0.1",
@@ -46046,7 +46180,7 @@
     },
     "packages/data-provider": {
       "name": "librechat-data-provider",
-      "version": "0.7.86",
+      "version": "0.7.87",
       "license": "ISC",
       "dependencies": {
         "axios": "^1.8.2",
@@ -46481,121 +46615,6 @@
       "engines": {
         "node": ">= 12.0.0"
       }
-    },
-    "packages/mcp": {
-      "name": "librechat-mcp",
-      "version": "1.2.2",
-      "license": "ISC",
-      "dependencies": {
-        "@modelcontextprotocol/sdk": "^1.11.2",
-        "diff": "^7.0.0",
-        "eventsource": "^3.0.2",
-        "express": "^4.21.2"
-      },
-      "devDependencies": {
-        "@babel/preset-env": "^7.21.5",
-        "@babel/preset-react": "^7.18.6",
-        "@babel/preset-typescript": "^7.21.0",
-        "@rollup/plugin-alias": "^5.1.0",
-        "@rollup/plugin-commonjs": "^25.0.2",
-        "@rollup/plugin-json": "^6.1.0",
-        "@rollup/plugin-node-resolve": "^15.1.0",
-        "@rollup/plugin-replace": "^5.0.5",
-        "@rollup/plugin-terser": "^0.4.4",
-        "@rollup/plugin-typescript": "^12.1.2",
-        "@types/diff": "^6.0.0",
-        "@types/express": "^5.0.0",
-        "@types/jest": "^29.5.2",
-        "@types/node": "^20.3.0",
-        "@types/react": "^18.2.18",
-        "@types/winston": "^2.4.4",
-        "jest": "^29.5.0",
-        "jest-junit": "^16.0.0",
-        "librechat-data-provider": "*",
-        "rimraf": "^5.0.1",
-        "rollup": "^4.22.4",
-        "rollup-plugin-generate-package-json": "^3.2.0",
-        "rollup-plugin-peer-deps-external": "^2.2.4",
-        "ts-node": "^10.9.2",
-        "typescript": "^5.0.4"
-      },
-      "peerDependencies": {
-        "keyv": "^5.3.2"
-      }
-    },
-    "packages/mcp/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "packages/mcp/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-      "dev": true,
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "packages/mcp/node_modules/jackspeak": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-      "dev": true,
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
-      }
-    },
-    "packages/mcp/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "packages/mcp/node_modules/rimraf": {
-      "version": "5.0.10",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
-      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^10.3.7"
-      },
-      "bin": {
-        "rimraf": "dist/esm/bin.mjs"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
     }
   }
 }
diff --git a/package.json b/package.json
index e24c5b43cc..cb33ac9164 100644
--- a/package.json
+++ b/package.json
@@ -38,9 +38,9 @@
     "backend:dev": "cross-env NODE_ENV=development npx nodemon api/server/index.js",
     "backend:stop": "node config/stop-backend.js",
     "build:data-provider": "cd packages/data-provider && npm run build",
-    "build:mcp": "cd packages/mcp && npm run build",
+    "build:api": "cd packages/api && npm run build",
     "build:data-schemas": "cd packages/data-schemas && npm run build",
-    "frontend": "npm run build:data-provider && npm run build:mcp && npm run build:data-schemas && cd client && npm run build",
+    "frontend": "npm run build:data-provider && npm run build:data-schemas && npm run build:api && cd client && npm run build",
     "frontend:ci": "npm run build:data-provider && cd client && npm run build:ci",
     "frontend:dev": "cd client && npm run dev",
     "e2e": "playwright test --config=e2e/playwright.config.local.ts",
@@ -62,7 +62,7 @@
     "b:api-inspect": "NODE_ENV=production bun --inspect run api/server/index.js",
     "b:api:dev": "NODE_ENV=production bun run --watch api/server/index.js",
     "b:data": "cd packages/data-provider && bun run b:build",
-    "b:mcp": "cd packages/mcp && bun run b:build",
+    "b:mcp": "cd packages/api && bun run b:build",
     "b:data-schemas": "cd packages/data-schemas && bun run b:build",
     "b:client": "bun --bun run b:data && bun --bun run b:mcp && bun --bun run b:data-schemas && cd client && bun --bun run b:build",
     "b:client:dev": "cd client && bun run b:dev",
diff --git a/packages/mcp/.gitignore b/packages/api/.gitignore
similarity index 100%
rename from packages/mcp/.gitignore
rename to packages/api/.gitignore
diff --git a/packages/mcp/babel.config.cjs b/packages/api/babel.config.cjs
similarity index 100%
rename from packages/mcp/babel.config.cjs
rename to packages/api/babel.config.cjs
diff --git a/packages/mcp/jest.config.mjs b/packages/api/jest.config.mjs
similarity index 100%
rename from packages/mcp/jest.config.mjs
rename to packages/api/jest.config.mjs
diff --git a/packages/mcp/package.json b/packages/api/package.json
similarity index 90%
rename from packages/mcp/package.json
rename to packages/api/package.json
index 5bfb680e4f..6b2462684e 100644
--- a/packages/mcp/package.json
+++ b/packages/api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "librechat-mcp",
+  "name": "@librechat/api",
   "version": "1.2.2",
   "type": "commonjs",
   "description": "MCP services for LibreChat",
@@ -47,6 +47,7 @@
     "@rollup/plugin-replace": "^5.0.5",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.2",
+    "@types/bun": "^1.2.15",
     "@types/diff": "^6.0.0",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.2",
@@ -66,13 +67,17 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
-  "dependencies": {
+  "peerDependencies": {
+    "@librechat/agents": "^2.4.37",
+    "@librechat/data-schemas": "*",
+    "librechat-data-provider": "*",
     "@modelcontextprotocol/sdk": "^1.11.2",
     "diff": "^7.0.0",
     "eventsource": "^3.0.2",
-    "express": "^4.21.2"
-  },
-  "peerDependencies": {
-    "keyv": "^5.3.2"
+    "express": "^4.21.2",
+    "node-fetch": "2.7.0",
+    "keyv": "^5.3.2",
+    "zod": "^3.22.4",
+    "tiktoken": "^1.0.15"
   }
 }
diff --git a/packages/mcp/rollup.config.js b/packages/api/rollup.config.js
similarity index 100%
rename from packages/mcp/rollup.config.js
rename to packages/api/rollup.config.js
diff --git a/packages/api/src/agents/index.ts b/packages/api/src/agents/index.ts
new file mode 100644
index 0000000000..ed003606ed
--- /dev/null
+++ b/packages/api/src/agents/index.ts
@@ -0,0 +1,3 @@
+export * from './memory';
+export * from './resources';
+export * from './run';
diff --git a/packages/api/src/agents/memory.ts b/packages/api/src/agents/memory.ts
new file mode 100644
index 0000000000..c9e4d14063
--- /dev/null
+++ b/packages/api/src/agents/memory.ts
@@ -0,0 +1,468 @@
+/** Memories */
+import { z } from 'zod';
+import { tool } from '@langchain/core/tools';
+import { Tools } from 'librechat-data-provider';
+import { logger } from '@librechat/data-schemas';
+import { Run, Providers, GraphEvents } from '@librechat/agents';
+import type {
+  StreamEventData,
+  ToolEndCallback,
+  EventHandler,
+  ToolEndData,
+  LLMConfig,
+} from '@librechat/agents';
+import type { TAttachment, MemoryArtifact } from 'librechat-data-provider';
+import type { ObjectId, MemoryMethods } from '@librechat/data-schemas';
+import type { BaseMessage } from '@langchain/core/messages';
+import type { Response as ServerResponse } from 'express';
+import { Tokenizer } from '~/utils';
+
+type RequiredMemoryMethods = Pick<
+  MemoryMethods,
+  'setMemory' | 'deleteMemory' | 'getFormattedMemories'
+>;
+
+type ToolEndMetadata = Record<string, unknown> & {
+  run_id?: string;
+  thread_id?: string;
+};
+
+export interface MemoryConfig {
+  validKeys?: string[];
+  instructions?: string;
+  llmConfig?: Partial<LLMConfig>;
+  tokenLimit?: number;
+}
+
+export const memoryInstructions =
+  'The system automatically stores important user information and can update or delete memories based on user requests, enabling dynamic memory management.';
+
+const getDefaultInstructions = (
+  validKeys?: string[],
+  tokenLimit?: number,
+) => `Use the \`set_memory\` tool to save important information about the user, but ONLY when the user has explicitly provided this information. If there is nothing to note about the user specifically, END THE TURN IMMEDIATELY.
+
+  The \`delete_memory\` tool should only be used in two scenarios:
+  1. When the user explicitly asks to forget or remove specific information
+  2. When updating existing memories, use the \`set_memory\` tool instead of deleting and re-adding the memory.
+  
+  ${
+    validKeys && validKeys.length > 0
+      ? `CRITICAL INSTRUCTION: Only the following keys are valid for storing memories:
+  ${validKeys.map((key) => `- ${key}`).join('\n  ')}`
+      : 'You can use any appropriate key to store memories about the user.'
+  }
+
+  ${
+    tokenLimit
+      ? `⚠️ TOKEN LIMIT: Each memory value must not exceed ${tokenLimit} tokens. Be concise and store only essential information.`
+      : ''
+  }
+
+  ⚠️ WARNING ⚠️
+  DO NOT STORE ANY INFORMATION UNLESS THE USER HAS EXPLICITLY PROVIDED IT.
+  ONLY store information the user has EXPLICITLY shared.
+  NEVER guess or assume user information.
+  ALL memory values must be factual statements about THIS specific user.
+  If nothing needs to be stored, DO NOT CALL any memory tools.
+  If you're unsure whether to store something, DO NOT store it.
+  If nothing needs to be stored, END THE TURN IMMEDIATELY.`;
+
+/**
+ * Creates a memory tool instance with user context
+ */
+const createMemoryTool = ({
+  userId,
+  setMemory,
+  validKeys,
+  tokenLimit,
+  totalTokens = 0,
+}: {
+  userId: string | ObjectId;
+  setMemory: MemoryMethods['setMemory'];
+  validKeys?: string[];
+  tokenLimit?: number;
+  totalTokens?: number;
+}) => {
+  return tool(
+    async ({ key, value }) => {
+      try {
+        if (validKeys && validKeys.length > 0 && !validKeys.includes(key)) {
+          logger.warn(
+            `Memory Agent failed to set memory: Invalid key "${key}". Must be one of: ${validKeys.join(
+              ', ',
+            )}`,
+          );
+          return `Invalid key "${key}". Must be one of: ${validKeys.join(', ')}`;
+        }
+
+        const tokenCount = Tokenizer.getTokenCount(value, 'o200k_base');
+
+        if (tokenLimit && tokenCount > tokenLimit) {
+          logger.warn(
+            `Memory Agent failed to set memory: Value exceeds token limit. Value has ${tokenCount} tokens, but limit is ${tokenLimit}`,
+          );
+          return `Memory value too large: ${tokenCount} tokens exceeds limit of ${tokenLimit}`;
+        }
+
+        if (tokenLimit && totalTokens + tokenCount > tokenLimit) {
+          const remainingCapacity = tokenLimit - totalTokens;
+          logger.warn(
+            `Memory Agent failed to set memory: Would exceed total token limit. Current usage: ${totalTokens}, new memory: ${tokenCount} tokens, limit: ${tokenLimit}`,
+          );
+          return `Cannot add memory: would exceed token limit. Current usage: ${totalTokens}/${tokenLimit} tokens. This memory requires ${tokenCount} tokens, but only ${remainingCapacity} tokens available.`;
+        }
+
+        const artifact: Record<Tools.memory, MemoryArtifact> = {
+          [Tools.memory]: {
+            key,
+            value,
+            tokenCount,
+            type: 'update',
+          },
+        };
+
+        const result = await setMemory({ userId, key, value, tokenCount });
+        if (result.ok) {
+          logger.debug(`Memory set for key "${key}" (${tokenCount} tokens) for user "${userId}"`);
+          return [`Memory set for key "${key}" (${tokenCount} tokens)`, artifact];
+        }
+        logger.warn(`Failed to set memory for key "${key}" for user "${userId}"`);
+        return [`Failed to set memory for key "${key}"`, undefined];
+      } catch (error) {
+        logger.error('Memory Agent failed to set memory', error);
+        return [`Error setting memory for key "${key}"`, undefined];
+      }
+    },
+    {
+      name: 'set_memory',
+      description: 'Saves important information about the user into memory.',
+      responseFormat: 'content_and_artifact',
+      schema: z.object({
+        key: z
+          .string()
+          .describe(
+            validKeys && validKeys.length > 0
+              ? `The key of the memory value. Must be one of: ${validKeys.join(', ')}`
+              : 'The key identifier for this memory',
+          ),
+        value: z
+          .string()
+          .describe(
+            'Value MUST be a complete sentence that fully describes relevant user information.',
+          ),
+      }),
+    },
+  );
+};
+
+/**
+ * Creates a delete memory tool instance with user context
+ */
+const createDeleteMemoryTool = ({
+  userId,
+  deleteMemory,
+  validKeys,
+}: {
+  userId: string | ObjectId;
+  deleteMemory: MemoryMethods['deleteMemory'];
+  validKeys?: string[];
+}) => {
+  return tool(
+    async ({ key }) => {
+      try {
+        if (validKeys && validKeys.length > 0 && !validKeys.includes(key)) {
+          logger.warn(
+            `Memory Agent failed to delete memory: Invalid key "${key}". Must be one of: ${validKeys.join(
+              ', ',
+            )}`,
+          );
+          return `Invalid key "${key}". Must be one of: ${validKeys.join(', ')}`;
+        }
+
+        const artifact: Record<Tools.memory, MemoryArtifact> = {
+          [Tools.memory]: {
+            key,
+            type: 'delete',
+          },
+        };
+
+        const result = await deleteMemory({ userId, key });
+        if (result.ok) {
+          logger.debug(`Memory deleted for key "${key}" for user "${userId}"`);
+          return [`Memory deleted for key "${key}"`, artifact];
+        }
+        logger.warn(`Failed to delete memory for key "${key}" for user "${userId}"`);
+        return [`Failed to delete memory for key "${key}"`, undefined];
+      } catch (error) {
+        logger.error('Memory Agent failed to delete memory', error);
+        return [`Error deleting memory for key "${key}"`, undefined];
+      }
+    },
+    {
+      name: 'delete_memory',
+      description:
+        'Deletes specific memory data about the user using the provided key. For updating existing memories, use the `set_memory` tool instead',
+      responseFormat: 'content_and_artifact',
+      schema: z.object({
+        key: z
+          .string()
+          .describe(
+            validKeys && validKeys.length > 0
+              ? `The key of the memory to delete. Must be one of: ${validKeys.join(', ')}`
+              : 'The key identifier of the memory to delete',
+          ),
+      }),
+    },
+  );
+};
+export class BasicToolEndHandler implements EventHandler {
+  private callback?: ToolEndCallback;
+  constructor(callback?: ToolEndCallback) {
+    this.callback = callback;
+  }
+  handle(
+    event: string,
+    data: StreamEventData | undefined,
+    metadata?: Record<string, unknown>,
+  ): void {
+    if (!metadata) {
+      console.warn(`Graph or metadata not found in ${event} event`);
+      return;
+    }
+    const toolEndData = data as ToolEndData | undefined;
+    if (!toolEndData?.output) {
+      console.warn('No output found in tool_end event');
+      return;
+    }
+    this.callback?.(toolEndData, metadata);
+  }
+}
+
+export async function processMemory({
+  res,
+  userId,
+  setMemory,
+  deleteMemory,
+  messages,
+  memory,
+  messageId,
+  conversationId,
+  validKeys,
+  instructions,
+  llmConfig,
+  tokenLimit,
+  totalTokens = 0,
+}: {
+  res: ServerResponse;
+  setMemory: MemoryMethods['setMemory'];
+  deleteMemory: MemoryMethods['deleteMemory'];
+  userId: string | ObjectId;
+  memory: string;
+  messageId: string;
+  conversationId: string;
+  messages: BaseMessage[];
+  validKeys?: string[];
+  instructions: string;
+  tokenLimit?: number;
+  totalTokens?: number;
+  llmConfig?: Partial<LLMConfig>;
+}): Promise<(TAttachment | null)[] | undefined> {
+  try {
+    const memoryTool = createMemoryTool({ userId, tokenLimit, setMemory, validKeys, totalTokens });
+    const deleteMemoryTool = createDeleteMemoryTool({
+      userId,
+      validKeys,
+      deleteMemory,
+    });
+
+    const currentMemoryTokens = totalTokens;
+
+    let memoryStatus = `# Existing memory:\n${memory ?? 'No existing memories'}`;
+
+    if (tokenLimit) {
+      const remainingTokens = tokenLimit - currentMemoryTokens;
+      memoryStatus = `# Memory Status:
+Current memory usage: ${currentMemoryTokens} tokens
+Token limit: ${tokenLimit} tokens
+Remaining capacity: ${remainingTokens} tokens
+
+# Existing memory:
+${memory ?? 'No existing memories'}`;
+    }
+
+    const defaultLLMConfig: LLMConfig = {
+      provider: Providers.OPENAI,
+      model: 'gpt-4.1-mini',
+      temperature: 0.4,
+      streaming: false,
+      disableStreaming: true,
+    };
+
+    const finalLLMConfig = {
+      ...defaultLLMConfig,
+      ...llmConfig,
+      /**
+       * Ensure streaming is always disabled for memory processing
+       */
+      streaming: false,
+      disableStreaming: true,
+    };
+
+    const artifactPromises: Promise<TAttachment | null>[] = [];
+    const memoryCallback = createMemoryCallback({ res, artifactPromises });
+    const customHandlers = {
+      [GraphEvents.TOOL_END]: new BasicToolEndHandler(memoryCallback),
+    };
+
+    const run = await Run.create({
+      runId: messageId,
+      graphConfig: {
+        type: 'standard',
+        llmConfig: finalLLMConfig,
+        tools: [memoryTool, deleteMemoryTool],
+        instructions,
+        additional_instructions: memoryStatus,
+        toolEnd: true,
+      },
+      customHandlers,
+      returnContent: true,
+    });
+
+    const config = {
+      configurable: {
+        provider: llmConfig?.provider,
+        thread_id: `memory-run-${conversationId}`,
+      },
+      streamMode: 'values',
+      version: 'v2',
+    } as const;
+
+    const inputs = {
+      messages,
+    };
+    const content = await run.processStream(inputs, config);
+    if (content) {
+      logger.debug('Memory Agent processed memory successfully', content);
+    } else {
+      logger.warn('Memory Agent processed memory but returned no content');
+    }
+    return await Promise.all(artifactPromises);
+  } catch (error) {
+    logger.error('Memory Agent failed to process memory', error);
+  }
+}
+
+export async function createMemoryProcessor({
+  res,
+  userId,
+  messageId,
+  memoryMethods,
+  conversationId,
+  config = {},
+}: {
+  res: ServerResponse;
+  messageId: string;
+  conversationId: string;
+  userId: string | ObjectId;
+  memoryMethods: RequiredMemoryMethods;
+  config?: MemoryConfig;
+}): Promise<[string, (messages: BaseMessage[]) => Promise<(TAttachment | null)[] | undefined>]> {
+  const { validKeys, instructions, llmConfig, tokenLimit } = config;
+  const finalInstructions = instructions || getDefaultInstructions(validKeys, tokenLimit);
+
+  const { withKeys, withoutKeys, totalTokens } = await memoryMethods.getFormattedMemories({
+    userId,
+  });
+
+  return [
+    withoutKeys,
+    async function (messages: BaseMessage[]): Promise<(TAttachment | null)[] | undefined> {
+      try {
+        return await processMemory({
+          res,
+          userId,
+          messages,
+          validKeys,
+          llmConfig,
+          messageId,
+          tokenLimit,
+          conversationId,
+          memory: withKeys,
+          totalTokens: totalTokens || 0,
+          instructions: finalInstructions,
+          setMemory: memoryMethods.setMemory,
+          deleteMemory: memoryMethods.deleteMemory,
+        });
+      } catch (error) {
+        logger.error('Memory Agent failed to process memory', error);
+      }
+    },
+  ];
+}
+
+async function handleMemoryArtifact({
+  res,
+  data,
+  metadata,
+}: {
+  res: ServerResponse;
+  data: ToolEndData;
+  metadata?: ToolEndMetadata;
+}) {
+  const output = data?.output;
+  if (!output) {
+    return null;
+  }
+
+  if (!output.artifact) {
+    return null;
+  }
+
+  const memoryArtifact = output.artifact[Tools.memory] as MemoryArtifact | undefined;
+  if (!memoryArtifact) {
+    return null;
+  }
+
+  const attachment: Partial<TAttachment> = {
+    type: Tools.memory,
+    toolCallId: output.tool_call_id,
+    messageId: metadata?.run_id ?? '',
+    conversationId: metadata?.thread_id ?? '',
+    [Tools.memory]: memoryArtifact,
+  };
+  if (!res.headersSent) {
+    return attachment;
+  }
+  res.write(`event: attachment\ndata: ${JSON.stringify(attachment)}\n\n`);
+  return attachment;
+}
+
+/**
+ * Creates a memory callback for handling memory artifacts
+ * @param params - The parameters object
+ * @param params.res - The server response object
+ * @param params.artifactPromises - Array to collect artifact promises
+ * @returns The memory callback function
+ */
+export function createMemoryCallback({
+  res,
+  artifactPromises,
+}: {
+  res: ServerResponse;
+  artifactPromises: Promise<Partial<TAttachment> | null>[];
+}): ToolEndCallback {
+  return async (data: ToolEndData, metadata?: Record<string, unknown>) => {
+    const output = data?.output;
+    const memoryArtifact = output?.artifact?.[Tools.memory] as MemoryArtifact;
+    if (memoryArtifact == null) {
+      return;
+    }
+    artifactPromises.push(
+      handleMemoryArtifact({ res, data, metadata }).catch((error) => {
+        logger.error('Error processing memory artifact content:', error);
+        return null;
+      }),
+    );
+  };
+}
diff --git a/packages/api/src/agents/resources.test.ts b/packages/api/src/agents/resources.test.ts
new file mode 100644
index 0000000000..8789856ab7
--- /dev/null
+++ b/packages/api/src/agents/resources.test.ts
@@ -0,0 +1,543 @@
+import { primeResources } from './resources';
+import { logger } from '@librechat/data-schemas';
+import { EModelEndpoint, EToolResources, AgentCapabilities } from 'librechat-data-provider';
+import type { Request as ServerRequest } from 'express';
+import type { TFile } from 'librechat-data-provider';
+import type { TGetFiles } from './resources';
+
+// Mock logger
+jest.mock('@librechat/data-schemas', () => ({
+  logger: {
+    error: jest.fn(),
+  },
+}));
+
+describe('primeResources', () => {
+  let mockReq: ServerRequest;
+  let mockGetFiles: jest.MockedFunction<TGetFiles>;
+  let requestFileSet: Set<string>;
+
+  beforeEach(() => {
+    // Reset mocks
+    jest.clearAllMocks();
+
+    // Setup mock request
+    mockReq = {
+      app: {
+        locals: {
+          [EModelEndpoint.agents]: {
+            capabilities: [AgentCapabilities.ocr],
+          },
+        },
+      },
+    } as unknown as ServerRequest;
+
+    // Setup mock getFiles function
+    mockGetFiles = jest.fn();
+
+    // Setup request file set
+    requestFileSet = new Set(['file1', 'file2', 'file3']);
+  });
+
+  describe('when OCR is enabled and tool_resources has OCR file_ids', () => {
+    it('should fetch OCR files and include them in attachments', async () => {
+      const mockOcrFiles: TFile[] = [
+        {
+          user: 'user1',
+          file_id: 'ocr-file-1',
+          filename: 'document.pdf',
+          filepath: '/uploads/document.pdf',
+          object: 'file',
+          type: 'application/pdf',
+          bytes: 1024,
+          embedded: false,
+          usage: 0,
+        },
+      ];
+
+      mockGetFiles.mockResolvedValue(mockOcrFiles);
+
+      const tool_resources = {
+        [EToolResources.ocr]: {
+          file_ids: ['ocr-file-1'],
+        },
+      };
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments: undefined,
+        tool_resources,
+      });
+
+      expect(mockGetFiles).toHaveBeenCalledWith({ file_id: { $in: ['ocr-file-1'] } }, {}, {});
+      expect(result.attachments).toEqual(mockOcrFiles);
+      expect(result.tool_resources).toEqual(tool_resources);
+    });
+  });
+
+  describe('when OCR is disabled', () => {
+    it('should not fetch OCR files even if tool_resources has OCR file_ids', async () => {
+      (mockReq.app as ServerRequest['app']).locals[EModelEndpoint.agents].capabilities = [];
+
+      const tool_resources = {
+        [EToolResources.ocr]: {
+          file_ids: ['ocr-file-1'],
+        },
+      };
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments: undefined,
+        tool_resources,
+      });
+
+      expect(mockGetFiles).not.toHaveBeenCalled();
+      expect(result.attachments).toBeUndefined();
+      expect(result.tool_resources).toEqual(tool_resources);
+    });
+  });
+
+  describe('when attachments are provided', () => {
+    it('should process files with fileIdentifier as execute_code resources', async () => {
+      const mockFiles: TFile[] = [
+        {
+          user: 'user1',
+          file_id: 'file1',
+          filename: 'script.py',
+          filepath: '/uploads/script.py',
+          object: 'file',
+          type: 'text/x-python',
+          bytes: 512,
+          embedded: false,
+          usage: 0,
+          metadata: {
+            fileIdentifier: 'python-script',
+          },
+        },
+      ];
+
+      const attachments = Promise.resolve(mockFiles);
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources: {},
+      });
+
+      expect(result.attachments).toEqual(mockFiles);
+      expect(result.tool_resources?.[EToolResources.execute_code]?.files).toEqual(mockFiles);
+    });
+
+    it('should process embedded files as file_search resources', async () => {
+      const mockFiles: TFile[] = [
+        {
+          user: 'user1',
+          file_id: 'file2',
+          filename: 'document.txt',
+          filepath: '/uploads/document.txt',
+          object: 'file',
+          type: 'text/plain',
+          bytes: 256,
+          embedded: true,
+          usage: 0,
+        },
+      ];
+
+      const attachments = Promise.resolve(mockFiles);
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources: {},
+      });
+
+      expect(result.attachments).toEqual(mockFiles);
+      expect(result.tool_resources?.[EToolResources.file_search]?.files).toEqual(mockFiles);
+    });
+
+    it('should process image files in requestFileSet as image_edit resources', async () => {
+      const mockFiles: TFile[] = [
+        {
+          user: 'user1',
+          file_id: 'file1',
+          filename: 'image.png',
+          filepath: '/uploads/image.png',
+          object: 'file',
+          type: 'image/png',
+          bytes: 2048,
+          embedded: false,
+          usage: 0,
+          height: 800,
+          width: 600,
+        },
+      ];
+
+      const attachments = Promise.resolve(mockFiles);
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources: {},
+      });
+
+      expect(result.attachments).toEqual(mockFiles);
+      expect(result.tool_resources?.[EToolResources.image_edit]?.files).toEqual(mockFiles);
+    });
+
+    it('should not process image files not in requestFileSet', async () => {
+      const mockFiles: TFile[] = [
+        {
+          user: 'user1',
+          file_id: 'file-not-in-set',
+          filename: 'image.png',
+          filepath: '/uploads/image.png',
+          object: 'file',
+          type: 'image/png',
+          bytes: 2048,
+          embedded: false,
+          usage: 0,
+          height: 800,
+          width: 600,
+        },
+      ];
+
+      const attachments = Promise.resolve(mockFiles);
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources: {},
+      });
+
+      expect(result.attachments).toEqual(mockFiles);
+      expect(result.tool_resources?.[EToolResources.image_edit]).toBeUndefined();
+    });
+
+    it('should not process image files without height and width', async () => {
+      const mockFiles: TFile[] = [
+        {
+          user: 'user1',
+          file_id: 'file1',
+          filename: 'image.png',
+          filepath: '/uploads/image.png',
+          object: 'file',
+          type: 'image/png',
+          bytes: 2048,
+          embedded: false,
+          usage: 0,
+          // Missing height and width
+        },
+      ];
+
+      const attachments = Promise.resolve(mockFiles);
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources: {},
+      });
+
+      expect(result.attachments).toEqual(mockFiles);
+      expect(result.tool_resources?.[EToolResources.image_edit]).toBeUndefined();
+    });
+
+    it('should filter out null files from attachments', async () => {
+      const mockFiles: Array<TFile | null> = [
+        {
+          user: 'user1',
+          file_id: 'file1',
+          filename: 'valid.txt',
+          filepath: '/uploads/valid.txt',
+          object: 'file',
+          type: 'text/plain',
+          bytes: 256,
+          embedded: false,
+          usage: 0,
+        },
+        null,
+        {
+          user: 'user1',
+          file_id: 'file2',
+          filename: 'valid2.txt',
+          filepath: '/uploads/valid2.txt',
+          object: 'file',
+          type: 'text/plain',
+          bytes: 128,
+          embedded: false,
+          usage: 0,
+        },
+      ];
+
+      const attachments = Promise.resolve(mockFiles);
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources: {},
+      });
+
+      expect(result.attachments).toHaveLength(2);
+      expect(result.attachments?.[0]?.file_id).toBe('file1');
+      expect(result.attachments?.[1]?.file_id).toBe('file2');
+    });
+
+    it('should merge existing tool_resources with new files', async () => {
+      const mockFiles: TFile[] = [
+        {
+          user: 'user1',
+          file_id: 'file1',
+          filename: 'script.py',
+          filepath: '/uploads/script.py',
+          object: 'file',
+          type: 'text/x-python',
+          bytes: 512,
+          embedded: false,
+          usage: 0,
+          metadata: {
+            fileIdentifier: 'python-script',
+          },
+        },
+      ];
+
+      const existingToolResources = {
+        [EToolResources.execute_code]: {
+          files: [
+            {
+              user: 'user1',
+              file_id: 'existing-file',
+              filename: 'existing.py',
+              filepath: '/uploads/existing.py',
+              object: 'file' as const,
+              type: 'text/x-python',
+              bytes: 256,
+              embedded: false,
+              usage: 0,
+            },
+          ],
+        },
+      };
+
+      const attachments = Promise.resolve(mockFiles);
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources: existingToolResources,
+      });
+
+      expect(result.tool_resources?.[EToolResources.execute_code]?.files).toHaveLength(2);
+      expect(result.tool_resources?.[EToolResources.execute_code]?.files?.[0]?.file_id).toBe(
+        'existing-file',
+      );
+      expect(result.tool_resources?.[EToolResources.execute_code]?.files?.[1]?.file_id).toBe(
+        'file1',
+      );
+    });
+  });
+
+  describe('when both OCR and attachments are provided', () => {
+    it('should include both OCR files and attachment files', async () => {
+      const mockOcrFiles: TFile[] = [
+        {
+          user: 'user1',
+          file_id: 'ocr-file-1',
+          filename: 'document.pdf',
+          filepath: '/uploads/document.pdf',
+          object: 'file',
+          type: 'application/pdf',
+          bytes: 1024,
+          embedded: false,
+          usage: 0,
+        },
+      ];
+
+      const mockAttachmentFiles: TFile[] = [
+        {
+          user: 'user1',
+          file_id: 'file1',
+          filename: 'attachment.txt',
+          filepath: '/uploads/attachment.txt',
+          object: 'file',
+          type: 'text/plain',
+          bytes: 256,
+          embedded: false,
+          usage: 0,
+        },
+      ];
+
+      mockGetFiles.mockResolvedValue(mockOcrFiles);
+      const attachments = Promise.resolve(mockAttachmentFiles);
+
+      const tool_resources = {
+        [EToolResources.ocr]: {
+          file_ids: ['ocr-file-1'],
+        },
+      };
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources,
+      });
+
+      expect(result.attachments).toHaveLength(2);
+      expect(result.attachments?.[0]?.file_id).toBe('ocr-file-1');
+      expect(result.attachments?.[1]?.file_id).toBe('file1');
+    });
+  });
+
+  describe('error handling', () => {
+    it('should handle errors gracefully and log them', async () => {
+      const mockFiles: TFile[] = [
+        {
+          user: 'user1',
+          file_id: 'file1',
+          filename: 'test.txt',
+          filepath: '/uploads/test.txt',
+          object: 'file',
+          type: 'text/plain',
+          bytes: 256,
+          embedded: false,
+          usage: 0,
+        },
+      ];
+
+      const attachments = Promise.resolve(mockFiles);
+      const error = new Error('Test error');
+
+      // Mock getFiles to throw an error when called for OCR
+      mockGetFiles.mockRejectedValue(error);
+
+      const tool_resources = {
+        [EToolResources.ocr]: {
+          file_ids: ['ocr-file-1'],
+        },
+      };
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources,
+      });
+
+      expect(logger.error).toHaveBeenCalledWith('Error priming resources', error);
+      expect(result.attachments).toEqual(mockFiles);
+      expect(result.tool_resources).toEqual(tool_resources);
+    });
+
+    it('should handle promise rejection in attachments', async () => {
+      const error = new Error('Attachment error');
+      const attachments = Promise.reject(error);
+
+      // The function should now handle rejected attachment promises gracefully
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources: {},
+      });
+
+      // Should log both the main error and the attachment error
+      expect(logger.error).toHaveBeenCalledWith('Error priming resources', error);
+      expect(logger.error).toHaveBeenCalledWith(
+        'Error resolving attachments in catch block',
+        error,
+      );
+
+      // Should return empty array when attachments promise is rejected
+      expect(result.attachments).toEqual([]);
+      expect(result.tool_resources).toEqual({});
+    });
+  });
+
+  describe('edge cases', () => {
+    it('should handle missing app.locals gracefully', async () => {
+      const reqWithoutLocals = {} as ServerRequest;
+
+      const result = await primeResources({
+        req: reqWithoutLocals,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments: undefined,
+        tool_resources: {
+          [EToolResources.ocr]: {
+            file_ids: ['ocr-file-1'],
+          },
+        },
+      });
+
+      expect(mockGetFiles).not.toHaveBeenCalled();
+      // When app.locals is missing and there's an error accessing properties,
+      // the function falls back to the catch block which returns an empty array
+      expect(result.attachments).toEqual([]);
+    });
+
+    it('should handle undefined tool_resources', async () => {
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments: undefined,
+        tool_resources: undefined,
+      });
+
+      expect(result.tool_resources).toEqual({});
+      expect(result.attachments).toBeUndefined();
+    });
+
+    it('should handle empty requestFileSet', async () => {
+      const mockFiles: TFile[] = [
+        {
+          user: 'user1',
+          file_id: 'file1',
+          filename: 'image.png',
+          filepath: '/uploads/image.png',
+          object: 'file',
+          type: 'image/png',
+          bytes: 2048,
+          embedded: false,
+          usage: 0,
+          height: 800,
+          width: 600,
+        },
+      ];
+
+      const attachments = Promise.resolve(mockFiles);
+      const emptyRequestFileSet = new Set<string>();
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet: emptyRequestFileSet,
+        attachments,
+        tool_resources: {},
+      });
+
+      expect(result.attachments).toEqual(mockFiles);
+      expect(result.tool_resources?.[EToolResources.image_edit]).toBeUndefined();
+    });
+  });
+});
diff --git a/packages/api/src/agents/resources.ts b/packages/api/src/agents/resources.ts
new file mode 100644
index 0000000000..644813bdfa
--- /dev/null
+++ b/packages/api/src/agents/resources.ts
@@ -0,0 +1,114 @@
+import { logger } from '@librechat/data-schemas';
+import { EModelEndpoint, EToolResources, AgentCapabilities } from 'librechat-data-provider';
+import type { FilterQuery, QueryOptions, ProjectionType } from 'mongoose';
+import type { AgentToolResources, TFile } from 'librechat-data-provider';
+import type { IMongoFile } from '@librechat/data-schemas';
+import type { Request as ServerRequest } from 'express';
+
+export type TGetFiles = (
+  filter: FilterQuery<IMongoFile>,
+  _sortOptions: ProjectionType<IMongoFile> | null | undefined,
+  selectFields: QueryOptions<IMongoFile> | null | undefined,
+) => Promise<Array<TFile>>;
+
+/**
+ * @param params
+ * @param params.req
+ * @param params.attachments
+ * @param params.requestFileSet
+ * @param params.tool_resources
+ */
+export const primeResources = async ({
+  req,
+  getFiles,
+  requestFileSet,
+  attachments: _attachments,
+  tool_resources: _tool_resources,
+}: {
+  req: ServerRequest;
+  requestFileSet: Set<string>;
+  attachments: Promise<Array<TFile | null>> | undefined;
+  tool_resources: AgentToolResources | undefined;
+  getFiles: TGetFiles;
+}): Promise<{
+  attachments: Array<TFile | undefined> | undefined;
+  tool_resources: AgentToolResources | undefined;
+}> => {
+  try {
+    let attachments: Array<TFile | undefined> | undefined;
+    const tool_resources = _tool_resources ?? {};
+    const isOCREnabled = (req.app.locals?.[EModelEndpoint.agents]?.capabilities ?? []).includes(
+      AgentCapabilities.ocr,
+    );
+    if (tool_resources[EToolResources.ocr]?.file_ids && isOCREnabled) {
+      const context = await getFiles(
+        {
+          file_id: { $in: tool_resources.ocr.file_ids },
+        },
+        {},
+        {},
+      );
+      attachments = (attachments ?? []).concat(context);
+    }
+    if (!_attachments) {
+      return { attachments, tool_resources };
+    }
+    const files = await _attachments;
+    if (!attachments) {
+      attachments = [];
+    }
+
+    for (const file of files) {
+      if (!file) {
+        continue;
+      }
+      if (file.metadata?.fileIdentifier) {
+        const execute_code = tool_resources[EToolResources.execute_code] ?? {};
+        if (!execute_code.files) {
+          tool_resources[EToolResources.execute_code] = { ...execute_code, files: [] };
+        }
+        tool_resources[EToolResources.execute_code]?.files?.push(file);
+      } else if (file.embedded === true) {
+        const file_search = tool_resources[EToolResources.file_search] ?? {};
+        if (!file_search.files) {
+          tool_resources[EToolResources.file_search] = { ...file_search, files: [] };
+        }
+        tool_resources[EToolResources.file_search]?.files?.push(file);
+      } else if (
+        requestFileSet.has(file.file_id) &&
+        file.type.startsWith('image') &&
+        file.height &&
+        file.width
+      ) {
+        const image_edit = tool_resources[EToolResources.image_edit] ?? {};
+        if (!image_edit.files) {
+          tool_resources[EToolResources.image_edit] = { ...image_edit, files: [] };
+        }
+        tool_resources[EToolResources.image_edit]?.files?.push(file);
+      }
+
+      attachments.push(file);
+    }
+    return { attachments, tool_resources };
+  } catch (error) {
+    logger.error('Error priming resources', error);
+
+    // Safely try to get attachments without rethrowing
+    let safeAttachments: Array<TFile | undefined> = [];
+    if (_attachments) {
+      try {
+        const attachmentFiles = await _attachments;
+        safeAttachments = (attachmentFiles?.filter((file) => !!file) ?? []) as Array<TFile>;
+      } catch (attachmentError) {
+        // If attachments promise is also rejected, just use empty array
+        logger.error('Error resolving attachments in catch block', attachmentError);
+        safeAttachments = [];
+      }
+    }
+
+    return {
+      attachments: safeAttachments,
+      tool_resources: _tool_resources,
+    };
+  }
+};
diff --git a/packages/api/src/agents/run.ts b/packages/api/src/agents/run.ts
new file mode 100644
index 0000000000..22f8c4ae93
--- /dev/null
+++ b/packages/api/src/agents/run.ts
@@ -0,0 +1,90 @@
+import { Run, Providers } from '@librechat/agents';
+import { providerEndpointMap, KnownEndpoints } from 'librechat-data-provider';
+import type { StandardGraphConfig, EventHandler, GraphEvents, IState } from '@librechat/agents';
+import type { Agent } from 'librechat-data-provider';
+import type * as t from '~/types';
+
+const customProviders = new Set([
+  Providers.XAI,
+  Providers.OLLAMA,
+  Providers.DEEPSEEK,
+  Providers.OPENROUTER,
+]);
+
+/**
+ * Creates a new Run instance with custom handlers and configuration.
+ *
+ * @param options - The options for creating the Run instance.
+ * @param options.agent - The agent for this run.
+ * @param options.signal - The signal for this run.
+ * @param options.req - The server request.
+ * @param options.runId - Optional run ID; otherwise, a new run ID will be generated.
+ * @param options.customHandlers - Custom event handlers.
+ * @param options.streaming - Whether to use streaming.
+ * @param options.streamUsage - Whether to stream usage information.
+ * @returns {Promise<Run<IState>>} A promise that resolves to a new Run instance.
+ */
+export async function createRun({
+  runId,
+  agent,
+  signal,
+  customHandlers,
+  streaming = true,
+  streamUsage = true,
+}: {
+  agent: Agent;
+  signal: AbortSignal;
+  runId?: string;
+  streaming?: boolean;
+  streamUsage?: boolean;
+  customHandlers?: Record<GraphEvents, EventHandler>;
+}): Promise<Run<IState>> {
+  const provider =
+    providerEndpointMap[agent.provider as keyof typeof providerEndpointMap] ?? agent.provider;
+  const llmConfig: t.RunLLMConfig = Object.assign(
+    {
+      provider,
+      streaming,
+      streamUsage,
+    },
+    agent.model_parameters,
+  );
+
+  /** Resolves issues with new OpenAI usage field */
+  if (
+    customProviders.has(agent.provider) ||
+    (agent.provider === Providers.OPENAI && agent.endpoint !== agent.provider)
+  ) {
+    llmConfig.streamUsage = false;
+    llmConfig.usage = true;
+  }
+
+  let reasoningKey: 'reasoning_content' | 'reasoning' | undefined;
+  if (
+    llmConfig.configuration?.baseURL?.includes(KnownEndpoints.openrouter) ||
+    (agent.endpoint && agent.endpoint.toLowerCase().includes(KnownEndpoints.openrouter))
+  ) {
+    reasoningKey = 'reasoning';
+  }
+
+  const graphConfig: StandardGraphConfig = {
+    signal,
+    llmConfig,
+    reasoningKey,
+    tools: agent.tools,
+    instructions: agent.instructions,
+    additional_instructions: agent.additional_instructions,
+    // toolEnd: agent.end_after_tools,
+  };
+
+  // TEMPORARY FOR TESTING
+  if (agent.provider === Providers.ANTHROPIC || agent.provider === Providers.BEDROCK) {
+    graphConfig.streamBuffer = 2000;
+  }
+
+  return Run.create({
+    runId,
+    graphConfig,
+    customHandlers,
+  });
+}
diff --git a/packages/api/src/endpoints/index.ts b/packages/api/src/endpoints/index.ts
new file mode 100644
index 0000000000..e919f9e429
--- /dev/null
+++ b/packages/api/src/endpoints/index.ts
@@ -0,0 +1 @@
+export * from './openai';
diff --git a/packages/api/src/endpoints/openai/index.ts b/packages/api/src/endpoints/openai/index.ts
new file mode 100644
index 0000000000..46ec106869
--- /dev/null
+++ b/packages/api/src/endpoints/openai/index.ts
@@ -0,0 +1,2 @@
+export * from './llm';
+export * from './initialize';
diff --git a/packages/api/src/endpoints/openai/initialize.ts b/packages/api/src/endpoints/openai/initialize.ts
new file mode 100644
index 0000000000..d921af781d
--- /dev/null
+++ b/packages/api/src/endpoints/openai/initialize.ts
@@ -0,0 +1,176 @@
+import {
+  ErrorTypes,
+  EModelEndpoint,
+  resolveHeaders,
+  mapModelToAzureConfig,
+} from 'librechat-data-provider';
+import type {
+  LLMConfigOptions,
+  UserKeyValues,
+  InitializeOpenAIOptionsParams,
+  OpenAIOptionsResult,
+} from '~/types';
+import { createHandleLLMNewToken } from '~/utils/generators';
+import { getAzureCredentials } from '~/utils/azure';
+import { isUserProvided } from '~/utils/common';
+import { getOpenAIConfig } from './llm';
+
+/**
+ * Initializes OpenAI options for agent usage. This function always returns configuration
+ * options and never creates a client instance (equivalent to optionsOnly=true behavior).
+ *
+ * @param params - Configuration parameters
+ * @returns Promise resolving to OpenAI configuration options
+ * @throws Error if API key is missing or user key has expired
+ */
+export const initializeOpenAI = async ({
+  req,
+  overrideModel,
+  endpointOption,
+  overrideEndpoint,
+  getUserKeyValues,
+  checkUserKeyExpiry,
+}: InitializeOpenAIOptionsParams): Promise<OpenAIOptionsResult> => {
+  const { PROXY, OPENAI_API_KEY, AZURE_API_KEY, OPENAI_REVERSE_PROXY, AZURE_OPENAI_BASEURL } =
+    process.env;
+
+  const { key: expiresAt } = req.body;
+  const modelName = overrideModel ?? req.body.model;
+  const endpoint = overrideEndpoint ?? req.body.endpoint;
+
+  if (!endpoint) {
+    throw new Error('Endpoint is required');
+  }
+
+  const credentials = {
+    [EModelEndpoint.openAI]: OPENAI_API_KEY,
+    [EModelEndpoint.azureOpenAI]: AZURE_API_KEY,
+  };
+
+  const baseURLOptions = {
+    [EModelEndpoint.openAI]: OPENAI_REVERSE_PROXY,
+    [EModelEndpoint.azureOpenAI]: AZURE_OPENAI_BASEURL,
+  };
+
+  const userProvidesKey = isUserProvided(credentials[endpoint as keyof typeof credentials]);
+  const userProvidesURL = isUserProvided(baseURLOptions[endpoint as keyof typeof baseURLOptions]);
+
+  let userValues: UserKeyValues | null = null;
+  if (expiresAt && (userProvidesKey || userProvidesURL)) {
+    checkUserKeyExpiry(expiresAt, endpoint);
+    userValues = await getUserKeyValues({ userId: req.user.id, name: endpoint });
+  }
+
+  let apiKey = userProvidesKey
+    ? userValues?.apiKey
+    : credentials[endpoint as keyof typeof credentials];
+  const baseURL = userProvidesURL
+    ? userValues?.baseURL
+    : baseURLOptions[endpoint as keyof typeof baseURLOptions];
+
+  const clientOptions: LLMConfigOptions = {
+    proxy: PROXY ?? undefined,
+    reverseProxyUrl: baseURL || undefined,
+    streaming: true,
+  };
+
+  const isAzureOpenAI = endpoint === EModelEndpoint.azureOpenAI;
+  const azureConfig = isAzureOpenAI && req.app.locals[EModelEndpoint.azureOpenAI];
+
+  if (isAzureOpenAI && azureConfig) {
+    const { modelGroupMap, groupMap } = azureConfig;
+    const {
+      azureOptions,
+      baseURL: configBaseURL,
+      headers = {},
+      serverless,
+    } = mapModelToAzureConfig({
+      modelName: modelName || '',
+      modelGroupMap,
+      groupMap,
+    });
+
+    clientOptions.reverseProxyUrl = configBaseURL ?? clientOptions.reverseProxyUrl;
+    clientOptions.headers = resolveHeaders({ ...headers, ...(clientOptions.headers ?? {}) });
+
+    const groupName = modelGroupMap[modelName || '']?.group;
+    if (groupName && groupMap[groupName]) {
+      clientOptions.addParams = groupMap[groupName]?.addParams;
+      clientOptions.dropParams = groupMap[groupName]?.dropParams;
+    }
+
+    apiKey = azureOptions.azureOpenAIApiKey;
+    clientOptions.azure = !serverless ? azureOptions : undefined;
+
+    if (serverless === true) {
+      clientOptions.defaultQuery = azureOptions.azureOpenAIApiVersion
+        ? { 'api-version': azureOptions.azureOpenAIApiVersion }
+        : undefined;
+
+      if (!clientOptions.headers) {
+        clientOptions.headers = {};
+      }
+      clientOptions.headers['api-key'] = apiKey;
+    }
+  } else if (isAzureOpenAI) {
+    clientOptions.azure =
+      userProvidesKey && userValues?.apiKey ? JSON.parse(userValues.apiKey) : getAzureCredentials();
+    apiKey = clientOptions.azure?.azureOpenAIApiKey;
+  }
+
+  if (userProvidesKey && !apiKey) {
+    throw new Error(
+      JSON.stringify({
+        type: ErrorTypes.NO_USER_KEY,
+      }),
+    );
+  }
+
+  if (!apiKey) {
+    throw new Error(`${endpoint} API Key not provided.`);
+  }
+
+  const modelOptions = {
+    ...endpointOption.model_parameters,
+    model: modelName,
+    user: req.user.id,
+  };
+
+  const finalClientOptions: LLMConfigOptions = {
+    ...clientOptions,
+    modelOptions,
+  };
+
+  const options = getOpenAIConfig(apiKey, finalClientOptions, endpoint);
+
+  const openAIConfig = req.app.locals[EModelEndpoint.openAI];
+  const allConfig = req.app.locals.all;
+  const azureRate = modelName?.includes('gpt-4') ? 30 : 17;
+
+  let streamRate: number | undefined;
+
+  if (isAzureOpenAI && azureConfig) {
+    streamRate = azureConfig.streamRate ?? azureRate;
+  } else if (!isAzureOpenAI && openAIConfig) {
+    streamRate = openAIConfig.streamRate;
+  }
+
+  if (allConfig?.streamRate) {
+    streamRate = allConfig.streamRate;
+  }
+
+  if (streamRate) {
+    options.llmConfig.callbacks = [
+      {
+        handleLLMNewToken: createHandleLLMNewToken(streamRate),
+      },
+    ];
+  }
+
+  const result: OpenAIOptionsResult = {
+    ...options,
+    streamRate,
+  };
+
+  return result;
+};
diff --git a/packages/api/src/endpoints/openai/llm.ts b/packages/api/src/endpoints/openai/llm.ts
new file mode 100644
index 0000000000..2f9a3f6011
--- /dev/null
+++ b/packages/api/src/endpoints/openai/llm.ts
@@ -0,0 +1,156 @@
+import { HttpsProxyAgent } from 'https-proxy-agent';
+import { KnownEndpoints } from 'librechat-data-provider';
+import type * as t from '~/types';
+import { sanitizeModelName, constructAzureURL } from '~/utils/azure';
+import { isEnabled } from '~/utils/common';
+
+/**
+ * Generates configuration options for creating a language model (LLM) instance.
+ * @param apiKey - The API key for authentication.
+ * @param options - Additional options for configuring the LLM.
+ * @param endpoint - The endpoint name
+ * @returns Configuration options for creating an LLM instance.
+ */
+export function getOpenAIConfig(
+  apiKey: string,
+  options: t.LLMConfigOptions = {},
+  endpoint?: string | null,
+): t.LLMConfigResult {
+  const {
+    modelOptions = {},
+    reverseProxyUrl,
+    defaultQuery,
+    headers,
+    proxy,
+    azure,
+    streaming = true,
+    addParams,
+    dropParams,
+  } = options;
+
+  const llmConfig: Partial<t.ClientOptions> & Partial<t.OpenAIParameters> = Object.assign(
+    {
+      streaming,
+      model: modelOptions.model ?? '',
+    },
+    modelOptions,
+  );
+
+  if (addParams && typeof addParams === 'object') {
+    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 = {};
+
+  if (
+    (reverseProxyUrl && reverseProxyUrl.includes(KnownEndpoints.openrouter)) ||
+    (endpoint && endpoint.toLowerCase().includes(KnownEndpoints.openrouter))
+  ) {
+    useOpenRouter = true;
+    llmConfig.include_reasoning = true;
+    configOptions.baseURL = reverseProxyUrl;
+    configOptions.defaultHeaders = Object.assign(
+      {
+        'HTTP-Referer': 'https://librechat.ai',
+        'X-Title': 'LibreChat',
+      },
+      headers,
+    );
+  } else if (reverseProxyUrl) {
+    configOptions.baseURL = reverseProxyUrl;
+    if (headers) {
+      configOptions.defaultHeaders = headers;
+    }
+  }
+
+  if (defaultQuery) {
+    configOptions.defaultQuery = defaultQuery;
+  }
+
+  if (proxy) {
+    const proxyAgent = new HttpsProxyAgent(proxy);
+    configOptions.httpAgent = proxyAgent;
+  }
+
+  if (azure) {
+    const useModelName = isEnabled(process.env.AZURE_USE_MODEL_AS_DEPLOYMENT_NAME);
+    const updatedAzure = { ...azure };
+    updatedAzure.azureOpenAIApiDeploymentName = useModelName
+      ? sanitizeModelName(llmConfig.model || '')
+      : azure.azureOpenAIApiDeploymentName;
+
+    if (process.env.AZURE_OPENAI_DEFAULT_MODEL) {
+      llmConfig.model = process.env.AZURE_OPENAI_DEFAULT_MODEL;
+    }
+
+    if (configOptions.baseURL) {
+      const azureURL = constructAzureURL({
+        baseURL: configOptions.baseURL,
+        azureOptions: updatedAzure,
+      });
+      updatedAzure.azureOpenAIBasePath = azureURL.split(
+        `/${updatedAzure.azureOpenAIApiDeploymentName}`,
+      )[0];
+    }
+
+    Object.assign(llmConfig, updatedAzure);
+    llmConfig.model = updatedAzure.azureOpenAIApiDeploymentName;
+  } else {
+    llmConfig.apiKey = apiKey;
+  }
+
+  if (process.env.OPENAI_ORGANIZATION && azure) {
+    configOptions.organization = process.env.OPENAI_ORGANIZATION;
+  }
+
+  if (useOpenRouter && llmConfig.reasoning_effort != null) {
+    llmConfig.reasoning = {
+      effort: llmConfig.reasoning_effort,
+    };
+    delete llmConfig.reasoning_effort;
+  }
+
+  if (llmConfig.max_tokens != null) {
+    llmConfig.maxTokens = llmConfig.max_tokens;
+    delete llmConfig.max_tokens;
+  }
+
+  return {
+    llmConfig,
+    configOptions,
+  };
+}
diff --git a/packages/mcp/src/flow/manager.spec.ts b/packages/api/src/flow/manager.spec.ts
similarity index 100%
rename from packages/mcp/src/flow/manager.spec.ts
rename to packages/api/src/flow/manager.spec.ts
diff --git a/packages/mcp/src/flow/manager.ts b/packages/api/src/flow/manager.ts
similarity index 100%
rename from packages/mcp/src/flow/manager.ts
rename to packages/api/src/flow/manager.ts
diff --git a/packages/mcp/src/flow/types.ts b/packages/api/src/flow/types.ts
similarity index 100%
rename from packages/mcp/src/flow/types.ts
rename to packages/api/src/flow/types.ts
diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
new file mode 100644
index 0000000000..09a3665e42
--- /dev/null
+++ b/packages/api/src/index.ts
@@ -0,0 +1,14 @@
+/* MCP */
+export * from './mcp/manager';
+/* Utilities */
+export * from './mcp/utils';
+export * from './utils';
+/* Flow */
+export * from './flow/manager';
+/* Agents */
+export * from './agents';
+/* Endpoints */
+export * from './endpoints';
+/* types */
+export type * from './mcp/types';
+export type * from './flow/types';
diff --git a/packages/mcp/src/connection.ts b/packages/api/src/mcp/connection.ts
similarity index 99%
rename from packages/mcp/src/connection.ts
rename to packages/api/src/mcp/connection.ts
index aff0e080ad..381834ba2a 100644
--- a/packages/mcp/src/connection.ts
+++ b/packages/api/src/mcp/connection.ts
@@ -11,7 +11,7 @@ import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/
 import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
 import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
 import type { Logger } from 'winston';
-import type * as t from './types/mcp.js';
+import type * as t from './types';
 
 function isStdioOptions(options: t.MCPOptions): options is t.StdioOptions {
   return 'command' in options;
@@ -87,7 +87,7 @@ export class MCPConnection extends EventEmitter {
     this.lastPingTime = Date.now();
     this.client = new Client(
       {
-        name: 'librechat-mcp-client',
+        name: '@librechat/api-client',
         version: '1.2.2',
       },
       {
diff --git a/packages/mcp/src/enum.ts b/packages/api/src/mcp/enum.ts
similarity index 100%
rename from packages/mcp/src/enum.ts
rename to packages/api/src/mcp/enum.ts
diff --git a/packages/mcp/src/manager.ts b/packages/api/src/mcp/manager.ts
similarity index 99%
rename from packages/mcp/src/manager.ts
rename to packages/api/src/mcp/manager.ts
index 0d8a1e4653..93655dd3bb 100644
--- a/packages/mcp/src/manager.ts
+++ b/packages/api/src/mcp/manager.ts
@@ -2,7 +2,7 @@ import { CallToolResultSchema, ErrorCode, McpError } from '@modelcontextprotocol
 import type { RequestOptions } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import type { JsonSchemaType, MCPOptions } from 'librechat-data-provider';
 import type { Logger } from 'winston';
-import type * as t from './types/mcp';
+import type * as t from './types';
 import { formatToolContent } from './parsers';
 import { MCPConnection } from './connection';
 import { CONSTANTS } from './enum';
diff --git a/packages/mcp/src/parsers.ts b/packages/api/src/mcp/parsers.ts
similarity index 99%
rename from packages/mcp/src/parsers.ts
rename to packages/api/src/mcp/parsers.ts
index 0ebcb077a5..e377f4b70c 100644
--- a/packages/mcp/src/parsers.ts
+++ b/packages/api/src/mcp/parsers.ts
@@ -1,4 +1,4 @@
-import type * as t from './types/mcp';
+import type * as t from './types';
 const RECOGNIZED_PROVIDERS = new Set([
   'google',
   'anthropic',
diff --git a/packages/mcp/src/types/mcp.ts b/packages/api/src/mcp/types/index.ts
similarity index 92%
rename from packages/mcp/src/types/mcp.ts
rename to packages/api/src/mcp/types/index.ts
index 024ed8fd30..bfd73633eb 100644
--- a/packages/mcp/src/types/mcp.ts
+++ b/packages/api/src/mcp/types/index.ts
@@ -8,7 +8,6 @@ import {
   StreamableHTTPOptionsSchema,
 } from 'librechat-data-provider';
 import type { JsonSchemaType, TPlugin } from 'librechat-data-provider';
-import { ToolSchema, ListToolsResultSchema } from '@modelcontextprotocol/sdk/types.js';
 import type * as t from '@modelcontextprotocol/sdk/types.js';
 
 export type StdioOptions = z.infer<typeof StdioOptionsSchema>;
@@ -45,8 +44,8 @@ export interface MCPPrompt {
 
 export type ConnectionState = 'disconnected' | 'connecting' | 'connected' | 'error';
 
-export type MCPTool = z.infer<typeof ToolSchema>;
-export type MCPToolListResponse = z.infer<typeof ListToolsResultSchema>;
+export type MCPTool = z.infer<typeof t.ToolSchema>;
+export type MCPToolListResponse = z.infer<typeof t.ListToolsResultSchema>;
 export type ToolContentPart = t.TextContent | t.ImageContent | t.EmbeddedResource | t.AudioContent;
 export type ImageContent = Extract<ToolContentPart, { type: 'image' }>;
 export type MCPToolCallResponse =
diff --git a/packages/mcp/src/utils.test.ts b/packages/api/src/mcp/utils.test.ts
similarity index 100%
rename from packages/mcp/src/utils.test.ts
rename to packages/api/src/mcp/utils.test.ts
diff --git a/packages/mcp/src/utils.ts b/packages/api/src/mcp/utils.ts
similarity index 100%
rename from packages/mcp/src/utils.ts
rename to packages/api/src/mcp/utils.ts
diff --git a/packages/api/src/types/azure.ts b/packages/api/src/types/azure.ts
new file mode 100644
index 0000000000..d21e1e1d01
--- /dev/null
+++ b/packages/api/src/types/azure.ts
@@ -0,0 +1,19 @@
+/**
+ * Azure OpenAI configuration interface
+ */
+export interface AzureOptions {
+  azureOpenAIApiKey?: string;
+  azureOpenAIApiInstanceName?: string;
+  azureOpenAIApiDeploymentName?: string;
+  azureOpenAIApiVersion?: string;
+  azureOpenAIBasePath?: string;
+}
+
+/**
+ * Client with azure property for setting deployment name
+ */
+export interface GenericClient {
+  azure: {
+    azureOpenAIApiDeploymentName?: string;
+  };
+}
diff --git a/packages/api/src/types/events.ts b/packages/api/src/types/events.ts
new file mode 100644
index 0000000000..1e866fa840
--- /dev/null
+++ b/packages/api/src/types/events.ts
@@ -0,0 +1,4 @@
+export type ServerSentEvent = {
+  data: string | Record<string, unknown>;
+  event?: string;
+};
diff --git a/packages/api/src/types/index.ts b/packages/api/src/types/index.ts
new file mode 100644
index 0000000000..488bcbf0e1
--- /dev/null
+++ b/packages/api/src/types/index.ts
@@ -0,0 +1,4 @@
+export * from './azure';
+export * from './events';
+export * from './openai';
+export * from './run';
diff --git a/packages/api/src/types/openai.ts b/packages/api/src/types/openai.ts
new file mode 100644
index 0000000000..cb11be984f
--- /dev/null
+++ b/packages/api/src/types/openai.ts
@@ -0,0 +1,97 @@
+import { z } from 'zod';
+import { openAISchema, EModelEndpoint } from 'librechat-data-provider';
+import type { TEndpointOption, TAzureConfig, TEndpoint } from 'librechat-data-provider';
+import type { OpenAIClientOptions } from '@librechat/agents';
+import type { AzureOptions } from './azure';
+
+export type OpenAIParameters = z.infer<typeof openAISchema>;
+
+/**
+ * Configuration options for the getLLMConfig function
+ */
+export interface LLMConfigOptions {
+  modelOptions?: Partial<OpenAIParameters>;
+  reverseProxyUrl?: string;
+  defaultQuery?: Record<string, string | undefined>;
+  headers?: Record<string, string>;
+  proxy?: string;
+  azure?: AzureOptions;
+  streaming?: boolean;
+  addParams?: Record<string, unknown>;
+  dropParams?: string[];
+}
+
+export type OpenAIConfiguration = OpenAIClientOptions['configuration'];
+
+export type ClientOptions = OpenAIClientOptions & {
+  include_reasoning?: boolean;
+};
+
+/**
+ * Return type for getLLMConfig function
+ */
+export interface LLMConfigResult {
+  llmConfig: ClientOptions;
+  configOptions: OpenAIConfiguration;
+}
+
+/**
+ * Interface for user values retrieved from the database
+ */
+export interface UserKeyValues {
+  apiKey?: string;
+  baseURL?: string;
+}
+
+/**
+ * Request interface with only the properties we need (avoids Express typing conflicts)
+ */
+export interface RequestData {
+  user: {
+    id: string;
+  };
+  body: {
+    model?: string;
+    endpoint?: string;
+    key?: string;
+  };
+  app: {
+    locals: {
+      [EModelEndpoint.azureOpenAI]?: TAzureConfig;
+      [EModelEndpoint.openAI]?: TEndpoint;
+      all?: TEndpoint;
+    };
+  };
+}
+
+/**
+ * Function type for getting user key values
+ */
+export type GetUserKeyValuesFunction = (params: {
+  userId: string;
+  name: string;
+}) => Promise<UserKeyValues>;
+
+/**
+ * Function type for checking user key expiry
+ */
+export type CheckUserKeyExpiryFunction = (expiresAt: string, endpoint: string) => void;
+
+/**
+ * Parameters for the initializeOpenAI function
+ */
+export interface InitializeOpenAIOptionsParams {
+  req: RequestData;
+  overrideModel?: string;
+  overrideEndpoint?: string;
+  endpointOption: Partial<TEndpointOption>;
+  getUserKeyValues: GetUserKeyValuesFunction;
+  checkUserKeyExpiry: CheckUserKeyExpiryFunction;
+}
+
+/**
+ * Extended LLM config result with stream rate handling
+ */
+export interface OpenAIOptionsResult extends LLMConfigResult {
+  streamRate?: number;
+}
diff --git a/packages/api/src/types/run.ts b/packages/api/src/types/run.ts
new file mode 100644
index 0000000000..080b3adba1
--- /dev/null
+++ b/packages/api/src/types/run.ts
@@ -0,0 +1,10 @@
+import type { AgentModelParameters, EModelEndpoint } from 'librechat-data-provider';
+import type { OpenAIConfiguration } from './openai';
+
+export type RunLLMConfig = {
+  provider: EModelEndpoint;
+  streaming: boolean;
+  streamUsage: boolean;
+  usage?: boolean;
+  configuration?: OpenAIConfiguration;
+} & AgentModelParameters;
diff --git a/api/utils/azureUtils.spec.js b/packages/api/src/utils/azure.spec.ts
similarity index 97%
rename from api/utils/azureUtils.spec.js
rename to packages/api/src/utils/azure.spec.ts
index 4d84451385..5f4a769ed8 100644
--- a/api/utils/azureUtils.spec.js
+++ b/packages/api/src/utils/azure.spec.ts
@@ -1,10 +1,11 @@
-const {
-  sanitizeModelName,
-  genAzureEndpoint,
+import {
   genAzureChatCompletion,
   getAzureCredentials,
   constructAzureURL,
-} = require('./azureUtils');
+  sanitizeModelName,
+  genAzureEndpoint,
+} from './azure';
+import type { GenericClient } from '~/types';
 
 describe('sanitizeModelName', () => {
   test('removes periods from the model name', () => {
@@ -118,7 +119,7 @@ describe('genAzureChatCompletion', () => {
   // Test with client parameter and model name
   test('updates client with sanitized model name when provided and feature enabled', () => {
     process.env.AZURE_USE_MODEL_AS_DEPLOYMENT_NAME = 'true';
-    const clientMock = { azure: {} };
+    const clientMock = { azure: {} } as GenericClient;
     const url = genAzureChatCompletion(
       {
         azureOpenAIApiInstanceName: 'instanceName',
@@ -135,7 +136,7 @@ describe('genAzureChatCompletion', () => {
 
   // Test with client parameter but without model name
   test('does not update client when model name is not provided', () => {
-    const clientMock = { azure: {} };
+    const clientMock = { azure: {} } as GenericClient;
     const url = genAzureChatCompletion(
       {
         azureOpenAIApiInstanceName: 'instanceName',
@@ -154,7 +155,7 @@ describe('genAzureChatCompletion', () => {
   // Test with client parameter and deployment name when feature is disabled
   test('does not update client when feature is disabled', () => {
     process.env.AZURE_USE_MODEL_AS_DEPLOYMENT_NAME = 'false';
-    const clientMock = { azure: {} };
+    const clientMock = { azure: {} } as GenericClient;
     const url = genAzureChatCompletion(
       {
         azureOpenAIApiInstanceName: 'instanceName',
diff --git a/api/utils/azureUtils.js b/packages/api/src/utils/azure.ts
similarity index 50%
rename from api/utils/azureUtils.js
rename to packages/api/src/utils/azure.ts
index 7adb133449..b4051d3d80 100644
--- a/api/utils/azureUtils.js
+++ b/packages/api/src/utils/azure.ts
@@ -1,57 +1,74 @@
-const { isEnabled } = require('~/server/utils/handleText');
+import { isEnabled } from './common';
+import type { AzureOptions, GenericClient } from '~/types';
 
 /**
  * Sanitizes the model name to be used in the URL by removing or replacing disallowed characters.
- * @param {string} modelName - The model name to be sanitized.
- * @returns {string} The sanitized model name.
+ * @param modelName - The model name to be sanitized.
+ * @returns The sanitized model name.
  */
-const sanitizeModelName = (modelName) => {
+export const sanitizeModelName = (modelName: string): string => {
   // Replace periods with empty strings and other disallowed characters as needed.
   return modelName.replace(/\./g, '');
 };
 
 /**
  * Generates the Azure OpenAI API endpoint URL.
- * @param {Object} params - The parameters object.
- * @param {string} params.azureOpenAIApiInstanceName - The Azure OpenAI API instance name.
- * @param {string} params.azureOpenAIApiDeploymentName - The Azure OpenAI API deployment name.
- * @returns {string} The complete endpoint URL for the Azure OpenAI API.
+ * @param params - The parameters object.
+ * @param params.azureOpenAIApiInstanceName - The Azure OpenAI API instance name.
+ * @param params.azureOpenAIApiDeploymentName - The Azure OpenAI API deployment name.
+ * @returns The complete endpoint URL for the Azure OpenAI API.
  */
-const genAzureEndpoint = ({ azureOpenAIApiInstanceName, azureOpenAIApiDeploymentName }) => {
+export const genAzureEndpoint = ({
+  azureOpenAIApiInstanceName,
+  azureOpenAIApiDeploymentName,
+}: {
+  azureOpenAIApiInstanceName: string;
+  azureOpenAIApiDeploymentName: string;
+}): string => {
   return `https://${azureOpenAIApiInstanceName}.openai.azure.com/openai/deployments/${azureOpenAIApiDeploymentName}`;
 };
 
 /**
  * Generates the Azure OpenAI API chat completion endpoint URL with the API version.
  * If both deploymentName and modelName are provided, modelName takes precedence.
- * @param {Object} AzureConfig - The Azure configuration object.
- * @param {string} AzureConfig.azureOpenAIApiInstanceName - The Azure OpenAI API instance name.
- * @param {string} [AzureConfig.azureOpenAIApiDeploymentName] - The Azure OpenAI API deployment name (optional).
- * @param {string} AzureConfig.azureOpenAIApiVersion - The Azure OpenAI API version.
- * @param {string} [modelName] - The model name to be included in the deployment name (optional).
- * @param {Object} [client] - The API Client class for optionally setting properties (optional).
- * @returns {string} The complete chat completion endpoint URL for the Azure OpenAI API.
- * @throws {Error} If neither azureOpenAIApiDeploymentName nor modelName is provided.
+ * @param azureConfig - The Azure configuration object.
+ * @param azureConfig.azureOpenAIApiInstanceName - The Azure OpenAI API instance name.
+ * @param azureConfig.azureOpenAIApiDeploymentName - The Azure OpenAI API deployment name (optional).
+ * @param azureConfig.azureOpenAIApiVersion - The Azure OpenAI API version.
+ * @param modelName - The model name to be included in the deployment name (optional).
+ * @param client - The API Client class for optionally setting properties (optional).
+ * @returns The complete chat completion endpoint URL for the Azure OpenAI API.
+ * @throws Error if neither azureOpenAIApiDeploymentName nor modelName is provided.
  */
-const genAzureChatCompletion = (
-  { azureOpenAIApiInstanceName, azureOpenAIApiDeploymentName, azureOpenAIApiVersion },
-  modelName,
-  client,
-) => {
+export const genAzureChatCompletion = (
+  {
+    azureOpenAIApiInstanceName,
+    azureOpenAIApiDeploymentName,
+    azureOpenAIApiVersion,
+  }: {
+    azureOpenAIApiInstanceName: string;
+    azureOpenAIApiDeploymentName?: string;
+    azureOpenAIApiVersion: string;
+  },
+  modelName?: string,
+  client?: GenericClient,
+): string => {
   // Determine the deployment segment of the URL based on provided modelName or azureOpenAIApiDeploymentName
-  let deploymentSegment;
+  let deploymentSegment: string;
   if (isEnabled(process.env.AZURE_USE_MODEL_AS_DEPLOYMENT_NAME) && modelName) {
     const sanitizedModelName = sanitizeModelName(modelName);
-    deploymentSegment = `${sanitizedModelName}`;
-    client &&
-      typeof client === 'object' &&
-      (client.azure.azureOpenAIApiDeploymentName = sanitizedModelName);
+    deploymentSegment = sanitizedModelName;
+    if (client && typeof client === 'object') {
+      client.azure.azureOpenAIApiDeploymentName = sanitizedModelName;
+    }
   } else if (azureOpenAIApiDeploymentName) {
     deploymentSegment = azureOpenAIApiDeploymentName;
   } else if (!process.env.AZURE_OPENAI_BASEURL) {
     throw new Error(
       'Either a model name with the `AZURE_USE_MODEL_AS_DEPLOYMENT_NAME` setting or a deployment name must be provided if `AZURE_OPENAI_BASEURL` is omitted.',
     );
+  } else {
+    deploymentSegment = '';
   }
 
   return `https://${azureOpenAIApiInstanceName}.openai.azure.com/openai/deployments/${deploymentSegment}/chat/completions?api-version=${azureOpenAIApiVersion}`;
@@ -59,9 +76,9 @@ const genAzureChatCompletion = (
 
 /**
  * Retrieves the Azure OpenAI API credentials from environment variables.
- * @returns {AzureOptions} An object containing the Azure OpenAI API credentials.
+ * @returns An object containing the Azure OpenAI API credentials.
  */
-const getAzureCredentials = () => {
+export const getAzureCredentials = (): AzureOptions => {
   return {
     azureOpenAIApiKey: process.env.AZURE_API_KEY ?? process.env.AZURE_OPENAI_API_KEY,
     azureOpenAIApiInstanceName: process.env.AZURE_OPENAI_API_INSTANCE_NAME,
@@ -76,12 +93,18 @@ const getAzureCredentials = () => {
  * them with 'azureOpenAIApiInstanceName' and 'azureOpenAIApiDeploymentName' from the azure object.
  * If the respective azure property is not provided, the placeholder is replaced with an empty string.
  *
- * @param {Object} params - The parameters object.
- * @param {string} params.baseURL - The baseURL to inspect for replacement placeholders.
- * @param {AzureOptions} params.azureOptions - The azure options object containing the instance and deployment names.
- * @returns {string} The complete baseURL with credentials injected for the Azure OpenAI API.
+ * @param params - The parameters object.
+ * @param params.baseURL - The baseURL to inspect for replacement placeholders.
+ * @param params.azureOptions - The azure options object containing the instance and deployment names.
+ * @returns The complete baseURL with credentials injected for the Azure OpenAI API.
  */
-function constructAzureURL({ baseURL, azureOptions }) {
+export function constructAzureURL({
+  baseURL,
+  azureOptions,
+}: {
+  baseURL: string;
+  azureOptions?: AzureOptions;
+}): string {
   let finalURL = baseURL;
 
   // Replace INSTANCE_NAME and DEPLOYMENT_NAME placeholders with actual values if available
@@ -95,11 +118,3 @@ function constructAzureURL({ baseURL, azureOptions }) {
 
   return finalURL;
 }
-
-module.exports = {
-  sanitizeModelName,
-  genAzureEndpoint,
-  genAzureChatCompletion,
-  getAzureCredentials,
-  constructAzureURL,
-};
diff --git a/packages/api/src/utils/common.spec.ts b/packages/api/src/utils/common.spec.ts
new file mode 100644
index 0000000000..c735fb057d
--- /dev/null
+++ b/packages/api/src/utils/common.spec.ts
@@ -0,0 +1,55 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+import { isEnabled } from './common';
+
+describe('isEnabled', () => {
+  test('should return true when input is "true"', () => {
+    expect(isEnabled('true')).toBe(true);
+  });
+
+  test('should return true when input is "TRUE"', () => {
+    expect(isEnabled('TRUE')).toBe(true);
+  });
+
+  test('should return true when input is true', () => {
+    expect(isEnabled(true)).toBe(true);
+  });
+
+  test('should return false when input is "false"', () => {
+    expect(isEnabled('false')).toBe(false);
+  });
+
+  test('should return false when input is false', () => {
+    expect(isEnabled(false)).toBe(false);
+  });
+
+  test('should return false when input is null', () => {
+    expect(isEnabled(null)).toBe(false);
+  });
+
+  test('should return false when input is undefined', () => {
+    expect(isEnabled()).toBe(false);
+  });
+
+  test('should return false when input is an empty string', () => {
+    expect(isEnabled('')).toBe(false);
+  });
+
+  test('should return false when input is a whitespace string', () => {
+    expect(isEnabled('   ')).toBe(false);
+  });
+
+  test('should return false when input is a number', () => {
+    // @ts-expect-error
+    expect(isEnabled(123)).toBe(false);
+  });
+
+  test('should return false when input is an object', () => {
+    // @ts-expect-error
+    expect(isEnabled({})).toBe(false);
+  });
+
+  test('should return false when input is an array', () => {
+    // @ts-expect-error
+    expect(isEnabled([])).toBe(false);
+  });
+});
diff --git a/packages/api/src/utils/common.ts b/packages/api/src/utils/common.ts
new file mode 100644
index 0000000000..693c00d487
--- /dev/null
+++ b/packages/api/src/utils/common.ts
@@ -0,0 +1,48 @@
+/**
+ * Checks if the given value is truthy by being either the boolean `true` or a string
+ * that case-insensitively matches 'true'.
+ *
+ * @param value - The value to check.
+ * @returns Returns `true` if the value is the boolean `true` or a case-insensitive
+ *                    match for the string 'true', otherwise returns `false`.
+ * @example
+ *
+ * isEnabled("True");  // returns true
+ * isEnabled("TRUE");  // returns true
+ * isEnabled(true);    // returns true
+ * isEnabled("false"); // returns false
+ * isEnabled(false);   // returns false
+ * isEnabled(null);    // returns false
+ * isEnabled();        // returns false
+ */
+export function isEnabled(value?: string | boolean | null | undefined): boolean {
+  if (typeof value === 'boolean') {
+    return value;
+  }
+  if (typeof value === 'string') {
+    return value.toLowerCase().trim() === 'true';
+  }
+  return false;
+}
+
+/**
+ * Checks if the provided value is 'user_provided'.
+ *
+ * @param value - The value to check.
+ * @returns - Returns true if the value is 'user_provided', otherwise false.
+ */
+export const isUserProvided = (value?: string): boolean => value === 'user_provided';
+
+/**
+ * @param values
+ */
+export function optionalChainWithEmptyCheck(
+  ...values: (string | number | undefined)[]
+): string | number | undefined {
+  for (const value of values) {
+    if (value !== undefined && value !== null && value !== '') {
+      return value;
+    }
+  }
+  return values[values.length - 1];
+}
diff --git a/packages/api/src/utils/events.ts b/packages/api/src/utils/events.ts
new file mode 100644
index 0000000000..76d1361d9b
--- /dev/null
+++ b/packages/api/src/utils/events.ts
@@ -0,0 +1,16 @@
+import type { Response as ServerResponse } from 'express';
+import type { ServerSentEvent } from '~/types';
+
+/**
+ * Sends message data in Server Sent Events format.
+ * @param res - The server response.
+ * @param event - The message event.
+ * @param event.event - The type of event.
+ * @param event.data - The message to be sent.
+ */
+export function sendEvent(res: ServerResponse, event: ServerSentEvent): void {
+  if (typeof event.data === 'string' && event.data.length === 0) {
+    return;
+  }
+  res.write(`event: message\ndata: ${JSON.stringify(event)}\n\n`);
+}
diff --git a/packages/api/src/utils/files.spec.ts b/packages/api/src/utils/files.spec.ts
new file mode 100644
index 0000000000..db51d51e0f
--- /dev/null
+++ b/packages/api/src/utils/files.spec.ts
@@ -0,0 +1,115 @@
+import { sanitizeFilename } from './files';
+
+jest.mock('node:crypto', () => {
+  const actualModule = jest.requireActual('node:crypto');
+  return {
+    ...actualModule,
+    randomBytes: jest.fn().mockReturnValue(Buffer.from('abc123', 'hex')),
+  };
+});
+
+describe('sanitizeFilename', () => {
+  test('removes directory components (1/2)', () => {
+    expect(sanitizeFilename('/path/to/file.txt')).toBe('file.txt');
+  });
+
+  test('removes directory components (2/2)', () => {
+    expect(sanitizeFilename('../../../../file.txt')).toBe('file.txt');
+  });
+
+  test('replaces non-alphanumeric characters', () => {
+    expect(sanitizeFilename('file name@#$.txt')).toBe('file_name___.txt');
+  });
+
+  test('preserves dots and hyphens', () => {
+    expect(sanitizeFilename('file-name.with.dots.txt')).toBe('file-name.with.dots.txt');
+  });
+
+  test('prepends underscore to filenames starting with a dot', () => {
+    expect(sanitizeFilename('.hiddenfile')).toBe('_.hiddenfile');
+  });
+
+  test('truncates long filenames', () => {
+    const longName = 'a'.repeat(300) + '.txt';
+    const result = sanitizeFilename(longName);
+    expect(result.length).toBe(255);
+    expect(result).toMatch(/^a+-abc123\.txt$/);
+  });
+
+  test('handles filenames with no extension', () => {
+    const longName = 'a'.repeat(300);
+    const result = sanitizeFilename(longName);
+    expect(result.length).toBe(255);
+    expect(result).toMatch(/^a+-abc123$/);
+  });
+
+  test('handles empty input', () => {
+    expect(sanitizeFilename('')).toBe('_');
+  });
+
+  test('handles input with only special characters', () => {
+    expect(sanitizeFilename('@#$%^&*')).toBe('_______');
+  });
+});
+
+describe('sanitizeFilename with real crypto', () => {
+  // Temporarily unmock crypto for these tests
+  beforeAll(() => {
+    jest.resetModules();
+    jest.unmock('node:crypto');
+  });
+
+  afterAll(() => {
+    jest.resetModules();
+    jest.mock('node:crypto', () => {
+      const actualModule = jest.requireActual('node:crypto');
+      return {
+        ...actualModule,
+        randomBytes: jest.fn().mockReturnValue(Buffer.from('abc123', 'hex')),
+      };
+    });
+  });
+
+  test('truncates long filenames with real crypto', async () => {
+    const { sanitizeFilename: realSanitizeFilename } = await import('./files');
+    const longName = 'b'.repeat(300) + '.pdf';
+    const result = realSanitizeFilename(longName);
+
+    expect(result.length).toBe(255);
+    expect(result).toMatch(/^b+-[a-f0-9]{6}\.pdf$/);
+    expect(result.endsWith('.pdf')).toBe(true);
+  });
+
+  test('handles filenames with no extension with real crypto', async () => {
+    const { sanitizeFilename: realSanitizeFilename } = await import('./files');
+    const longName = 'c'.repeat(300);
+    const result = realSanitizeFilename(longName);
+
+    expect(result.length).toBe(255);
+    expect(result).toMatch(/^c+-[a-f0-9]{6}$/);
+    expect(result).not.toContain('.');
+  });
+
+  test('generates unique suffixes for identical long filenames', async () => {
+    const { sanitizeFilename: realSanitizeFilename } = await import('./files');
+    const longName = 'd'.repeat(300) + '.doc';
+    const result1 = realSanitizeFilename(longName);
+    const result2 = realSanitizeFilename(longName);
+
+    expect(result1.length).toBe(255);
+    expect(result2.length).toBe(255);
+    expect(result1).not.toBe(result2); // Should be different due to random suffix
+    expect(result1.endsWith('.doc')).toBe(true);
+    expect(result2.endsWith('.doc')).toBe(true);
+  });
+
+  test('real crypto produces valid hex strings', async () => {
+    const { sanitizeFilename: realSanitizeFilename } = await import('./files');
+    const longName = 'test'.repeat(100) + '.txt';
+    const result = realSanitizeFilename(longName);
+
+    const hexMatch = result.match(/-([a-f0-9]{6})\.txt$/);
+    expect(hexMatch).toBeTruthy();
+    expect(hexMatch![1]).toMatch(/^[a-f0-9]{6}$/);
+  });
+});
diff --git a/packages/api/src/utils/files.ts b/packages/api/src/utils/files.ts
new file mode 100644
index 0000000000..0d8f111a26
--- /dev/null
+++ b/packages/api/src/utils/files.ts
@@ -0,0 +1,33 @@
+import path from 'path';
+import crypto from 'node:crypto';
+
+/**
+ * Sanitize a filename by removing any directory components, replacing non-alphanumeric characters
+ * @param inputName
+ */
+export function sanitizeFilename(inputName: string): string {
+  // Remove any directory components
+  let name = path.basename(inputName);
+
+  // Replace any non-alphanumeric characters except for '.' and '-'
+  name = name.replace(/[^a-zA-Z0-9.-]/g, '_');
+
+  // Ensure the name doesn't start with a dot (hidden file in Unix-like systems)
+  if (name.startsWith('.') || name === '') {
+    name = '_' + name;
+  }
+
+  // Limit the length of the filename
+  const MAX_LENGTH = 255;
+  if (name.length > MAX_LENGTH) {
+    const ext = path.extname(name);
+    const nameWithoutExt = path.basename(name, ext);
+    name =
+      nameWithoutExt.slice(0, MAX_LENGTH - ext.length - 7) +
+      '-' +
+      crypto.randomBytes(3).toString('hex') +
+      ext;
+  }
+
+  return name;
+}
diff --git a/packages/api/src/utils/generators.ts b/packages/api/src/utils/generators.ts
new file mode 100644
index 0000000000..902721df34
--- /dev/null
+++ b/packages/api/src/utils/generators.ts
@@ -0,0 +1,75 @@
+import fetch from 'node-fetch';
+import { logger } from '@librechat/data-schemas';
+import { GraphEvents, sleep } from '@librechat/agents';
+import type { Response as ServerResponse } from 'express';
+import type { ServerSentEvent } from '~/types';
+import { sendEvent } from './events';
+
+/**
+ * Makes a function to make HTTP request and logs the process.
+ * @param params
+ * @param params.directEndpoint - Whether to use a direct endpoint.
+ * @param params.reverseProxyUrl - The reverse proxy URL to use for the request.
+ * @returns A promise that resolves to the response of the fetch request.
+ */
+export function createFetch({
+  directEndpoint = false,
+  reverseProxyUrl = '',
+}: {
+  directEndpoint?: boolean;
+  reverseProxyUrl?: string;
+}) {
+  /**
+   * Makes an HTTP request and logs the process.
+   * @param url - The URL to make the request to. Can be a string or a Request object.
+   * @param init - Optional init options for the request.
+   * @returns A promise that resolves to the response of the fetch request.
+   */
+  return async function (
+    _url: fetch.RequestInfo,
+    init: fetch.RequestInit,
+  ): Promise<fetch.Response> {
+    let url = _url;
+    if (directEndpoint) {
+      url = reverseProxyUrl;
+    }
+    logger.debug(`Making request to ${url}`);
+    if (typeof Bun !== 'undefined') {
+      return await fetch(url, init);
+    }
+    return await fetch(url, init);
+  };
+}
+
+/**
+ * Creates event handlers for stream events that don't capture client references
+ * @param res - The response object to send events to
+ * @returns Object containing handler functions
+ */
+export function createStreamEventHandlers(res: ServerResponse) {
+  return {
+    [GraphEvents.ON_RUN_STEP]: function (event: ServerSentEvent) {
+      if (res) {
+        sendEvent(res, event);
+      }
+    },
+    [GraphEvents.ON_MESSAGE_DELTA]: function (event: ServerSentEvent) {
+      if (res) {
+        sendEvent(res, event);
+      }
+    },
+    [GraphEvents.ON_REASONING_DELTA]: function (event: ServerSentEvent) {
+      if (res) {
+        sendEvent(res, event);
+      }
+    },
+  };
+}
+
+export function createHandleLLMNewToken(streamRate: number) {
+  return async function () {
+    if (streamRate) {
+      await sleep(streamRate);
+    }
+  };
+}
diff --git a/packages/api/src/utils/index.ts b/packages/api/src/utils/index.ts
new file mode 100644
index 0000000000..ae6157b6c1
--- /dev/null
+++ b/packages/api/src/utils/index.ts
@@ -0,0 +1,5 @@
+export * from './azure';
+export * from './common';
+export * from './events';
+export * from './generators';
+export { default as Tokenizer } from './tokenizer';
diff --git a/api/server/services/Tokenizer.spec.js b/packages/api/src/utils/tokenizer.spec.ts
similarity index 90%
rename from api/server/services/Tokenizer.spec.js
rename to packages/api/src/utils/tokenizer.spec.ts
index 2f93489dcc..edd6fe14de 100644
--- a/api/server/services/Tokenizer.spec.js
+++ b/packages/api/src/utils/tokenizer.spec.ts
@@ -5,13 +5,20 @@
  * Make sure to install `tiktoken` and have it configured properly.
  */
 
-const Tokenizer = require('./Tokenizer'); // <-- Adjust path to your singleton file
-const { logger } = require('~/config');
+import { logger } from '@librechat/data-schemas';
+import type { Tiktoken } from 'tiktoken';
+import Tokenizer from './tokenizer';
+
+jest.mock('@librechat/data-schemas', () => ({
+  logger: {
+    error: jest.fn(),
+  },
+}));
 
 describe('Tokenizer', () => {
-  it('should be a singleton (same instance)', () => {
-    const AnotherTokenizer = require('./Tokenizer'); // same path
-    expect(Tokenizer).toBe(AnotherTokenizer);
+  it('should be a singleton (same instance)', async () => {
+    const AnotherTokenizer = await import('./tokenizer'); // same path
+    expect(Tokenizer).toBe(AnotherTokenizer.default);
   });
 
   describe('getTokenizer', () => {
@@ -73,7 +80,7 @@ describe('Tokenizer', () => {
         free() {
           throw new Error('Intentional free error');
         },
-      };
+      } as unknown as Tiktoken;
 
       // Should not throw uncaught errors
       Tokenizer.freeAndResetAllEncoders();
@@ -103,7 +110,7 @@ describe('Tokenizer', () => {
     });
 
     it('should reset encoders if an error is thrown', () => {
-      // We can simulate an error by temporarily overriding the selected tokenizer’s `encode` method.
+      // We can simulate an error by temporarily overriding the selected tokenizer's `encode` method.
       const tokenizer = Tokenizer.getTokenizer('cl100k_base', false);
       const originalEncode = tokenizer.encode;
       tokenizer.encode = () => {
diff --git a/api/server/services/Tokenizer.js b/packages/api/src/utils/tokenizer.ts
similarity index 56%
rename from api/server/services/Tokenizer.js
rename to packages/api/src/utils/tokenizer.ts
index ac620defa8..2a2088cad3 100644
--- a/api/server/services/Tokenizer.js
+++ b/packages/api/src/utils/tokenizer.ts
@@ -1,28 +1,41 @@
-const { encoding_for_model: encodingForModel, get_encoding: getEncoding } = require('tiktoken');
-const { logger } = require('~/config');
+import { logger } from '@librechat/data-schemas';
+import { encoding_for_model as encodingForModel, get_encoding as getEncoding } from 'tiktoken';
+import type { Tiktoken, TiktokenModel, TiktokenEncoding } from 'tiktoken';
+
+interface TokenizerOptions {
+  debug?: boolean;
+}
 
 class Tokenizer {
+  tokenizersCache: Record<string, Tiktoken>;
+  tokenizerCallsCount: number;
+  private options?: TokenizerOptions;
+
   constructor() {
     this.tokenizersCache = {};
     this.tokenizerCallsCount = 0;
   }
 
-  getTokenizer(encoding, isModelName = false, extendSpecialTokens = {}) {
-    let tokenizer;
+  getTokenizer(
+    encoding: TiktokenModel | TiktokenEncoding,
+    isModelName = false,
+    extendSpecialTokens: Record<string, number> = {},
+  ): Tiktoken {
+    let tokenizer: Tiktoken;
     if (this.tokenizersCache[encoding]) {
       tokenizer = this.tokenizersCache[encoding];
     } else {
       if (isModelName) {
-        tokenizer = encodingForModel(encoding, extendSpecialTokens);
+        tokenizer = encodingForModel(encoding as TiktokenModel, extendSpecialTokens);
       } else {
-        tokenizer = getEncoding(encoding, extendSpecialTokens);
+        tokenizer = getEncoding(encoding as TiktokenEncoding, extendSpecialTokens);
       }
       this.tokenizersCache[encoding] = tokenizer;
     }
     return tokenizer;
   }
 
-  freeAndResetAllEncoders() {
+  freeAndResetAllEncoders(): void {
     try {
       Object.keys(this.tokenizersCache).forEach((key) => {
         if (this.tokenizersCache[key]) {
@@ -36,7 +49,7 @@ class Tokenizer {
     }
   }
 
-  resetTokenizersIfNecessary() {
+  resetTokenizersIfNecessary(): void {
     if (this.tokenizerCallsCount >= 25) {
       if (this.options?.debug) {
         logger.debug('[Tokenizer] freeAndResetAllEncoders: reached 25 encodings, resetting...');
@@ -46,12 +59,13 @@ class Tokenizer {
     this.tokenizerCallsCount++;
   }
 
-  getTokenCount(text, encoding = 'cl100k_base') {
+  getTokenCount(text: string, encoding: TiktokenModel | TiktokenEncoding = 'cl100k_base'): number {
     this.resetTokenizersIfNecessary();
     try {
       const tokenizer = this.getTokenizer(encoding);
       return tokenizer.encode(text, 'all').length;
     } catch (error) {
+      logger.error('[Tokenizer] Error getting token count:', error);
       this.freeAndResetAllEncoders();
       const tokenizer = this.getTokenizer(encoding);
       return tokenizer.encode(text, 'all').length;
@@ -61,4 +75,4 @@ class Tokenizer {
 
 const TokenizerSingleton = new Tokenizer();
 
-module.exports = TokenizerSingleton;
+export default TokenizerSingleton;
diff --git a/packages/mcp/tsconfig-paths-bootstrap.mjs b/packages/api/tsconfig-paths-bootstrap.mjs
similarity index 100%
rename from packages/mcp/tsconfig-paths-bootstrap.mjs
rename to packages/api/tsconfig-paths-bootstrap.mjs
diff --git a/packages/mcp/tsconfig.json b/packages/api/tsconfig.json
similarity index 92%
rename from packages/mcp/tsconfig.json
rename to packages/api/tsconfig.json
index 7c03dc1fb4..ccdf3ebb2e 100644
--- a/packages/mcp/tsconfig.json
+++ b/packages/api/tsconfig.json
@@ -18,7 +18,10 @@
     "isolatedModules": true,
     "noEmit": true,
     "sourceMap": true,
-    "baseUrl": "."
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["./src/*"]
+    }
   },
   "ts-node": {
     "experimentalSpecifierResolution": "node",
diff --git a/packages/mcp/tsconfig.spec.json b/packages/api/tsconfig.spec.json
similarity index 100%
rename from packages/mcp/tsconfig.spec.json
rename to packages/api/tsconfig.spec.json
diff --git a/packages/data-provider/package.json b/packages/data-provider/package.json
index 7cdd37eae7..146121cb44 100644
--- a/packages/data-provider/package.json
+++ b/packages/data-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "librechat-data-provider",
-  "version": "0.7.86",
+  "version": "0.7.87",
   "description": "data services for librechat apps",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
diff --git a/packages/data-provider/src/api-endpoints.ts b/packages/data-provider/src/api-endpoints.ts
index 63a00acef1..88a9d4a148 100644
--- a/packages/data-provider/src/api-endpoints.ts
+++ b/packages/data-provider/src/api-endpoints.ts
@@ -254,6 +254,7 @@ export const getAllPromptGroups = () => `${prompts()}/all`;
 export const roles = () => '/api/roles';
 export const getRole = (roleName: string) => `${roles()}/${roleName.toLowerCase()}`;
 export const updatePromptPermissions = (roleName: string) => `${getRole(roleName)}/prompts`;
+export const updateMemoryPermissions = (roleName: string) => `${getRole(roleName)}/memories`;
 export const updateAgentPermissions = (roleName: string) => `${getRole(roleName)}/agents`;
 
 /* Conversation Tags */
@@ -283,3 +284,8 @@ export const confirmTwoFactor = () => '/api/auth/2fa/confirm';
 export const disableTwoFactor = () => '/api/auth/2fa/disable';
 export const regenerateBackupCodes = () => '/api/auth/2fa/backup/regenerate';
 export const verifyTwoFactorTemp = () => '/api/auth/2fa/verify-temp';
+
+/* Memories */
+export const memories = () => '/api/memories';
+export const memory = (key: string) => `${memories()}/${encodeURIComponent(key)}`;
+export const memoryPreferences = () => `${memories()}/preferences`;
diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.ts
index 005efa4434..beadb4c3f3 100644
--- a/packages/data-provider/src/config.ts
+++ b/packages/data-provider/src/config.ts
@@ -493,6 +493,7 @@ export const intefaceSchema = z
     sidePanel: z.boolean().optional(),
     multiConvo: z.boolean().optional(),
     bookmarks: z.boolean().optional(),
+    memories: z.boolean().optional(),
     presets: z.boolean().optional(),
     prompts: z.boolean().optional(),
     agents: z.boolean().optional(),
@@ -508,6 +509,7 @@ export const intefaceSchema = z
     presets: true,
     multiConvo: true,
     bookmarks: true,
+    memories: true,
     prompts: true,
     agents: true,
     temporaryChat: true,
@@ -649,11 +651,35 @@ export const balanceSchema = z.object({
   refillAmount: z.number().optional().default(10000),
 });
 
+export const memorySchema = z.object({
+  disabled: z.boolean().optional(),
+  validKeys: z.array(z.string()).optional(),
+  tokenLimit: z.number().optional(),
+  personalize: z.boolean().default(true),
+  messageWindowSize: z.number().optional().default(5),
+  agent: z
+    .union([
+      z.object({
+        id: z.string(),
+      }),
+      z.object({
+        provider: z.string(),
+        model: z.string(),
+        instructions: z.string().optional(),
+        model_parameters: z.record(z.any()).optional(),
+      }),
+    ])
+    .optional(),
+});
+
+export type TMemoryConfig = z.infer<typeof memorySchema>;
+
 export const configSchema = z.object({
   version: z.string(),
   cache: z.boolean().default(true),
   ocr: ocrSchema.optional(),
   webSearch: webSearchSchema.optional(),
+  memory: memorySchema.optional(),
   secureImageLinks: z.boolean().optional(),
   imageOutputType: z.nativeEnum(EImageOutputType).default(EImageOutputType.PNG),
   includedTools: z.array(z.string()).optional(),
@@ -1291,6 +1317,10 @@ export enum SettingsTabValues {
    * Chat input commands
    */
   COMMANDS = 'commands',
+  /**
+   * Tab for Personalization Settings
+   */
+  PERSONALIZATION = 'personalization',
 }
 
 export enum STTProviders {
diff --git a/packages/data-provider/src/createPayload.ts b/packages/data-provider/src/createPayload.ts
index edd8f0e426..1640d877d8 100644
--- a/packages/data-provider/src/createPayload.ts
+++ b/packages/data-provider/src/createPayload.ts
@@ -13,11 +13,11 @@ export default function createPayload(submission: t.TSubmission) {
     ephemeralAgent,
   } = submission;
   const { conversationId } = s.tConvoUpdateSchema.parse(conversation);
-  const { endpoint, endpointType } = endpointOption as {
+  const { endpoint: _e, endpointType } = endpointOption as {
     endpoint: s.EModelEndpoint;
     endpointType?: s.EModelEndpoint;
   };
-
+  const endpoint = _e as s.EModelEndpoint;
   let server = EndpointURLs[endpointType ?? endpoint];
   const isEphemeral = s.isEphemeralAgent(endpoint, ephemeralAgent);
 
@@ -32,6 +32,7 @@ export default function createPayload(submission: t.TSubmission) {
   const payload: t.TPayload = {
     ...userMessage,
     ...endpointOption,
+    endpoint,
     ephemeralAgent: isEphemeral ? ephemeralAgent : undefined,
     isContinued: !!(isEdited && isContinued),
     conversationId,
diff --git a/packages/data-provider/src/data-service.ts b/packages/data-provider/src/data-service.ts
index 036d7928c7..c78553f3a3 100644
--- a/packages/data-provider/src/data-service.ts
+++ b/packages/data-provider/src/data-service.ts
@@ -718,6 +718,12 @@ export function updateAgentPermissions(
   return request.put(endpoints.updateAgentPermissions(variables.roleName), variables.updates);
 }
 
+export function updateMemoryPermissions(
+  variables: m.UpdateMemoryPermVars,
+): Promise<m.UpdatePermResponse> {
+  return request.put(endpoints.updateMemoryPermissions(variables.roleName), variables.updates);
+}
+
 /* Tags */
 export function getConversationTags(): Promise<t.TConversationTagsResponse> {
   return request.get(endpoints.conversationTags());
@@ -799,3 +805,33 @@ export function verifyTwoFactorTemp(
 ): Promise<t.TVerify2FATempResponse> {
   return request.post(endpoints.verifyTwoFactorTemp(), payload);
 }
+
+/* Memories */
+export const getMemories = (): Promise<q.MemoriesResponse> => {
+  return request.get(endpoints.memories());
+};
+
+export const deleteMemory = (key: string): Promise<void> => {
+  return request.delete(endpoints.memory(key));
+};
+
+export const updateMemory = (
+  key: string,
+  value: string,
+  originalKey?: string,
+): Promise<q.TUserMemory> => {
+  return request.patch(endpoints.memory(originalKey || key), { key, value });
+};
+
+export const updateMemoryPreferences = (preferences: {
+  memories: boolean;
+}): Promise<{ updated: boolean; preferences: { memories: boolean } }> => {
+  return request.patch(endpoints.memoryPreferences(), preferences);
+};
+
+export const createMemory = (data: {
+  key: string;
+  value: string;
+}): Promise<{ created: boolean; memory: q.TUserMemory }> => {
+  return request.post(endpoints.memories(), data);
+};
diff --git a/packages/data-provider/src/index.ts b/packages/data-provider/src/index.ts
index f6c9579eb6..9869029adf 100644
--- a/packages/data-provider/src/index.ts
+++ b/packages/data-provider/src/index.ts
@@ -16,6 +16,8 @@ export * from './models';
 export * from './mcp';
 /* web search */
 export * from './web';
+/* memory */
+export * from './memory';
 /* RBAC */
 export * from './permissions';
 export * from './roles';
diff --git a/packages/data-provider/src/keys.ts b/packages/data-provider/src/keys.ts
index f9e51dc094..93e21c7e45 100644
--- a/packages/data-provider/src/keys.ts
+++ b/packages/data-provider/src/keys.ts
@@ -46,6 +46,8 @@ export enum QueryKeys {
   health = 'health',
   userTerms = 'userTerms',
   banner = 'banner',
+  /* Memories */
+  memories = 'memories',
 }
 
 export enum MutationKeys {
@@ -70,4 +72,5 @@ export enum MutationKeys {
   updateRole = 'updateRole',
   enableTwoFactor = 'enableTwoFactor',
   verifyTwoFactor = 'verifyTwoFactor',
+  updateMemoryPreferences = 'updateMemoryPreferences',
 }
diff --git a/packages/data-provider/src/memory.ts b/packages/data-provider/src/memory.ts
new file mode 100644
index 0000000000..ca52ef5248
--- /dev/null
+++ b/packages/data-provider/src/memory.ts
@@ -0,0 +1,62 @@
+import type { TCustomConfig, TMemoryConfig } from './config';
+
+/**
+ * Loads the memory configuration and validates it
+ * @param config - The memory configuration from librechat.yaml
+ * @returns The validated memory configuration
+ */
+export function loadMemoryConfig(config: TCustomConfig['memory']): TMemoryConfig | undefined {
+  if (!config) {
+    return undefined;
+  }
+
+  // If disabled is explicitly true, return the config as-is
+  if (config.disabled === true) {
+    return config;
+  }
+
+  // Check if the agent configuration is valid
+  const hasValidAgent =
+    config.agent &&
+    (('id' in config.agent && !!config.agent.id) ||
+      ('provider' in config.agent &&
+        'model' in config.agent &&
+        !!config.agent.provider &&
+        !!config.agent.model));
+
+  // If agent config is invalid, treat as disabled
+  if (!hasValidAgent) {
+    return {
+      ...config,
+      disabled: true,
+    };
+  }
+
+  return config;
+}
+
+/**
+ * Checks if memory feature is enabled based on the configuration
+ * @param config - The memory configuration
+ * @returns True if memory is enabled, false otherwise
+ */
+export function isMemoryEnabled(config: TMemoryConfig | undefined): boolean {
+  if (!config) {
+    return false;
+  }
+
+  if (config.disabled === true) {
+    return false;
+  }
+
+  // Check if agent configuration is valid
+  const hasValidAgent =
+    config.agent &&
+    (('id' in config.agent && !!config.agent.id) ||
+      ('provider' in config.agent &&
+        'model' in config.agent &&
+        !!config.agent.provider &&
+        !!config.agent.model));
+
+  return !!hasValidAgent;
+}
diff --git a/packages/data-provider/src/parsers.ts b/packages/data-provider/src/parsers.ts
index 16a1b86fc1..1c3eb511d0 100644
--- a/packages/data-provider/src/parsers.ts
+++ b/packages/data-provider/src/parsers.ts
@@ -225,13 +225,15 @@ const extractOmniVersion = (modelStr: string): string => {
 export const getResponseSender = (endpointOption: t.TEndpointOption): string => {
   const {
     model: _m,
-    endpoint,
+    endpoint: _e,
     endpointType,
     modelDisplayLabel: _mdl,
     chatGptLabel: _cgl,
     modelLabel: _ml,
   } = endpointOption;
 
+  const endpoint = _e as EModelEndpoint;
+
   const model = _m ?? '';
   const modelDisplayLabel = _mdl ?? '';
   const chatGptLabel = _cgl ?? '';
diff --git a/packages/data-provider/src/permissions.ts b/packages/data-provider/src/permissions.ts
index c75f210536..1711c8b4e0 100644
--- a/packages/data-provider/src/permissions.ts
+++ b/packages/data-provider/src/permissions.ts
@@ -16,6 +16,10 @@ export enum PermissionTypes {
    * Type for Agent Permissions
    */
   AGENTS = 'AGENTS',
+  /**
+   * Type for Memory Permissions
+   */
+  MEMORIES = 'MEMORIES',
   /**
    * Type for Multi-Conversation Permissions
    */
@@ -45,6 +49,8 @@ export enum Permissions {
   READ = 'READ',
   READ_AUTHOR = 'READ_AUTHOR',
   SHARE = 'SHARE',
+  /** Can disable if desired */
+  OPT_OUT = 'OPT_OUT',
 }
 
 export const promptPermissionsSchema = z.object({
@@ -60,6 +66,15 @@ export const bookmarkPermissionsSchema = z.object({
 });
 export type TBookmarkPermissions = z.infer<typeof bookmarkPermissionsSchema>;
 
+export const memoryPermissionsSchema = z.object({
+  [Permissions.USE]: z.boolean().default(true),
+  [Permissions.CREATE]: z.boolean().default(true),
+  [Permissions.UPDATE]: z.boolean().default(true),
+  [Permissions.READ]: z.boolean().default(true),
+  [Permissions.OPT_OUT]: z.boolean().default(true),
+});
+export type TMemoryPermissions = z.infer<typeof memoryPermissionsSchema>;
+
 export const agentPermissionsSchema = z.object({
   [Permissions.SHARED_GLOBAL]: z.boolean().default(false),
   [Permissions.USE]: z.boolean().default(true),
@@ -92,6 +107,7 @@ export type TWebSearchPermissions = z.infer<typeof webSearchPermissionsSchema>;
 export const permissionsSchema = z.object({
   [PermissionTypes.PROMPTS]: promptPermissionsSchema,
   [PermissionTypes.BOOKMARKS]: bookmarkPermissionsSchema,
+  [PermissionTypes.MEMORIES]: memoryPermissionsSchema,
   [PermissionTypes.AGENTS]: agentPermissionsSchema,
   [PermissionTypes.MULTI_CONVO]: multiConvoPermissionsSchema,
   [PermissionTypes.TEMPORARY_CHAT]: temporaryChatPermissionsSchema,
diff --git a/packages/data-provider/src/roles.ts b/packages/data-provider/src/roles.ts
index bb7b1b5ff7..5ec82efaa2 100644
--- a/packages/data-provider/src/roles.ts
+++ b/packages/data-provider/src/roles.ts
@@ -5,6 +5,7 @@ import {
   permissionsSchema,
   agentPermissionsSchema,
   promptPermissionsSchema,
+  memoryPermissionsSchema,
   runCodePermissionsSchema,
   webSearchPermissionsSchema,
   bookmarkPermissionsSchema,
@@ -48,6 +49,13 @@ const defaultRolesSchema = z.object({
       [PermissionTypes.BOOKMARKS]: bookmarkPermissionsSchema.extend({
         [Permissions.USE]: z.boolean().default(true),
       }),
+      [PermissionTypes.MEMORIES]: memoryPermissionsSchema.extend({
+        [Permissions.USE]: z.boolean().default(true),
+        [Permissions.CREATE]: z.boolean().default(true),
+        [Permissions.UPDATE]: z.boolean().default(true),
+        [Permissions.READ]: z.boolean().default(true),
+        [Permissions.OPT_OUT]: z.boolean().default(true),
+      }),
       [PermissionTypes.AGENTS]: agentPermissionsSchema.extend({
         [Permissions.SHARED_GLOBAL]: z.boolean().default(true),
         [Permissions.USE]: z.boolean().default(true),
@@ -86,6 +94,13 @@ export const roleDefaults = defaultRolesSchema.parse({
       [PermissionTypes.BOOKMARKS]: {
         [Permissions.USE]: true,
       },
+      [PermissionTypes.MEMORIES]: {
+        [Permissions.USE]: true,
+        [Permissions.CREATE]: true,
+        [Permissions.UPDATE]: true,
+        [Permissions.READ]: true,
+        [Permissions.OPT_OUT]: true,
+      },
       [PermissionTypes.AGENTS]: {
         [Permissions.SHARED_GLOBAL]: true,
         [Permissions.USE]: true,
@@ -110,6 +125,7 @@ export const roleDefaults = defaultRolesSchema.parse({
     permissions: {
       [PermissionTypes.PROMPTS]: {},
       [PermissionTypes.BOOKMARKS]: {},
+      [PermissionTypes.MEMORIES]: {},
       [PermissionTypes.AGENTS]: {},
       [PermissionTypes.MULTI_CONVO]: {},
       [PermissionTypes.TEMPORARY_CHAT]: {},
diff --git a/packages/data-provider/src/schemas.ts b/packages/data-provider/src/schemas.ts
index 96116c1f5b..149b10062c 100644
--- a/packages/data-provider/src/schemas.ts
+++ b/packages/data-provider/src/schemas.ts
@@ -522,11 +522,19 @@ export const tMessageSchema = z.object({
   feedback: feedbackSchema.optional(),
 });
 
+export type MemoryArtifact = {
+  key: string;
+  value?: string;
+  tokenCount?: number;
+  type: 'update' | 'delete';
+};
+
 export type TAttachmentMetadata = {
   type?: Tools;
   messageId: string;
   toolCallId: string;
   [Tools.web_search]?: SearchResultData;
+  [Tools.memory]?: MemoryArtifact;
 };
 
 export type TAttachment =
diff --git a/packages/data-provider/src/types.ts b/packages/data-provider/src/types.ts
index 706d2a2e8b..275c405c1a 100644
--- a/packages/data-provider/src/types.ts
+++ b/packages/data-provider/src/types.ts
@@ -1,17 +1,18 @@
 import type OpenAI from 'openai';
 import type { InfiniteData } from '@tanstack/react-query';
 import type {
+  TBanner,
   TMessage,
   TResPlugin,
-  ImageDetail,
   TSharedLink,
   TConversation,
   EModelEndpoint,
   TConversationTag,
-  TBanner,
+  TAttachment,
 } from './schemas';
-import { TMinimalFeedback } from './feedback';
-import { SettingDefinition } from './generate';
+import type { SettingDefinition } from './generate';
+import type { TMinimalFeedback } from './feedback';
+import type { Agent } from './types/assistants';
 
 export type TOpenAIMessage = OpenAI.Chat.ChatCompletionMessageParam;
 
@@ -20,28 +21,78 @@ export * from './schemas';
 export type TMessages = TMessage[];
 
 /* TODO: Cleanup EndpointOption types */
-export type TEndpointOption = {
-  spec?: string | null;
-  iconURL?: string | null;
-  endpoint: EModelEndpoint;
-  endpointType?: EModelEndpoint;
+export type TEndpointOption = Pick<
+  TConversation,
+  // Core conversation fields
+  | 'endpoint'
+  | 'endpointType'
+  | 'model'
+  | 'modelLabel'
+  | 'chatGptLabel'
+  | 'promptPrefix'
+  | 'temperature'
+  | 'topP'
+  | 'topK'
+  | 'top_p'
+  | 'frequency_penalty'
+  | 'presence_penalty'
+  | 'maxOutputTokens'
+  | 'maxContextTokens'
+  | 'max_tokens'
+  | 'maxTokens'
+  | 'resendFiles'
+  | 'imageDetail'
+  | 'reasoning_effort'
+  | 'instructions'
+  | 'additional_instructions'
+  | 'append_current_datetime'
+  | 'tools'
+  | 'stop'
+  | 'region'
+  | 'additionalModelRequestFields'
+  // Anthropic-specific
+  | 'promptCache'
+  | 'thinking'
+  | 'thinkingBudget'
+  // Assistant/Agent fields
+  | 'assistant_id'
+  | 'agent_id'
+  // UI/Display fields
+  | 'iconURL'
+  | 'greeting'
+  | 'spec'
+  // Artifacts
+  | 'artifacts'
+  // Files
+  | 'file_ids'
+  // System field
+  | 'system'
+  // Google examples
+  | 'examples'
+  // Context
+  | 'context'
+> & {
+  // Fields specific to endpoint options that don't exist on TConversation
   modelDisplayLabel?: string;
-  resendFiles?: boolean;
-  promptCache?: boolean;
-  maxContextTokens?: number;
-  imageDetail?: ImageDetail;
-  model?: string | null;
-  promptPrefix?: string;
-  temperature?: number;
-  chatGptLabel?: string | null;
-  modelLabel?: string | null;
-  jailbreak?: boolean;
   key?: string | null;
-  /* assistant */
+  /** @deprecated Assistants API */
   thread_id?: string;
-  /* multi-response stream */
+  // Conversation identifiers for multi-response streams
   overrideConvoId?: string;
   overrideUserMessageId?: string;
+  // Model parameters (used by different endpoints)
+  modelOptions?: Record<string, unknown>;
+  model_parameters?: Record<string, unknown>;
+  // Configuration data (added by middleware)
+  modelsConfig?: TModelsConfig;
+  // File attachments (processed by middleware)
+  attachments?: TAttachment[];
+  // Generated prompts
+  artifactsPrompt?: string;
+  // Agent-specific fields
+  agent?: Promise<Agent>;
+  // Client-specific options
+  clientOptions?: Record<string, unknown>;
 };
 
 export type TEphemeralAgent = {
@@ -130,6 +181,9 @@ export type TUser = {
   plugins?: string[];
   twoFactorEnabled?: boolean;
   backupCodes?: TBackupCode[];
+  personalization?: {
+    memories?: boolean;
+  };
   createdAt: string;
   updatedAt: string;
 };
@@ -557,7 +611,7 @@ export type TUpdateFeedbackResponse = {
   messageId: string;
   conversationId: string;
   feedback?: TMinimalFeedback;
-}
+};
 
 export type TBalanceResponse = {
   tokenCredits: number;
diff --git a/packages/data-provider/src/types/assistants.ts b/packages/data-provider/src/types/assistants.ts
index 963d3396e2..cbcc51687b 100644
--- a/packages/data-provider/src/types/assistants.ts
+++ b/packages/data-provider/src/types/assistants.ts
@@ -22,6 +22,7 @@ export enum Tools {
   web_search = 'web_search',
   retrieval = 'retrieval',
   function = 'function',
+  memory = 'memory',
 }
 
 export enum EToolResources {
diff --git a/packages/data-provider/src/types/mutations.ts b/packages/data-provider/src/types/mutations.ts
index 7193e1d355..4e1f01debe 100644
--- a/packages/data-provider/src/types/mutations.ts
+++ b/packages/data-provider/src/types/mutations.ts
@@ -278,7 +278,7 @@ export type UpdatePermVars<T> = {
 };
 
 export type UpdatePromptPermVars = UpdatePermVars<p.TPromptPermissions>;
-
+export type UpdateMemoryPermVars = UpdatePermVars<p.TMemoryPermissions>;
 export type UpdateAgentPermVars = UpdatePermVars<p.TAgentPermissions>;
 
 export type UpdatePermResponse = r.TRole;
@@ -290,6 +290,13 @@ export type UpdatePromptPermOptions = MutationOptions<
   types.TError | null | undefined
 >;
 
+export type UpdateMemoryPermOptions = MutationOptions<
+  UpdatePermResponse,
+  UpdateMemoryPermVars,
+  unknown,
+  types.TError | null | undefined
+>;
+
 export type UpdateAgentPermOptions = MutationOptions<
   UpdatePermResponse,
   UpdateAgentPermVars,
diff --git a/packages/data-provider/src/types/queries.ts b/packages/data-provider/src/types/queries.ts
index d396c1fff8..cd792e4bda 100644
--- a/packages/data-provider/src/types/queries.ts
+++ b/packages/data-provider/src/types/queries.ts
@@ -109,3 +109,18 @@ export type VerifyToolAuthResponse = {
 
 export type GetToolCallParams = { conversationId: string };
 export type ToolCallResults = a.ToolCallResult[];
+
+/* Memories */
+export type TUserMemory = {
+  key: string;
+  value: string;
+  updated_at: string;
+  tokenCount?: number;
+};
+
+export type MemoriesResponse = {
+  memories: TUserMemory[];
+  totalTokens: number;
+  tokenLimit: number | null;
+  usagePercentage: number | null;
+};
diff --git a/packages/data-provider/src/web.ts b/packages/data-provider/src/web.ts
index 103d906653..0b0ab63c86 100644
--- a/packages/data-provider/src/web.ts
+++ b/packages/data-provider/src/web.ts
@@ -5,8 +5,8 @@ import type {
   SearchProviders,
   TWebSearchConfig,
 } from './config';
-import { extractVariableName } from './utils';
 import { SearchCategories, SafeSearchTypes } from './config';
+import { extractVariableName } from './utils';
 import { AuthType } from './schemas';
 
 export function loadWebSearchConfig(
@@ -64,23 +64,29 @@ export const webSearchAuth = {
 /**
  * Extracts all API keys from the webSearchAuth configuration object
  */
-export const webSearchKeys: TWebSearchKeys[] = [];
+export function getWebSearchKeys(): TWebSearchKeys[] {
+  const keys: TWebSearchKeys[] = [];
 
-// Iterate through each category (providers, scrapers, rerankers)
-for (const category of Object.keys(webSearchAuth)) {
-  const categoryObj = webSearchAuth[category as TWebSearchCategories];
+  // Iterate through each category (providers, scrapers, rerankers)
+  for (const category of Object.keys(webSearchAuth)) {
+    const categoryObj = webSearchAuth[category as TWebSearchCategories];
 
-  // Iterate through each service within the category
-  for (const service of Object.keys(categoryObj)) {
-    const serviceObj = categoryObj[service as keyof typeof categoryObj];
+    // Iterate through each service within the category
+    for (const service of Object.keys(categoryObj)) {
+      const serviceObj = categoryObj[service as keyof typeof categoryObj];
 
-    // Extract the API keys from the service
-    for (const key of Object.keys(serviceObj)) {
-      webSearchKeys.push(key as TWebSearchKeys);
+      // Extract the API keys from the service
+      for (const key of Object.keys(serviceObj)) {
+        keys.push(key as TWebSearchKeys);
+      }
     }
   }
+
+  return keys;
 }
 
+export const webSearchKeys: TWebSearchKeys[] = getWebSearchKeys();
+
 export function extractWebSearchEnvVars({
   keys,
   config,
diff --git a/packages/data-schemas/README.md b/packages/data-schemas/README.md
deleted file mode 100644
index f9362e8238..0000000000
--- a/packages/data-schemas/README.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# `@librechat/data-schemas`
-
-Mongoose schemas and models for LibreChat. This package provides a comprehensive collection of Mongoose schemas used across the LibreChat project, enabling robust data modeling and validation for various entities such as actions, agents, messages, users, and more.
-
-
-## Features
-
-- **Modular Schemas:** Includes schemas for actions, agents, assistants, balance, banners, categories, conversation tags, conversations, files, keys, messages, plugin authentication, presets, projects, prompts, prompt groups, roles, sessions, shared links, tokens, tool calls, transactions, and users.
-- **TypeScript Support:** Provides TypeScript definitions for type-safe development.
-- **Ready for Mongoose Integration:** Easily integrate with Mongoose to create models and interact with your MongoDB database.
-- **Flexible & Extensible:** Designed to support the evolving needs of LibreChat while being adaptable to other projects.
-
-
-## Installation
-
-Install the package via npm or yarn:
-
-```bash
-npm install @librechat/data-schemas
-```
-
-Or with yarn:
-
-```bash
-yarn add @librechat/data-schemas
-```
-
-
-## Usage
-
-After installation, you can import and use the schemas in your project. For example, to create a Mongoose model for a user:
-
-```js
-import mongoose from 'mongoose';
-import { userSchema } from '@librechat/data-schemas';
-
-const UserModel = mongoose.model('User', userSchema);
-
-// Now you can use UserModel to create, read, update, and delete user documents.
-```
-
-You can also import other schemas as needed:
-
-```js
-import { actionSchema, agentSchema, messageSchema } from '@librechat/data-schemas';
-```
-
-Each schema is designed to integrate seamlessly with Mongoose and provides indexes, timestamps, and validations tailored for LibreChat’s use cases.
-
-
-## Development
-
-This package uses Rollup and TypeScript for building and bundling.
-
-### Available Scripts
-
-- **Build:**  
-  Cleans the `dist` directory and builds the package.
-  ```bash
-  npm run build
-  ```
-
-- **Build Watch:**  
-  Rebuilds automatically on file changes.
-  ```bash
-  npm run build:watch
-  ```
-
-- **Test:**  
-  Runs tests with coverage in watch mode.
-  ```bash
-  npm run test
-  ```
-
-- **Test (CI):**  
-  Runs tests with coverage for CI environments.
-  ```bash
-  npm run test:ci
-  ```
-
-- **Verify:**  
-  Runs tests in CI mode to verify code integrity.
-  ```bash
-  npm run verify
-  ```
-
-- **Clean:**  
-  Removes the `dist` directory.
-  ```bash
-  npm run clean
-  ```
-
-For those using Bun, equivalent scripts are available:
-- **Bun Clean:** `bun run b:clean`
-- **Bun Build:** `bun run b:build`
-
-
-## Repository & Issues
-
-The source code is maintained on GitHub.
-- **Repository:** [LibreChat Repository](https://github.com/danny-avila/LibreChat.git)
-- **Issues & Bug Reports:** [LibreChat Issues](https://github.com/danny-avila/LibreChat/issues)
-
-
-## License
-
-This project is licensed under the [MIT License](LICENSE).
-
-
-## Contributing
-
-Contributions to improve and expand the data schemas are welcome. If you have suggestions, improvements, or bug fixes, please open an issue or submit a pull request on the [GitHub repository](https://github.com/danny-avila/LibreChat/issues).
-
-For more detailed documentation on each schema and model, please refer to the source code or visit the [LibreChat website](https://librechat.ai).
diff --git a/packages/data-schemas/src/index.ts b/packages/data-schemas/src/index.ts
index a5a4ec59ed..d445eecb47 100644
--- a/packages/data-schemas/src/index.ts
+++ b/packages/data-schemas/src/index.ts
@@ -3,5 +3,6 @@ export * from './schema';
 export { createModels } from './models';
 export { createMethods } from './methods';
 export type * from './types';
+export type * from './methods';
 export { default as logger } from './config/winston';
 export { default as meiliLogger } from './config/meiliLogger';
diff --git a/packages/data-schemas/src/methods/index.ts b/packages/data-schemas/src/methods/index.ts
index 324159b0ae..33dcdc918d 100644
--- a/packages/data-schemas/src/methods/index.ts
+++ b/packages/data-schemas/src/methods/index.ts
@@ -2,6 +2,8 @@ import { createUserMethods, type UserMethods } from './user';
 import { createSessionMethods, type SessionMethods } from './session';
 import { createTokenMethods, type TokenMethods } from './token';
 import { createRoleMethods, type RoleMethods } from './role';
+/* Memories */
+import { createMemoryMethods, type MemoryMethods } from './memory';
 
 /**
  * Creates all database methods for all collections
@@ -12,7 +14,9 @@ export function createMethods(mongoose: typeof import('mongoose')) {
     ...createSessionMethods(mongoose),
     ...createTokenMethods(mongoose),
     ...createRoleMethods(mongoose),
+    ...createMemoryMethods(mongoose),
   };
 }
 
-export type AllMethods = UserMethods & SessionMethods & TokenMethods & RoleMethods;
+export type { MemoryMethods };
+export type AllMethods = UserMethods & SessionMethods & TokenMethods & RoleMethods & MemoryMethods;
diff --git a/packages/data-schemas/src/methods/memory.ts b/packages/data-schemas/src/methods/memory.ts
new file mode 100644
index 0000000000..021354eab2
--- /dev/null
+++ b/packages/data-schemas/src/methods/memory.ts
@@ -0,0 +1,168 @@
+import { Types } from 'mongoose';
+import logger from '~/config/winston';
+import type * as t from '~/types';
+
+/**
+ * Formats a date in YYYY-MM-DD format
+ */
+const formatDate = (date: Date): string => {
+  return date.toISOString().split('T')[0];
+};
+
+// Factory function that takes mongoose instance and returns the methods
+export function createMemoryMethods(mongoose: typeof import('mongoose')) {
+  const MemoryEntry = mongoose.models.MemoryEntry;
+
+  /**
+   * Creates a new memory entry for a user
+   * Throws an error if a memory with the same key already exists
+   */
+  async function createMemory({
+    userId,
+    key,
+    value,
+    tokenCount = 0,
+  }: t.SetMemoryParams): Promise<t.MemoryResult> {
+    try {
+      if (key?.toLowerCase() === 'nothing') {
+        return { ok: false };
+      }
+
+      const existingMemory = await MemoryEntry.findOne({ userId, key });
+      if (existingMemory) {
+        throw new Error('Memory with this key already exists');
+      }
+
+      await MemoryEntry.create({
+        userId,
+        key,
+        value,
+        tokenCount,
+        updated_at: new Date(),
+      });
+
+      return { ok: true };
+    } catch (error) {
+      throw new Error(
+        `Failed to create memory: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      );
+    }
+  }
+
+  /**
+   * Sets or updates a memory entry for a user
+   */
+  async function setMemory({
+    userId,
+    key,
+    value,
+    tokenCount = 0,
+  }: t.SetMemoryParams): Promise<t.MemoryResult> {
+    try {
+      if (key?.toLowerCase() === 'nothing') {
+        return { ok: false };
+      }
+
+      await MemoryEntry.findOneAndUpdate(
+        { userId, key },
+        {
+          value,
+          tokenCount,
+          updated_at: new Date(),
+        },
+        {
+          upsert: true,
+          new: true,
+        },
+      );
+
+      return { ok: true };
+    } catch (error) {
+      throw new Error(
+        `Failed to set memory: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      );
+    }
+  }
+
+  /**
+   * Deletes a specific memory entry for a user
+   */
+  async function deleteMemory({ userId, key }: t.DeleteMemoryParams): Promise<t.MemoryResult> {
+    try {
+      const result = await MemoryEntry.findOneAndDelete({ userId, key });
+      return { ok: !!result };
+    } catch (error) {
+      throw new Error(
+        `Failed to delete memory: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      );
+    }
+  }
+
+  /**
+   * Gets all memory entries for a user
+   */
+  async function getAllUserMemories(
+    userId: string | Types.ObjectId,
+  ): Promise<t.IMemoryEntryLean[]> {
+    try {
+      return (await MemoryEntry.find({ userId }).lean()) as t.IMemoryEntryLean[];
+    } catch (error) {
+      throw new Error(
+        `Failed to get all memories: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      );
+    }
+  }
+
+  /**
+   * Gets and formats all memories for a user in two different formats
+   */
+  async function getFormattedMemories({
+    userId,
+  }: t.GetFormattedMemoriesParams): Promise<t.FormattedMemoriesResult> {
+    try {
+      const memories = await getAllUserMemories(userId);
+
+      if (!memories || memories.length === 0) {
+        return { withKeys: '', withoutKeys: '', totalTokens: 0 };
+      }
+
+      const sortedMemories = memories.sort(
+        (a, b) => new Date(a.updated_at!).getTime() - new Date(b.updated_at!).getTime(),
+      );
+
+      const totalTokens = sortedMemories.reduce((sum, memory) => {
+        return sum + (memory.tokenCount || 0);
+      }, 0);
+
+      const withKeys = sortedMemories
+        .map((memory, index) => {
+          const date = formatDate(new Date(memory.updated_at!));
+          const tokenInfo = memory.tokenCount ? ` [${memory.tokenCount} tokens]` : '';
+          return `${index + 1}. [${date}]. ["key": "${memory.key}"]${tokenInfo}. ["value": "${memory.value}"]`;
+        })
+        .join('\n\n');
+
+      const withoutKeys = sortedMemories
+        .map((memory, index) => {
+          const date = formatDate(new Date(memory.updated_at!));
+          return `${index + 1}. [${date}]. ${memory.value}`;
+        })
+        .join('\n\n');
+
+      return { withKeys, withoutKeys, totalTokens };
+    } catch (error) {
+      logger.error('Failed to get formatted memories:', error);
+      return { withKeys: '', withoutKeys: '', totalTokens: 0 };
+    }
+  }
+
+  return {
+    setMemory,
+    createMemory,
+    deleteMemory,
+    getAllUserMemories,
+    getFormattedMemories,
+  };
+}
+
+export type MemoryMethods = ReturnType<typeof createMemoryMethods>;
diff --git a/packages/data-schemas/src/methods/user.ts b/packages/data-schemas/src/methods/user.ts
index b3460faa72..f29486e0e9 100644
--- a/packages/data-schemas/src/methods/user.ts
+++ b/packages/data-schemas/src/methods/user.ts
@@ -170,6 +170,35 @@ export function createUserMethods(mongoose: typeof import('mongoose')) {
     });
   }
 
+  /**
+   * Update a user's personalization memories setting.
+   * Handles the edge case where the personalization object doesn't exist.
+   */
+  async function toggleUserMemories(
+    userId: string,
+    memoriesEnabled: boolean,
+  ): Promise<IUser | null> {
+    const User = mongoose.models.User;
+
+    // First, ensure the personalization object exists
+    const user = await User.findById(userId);
+    if (!user) {
+      return null;
+    }
+
+    // Use $set to update the nested field, which will create the personalization object if it doesn't exist
+    const updateOperation = {
+      $set: {
+        'personalization.memories': memoriesEnabled,
+      },
+    };
+
+    return (await User.findByIdAndUpdate(userId, updateOperation, {
+      new: true,
+      runValidators: true,
+    }).lean()) as IUser | null;
+  }
+
   // Return all methods
   return {
     findUser,
@@ -179,6 +208,7 @@ export function createUserMethods(mongoose: typeof import('mongoose')) {
     getUserById,
     deleteUserById,
     generateToken,
+    toggleUserMemories,
   };
 }
 
diff --git a/packages/data-schemas/src/models/index.ts b/packages/data-schemas/src/models/index.ts
index 5be6a67d0e..a68a25bcfb 100644
--- a/packages/data-schemas/src/models/index.ts
+++ b/packages/data-schemas/src/models/index.ts
@@ -20,6 +20,7 @@ import { createPromptGroupModel } from './promptGroup';
 import { createConversationTagModel } from './conversationTag';
 import { createSharedLinkModel } from './sharedLink';
 import { createToolCallModel } from './toolCall';
+import { createMemoryModel } from './memory';
 
 /**
  * Creates all database models for all collections
@@ -48,5 +49,6 @@ export function createModels(mongoose: typeof import('mongoose')) {
     ConversationTag: createConversationTagModel(mongoose),
     SharedLink: createSharedLinkModel(mongoose),
     ToolCall: createToolCallModel(mongoose),
+    MemoryEntry: createMemoryModel(mongoose),
   };
 }
diff --git a/packages/data-schemas/src/models/memory.ts b/packages/data-schemas/src/models/memory.ts
new file mode 100644
index 0000000000..fb970c04ce
--- /dev/null
+++ b/packages/data-schemas/src/models/memory.ts
@@ -0,0 +1,6 @@
+import memorySchema from '~/schema/memory';
+import type { IMemoryEntry } from '~/types/memory';
+
+export function createMemoryModel(mongoose: typeof import('mongoose')) {
+  return mongoose.models.MemoryEntry || mongoose.model<IMemoryEntry>('MemoryEntry', memorySchema);
+}
diff --git a/packages/data-schemas/src/models/plugins/mongoMeili.ts b/packages/data-schemas/src/models/plugins/mongoMeili.ts
index 1956be9f30..77597cdf63 100644
--- a/packages/data-schemas/src/models/plugins/mongoMeili.ts
+++ b/packages/data-schemas/src/models/plugins/mongoMeili.ts
@@ -1,6 +1,14 @@
 import _ from 'lodash';
 import { MeiliSearch, Index } from 'meilisearch';
-import type { FilterQuery, Types, Schema, Document, Model, Query } from 'mongoose';
+import type {
+  CallbackWithoutResultAndOptionalError,
+  FilterQuery,
+  Document,
+  Schema,
+  Query,
+  Types,
+  Model,
+} from 'mongoose';
 import logger from '~/config/meiliLogger';
 
 interface MongoMeiliOptions {
@@ -24,12 +32,12 @@ interface ContentItem {
 interface DocumentWithMeiliIndex extends Document {
   _meiliIndex?: boolean;
   preprocessObjectForIndex?: () => Record<string, unknown>;
-  addObjectToMeili?: () => Promise<void>;
-  updateObjectToMeili?: () => Promise<void>;
-  deleteObjectFromMeili?: () => Promise<void>;
-  postSaveHook?: () => void;
-  postUpdateHook?: () => void;
-  postRemoveHook?: () => void;
+  addObjectToMeili?: (next: CallbackWithoutResultAndOptionalError) => Promise<void>;
+  updateObjectToMeili?: (next: CallbackWithoutResultAndOptionalError) => Promise<void>;
+  deleteObjectFromMeili?: (next: CallbackWithoutResultAndOptionalError) => Promise<void>;
+  postSaveHook?: (next: CallbackWithoutResultAndOptionalError) => void;
+  postUpdateHook?: (next: CallbackWithoutResultAndOptionalError) => void;
+  postRemoveHook?: (next: CallbackWithoutResultAndOptionalError) => void;
   conversationId?: string;
   content?: ContentItem[];
   messageId?: string;
@@ -220,7 +228,7 @@ const createMeiliMongooseModel = ({
           );
         }
       } catch (error) {
-        logger.error('[syncWithMeili] Error adding document to Meili', error);
+        logger.error('[syncWithMeili] Error adding document to Meili:', error);
       }
     }
 
@@ -306,28 +314,48 @@ const createMeiliMongooseModel = ({
     /**
      * Adds the current document to the MeiliSearch index
      */
-    async addObjectToMeili(this: DocumentWithMeiliIndex): Promise<void> {
+    async addObjectToMeili(
+      this: DocumentWithMeiliIndex,
+      next: CallbackWithoutResultAndOptionalError,
+    ): Promise<void> {
       const object = this.preprocessObjectForIndex!();
       try {
         await index.addDocuments([object]);
       } catch (error) {
-        logger.error('[addObjectToMeili] Error adding document to Meili', error);
+        logger.error('[addObjectToMeili] Error adding document to Meili:', error);
+        return next();
       }
 
-      await this.collection.updateMany(
-        { _id: this._id as Types.ObjectId },
-        { $set: { _meiliIndex: true } },
-      );
+      try {
+        await this.collection.updateMany(
+          { _id: this._id as Types.ObjectId },
+          { $set: { _meiliIndex: true } },
+        );
+      } catch (error) {
+        logger.error('[addObjectToMeili] Error updating _meiliIndex field:', error);
+        return next();
+      }
+
+      next();
     }
 
     /**
      * Updates the current document in the MeiliSearch index
      */
-    async updateObjectToMeili(this: DocumentWithMeiliIndex): Promise<void> {
-      const object = _.omitBy(_.pick(this.toJSON(), attributesToIndex), (v, k) =>
-        k.startsWith('$'),
-      );
-      await index.updateDocuments([object]);
+    async updateObjectToMeili(
+      this: DocumentWithMeiliIndex,
+      next: CallbackWithoutResultAndOptionalError,
+    ): Promise<void> {
+      try {
+        const object = _.omitBy(_.pick(this.toJSON(), attributesToIndex), (v, k) =>
+          k.startsWith('$'),
+        );
+        await index.updateDocuments([object]);
+        next();
+      } catch (error) {
+        logger.error('[updateObjectToMeili] Error updating document in Meili:', error);
+        return next();
+      }
     }
 
     /**
@@ -335,8 +363,17 @@ const createMeiliMongooseModel = ({
      *
      * @returns {Promise<void>}
      */
-    async deleteObjectFromMeili(this: DocumentWithMeiliIndex): Promise<void> {
-      await index.deleteDocument(this._id as string);
+    async deleteObjectFromMeili(
+      this: DocumentWithMeiliIndex,
+      next: CallbackWithoutResultAndOptionalError,
+    ): Promise<void> {
+      try {
+        await index.deleteDocument(this._id as string);
+        next();
+      } catch (error) {
+        logger.error('[deleteObjectFromMeili] Error deleting document from Meili:', error);
+        return next();
+      }
     }
 
     /**
@@ -345,11 +382,11 @@ const createMeiliMongooseModel = ({
      * If the document is already indexed (i.e. `_meiliIndex` is true), it updates it;
      * otherwise, it adds the document to the index.
      */
-    postSaveHook(this: DocumentWithMeiliIndex): void {
+    postSaveHook(this: DocumentWithMeiliIndex, next: CallbackWithoutResultAndOptionalError): void {
       if (this._meiliIndex) {
-        this.updateObjectToMeili!();
+        this.updateObjectToMeili!(next);
       } else {
-        this.addObjectToMeili!();
+        this.addObjectToMeili!(next);
       }
     }
 
@@ -359,9 +396,14 @@ const createMeiliMongooseModel = ({
      * This hook is triggered after a document update, ensuring that changes are
      * propagated to the MeiliSearch index if the document is indexed.
      */
-    postUpdateHook(this: DocumentWithMeiliIndex): void {
+    postUpdateHook(
+      this: DocumentWithMeiliIndex,
+      next: CallbackWithoutResultAndOptionalError,
+    ): void {
       if (this._meiliIndex) {
-        this.updateObjectToMeili!();
+        this.updateObjectToMeili!(next);
+      } else {
+        next();
       }
     }
 
@@ -371,9 +413,14 @@ const createMeiliMongooseModel = ({
      * This hook is triggered after a document is removed, ensuring that the document
      * is also removed from the MeiliSearch index if it was previously indexed.
      */
-    postRemoveHook(this: DocumentWithMeiliIndex): void {
+    postRemoveHook(
+      this: DocumentWithMeiliIndex,
+      next: CallbackWithoutResultAndOptionalError,
+    ): void {
       if (this._meiliIndex) {
-        this.deleteObjectFromMeili!();
+        this.deleteObjectFromMeili!(next);
+      } else {
+        next();
       }
     }
   }
@@ -429,16 +476,16 @@ export default function mongoMeili(schema: Schema, options: MongoMeiliOptions):
   schema.loadClass(createMeiliMongooseModel({ index, attributesToIndex }));
 
   // Register Mongoose hooks
-  schema.post('save', function (doc: DocumentWithMeiliIndex) {
-    doc.postSaveHook?.();
+  schema.post('save', function (doc: DocumentWithMeiliIndex, next) {
+    doc.postSaveHook?.(next);
   });
 
-  schema.post('updateOne', function (doc: DocumentWithMeiliIndex) {
-    doc.postUpdateHook?.();
+  schema.post('updateOne', function (doc: DocumentWithMeiliIndex, next) {
+    doc.postUpdateHook?.(next);
   });
 
-  schema.post('deleteOne', function (doc: DocumentWithMeiliIndex) {
-    doc.postRemoveHook?.();
+  schema.post('deleteOne', function (doc: DocumentWithMeiliIndex, next) {
+    doc.postRemoveHook?.(next);
   });
 
   // Pre-deleteMany hook: remove corresponding documents from MeiliSearch when multiple documents are deleted.
@@ -486,13 +533,13 @@ export default function mongoMeili(schema: Schema, options: MongoMeiliOptions):
   });
 
   // Post-findOneAndUpdate hook
-  schema.post('findOneAndUpdate', async function (doc: DocumentWithMeiliIndex) {
+  schema.post('findOneAndUpdate', async function (doc: DocumentWithMeiliIndex, next) {
     if (!meiliEnabled) {
-      return;
+      return next();
     }
 
     if (doc.unfinished) {
-      return;
+      return next();
     }
 
     let meiliDoc: Record<string, unknown> | undefined;
@@ -509,9 +556,9 @@ export default function mongoMeili(schema: Schema, options: MongoMeiliOptions):
     }
 
     if (meiliDoc && meiliDoc.title === doc.title) {
-      return;
+      return next();
     }
 
-    doc.postSaveHook?.();
+    doc.postSaveHook?.(next);
   });
 }
diff --git a/packages/data-schemas/src/schema/index.ts b/packages/data-schemas/src/schema/index.ts
index 8a69a0cb2c..e95f560b23 100644
--- a/packages/data-schemas/src/schema/index.ts
+++ b/packages/data-schemas/src/schema/index.ts
@@ -21,3 +21,4 @@ export { default as tokenSchema } from './token';
 export { default as toolCallSchema } from './toolCall';
 export { default as transactionSchema } from './transaction';
 export { default as userSchema } from './user';
+export { default as memorySchema } from './memory';
diff --git a/packages/data-schemas/src/schema/memory.ts b/packages/data-schemas/src/schema/memory.ts
new file mode 100644
index 0000000000..b6eadf04a7
--- /dev/null
+++ b/packages/data-schemas/src/schema/memory.ts
@@ -0,0 +1,33 @@
+import { Schema } from 'mongoose';
+import type { IMemoryEntry } from '~/types/memory';
+
+const MemoryEntrySchema: Schema<IMemoryEntry> = new Schema({
+  userId: {
+    type: Schema.Types.ObjectId,
+    ref: 'User',
+    index: true,
+    required: true,
+  },
+  key: {
+    type: String,
+    required: true,
+    validate: {
+      validator: (v: string) => /^[a-z_]+$/.test(v),
+      message: 'Key must only contain lowercase letters and underscores',
+    },
+  },
+  value: {
+    type: String,
+    required: true,
+  },
+  tokenCount: {
+    type: Number,
+    default: 0,
+  },
+  updated_at: {
+    type: Date,
+    default: Date.now,
+  },
+});
+
+export default MemoryEntrySchema;
diff --git a/packages/data-schemas/src/schema/role.ts b/packages/data-schemas/src/schema/role.ts
index bd20fa4ca0..1f6b5f5d57 100644
--- a/packages/data-schemas/src/schema/role.ts
+++ b/packages/data-schemas/src/schema/role.ts
@@ -13,6 +13,13 @@ const rolePermissionsSchema = new Schema(
       [Permissions.USE]: { type: Boolean, default: true },
       [Permissions.CREATE]: { type: Boolean, default: true },
     },
+    [PermissionTypes.MEMORIES]: {
+      [Permissions.USE]: { type: Boolean, default: true },
+      [Permissions.CREATE]: { type: Boolean, default: true },
+      [Permissions.UPDATE]: { type: Boolean, default: true },
+      [Permissions.READ]: { type: Boolean, default: true },
+      [Permissions.OPT_OUT]: { type: Boolean, default: true },
+    },
     [PermissionTypes.AGENTS]: {
       [Permissions.SHARED_GLOBAL]: { type: Boolean, default: false },
       [Permissions.USE]: { type: Boolean, default: true },
@@ -45,6 +52,12 @@ const roleSchema: Schema<IRole> = new Schema({
         [Permissions.USE]: true,
         [Permissions.CREATE]: true,
       },
+      [PermissionTypes.MEMORIES]: {
+        [Permissions.USE]: true,
+        [Permissions.CREATE]: true,
+        [Permissions.UPDATE]: true,
+        [Permissions.READ]: true,
+      },
       [PermissionTypes.AGENTS]: {
         [Permissions.SHARED_GLOBAL]: false,
         [Permissions.USE]: true,
diff --git a/packages/data-schemas/src/schema/user.ts b/packages/data-schemas/src/schema/user.ts
index 6107488ee8..cc8748ac05 100644
--- a/packages/data-schemas/src/schema/user.ts
+++ b/packages/data-schemas/src/schema/user.ts
@@ -129,6 +129,15 @@ const userSchema = new Schema<IUser>(
       type: Boolean,
       default: false,
     },
+    personalization: {
+      type: {
+        memories: {
+          type: Boolean,
+          default: true,
+        },
+      },
+      default: {},
+    },
   },
   { timestamps: true },
 );
diff --git a/packages/data-schemas/src/types/index.ts b/packages/data-schemas/src/types/index.ts
index 27914d2721..7b7037c8ed 100644
--- a/packages/data-schemas/src/types/index.ts
+++ b/packages/data-schemas/src/types/index.ts
@@ -1,3 +1,6 @@
+import type { Types } from 'mongoose';
+
+export type ObjectId = Types.ObjectId;
 export * from './user';
 export * from './token';
 export * from './convo';
@@ -10,3 +13,5 @@ export * from './role';
 export * from './action';
 export * from './assistant';
 export * from './file';
+/* Memories */
+export * from './memory';
diff --git a/packages/data-schemas/src/types/memory.ts b/packages/data-schemas/src/types/memory.ts
new file mode 100644
index 0000000000..6ab6c29345
--- /dev/null
+++ b/packages/data-schemas/src/types/memory.ts
@@ -0,0 +1,48 @@
+import type { Types, Document } from 'mongoose';
+
+// Base memory interfaces
+export interface IMemoryEntry extends Document {
+  userId: Types.ObjectId;
+  key: string;
+  value: string;
+  tokenCount?: number;
+  updated_at?: Date;
+}
+
+export interface IMemoryEntryLean {
+  _id: Types.ObjectId;
+  userId: Types.ObjectId;
+  key: string;
+  value: string;
+  tokenCount?: number;
+  updated_at?: Date;
+  __v?: number;
+}
+
+// Method parameter interfaces
+export interface SetMemoryParams {
+  userId: string | Types.ObjectId;
+  key: string;
+  value: string;
+  tokenCount?: number;
+}
+
+export interface DeleteMemoryParams {
+  userId: string | Types.ObjectId;
+  key: string;
+}
+
+export interface GetFormattedMemoriesParams {
+  userId: string | Types.ObjectId;
+}
+
+// Result interfaces
+export interface MemoryResult {
+  ok: boolean;
+}
+
+export interface FormattedMemoriesResult {
+  withKeys: string;
+  withoutKeys: string;
+  totalTokens?: number;
+}
diff --git a/packages/data-schemas/src/types/role.ts b/packages/data-schemas/src/types/role.ts
index 773a1a3929..590da9432e 100644
--- a/packages/data-schemas/src/types/role.ts
+++ b/packages/data-schemas/src/types/role.ts
@@ -12,6 +12,12 @@ export interface IRole extends Document {
       [Permissions.USE]?: boolean;
       [Permissions.CREATE]?: boolean;
     };
+    [PermissionTypes.MEMORIES]?: {
+      [Permissions.USE]?: boolean;
+      [Permissions.CREATE]?: boolean;
+      [Permissions.UPDATE]?: boolean;
+      [Permissions.READ]?: boolean;
+    };
     [PermissionTypes.AGENTS]?: {
       [Permissions.SHARED_GLOBAL]?: boolean;
       [Permissions.USE]?: boolean;
diff --git a/packages/data-schemas/src/types/user.ts b/packages/data-schemas/src/types/user.ts
index 206d051819..9d2c3fc735 100644
--- a/packages/data-schemas/src/types/user.ts
+++ b/packages/data-schemas/src/types/user.ts
@@ -30,6 +30,9 @@ export interface IUser extends Document {
   }>;
   expiresAt?: Date;
   termsAccepted?: boolean;
+  personalization?: {
+    memories?: boolean;
+  };
   createdAt?: Date;
   updatedAt?: Date;
 }
diff --git a/packages/mcp/src/demo/everything.ts b/packages/mcp/src/demo/everything.ts
deleted file mode 100644
index 58e677a3e4..0000000000
--- a/packages/mcp/src/demo/everything.ts
+++ /dev/null
@@ -1,231 +0,0 @@
-import express from 'express';
-import { EventSource } from 'eventsource';
-import { MCPConnection } from '../connection';
-import type { MCPOptions } from '../types/mcp';
-
-// Set up EventSource for Node environment
-global.EventSource = EventSource;
-
-const app = express();
-app.use(express.json());
-
-let mcp: MCPConnection;
-
-const initializeMCP = async () => {
-  console.log('Initializing MCP with SSE transport...');
-
-  const mcpOptions: MCPOptions = {
-    type: 'sse' as const,
-    url: 'http://localhost:3001/sse',
-    // type: 'stdio' as const,
-    // 'command': 'npx',
-    // 'args': [
-    //   '-y',
-    //   '@modelcontextprotocol/server-everything',
-    // ],
-  };
-
-  try {
-    await MCPConnection.destroyInstance();
-    mcp = MCPConnection.getInstance('everything', mcpOptions);
-
-    mcp.on('connectionChange', (state) => {
-      console.log(`MCP connection state changed to: ${state}`);
-    });
-
-    mcp.on('error', (error) => {
-      console.error('MCP error:', error);
-    });
-
-    console.log('Connecting to MCP server...');
-    await mcp.connectClient();
-    console.log('Connected to MCP server');
-
-    // Test the connection
-    try {
-      const resources = await mcp.fetchResources();
-      console.log('Available resources:', resources);
-    } catch (error) {
-      console.error('Error fetching resources:', error);
-    }
-  } catch (error) {
-    console.error('Failed to connect to MCP server:', error);
-  }
-};
-
-// API Endpoints
-app.get('/status', (req, res) => {
-  res.json({
-    connected: mcp.isConnected(),
-    state: mcp.getConnectionState(),
-    error: mcp.getLastError()?.message,
-  });
-});
-
-// Resources endpoint
-app.get('/resources', async (req, res) => {
-  try {
-    const resources = await mcp.fetchResources();
-    res.json({ resources });
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// Tools endpoint with all tool operations
-app.get('/tools', async (req, res) => {
-  try {
-    const tools = await mcp.fetchTools();
-    res.json({ tools });
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// Echo tool endpoint
-app.post('/tools/echo', async (req, res) => {
-  try {
-    const { message } = req.body;
-    const result = await mcp.client.callTool({
-      name: 'echo',
-      arguments: { message },
-    });
-    res.json(result);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// Add tool endpoint
-app.post('/tools/add', async (req, res) => {
-  try {
-    const { a, b } = req.body;
-    const result = await mcp.client.callTool({
-      name: 'add',
-      arguments: { a, b },
-    });
-    res.json(result);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// Long running operation endpoint
-app.post('/tools/long-operation', async (req, res) => {
-  try {
-    const { duration, steps } = req.body;
-    const result = await mcp.client.callTool({
-      name: 'longRunningOperation',
-      arguments: { duration, steps },
-    });
-    res.json(result);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// Sample LLM endpoint
-app.post('/tools/sample', async (req, res) => {
-  try {
-    const { prompt, maxTokens } = req.body;
-    const result = await mcp.client.callTool({
-      name: 'sampleLLM',
-      arguments: { prompt, maxTokens },
-    });
-    res.json(result);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// Get tiny image endpoint
-app.get('/tools/tiny-image', async (req, res) => {
-  try {
-    const result = await mcp.client.callTool({
-      name: 'getTinyImage',
-      arguments: {},
-    });
-    res.json(result);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// Prompts endpoints
-app.get('/prompts', async (req, res) => {
-  try {
-    const prompts = await mcp.fetchPrompts();
-    res.json({ prompts });
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-app.post('/prompts/simple', async (req, res) => {
-  try {
-    const result = await mcp.client.getPrompt({
-      name: 'simple_prompt',
-    });
-    res.json(result);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-app.post('/prompts/complex', async (req, res) => {
-  try {
-    const { temperature, style } = req.body;
-    const result = await mcp.client.getPrompt({
-      name: 'complex_prompt',
-      arguments: { temperature, style },
-    });
-    res.json(result);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// Resource subscription endpoints
-app.post('/resources/subscribe', async (req, res) => {
-  try {
-    const { uri } = req.body;
-    await mcp.client.subscribeResource({ uri });
-    res.json({ success: true });
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-app.post('/resources/unsubscribe', async (req, res) => {
-  try {
-    const { uri } = req.body;
-    await mcp.client.unsubscribeResource({ uri });
-    res.json({ success: true });
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// Error handling
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-app.use((err: Error, req: express.Request, res: express.Response, next: express.NextFunction) => {
-  console.error('Unhandled error:', err);
-  res.status(500).json({
-    error: 'Internal server error',
-    message: err.message,
-  });
-});
-
-// Cleanup on shutdown
-process.on('SIGINT', async () => {
-  console.log('Shutting down...');
-  await MCPConnection.destroyInstance();
-  process.exit(0);
-});
-
-// Start server
-const PORT = process.env.MCP_PORT ?? 3000;
-app.listen(PORT, () => {
-  console.log(`Server running on http://localhost:${PORT}`);
-  initializeMCP();
-});
diff --git a/packages/mcp/src/demo/filesystem.ts b/packages/mcp/src/demo/filesystem.ts
deleted file mode 100644
index 4f3a21411f..0000000000
--- a/packages/mcp/src/demo/filesystem.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-import express from 'express';
-import { EventSource } from 'eventsource';
-import { MCPConnection } from '../connection';
-import type { MCPOptions } from '../types/mcp';
-
-// Set up EventSource for Node environment
-global.EventSource = EventSource;
-
-const app = express();
-app.use(express.json());
-
-let mcp: MCPConnection;
-
-const initializeMCP = async () => {
-  console.log('Initializing MCP with SSE transport...');
-
-  const mcpOptions: MCPOptions = {
-    // type: 'sse' as const,
-    // url: 'http://localhost:3001/sse',
-    type: 'stdio' as const,
-    command: 'npx',
-    args: ['-y', '@modelcontextprotocol/server-filesystem', '/home/danny/LibreChat/'],
-  };
-
-  try {
-    // Clean up any existing instance
-    await MCPConnection.destroyInstance();
-
-    // Get singleton instance
-    mcp = MCPConnection.getInstance('filesystem', mcpOptions);
-
-    // Add event listeners
-    mcp.on('connectionChange', (state) => {
-      console.log(`MCP connection state changed to: ${state}`);
-    });
-
-    mcp.on('error', (error) => {
-      console.error('MCP error:', error);
-    });
-
-    // Connect to server
-    console.log('Connecting to MCP server...');
-    await mcp.connectClient();
-    console.log('Connected to MCP server');
-  } catch (error) {
-    console.error('Failed to connect to MCP server:', error);
-  }
-};
-
-// Initialize MCP connection
-initializeMCP();
-
-// API Endpoints
-app.get('/status', (req, res) => {
-  res.json({
-    connected: mcp.isConnected(),
-    state: mcp.getConnectionState(),
-    error: mcp.getLastError()?.message,
-  });
-});
-
-app.get('/resources', async (req, res) => {
-  try {
-    const resources = await mcp.fetchResources();
-    res.json({ resources });
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-app.get('/tools', async (req, res) => {
-  try {
-    const tools = await mcp.fetchTools();
-    res.json({ tools });
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// File operations
-// @ts-ignore
-app.get('/files/read', async (req, res) => {
-  const filePath = req.query.path as string;
-  if (!filePath) {
-    return res.status(400).json({ error: 'Path parameter is required' });
-  }
-
-  try {
-    const result = await mcp.client.callTool({
-      name: 'read_file',
-      arguments: { path: filePath },
-    });
-    res.json(result);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// @ts-ignore
-app.post('/files/write', async (req, res) => {
-  const { path, content } = req.body;
-  if (!path || content === undefined) {
-    return res.status(400).json({ error: 'Path and content are required' });
-  }
-
-  try {
-    const result = await mcp.client.callTool({
-      name: 'write_file',
-      arguments: { path, content },
-    });
-    res.json(result);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// @ts-ignore
-app.post('/files/edit', async (req, res) => {
-  const { path, edits, dryRun = false } = req.body;
-  if (!path || !edits) {
-    return res.status(400).json({ error: 'Path and edits are required' });
-  }
-
-  try {
-    const result = await mcp.client.callTool({
-      name: 'edit_file',
-      arguments: { path, edits, dryRun },
-    });
-    res.json(result);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// Directory operations
-// @ts-ignore
-app.get('/directory/list', async (req, res) => {
-  const dirPath = req.query.path as string;
-  if (!dirPath) {
-    return res.status(400).json({ error: 'Path parameter is required' });
-  }
-
-  try {
-    const result = await mcp.client.callTool({
-      name: 'list_directory',
-      arguments: { path: dirPath },
-    });
-    res.json(result);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// @ts-ignore
-app.post('/directory/create', async (req, res) => {
-  const { path } = req.body;
-  if (!path) {
-    return res.status(400).json({ error: 'Path is required' });
-  }
-
-  try {
-    const result = await mcp.client.callTool({
-      name: 'create_directory',
-      arguments: { path },
-    });
-    res.json(result);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// Search endpoint
-// @ts-ignore
-app.get('/search', async (req, res) => {
-  const { path, pattern } = req.query;
-  if (!path || !pattern) {
-    return res.status(400).json({ error: 'Path and pattern parameters are required' });
-  }
-
-  try {
-    const result = await mcp.client.callTool({
-      name: 'search_files',
-      arguments: { path, pattern },
-    });
-    res.json(result);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-});
-
-// Error handling
-app.use((err: Error, req: express.Request, res: express.Response, next: express.NextFunction) => {
-  console.error('Unhandled error:', err);
-  res.status(500).json({
-    error: 'Internal server error',
-    message: err.message,
-  });
-});
-
-// Cleanup on shutdown
-process.on('SIGINT', async () => {
-  console.log('Shutting down...');
-  await MCPConnection.destroyInstance();
-  process.exit(0);
-});
-
-// Start server
-const PORT = process.env.MCP_PORT || 3000;
-app.listen(PORT, () => {
-  console.log(`Server running on http://localhost:${PORT}`);
-});
diff --git a/packages/mcp/src/demo/servers.ts b/packages/mcp/src/demo/servers.ts
deleted file mode 100644
index 1c5cad926c..0000000000
--- a/packages/mcp/src/demo/servers.ts
+++ /dev/null
@@ -1,226 +0,0 @@
-// server.ts
-import express from 'express';
-import { EventSource } from 'eventsource';
-import { MCPManager } from '../manager';
-import { MCPConnection } from '../connection';
-import type * as t from '../types/mcp';
-
-// Set up EventSource for Node environment
-global.EventSource = EventSource;
-
-const app = express();
-app.use(express.json());
-
-const mcpManager = MCPManager.getInstance();
-
-const mcpServers: t.MCPServers = {
-  everything: {
-    type: 'sse' as const,
-    url: 'http://localhost:3001/sse',
-  },
-  filesystem: {
-    type: 'stdio' as const,
-    command: 'npx',
-    args: ['-y', '@modelcontextprotocol/server-filesystem', '/home/danny/LibreChat/'],
-  },
-};
-
-// Generic helper to get connection and handle errors
-const withConnection = async (
-  serverName: string,
-  res: express.Response,
-  callback: (connection: MCPConnection) => Promise<void>,
-) => {
-  const connection = mcpManager.getConnection(serverName);
-  if (!connection) {
-    return res.status(404).json({ error: `Server "${serverName}" not found` });
-  }
-  try {
-    await callback(connection);
-  } catch (error) {
-    res.status(500).json({ error: String(error) });
-  }
-};
-
-// Common endpoints for all servers
-// @ts-ignore
-app.get('/status/:server', (req, res) => {
-  const connection = mcpManager.getConnection(req.params.server);
-  if (!connection) {
-    return res.status(404).json({ error: 'Server not found' });
-  }
-
-  res.json({
-    connected: connection.isConnected(),
-    state: connection.getConnectionState(),
-    error: connection.getLastError()?.message,
-  });
-});
-
-app.get('/resources/:server', async (req, res) => {
-  await withConnection(req.params.server, res, async (connection) => {
-    const resources = await connection.fetchResources();
-    res.json({ resources });
-  });
-});
-
-app.get('/tools/:server', async (req, res) => {
-  await withConnection(req.params.server, res, async (connection) => {
-    const tools = await connection.fetchTools();
-    res.json({ tools });
-  });
-});
-
-// "Everything" server specific endpoints
-app.post('/everything/tools/echo', async (req, res) => {
-  await withConnection('everything', res, async (connection) => {
-    const { message } = req.body;
-    const result = await connection.client.callTool({
-      name: 'echo',
-      arguments: { message },
-    });
-    res.json(result);
-  });
-});
-
-app.post('/everything/tools/add', async (req, res) => {
-  await withConnection('everything', res, async (connection) => {
-    const { a, b } = req.body;
-    const result = await connection.client.callTool({
-      name: 'add',
-      arguments: { a, b },
-    });
-    res.json(result);
-  });
-});
-
-app.post('/everything/tools/long-operation', async (req, res) => {
-  await withConnection('everything', res, async (connection) => {
-    const { duration, steps } = req.body;
-    const result = await connection.client.callTool({
-      name: 'longRunningOperation',
-      arguments: { duration, steps },
-    });
-    res.json(result);
-  });
-});
-
-// Filesystem server specific endpoints
-// @ts-ignore
-app.get('/filesystem/files/read', async (req, res) => {
-  const filePath = req.query.path as string;
-  if (!filePath) {
-    return res.status(400).json({ error: 'Path parameter is required' });
-  }
-
-  await withConnection('filesystem', res, async (connection) => {
-    const result = await connection.client.callTool({
-      name: 'read_file',
-      arguments: { path: filePath },
-    });
-    res.json(result);
-  });
-});
-
-// @ts-ignore
-app.post('/filesystem/files/write', async (req, res) => {
-  const { path, content } = req.body;
-  if (!path || content === undefined) {
-    return res.status(400).json({ error: 'Path and content are required' });
-  }
-
-  await withConnection('filesystem', res, async (connection) => {
-    const result = await connection.client.callTool({
-      name: 'write_file',
-      arguments: { path, content },
-    });
-    res.json(result);
-  });
-});
-
-// @ts-ignore
-app.post('/filesystem/files/edit', async (req, res) => {
-  const { path, edits, dryRun = false } = req.body;
-  if (!path || !edits) {
-    return res.status(400).json({ error: 'Path and edits are required' });
-  }
-
-  await withConnection('filesystem', res, async (connection) => {
-    const result = await connection.client.callTool({
-      name: 'edit_file',
-      arguments: { path, edits, dryRun },
-    });
-    res.json(result);
-  });
-});
-
-// @ts-ignore
-app.get('/filesystem/directory/list', async (req, res) => {
-  const dirPath = req.query.path as string;
-  if (!dirPath) {
-    return res.status(400).json({ error: 'Path parameter is required' });
-  }
-
-  await withConnection('filesystem', res, async (connection) => {
-    const result = await connection.client.callTool({
-      name: 'list_directory',
-      arguments: { path: dirPath },
-    });
-    res.json(result);
-  });
-});
-
-// @ts-ignore
-app.post('/filesystem/directory/create', async (req, res) => {
-  const { path } = req.body;
-  if (!path) {
-    return res.status(400).json({ error: 'Path is required' });
-  }
-
-  await withConnection('filesystem', res, async (connection) => {
-    const result = await connection.client.callTool({
-      name: 'create_directory',
-      arguments: { path },
-    });
-    res.json(result);
-  });
-});
-
-// @ts-ignore
-app.get('/filesystem/search', async (req, res) => {
-  const { path, pattern } = req.query;
-  if (!path || !pattern) {
-    return res.status(400).json({ error: 'Path and pattern parameters are required' });
-  }
-
-  await withConnection('filesystem', res, async (connection) => {
-    const result = await connection.client.callTool({
-      name: 'search_files',
-      arguments: { path, pattern },
-    });
-    res.json(result);
-  });
-});
-
-// Error handling
-app.use((err: Error, req: express.Request, res: express.Response, next: express.NextFunction) => {
-  console.error('Unhandled error:', err);
-  res.status(500).json({
-    error: 'Internal server error',
-    message: err.message,
-  });
-});
-
-// Cleanup on shutdown
-process.on('SIGINT', async () => {
-  console.log('Shutting down...');
-  await MCPManager.destroyInstance();
-  process.exit(0);
-});
-
-// Start server
-const PORT = process.env.MCP_PORT ?? 3000;
-app.listen(PORT, async () => {
-  console.log(`Server running on http://localhost:${PORT}`);
-  await mcpManager.initializeMCP(mcpServers);
-});
diff --git a/packages/mcp/src/examples/everything/everything.ts b/packages/mcp/src/examples/everything/everything.ts
deleted file mode 100644
index 6080ff4ff4..0000000000
--- a/packages/mcp/src/examples/everything/everything.ts
+++ /dev/null
@@ -1,426 +0,0 @@
-import { Server } from '@modelcontextprotocol/sdk/server/index.js';
-import {
-  CallToolRequestSchema,
-  CreateMessageRequest,
-  CreateMessageResultSchema,
-  GetPromptRequestSchema,
-  ListPromptsRequestSchema,
-  ListResourcesRequestSchema,
-  ListResourceTemplatesRequestSchema,
-  ListToolsRequestSchema,
-  ReadResourceRequestSchema,
-  Resource,
-  SetLevelRequestSchema,
-  SubscribeRequestSchema,
-  Tool,
-  ToolSchema,
-  UnsubscribeRequestSchema,
-} from '@modelcontextprotocol/sdk/types.js';
-import { z } from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
-
-const ToolInputSchema = ToolSchema.shape.inputSchema;
-type ToolInput = z.infer<typeof ToolInputSchema>;
-
-/* Input schemas for tools implemented in this server */
-const EchoSchema = z.object({
-  message: z.string().describe('Message to echo'),
-});
-
-const AddSchema = z.object({
-  a: z.number().describe('First number'),
-  b: z.number().describe('Second number'),
-});
-
-const LongRunningOperationSchema = z.object({
-  duration: z.number().default(10).describe('Duration of the operation in seconds'),
-  steps: z.number().default(5).describe('Number of steps in the operation'),
-});
-
-const SampleLLMSchema = z.object({
-  prompt: z.string().describe('The prompt to send to the LLM'),
-  maxTokens: z.number().default(100).describe('Maximum number of tokens to generate'),
-});
-
-const GetTinyImageSchema = z.object({});
-
-enum ToolName {
-  ECHO = 'echo',
-  ADD = 'add',
-  LONG_RUNNING_OPERATION = 'longRunningOperation',
-  SAMPLE_LLM = 'sampleLLM',
-  GET_TINY_IMAGE = 'getTinyImage',
-}
-
-enum PromptName {
-  SIMPLE = 'simple_prompt',
-  COMPLEX = 'complex_prompt',
-}
-
-export const createServer = () => {
-  const server = new Server(
-    {
-      name: 'example-servers/everything',
-      version: '1.0.0',
-    },
-    {
-      capabilities: {
-        prompts: {},
-        resources: { subscribe: true },
-        tools: {},
-        logging: {},
-      },
-    },
-  );
-
-  const subscriptions: Set<string> = new Set();
-  let updateInterval: NodeJS.Timeout | undefined;
-
-  // Set up update interval for subscribed resources
-  // eslint-disable-next-line prefer-const
-  updateInterval = setInterval(() => {
-    // @ts-ignore
-    for (const uri of subscriptions) {
-      server.notification({
-        method: 'notifications/resources/updated',
-        params: { uri },
-      });
-    }
-  }, 5000);
-
-  // Helper method to request sampling from client
-  const requestSampling = async (context: string, uri: string, maxTokens = 100) => {
-    const request: CreateMessageRequest = {
-      method: 'sampling/createMessage',
-      params: {
-        messages: [
-          {
-            role: 'user',
-            content: {
-              type: 'text',
-              text: `Resource ${uri} context: ${context}`,
-            },
-          },
-        ],
-        systemPrompt: 'You are a helpful test server.',
-        maxTokens,
-        temperature: 0.7,
-        includeContext: 'thisServer',
-      },
-    };
-
-    return await server.request(request, CreateMessageResultSchema);
-  };
-
-  const ALL_RESOURCES: Resource[] = Array.from({ length: 100 }, (_, i) => {
-    const uri = `test://static/resource/${i + 1}`;
-    if (i % 2 === 0) {
-      return {
-        uri,
-        name: `Resource ${i + 1}`,
-        mimeType: 'text/plain',
-        text: `Resource ${i + 1}: This is a plaintext resource`,
-      };
-    } else {
-      const buffer = Buffer.from(`Resource ${i + 1}: This is a base64 blob`);
-      return {
-        uri,
-        name: `Resource ${i + 1}`,
-        mimeType: 'application/octet-stream',
-        blob: buffer.toString('base64'),
-      };
-    }
-  });
-
-  const PAGE_SIZE = 10;
-
-  server.setRequestHandler(ListResourcesRequestSchema, async (request) => {
-    const cursor = request.params?.cursor;
-    let startIndex = 0;
-
-    if (cursor) {
-      const decodedCursor = parseInt(atob(cursor), 10);
-      if (!isNaN(decodedCursor)) {
-        startIndex = decodedCursor;
-      }
-    }
-
-    const endIndex = Math.min(startIndex + PAGE_SIZE, ALL_RESOURCES.length);
-    const resources = ALL_RESOURCES.slice(startIndex, endIndex);
-
-    let nextCursor: string | undefined;
-    if (endIndex < ALL_RESOURCES.length) {
-      nextCursor = btoa(endIndex.toString());
-    }
-
-    return {
-      resources,
-      nextCursor,
-    };
-  });
-
-  server.setRequestHandler(ListResourceTemplatesRequestSchema, async () => {
-    return {
-      resourceTemplates: [
-        {
-          uriTemplate: 'test://static/resource/{id}',
-          name: 'Static Resource',
-          description: 'A static resource with a numeric ID',
-        },
-      ],
-    };
-  });
-
-  server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
-    const uri = request.params.uri;
-
-    if (uri.startsWith('test://static/resource/')) {
-      const index = parseInt(uri.split('/').pop() ?? '', 10) - 1;
-      if (index >= 0 && index < ALL_RESOURCES.length) {
-        const resource = ALL_RESOURCES[index];
-        return {
-          contents: [resource],
-        };
-      }
-    }
-
-    throw new Error(`Unknown resource: ${uri}`);
-  });
-
-  server.setRequestHandler(SubscribeRequestSchema, async (request) => {
-    const { uri } = request.params;
-    subscriptions.add(uri);
-
-    // Request sampling from client when someone subscribes
-    await requestSampling('A new subscription was started', uri);
-    return {};
-  });
-
-  server.setRequestHandler(UnsubscribeRequestSchema, async (request) => {
-    subscriptions.delete(request.params.uri);
-    return {};
-  });
-
-  server.setRequestHandler(ListPromptsRequestSchema, async () => {
-    return {
-      prompts: [
-        {
-          name: PromptName.SIMPLE,
-          description: 'A prompt without arguments',
-        },
-        {
-          name: PromptName.COMPLEX,
-          description: 'A prompt with arguments',
-          arguments: [
-            {
-              name: 'temperature',
-              description: 'Temperature setting',
-              required: true,
-            },
-            {
-              name: 'style',
-              description: 'Output style',
-              required: false,
-            },
-          ],
-        },
-      ],
-    };
-  });
-
-  server.setRequestHandler(GetPromptRequestSchema, async (request) => {
-    const { name, arguments: args } = request.params;
-
-    if (name === PromptName.SIMPLE) {
-      return {
-        messages: [
-          {
-            role: 'user',
-            content: {
-              type: 'text',
-              text: 'This is a simple prompt without arguments.',
-            },
-          },
-        ],
-      };
-    }
-
-    if (name === PromptName.COMPLEX) {
-      return {
-        messages: [
-          {
-            role: 'user',
-            content: {
-              type: 'text',
-              text: `This is a complex prompt with arguments: temperature=${args?.temperature}, style=${args?.style}`,
-            },
-          },
-          {
-            role: 'assistant',
-            content: {
-              type: 'text',
-              text: 'I understand. You\'ve provided a complex prompt with temperature and style arguments. How would you like me to proceed?',
-            },
-          },
-          {
-            role: 'user',
-            content: {
-              type: 'image',
-              data: MCP_TINY_IMAGE,
-              mimeType: 'image/png',
-            },
-          },
-        ],
-      };
-    }
-
-    throw new Error(`Unknown prompt: ${name}`);
-  });
-
-  server.setRequestHandler(ListToolsRequestSchema, async () => {
-    const tools: Tool[] = [
-      {
-        name: ToolName.ECHO,
-        description: 'Echoes back the input',
-        inputSchema: zodToJsonSchema(EchoSchema) as ToolInput,
-      },
-      {
-        name: ToolName.ADD,
-        description: 'Adds two numbers',
-        inputSchema: zodToJsonSchema(AddSchema) as ToolInput,
-      },
-      {
-        name: ToolName.LONG_RUNNING_OPERATION,
-        description: 'Demonstrates a long running operation with progress updates',
-        inputSchema: zodToJsonSchema(LongRunningOperationSchema) as ToolInput,
-      },
-      {
-        name: ToolName.SAMPLE_LLM,
-        description: 'Samples from an LLM using MCP\'s sampling feature',
-        inputSchema: zodToJsonSchema(SampleLLMSchema) as ToolInput,
-      },
-      {
-        name: ToolName.GET_TINY_IMAGE,
-        description: 'Returns the MCP_TINY_IMAGE',
-        inputSchema: zodToJsonSchema(GetTinyImageSchema) as ToolInput,
-      },
-    ];
-
-    return { tools };
-  });
-
-  server.setRequestHandler(CallToolRequestSchema, async (request) => {
-    const { name, arguments: args } = request.params;
-
-    if (name === ToolName.ECHO) {
-      const validatedArgs = EchoSchema.parse(args);
-      return {
-        content: [{ type: 'text', text: `Echo: ${validatedArgs.message}` }],
-      };
-    }
-
-    if (name === ToolName.ADD) {
-      const validatedArgs = AddSchema.parse(args);
-      const sum = validatedArgs.a + validatedArgs.b;
-      return {
-        content: [
-          {
-            type: 'text',
-            text: `The sum of ${validatedArgs.a} and ${validatedArgs.b} is ${sum}.`,
-          },
-        ],
-      };
-    }
-
-    if (name === ToolName.LONG_RUNNING_OPERATION) {
-      const validatedArgs = LongRunningOperationSchema.parse(args);
-      const { duration, steps } = validatedArgs;
-      const stepDuration = duration / steps;
-      const progressToken = request.params._meta?.progressToken;
-
-      for (let i = 1; i < steps + 1; i++) {
-        await new Promise((resolve) => setTimeout(resolve, stepDuration * 1000));
-
-        if (progressToken !== undefined) {
-          await server.notification({
-            method: 'notifications/progress',
-            params: {
-              progress: i,
-              total: steps,
-              progressToken,
-            },
-          });
-        }
-      }
-
-      return {
-        content: [
-          {
-            type: 'text',
-            text: `Long running operation completed. Duration: ${duration} seconds, Steps: ${steps}.`,
-          },
-        ],
-      };
-    }
-
-    if (name === ToolName.SAMPLE_LLM) {
-      const validatedArgs = SampleLLMSchema.parse(args);
-      const { prompt, maxTokens } = validatedArgs;
-
-      const result = await requestSampling(prompt, ToolName.SAMPLE_LLM, maxTokens);
-      return {
-        content: [{ type: 'text', text: `LLM sampling result: ${result}` }],
-      };
-    }
-
-    if (name === ToolName.GET_TINY_IMAGE) {
-      GetTinyImageSchema.parse(args);
-      return {
-        content: [
-          {
-            type: 'text',
-            text: 'This is a tiny image:',
-          },
-          {
-            type: 'image',
-            data: MCP_TINY_IMAGE,
-            mimeType: 'image/png',
-          },
-          {
-            type: 'text',
-            text: 'The image above is the MCP tiny image.',
-          },
-        ],
-      };
-    }
-
-    throw new Error(`Unknown tool: ${name}`);
-  });
-
-  server.setRequestHandler(SetLevelRequestSchema, async (request) => {
-    const { level } = request.params;
-
-    // Demonstrate different log levels
-    await server.notification({
-      method: 'notifications/message',
-      params: {
-        level: 'debug',
-        logger: 'test-server',
-        data: `Logging level set to: ${level}`,
-      },
-    });
-
-    return {};
-  });
-
-  const cleanup = async () => {
-    if (updateInterval) {
-      clearInterval(updateInterval);
-    }
-  };
-
-  return { server, cleanup };
-};
-
-const MCP_TINY_IMAGE =
-  'iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAKsGlDQ1BJQ0MgUHJvZmlsZQAASImVlwdUU+kSgOfe9JDQEiIgJfQmSCeAlBBaAAXpYCMkAUKJMRBU7MriClZURLCs6KqIgo0idizYFsWC3QVZBNR1sWDDlXeBQ9jdd9575805c+a7c+efmf+e/z9nLgCdKZDJMlF1gCxpjjwyyI8dn5DIJvUABRiY0kBdIMyWcSMiwgCTUft3+dgGyJC9YzuU69/f/1fREImzhQBIBMbJomxhFsbHMe0TyuQ5ALg9mN9kbo5siK9gzJRjDWL8ZIhTR7hviJOHGY8fjomO5GGsDUCmCQTyVACaKeZn5wpTsTw0f4ztpSKJFGPsGbyzsmaLMMbqgiUWI8N4KD8n+S95Uv+WM1mZUyBIVfLIXoaF7C/JlmUK5v+fn+N/S1amYrSGOaa0NHlwJGaxvpAHGbNDlSxNnhI+yhLRcPwwpymCY0ZZmM1LHGWRwD9UuTZzStgop0gC+co8OfzoURZnB0SNsnx2pLJWipzHHWWBfKyuIiNG6U8T85X589Ki40Y5VxI7ZZSzM6JCx2J4Sr9cEansXywN8hurG6jce1b2X/Yr4SvX5qRFByv3LhjrXyzljuXMjlf2JhL7B4zFxCjjZTl+ylqyzAhlvDgzSOnPzo1Srs3BDuTY2gjlN0wXhESMMoRBELAhBjIhB+QggECQgBTEOeJ5Q2cUeLNl8+WS1LQcNhe7ZWI2Xyq0m8B2tHd0Bhi6syNH4j1r+C4irGtjvhWVAF4nBgcHT475Qm4BHEkCoNaO+SxnAKh3A1w5JVTIc0d8Q9cJCEAFNWCCDhiACViCLTiCK3iCLwRACIRDNCTATBBCGmRhnc+FhbAMCqAI1sNmKIOdsBv2wyE4CvVwCs7DZbgOt+AePIZ26IJX0AcfYQBBEBJCRxiIDmKImCE2iCPCQbyRACQMiUQSkCQkFZEiCmQhsgIpQoqRMmQXUokcQU4g55GrSCvyEOlAepF3yFcUh9JQJqqPmqMTUQ7KRUPRaHQGmorOQfPQfHQtWopWoAfROvQ8eh29h7ajr9B+HOBUcCycEc4Wx8HxcOG4RFwKTo5bjCvEleAqcNW4Rlwz7g6uHfca9wVPxDPwbLwt3hMfjI/BC/Fz8Ivxq/Fl+P34OvxF/B18B74P/51AJ+gRbAgeBD4hnpBKmEsoIJQQ9hJqCZcI9whdhI9EIpFFtCC6EYOJCcR04gLiauJ2Yg3xHLGV2EnsJ5FIOiQbkhcpnCQg5ZAKSFtJB0lnSbdJXaTPZBWyIdmRHEhOJEvJy8kl5APkM+Tb5G7yAEWdYkbxoIRTRJT5lHWUPZRGyk1KF2WAqkG1oHpRo6np1GXUUmo19RL1CfW9ioqKsYq7ylQVicpSlVKVwypXVDpUvtA0adY0Hm06TUFbS9tHO0d7SHtPp9PN6b70RHoOfS29kn6B/oz+WZWhaqfKVxWpLlEtV61Tva36Ro2iZqbGVZuplqdWonZM7abaa3WKurk6T12gvli9XP2E+n31fg2GhoNGuEaWxmqNAxpXNXo0SZrmmgGaIs18zd2aFzQ7GTiGCYPHEDJWMPYwLjG6mESmBZPPTGcWMQ8xW5h9WppazlqxWvO0yrVOa7WzcCxzFp+VyVrHOspqY30dpz+OO048btW46nG3x33SHq/tqy3WLtSu0b6n/VWHrROgk6GzQade56kuXtdad6ruXN0dupd0X49njvccLxxfOP7o+Ed6qJ61XqTeAr3dejf0+vUN9IP0Zfpb9S/ovzZgGfgapBtsMjhj0GvIMPQ2lBhuMjxr+JKtxeayM9ml7IvsPiM9o2AjhdEuoxajAWML4xjj5cY1xk9NqCYckxSTTSZNJn2mhqaTTReaVpk+MqOYcczSzLaYNZt9MrcwjzNfaV5v3mOhbcG3yLOosnhiSbf0sZxjWWF514poxbHKsNpudcsatXaxTrMut75pg9q42khsttu0TiBMcJ8gnVAx4b4tzZZrm2tbZdthx7ILs1tuV2/3ZqLpxMSJGyY2T/xu72Kfab/H/rGDpkOIw3KHRod3jtaOQsdyx7tOdKdApyVODU5vnW2cxc47nB+4MFwmu6x0aXL509XNVe5a7drrZuqW5LbN7T6HyYngrOZccSe4+7kvcT/l/sXD1SPH46jHH562nhmeBzx7JllMEk/aM6nTy9hL4LXLq92b7Z3k/ZN3u4+Rj8Cnwue5r4mvyHevbzfXipvOPch942fvJ/er9fvE8+At4p3zx/kH+Rf6twRoBsQElAU8CzQOTA2sCuwLcglaEHQumBAcGrwh+D5fny/kV/L7QtxCFoVcDKWFRoWWhT4Psw6ThzVORieHTN44+ckUsynSKfXhEM4P3xj+NMIiYk7EyanEqRFTy6e+iHSIXBjZHMWImhV1IOpjtF/0uujHMZYxipimWLXY6bGVsZ/i/OOK49rjJ8Yvir+eoJsgSWhIJCXGJu5N7J8WMG3ztK7pLtMLprfNsJgxb8bVmbozM2eenqU2SzDrWBIhKS7pQNI3QbigQtCfzE/eltwn5Am3CF+JfEWbRL1iL3GxuDvFK6U4pSfVK3Vjam+aT1pJ2msJT1ImeZsenL4z/VNGeMa+jMHMuMyaLHJWUtYJqaY0Q3pxtsHsebNbZTayAln7HI85m+f0yUPle7OR7BnZDTlMbDi6obBU/KDoyPXOLc/9PDd27rF5GvOk827Mt56/an53XmDezwvwC4QLmhYaLVy2sGMRd9Guxcji5MVNS0yW5C/pWhq0dP8y6rKMZb8st19evPzDirgVjfn6+UvzO38I+qGqQLVAXnB/pefKnT/if5T82LLKadXWVd8LRYXXiuyLSoq+rRauvrbGYU3pmsG1KWtb1rmu27GeuF66vm2Dz4b9xRrFecWdGydvrNvE3lS46cPmWZuvljiX7NxC3aLY0l4aVtqw1XTr+q3fytLK7pX7ldds09u2atun7aLtt3f47qjeqb+zaOfXnyQ/PdgVtKuuwryiZDdxd+7uF3ti9zT/zPm5cq/u3qK9f+6T7mvfH7n/YqVbZeUBvQPrqtAqRVXvwekHbx3yP9RQbVu9q4ZVU3QYDisOvzySdKTtaOjRpmOcY9XHzY5vq2XUFtYhdfPr+urT6tsbEhpaT4ScaGr0bKw9aXdy3ymjU+WntU6vO0M9k39m8Gze2f5zsnOvz6ee72ya1fT4QvyFuxenXmy5FHrpyuXAyxeauc1nr3hdOXXV4+qJa5xr9dddr9fdcLlR+4vLL7Utri11N91uNtzyv9XYOqn1zG2f2+fv+N+5fJd/9/q9Kfda22LaHtyffr/9gehBz8PMh28f5T4aeLz0CeFJ4VP1pyXP9J5V/Gr1a027a/vpDv+OG8+jnj/uFHa++i37t29d+S/oL0q6Dbsrexx7TvUG9t56Oe1l1yvZq4HXBb9r/L7tjeWb43/4/nGjL76v66387eC71e913u/74PyhqT+i/9nHrI8Dnwo/63ze/4Xzpflr3NfugbnfSN9K/7T6s/F76Pcng1mDgzKBXDA8CuAwRVNSAN7tA6AnADCwGYI6bWSmHhZk5D9gmOA/8cjcPSyuANWYGRqNeOcADmNqvhRAzRdgaCyK9gXUyUmpo/Pv8Kw+JAbYv8K0HECi2x6tebQU/iEjc/xf+v6nBWXWv9l/AV0EC6JTIblRAAAAeGVYSWZNTQAqAAAACAAFARIAAwAAAAEAAQAAARoABQAAAAEAAABKARsABQAAAAEAAABSASgAAwAAAAEAAgAAh2kABAAAAAEAAABaAAAAAAAAAJAAAAABAAAAkAAAAAEAAqACAAQAAAABAAAAFKADAAQAAAABAAAAFAAAAAAXNii1AAAACXBIWXMAABYlAAAWJQFJUiTwAAAB82lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNi4wLjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOllSZXNvbHV0aW9uPjE0NDwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPHRpZmY6WFJlc29sdXRpb24+MTQ0PC90aWZmOlhSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpSZXNvbHV0aW9uVW5pdD4yPC90aWZmOlJlc29sdXRpb25Vbml0PgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KReh49gAAAjRJREFUOBGFlD2vMUEUx2clvoNCcW8hCqFAo1dKhEQpvsF9KrWEBh/ALbQ0KkInBI3SWyGPCCJEQliXgsTLefaca/bBWjvJzs6cOf/fnDkzOQJIjWm06/XKBEGgD8c6nU5VIWgBtQDPZPWtJE8O63a7LBgMMo/Hw0ql0jPjcY4RvmqXy4XMjUYDUwLtdhtmsxnYbDbI5/O0djqdFFKmsEiGZ9jP9gem0yn0ej2Yz+fg9XpfycimAD7DttstQTDKfr8Po9GIIg6Hw1Cr1RTgB+A72GAwgMPhQLBMJgNSXsFqtUI2myUo18pA6QJogefsPrLBX4QdCVatViklw+EQRFGEj88P2O12pEUGATmsXq+TaLPZ0AXgMRF2vMEqlQoJTSYTpNNpApvNZliv1/+BHDaZTAi2Wq1A3Ig0xmMej7+RcZjdbodUKkWAaDQK+GHjHPnImB88JrZIJAKFQgH2+z2BOczhcMiwRCIBgUAA+NN5BP6mj2DYff35gk6nA61WCzBn2JxO5wPM7/fLz4vD0E+OECfn8xl/0Gw2KbLxeAyLxQIsFgt8p75pDSO7h/HbpUWpewCike9WLpfB7XaDy+WCYrFI/slk8i0MnRRAUt46hPMI4vE4+Hw+ec7t9/44VgWigEeby+UgFArJWjUYOqhWG6x50rpcSfR6PVUfNOgEVRlTX0HhrZBKz4MZjUYWi8VoA+lc9H/VaRZYjBKrtXR8tlwumcFgeMWRbZpA9ORQWfVm8A/FsrLaxebd5wAAAABJRU5ErkJggg==';
diff --git a/packages/mcp/src/examples/everything/index.ts b/packages/mcp/src/examples/everything/index.ts
deleted file mode 100644
index 4688e4bf88..0000000000
--- a/packages/mcp/src/examples/everything/index.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env node
-
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { createServer } from './everything';
-
-async function main() {
-  const transport = new StdioServerTransport();
-  const { server, cleanup } = createServer();
-
-  await server.connect(transport);
-
-  // Cleanup on exit
-  process.on('SIGINT', async () => {
-    await cleanup();
-    await server.close();
-    process.exit(0);
-  });
-}
-
-main().catch((error) => {
-  console.error('Server error:', error);
-  process.exit(1);
-});
diff --git a/packages/mcp/src/examples/everything/sse.ts b/packages/mcp/src/examples/everything/sse.ts
deleted file mode 100644
index 38b329ae76..0000000000
--- a/packages/mcp/src/examples/everything/sse.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
-import express from 'express';
-import { createServer } from './everything.js';
-const app = express();
-const { server, cleanup } = createServer();
-let transport: SSEServerTransport;
-app.get('/sse', async (req, res) => {
-  console.log('Received connection');
-  transport = new SSEServerTransport('/message', res);
-  await server.connect(transport);
-  server.onclose = async () => {
-    await cleanup();
-    await server.close();
-    process.exit(0);
-  };
-});
-app.post('/message', async (req, res) => {
-  console.log('Received message');
-  await transport.handlePostMessage(req, res);
-});
-const PORT = process.env.SSE_PORT ?? 3001;
-app.listen(PORT, () => {
-  console.log(`Server is running on port ${PORT}`);
-});
diff --git a/packages/mcp/src/examples/filesystem.ts b/packages/mcp/src/examples/filesystem.ts
deleted file mode 100644
index c2e3c430f2..0000000000
--- a/packages/mcp/src/examples/filesystem.ts
+++ /dev/null
@@ -1,700 +0,0 @@
-#!/usr/bin/env node
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-import { Server } from '@modelcontextprotocol/sdk/server/index.js';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
-import {
-  JSONRPCMessage,
-  CallToolRequestSchema,
-  ListToolsRequestSchema,
-  InitializeRequestSchema,
-  ToolSchema,
-} from '@modelcontextprotocol/sdk/types.js';
-import fs from 'fs/promises';
-import path from 'path';
-import os from 'os';
-import { z } from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
-import { diffLines, createTwoFilesPatch } from 'diff';
-import { IncomingMessage, ServerResponse } from 'node:http';
-import { minimatch } from 'minimatch';
-import express from 'express';
-
-function normalizePath(p: string): string {
-  return path.normalize(p).toLowerCase();
-}
-
-function expandHome(filepath: string): string {
-  if (filepath.startsWith('~/') || filepath === '~') {
-    return path.join(os.homedir(), filepath.slice(1));
-  }
-  return filepath;
-}
-
-// Command line argument parsing
-const args = process.argv.slice(2);
-
-// Parse command line arguments for transport type
-const transportArg = args.find((arg) => arg.startsWith('--transport='));
-const portArg = args.find((arg) => arg.startsWith('--port='));
-const directories = args.filter((arg) => !arg.startsWith('--'));
-
-if (directories.length === 0) {
-  console.error(
-    'Usage: mcp-server-filesystem [--transport=stdio|sse] [--port=3000] <allowed-directory> [additional-directories...]',
-  );
-  process.exit(1);
-}
-
-// Extract transport type and port from arguments
-const transport = transportArg ? (transportArg.split('=')[1] as 'stdio' | 'sse') : 'stdio';
-
-const port = portArg ? parseInt(portArg.split('=')[1], 10) : undefined;
-
-// Store allowed directories in normalized form
-const allowedDirectories = directories.map((dir) => normalizePath(path.resolve(expandHome(dir))));
-
-// Validate that all directories exist and are accessible
-/** @ts-ignore */
-await Promise.all(
-  directories.map(async (dir) => {
-    try {
-      const stats = await fs.stat(dir);
-      if (!stats.isDirectory()) {
-        console.error(`Error: ${dir} is not a directory`);
-        process.exit(1);
-      }
-    } catch (error) {
-      console.error(`Error accessing directory ${dir}:`, error);
-      process.exit(1);
-    }
-  }),
-);
-
-// Security utilities
-async function validatePath(requestedPath: string): Promise<string> {
-  const expandedPath = expandHome(requestedPath);
-  const absolute = path.isAbsolute(expandedPath)
-    ? path.resolve(expandedPath)
-    : path.resolve(process.cwd(), expandedPath);
-
-  const normalizedRequested = normalizePath(absolute);
-
-  // Check if path is within allowed directories
-  const isAllowed = allowedDirectories.some((dir) => normalizedRequested.startsWith(dir));
-  if (!isAllowed) {
-    throw new Error(
-      `Access denied - path outside allowed directories: ${absolute} not in ${allowedDirectories.join(
-        ', ',
-      )}`,
-    );
-  }
-
-  // Handle symlinks by checking their real path
-  try {
-    const realPath = await fs.realpath(absolute);
-    const normalizedReal = normalizePath(realPath);
-    const isRealPathAllowed = allowedDirectories.some((dir) => normalizedReal.startsWith(dir));
-    if (!isRealPathAllowed) {
-      throw new Error('Access denied - symlink target outside allowed directories');
-    }
-    return realPath;
-  } catch (error) {
-    // For new files that don't exist yet, verify parent directory
-    const parentDir = path.dirname(absolute);
-    try {
-      const realParentPath = await fs.realpath(parentDir);
-      const normalizedParent = normalizePath(realParentPath);
-      const isParentAllowed = allowedDirectories.some((dir) => normalizedParent.startsWith(dir));
-      if (!isParentAllowed) {
-        throw new Error('Access denied - parent directory outside allowed directories');
-      }
-      return absolute;
-    } catch {
-      throw new Error(`Parent directory does not exist: ${parentDir}`);
-    }
-  }
-}
-
-// Schema definitions
-const ReadFileArgsSchema = z.object({
-  path: z.string(),
-});
-
-const ReadMultipleFilesArgsSchema = z.object({
-  paths: z.array(z.string()),
-});
-
-const WriteFileArgsSchema = z.object({
-  path: z.string(),
-  content: z.string(),
-});
-
-const EditOperation = z.object({
-  oldText: z.string().describe('Text to search for - must match exactly'),
-  newText: z.string().describe('Text to replace with'),
-});
-
-const EditFileArgsSchema = z.object({
-  path: z.string(),
-  edits: z.array(EditOperation),
-  dryRun: z.boolean().default(false).describe('Preview changes using git-style diff format'),
-});
-
-const CreateDirectoryArgsSchema = z.object({
-  path: z.string(),
-});
-
-const ListDirectoryArgsSchema = z.object({
-  path: z.string(),
-});
-
-const MoveFileArgsSchema = z.object({
-  source: z.string(),
-  destination: z.string(),
-});
-
-const SearchFilesArgsSchema = z.object({
-  path: z.string(),
-  pattern: z.string(),
-  excludePatterns: z.array(z.string()).optional().default([]),
-});
-
-const GetFileInfoArgsSchema = z.object({
-  path: z.string(),
-});
-
-const ToolInputSchema = ToolSchema.shape.inputSchema;
-type ToolInput = z.infer<typeof ToolInputSchema>;
-
-interface FileInfo {
-  size: number;
-  created: Date;
-  modified: Date;
-  accessed: Date;
-  isDirectory: boolean;
-  isFile: boolean;
-  permissions: string;
-}
-
-// Server setup
-const server = new Server(
-  {
-    name: 'secure-filesystem-server',
-    version: '0.2.0',
-  },
-  {
-    capabilities: {
-      tools: {},
-    },
-  },
-);
-
-// Tool implementations
-async function getFileStats(filePath: string): Promise<FileInfo> {
-  const stats = await fs.stat(filePath);
-  return {
-    size: stats.size,
-    created: stats.birthtime,
-    modified: stats.mtime,
-    accessed: stats.atime,
-    isDirectory: stats.isDirectory(),
-    isFile: stats.isFile(),
-    permissions: stats.mode.toString(8).slice(-3),
-  };
-}
-
-async function searchFiles(
-  rootPath: string,
-  pattern: string,
-  excludePatterns: string[] = [],
-): Promise<string[]> {
-  const results: string[] = [];
-
-  async function search(currentPath: string) {
-    const entries = await fs.readdir(currentPath, { withFileTypes: true });
-
-    for (const entry of entries) {
-      const fullPath = path.join(currentPath, entry.name);
-
-      try {
-        // Validate each path before processing
-        await validatePath(fullPath);
-
-        // Check if path matches any exclude pattern
-        const relativePath = path.relative(rootPath, fullPath);
-        const shouldExclude = excludePatterns.some((pattern) => {
-          const globPattern = pattern.includes('*') ? pattern : `**/${pattern}/**`;
-          return minimatch(relativePath, globPattern, { dot: true });
-        });
-
-        if (shouldExclude) {
-          continue;
-        }
-
-        if (entry.name.toLowerCase().includes(pattern.toLowerCase())) {
-          results.push(fullPath);
-        }
-
-        if (entry.isDirectory()) {
-          await search(fullPath);
-        }
-      } catch (error) {
-        // Skip invalid paths during search
-        continue;
-      }
-    }
-  }
-
-  await search(rootPath);
-  return results;
-}
-
-// file editing and diffing utilities
-function normalizeLineEndings(text: string): string {
-  return text.replace(/\r\n/g, '\n');
-}
-
-function createUnifiedDiff(originalContent: string, newContent: string, filepath = 'file'): string {
-  // Ensure consistent line endings for diff
-  const normalizedOriginal = normalizeLineEndings(originalContent);
-  const normalizedNew = normalizeLineEndings(newContent);
-
-  return createTwoFilesPatch(
-    filepath,
-    filepath,
-    normalizedOriginal,
-    normalizedNew,
-    'original',
-    'modified',
-  );
-}
-
-async function applyFileEdits(
-  filePath: string,
-  edits: Array<{ oldText: string; newText: string }>,
-  dryRun = false,
-): Promise<string> {
-  // Read file content and normalize line endings
-  const content = normalizeLineEndings(await fs.readFile(filePath, 'utf-8'));
-
-  // Apply edits sequentially
-  let modifiedContent = content;
-  for (const edit of edits) {
-    const normalizedOld = normalizeLineEndings(edit.oldText);
-    const normalizedNew = normalizeLineEndings(edit.newText);
-
-    // If exact match exists, use it
-    if (modifiedContent.includes(normalizedOld)) {
-      modifiedContent = modifiedContent.replace(normalizedOld, normalizedNew);
-      continue;
-    }
-
-    // Otherwise, try line-by-line matching with flexibility for whitespace
-    const oldLines = normalizedOld.split('\n');
-    const contentLines = modifiedContent.split('\n');
-    let matchFound = false;
-
-    for (let i = 0; i <= contentLines.length - oldLines.length; i++) {
-      const potentialMatch = contentLines.slice(i, i + oldLines.length);
-
-      // Compare lines with normalized whitespace
-      const isMatch = oldLines.every((oldLine, j) => {
-        const contentLine = potentialMatch[j];
-        return oldLine.trim() === contentLine.trim();
-      });
-
-      if (isMatch) {
-        // Preserve original indentation of first line
-        const originalIndent = contentLines[i].match(/^\s*/)?.[0] || '';
-        const newLines = normalizedNew.split('\n').map((line, j) => {
-          if (j === 0) {
-            return originalIndent + line.trimStart();
-          }
-          // For subsequent lines, try to preserve relative indentation
-          const oldIndent = oldLines[j]?.match(/^\s*/)?.[0] || '';
-          const newIndent = line.match(/^\s*/)?.[0] || '';
-          if (oldIndent && newIndent) {
-            const relativeIndent = newIndent.length - oldIndent.length;
-            return originalIndent + ' '.repeat(Math.max(0, relativeIndent)) + line.trimStart();
-          }
-          return line;
-        });
-
-        contentLines.splice(i, oldLines.length, ...newLines);
-        modifiedContent = contentLines.join('\n');
-        matchFound = true;
-        break;
-      }
-    }
-
-    if (!matchFound) {
-      throw new Error(`Could not find exact match for edit:\n${edit.oldText}`);
-    }
-  }
-
-  // Create unified diff
-  const diff = createUnifiedDiff(content, modifiedContent, filePath);
-
-  // Format diff with appropriate number of backticks
-  let numBackticks = 3;
-  while (diff.includes('`'.repeat(numBackticks))) {
-    numBackticks++;
-  }
-  const formattedDiff = `${'`'.repeat(numBackticks)}diff\n${diff}${'`'.repeat(numBackticks)}\n\n`;
-
-  if (!dryRun) {
-    await fs.writeFile(filePath, modifiedContent, 'utf-8');
-  }
-
-  return formattedDiff;
-}
-
-// Tool handlers
-server.setRequestHandler(ListToolsRequestSchema, async () => {
-  return {
-    tools: [
-      {
-        name: 'read_file',
-        description:
-          'Read the complete contents of a file from the file system. ' +
-          'Handles various text encodings and provides detailed error messages ' +
-          'if the file cannot be read. Use this tool when you need to examine ' +
-          'the contents of a single file. Only works within allowed directories.',
-        inputSchema: zodToJsonSchema(ReadFileArgsSchema) as ToolInput,
-      },
-      {
-        name: 'read_multiple_files',
-        description:
-          'Read the contents of multiple files simultaneously. This is more ' +
-          'efficient than reading files one by one when you need to analyze ' +
-          'or compare multiple files. Each file\'s content is returned with its ' +
-          'path as a reference. Failed reads for individual files won\'t stop ' +
-          'the entire operation. Only works within allowed directories.',
-        inputSchema: zodToJsonSchema(ReadMultipleFilesArgsSchema) as ToolInput,
-      },
-      {
-        name: 'write_file',
-        description:
-          'Create a new file or completely overwrite an existing file with new content. ' +
-          'Use with caution as it will overwrite existing files without warning. ' +
-          'Handles text content with proper encoding. Only works within allowed directories.',
-        inputSchema: zodToJsonSchema(WriteFileArgsSchema) as ToolInput,
-      },
-      {
-        name: 'edit_file',
-        description:
-          'Make line-based edits to a text file. Each edit replaces exact line sequences ' +
-          'with new content. Returns a git-style diff showing the changes made. ' +
-          'Only works within allowed directories.',
-        inputSchema: zodToJsonSchema(EditFileArgsSchema) as ToolInput,
-      },
-      {
-        name: 'create_directory',
-        description:
-          'Create a new directory or ensure a directory exists. Can create multiple ' +
-          'nested directories in one operation. If the directory already exists, ' +
-          'this operation will succeed silently. Perfect for setting up directory ' +
-          'structures for projects or ensuring required paths exist. Only works within allowed directories.',
-        inputSchema: zodToJsonSchema(CreateDirectoryArgsSchema) as ToolInput,
-      },
-      {
-        name: 'list_directory',
-        description:
-          'Get a detailed listing of all files and directories in a specified path. ' +
-          'Results clearly distinguish between files and directories with [FILE] and [DIR] ' +
-          'prefixes. This tool is essential for understanding directory structure and ' +
-          'finding specific files within a directory. Only works within allowed directories.',
-        inputSchema: zodToJsonSchema(ListDirectoryArgsSchema) as ToolInput,
-      },
-      {
-        name: 'move_file',
-        description:
-          'Move or rename files and directories. Can move files between directories ' +
-          'and rename them in a single operation. If the destination exists, the ' +
-          'operation will fail. Works across different directories and can be used ' +
-          'for simple renaming within the same directory. Both source and destination must be within allowed directories.',
-        inputSchema: zodToJsonSchema(MoveFileArgsSchema) as ToolInput,
-      },
-      {
-        name: 'search_files',
-        description:
-          'Recursively search for files and directories matching a pattern. ' +
-          'Searches through all subdirectories from the starting path. The search ' +
-          'is case-insensitive and matches partial names. Returns full paths to all ' +
-          'matching items. Great for finding files when you don\'t know their exact location. ' +
-          'Only searches within allowed directories.',
-        inputSchema: zodToJsonSchema(SearchFilesArgsSchema) as ToolInput,
-      },
-      {
-        name: 'get_file_info',
-        description:
-          'Retrieve detailed metadata about a file or directory. Returns comprehensive ' +
-          'information including size, creation time, last modified time, permissions, ' +
-          'and type. This tool is perfect for understanding file characteristics ' +
-          'without reading the actual content. Only works within allowed directories.',
-        inputSchema: zodToJsonSchema(GetFileInfoArgsSchema) as ToolInput,
-      },
-      {
-        name: 'list_allowed_directories',
-        description:
-          'Returns the list of directories that this server is allowed to access. ' +
-          'Use this to understand which directories are available before trying to access files.',
-        inputSchema: {
-          type: 'object',
-          properties: {},
-          required: [],
-        },
-      },
-    ],
-  };
-});
-
-server.setRequestHandler(CallToolRequestSchema, async (request) => {
-  try {
-    const { name, arguments: args } = request.params;
-
-    switch (name) {
-      case 'read_file': {
-        const parsed = ReadFileArgsSchema.safeParse(args);
-        if (!parsed.success) {
-          throw new Error(`Invalid arguments for read_file: ${parsed.error}`);
-        }
-        const validPath = await validatePath(parsed.data.path);
-        const content = await fs.readFile(validPath, 'utf-8');
-        return {
-          content: [{ type: 'text', text: content }],
-        };
-      }
-
-      case 'read_multiple_files': {
-        const parsed = ReadMultipleFilesArgsSchema.safeParse(args);
-        if (!parsed.success) {
-          throw new Error(`Invalid arguments for read_multiple_files: ${parsed.error}`);
-        }
-        const results = await Promise.all(
-          parsed.data.paths.map(async (filePath: string) => {
-            try {
-              const validPath = await validatePath(filePath);
-              const content = await fs.readFile(validPath, 'utf-8');
-              return `${filePath}:\n${content}\n`;
-            } catch (error) {
-              const errorMessage = error instanceof Error ? error.message : String(error);
-              return `${filePath}: Error - ${errorMessage}`;
-            }
-          }),
-        );
-        return {
-          content: [{ type: 'text', text: results.join('\n---\n') }],
-        };
-      }
-
-      case 'write_file': {
-        const parsed = WriteFileArgsSchema.safeParse(args);
-        if (!parsed.success) {
-          throw new Error(`Invalid arguments for write_file: ${parsed.error}`);
-        }
-        const validPath = await validatePath(parsed.data.path);
-        await fs.writeFile(validPath, parsed.data.content, 'utf-8');
-        return {
-          content: [{ type: 'text', text: `Successfully wrote to ${parsed.data.path}` }],
-        };
-      }
-
-      case 'edit_file': {
-        const parsed = EditFileArgsSchema.safeParse(args);
-        if (!parsed.success) {
-          throw new Error(`Invalid arguments for edit_file: ${parsed.error}`);
-        }
-        const validPath = await validatePath(parsed.data.path);
-        const result = await applyFileEdits(validPath, parsed.data.edits, parsed.data.dryRun);
-        return {
-          content: [{ type: 'text', text: result }],
-        };
-      }
-
-      case 'create_directory': {
-        const parsed = CreateDirectoryArgsSchema.safeParse(args);
-        if (!parsed.success) {
-          throw new Error(`Invalid arguments for create_directory: ${parsed.error}`);
-        }
-        const validPath = await validatePath(parsed.data.path);
-        await fs.mkdir(validPath, { recursive: true });
-        return {
-          content: [{ type: 'text', text: `Successfully created directory ${parsed.data.path}` }],
-        };
-      }
-
-      case 'list_directory': {
-        const parsed = ListDirectoryArgsSchema.safeParse(args);
-        if (!parsed.success) {
-          throw new Error(`Invalid arguments for list_directory: ${parsed.error}`);
-        }
-        const validPath = await validatePath(parsed.data.path);
-        const entries = await fs.readdir(validPath, { withFileTypes: true });
-        const formatted = entries
-          .map((entry) => `${entry.isDirectory() ? '[DIR]' : '[FILE]'} ${entry.name}`)
-          .join('\n');
-        return {
-          content: [{ type: 'text', text: formatted }],
-        };
-      }
-
-      case 'move_file': {
-        const parsed = MoveFileArgsSchema.safeParse(args);
-        if (!parsed.success) {
-          throw new Error(`Invalid arguments for move_file: ${parsed.error}`);
-        }
-        const validSourcePath = await validatePath(parsed.data.source);
-        const validDestPath = await validatePath(parsed.data.destination);
-        await fs.rename(validSourcePath, validDestPath);
-        return {
-          content: [
-            {
-              type: 'text',
-              text: `Successfully moved ${parsed.data.source} to ${parsed.data.destination}`,
-            },
-          ],
-        };
-      }
-
-      case 'search_files': {
-        const parsed = SearchFilesArgsSchema.safeParse(args);
-        if (!parsed.success) {
-          throw new Error(`Invalid arguments for search_files: ${parsed.error}`);
-        }
-        const validPath = await validatePath(parsed.data.path);
-        const results = await searchFiles(
-          validPath,
-          parsed.data.pattern,
-          parsed.data.excludePatterns,
-        );
-        return {
-          content: [
-            { type: 'text', text: results.length > 0 ? results.join('\n') : 'No matches found' },
-          ],
-        };
-      }
-
-      case 'get_file_info': {
-        const parsed = GetFileInfoArgsSchema.safeParse(args);
-        if (!parsed.success) {
-          throw new Error(`Invalid arguments for get_file_info: ${parsed.error}`);
-        }
-        const validPath = await validatePath(parsed.data.path);
-        const info = await getFileStats(validPath);
-        return {
-          content: [
-            {
-              type: 'text',
-              text: Object.entries(info)
-                .map(([key, value]) => `${key}: ${value}`)
-                .join('\n'),
-            },
-          ],
-        };
-      }
-
-      case 'list_allowed_directories': {
-        return {
-          content: [
-            {
-              type: 'text',
-              text: `Allowed directories:\n${allowedDirectories.join('\n')}`,
-            },
-          ],
-        };
-      }
-
-      default:
-        throw new Error(`Unknown tool: ${name}`);
-    }
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    return {
-      content: [{ type: 'text', text: `Error: ${errorMessage}` }],
-      isError: true,
-    };
-  }
-});
-
-// Start server
-// async function runServer() {
-//   const transport = new StdioServerTransport();
-//   await server.connect(transport);
-//   console.error('Secure MCP Filesystem Server running on stdio');
-//   console.error('Allowed directories:', allowedDirectories);
-// }
-
-// runServer().catch((error) => {
-//   console.error('Fatal error running server:', error);
-//   process.exit(1);
-// });
-
-async function runServer(transport: 'stdio' | 'sse', port?: number) {
-  if (transport === 'stdio') {
-    const stdioTransport = new StdioServerTransport();
-    await server.connect(stdioTransport);
-    console.error('Secure MCP Filesystem Server running on stdio');
-    console.error('Allowed directories:', allowedDirectories);
-  } else {
-    const app = express();
-    app.use(express.json());
-
-    // Set up CORS
-    app.use((req, res, next) => {
-      res.header('Access-Control-Allow-Origin', '*');
-      res.header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
-      res.header('Access-Control-Allow-Headers', 'Content-Type');
-      if (req.method === 'OPTIONS') {
-        return res.sendStatus(200);
-      }
-      next();
-    });
-
-    let transport: SSEServerTransport;
-
-    // SSE endpoint
-    app.get('/sse', async (req, res) => {
-      console.log('New SSE connection');
-      transport = new SSEServerTransport('/message', res);
-      await server.connect(transport);
-
-      // Cleanup on close
-      res.on('close', async () => {
-        console.log('SSE connection closed');
-        await server.close();
-      });
-    });
-
-    // Message endpoint
-    app.post('/message', async (req, res) => {
-      if (!transport) {
-        return res.status(503).send('SSE connection not established');
-      }
-      await transport.handlePostMessage(req, res);
-    });
-
-    const serverPort = port || 3001;
-    app.listen(serverPort, () => {
-      console.log(
-        `Secure MCP Filesystem Server running on SSE at http://localhost:${serverPort}/sse`,
-      );
-      console.log('Allowed directories:', allowedDirectories);
-    });
-  }
-}
-
-if (directories.length === 0) {
-  console.error(
-    'Usage: mcp-server-filesystem [--transport=stdio|sse] [--port=3000] <allowed-directory> [additional-directories...]',
-  );
-  process.exit(1);
-}
-
-// Start the server with the specified transport
-runServer(transport, port).catch((error) => {
-  console.error('Fatal error running server:', error);
-  process.exit(1);
-});
diff --git a/packages/mcp/src/index.ts b/packages/mcp/src/index.ts
deleted file mode 100644
index ba063ef1e3..0000000000
--- a/packages/mcp/src/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* MCP */
-export * from './manager';
-/* Utilities */
-export * from './utils';
-/* Flow */
-export * from './flow/manager';
-/* types */
-export type * from './types/mcp';
-export type * from './flow/types';

From 293ac02b95cce0c2c22434db41d69818b6b27f28 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Sat, 7 Jun 2025 20:23:19 -0400
Subject: [PATCH 16/49] =?UTF-8?q?=F0=9F=9B=A1=EF=B8=8F=20chore:=20update?=
 =?UTF-8?q?=20multer=20to=20v2.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/package.json  |   2 +-
 package-lock.json | 106 ++++++++++++++++++++++++++++------------------
 2 files changed, 65 insertions(+), 43 deletions(-)

diff --git a/api/package.json b/api/package.json
index 22be4f18e9..305431099c 100644
--- a/api/package.json
+++ b/api/package.json
@@ -88,7 +88,7 @@
     "mime": "^3.0.0",
     "module-alias": "^2.2.3",
     "mongoose": "^8.12.1",
-    "multer": "^2.0.0",
+    "multer": "^2.0.1",
     "nanoid": "^3.3.7",
     "node-fetch": "^2.7.0",
     "nodemailer": "^6.9.15",
diff --git a/package-lock.json b/package-lock.json
index 35a5a388ea..56c5056a07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -104,7 +104,7 @@
         "mime": "^3.0.0",
         "module-alias": "^2.2.3",
         "mongoose": "^8.12.1",
-        "multer": "^2.0.0",
+        "multer": "^2.0.1",
         "nanoid": "^3.3.7",
         "node-fetch": "^2.7.0",
         "nodemailer": "^6.9.15",
@@ -2198,18 +2198,6 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
-    "api/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "api/node_modules/mongodb": {
       "version": "6.14.2",
       "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.14.2.tgz",
@@ -2355,24 +2343,6 @@
         "url": "https://opencollective.com/mongoose"
       }
     },
-    "api/node_modules/multer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.0.tgz",
-      "integrity": "sha512-bS8rPZurbAuHGAnApbM9d4h1wSoYqrOqkE+6a64KLMK9yWU7gJXBDDVklKQ3TPi9DRb85cRs6yXaC0+cjxRtRg==",
-      "license": "MIT",
-      "dependencies": {
-        "append-field": "^1.0.0",
-        "busboy": "^1.0.0",
-        "concat-stream": "^1.5.2",
-        "mkdirp": "^0.5.4",
-        "object-assign": "^4.1.1",
-        "type-is": "^1.6.4",
-        "xtend": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 10.16.0"
-      }
-    },
     "api/node_modules/object-hash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
@@ -26338,7 +26308,8 @@
     "node_modules/append-field": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz",
-      "integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw=="
+      "integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==",
+      "license": "MIT"
     },
     "node_modules/arg": {
       "version": "5.0.2",
@@ -28042,19 +28013,34 @@
       "dev": true
     },
     "node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
+      "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
       "engines": [
-        "node >= 0.8"
+        "node >= 6.0"
       ],
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
+        "readable-stream": "^3.0.2",
         "typedarray": "^0.0.6"
       }
     },
+    "node_modules/concat-stream/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/connect-redis": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/connect-redis/-/connect-redis-7.1.1.tgz",
@@ -28169,7 +28155,8 @@
     "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
     },
     "node_modules/cors": {
       "version": "2.8.5",
@@ -33237,7 +33224,8 @@
     "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
     },
     "node_modules/isexe": {
       "version": "2.0.0",
@@ -37038,6 +37026,36 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
+    "node_modules/multer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.1.tgz",
+      "integrity": "sha512-Ug8bXeTIUlxurg8xLTEskKShvcKDZALo1THEX5E41pYCD2sCVub5/kIRIGqWNoqV6szyLyQKV6mD4QUrWE5GCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "append-field": "^1.0.0",
+        "busboy": "^1.6.0",
+        "concat-stream": "^2.0.0",
+        "mkdirp": "^0.5.6",
+        "object-assign": "^4.1.1",
+        "type-is": "^1.6.18",
+        "xtend": "^4.0.2"
+      },
+      "engines": {
+        "node": ">= 10.16.0"
+      }
+    },
+    "node_modules/multer/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
     "node_modules/mustache": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
@@ -39736,7 +39754,8 @@
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
     },
     "node_modules/prompts": {
       "version": "2.4.2",
@@ -40533,6 +40552,7 @@
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -40546,7 +40566,8 @@
     "node_modules/readable-stream/node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
     },
     "node_modules/readable-web-to-node-stream": {
       "version": "3.0.2",
@@ -43837,7 +43858,8 @@
     "node_modules/typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+      "license": "MIT"
     },
     "node_modules/typedarray.prototype.slice": {
       "version": "1.0.5",

From 9bb9aba8eccec8105d4a3f08c1bed6cd158ed02b Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Sun, 8 Jun 2025 10:36:43 -0400
Subject: [PATCH 17/49] =?UTF-8?q?=F0=9F=90=B3=20chore:=20conflicting=20bui?=
 =?UTF-8?q?ld=20stage=20name=20in=20Dockerfile.multi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile.multi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.multi b/Dockerfile.multi
index 26c5705376..17a9847323 100644
--- a/Dockerfile.multi
+++ b/Dockerfile.multi
@@ -38,7 +38,7 @@ COPY --from=data-provider-build /app/packages/data-provider/dist /app/packages/d
 RUN npm run build
 
 # Build `api` package
-FROM base AS api-build
+FROM base AS api-package-build
 WORKDIR /app/packages/api
 COPY packages/api ./
 COPY --from=data-provider-build /app/packages/data-provider/dist /app/packages/data-provider/dist
@@ -65,7 +65,7 @@ COPY api ./api
 COPY config ./config
 COPY --from=data-provider-build /app/packages/data-provider/dist ./packages/data-provider/dist
 COPY --from=data-schemas-build /app/packages/data-schemas/dist ./packages/data-schemas/dist
-COPY --from=api-build /app/packages/api/dist ./packages/api/dist
+COPY --from=api-package-build /app/packages/api/dist ./packages/api/dist
 COPY --from=client-build /app/client/dist ./client/dist
 WORKDIR /app/api
 EXPOSE 3080

From b0054c775a2925be981a8137fd7af8217ff39a3d Mon Sep 17 00:00:00 2001
From: Marco Beretta <81851188+berry-13@users.noreply.github.com>
Date: Sun, 8 Jun 2025 20:00:57 +0200
Subject: [PATCH 18/49] =?UTF-8?q?=F0=9F=8E=A8=20refactor:=20Enhance=20UI?=
 =?UTF-8?q?=20Consistency,=20Accessibility=20&=20Localization=20(#7788)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Bookmarks/DeleteBookmarkButton.tsx        | 36 ++++-----
 .../Bookmarks/EditBookmarkButton.tsx          | 34 ++++-----
 .../Chat/Messages/SiblingSwitch.tsx           | 64 +++++++---------
 .../SidePanel/Bookmarks/BookmarkTableRow.tsx  | 10 ++-
 .../SidePanel/Memories/MemoryEditDialog.tsx   |  2 +-
 .../SidePanel/Memories/MemoryViewer.tsx       | 75 ++++++++-----------
 client/src/components/ui/OGDialogTemplate.tsx |  8 +-
 client/src/locales/en/translation.json        |  2 +-
 8 files changed, 104 insertions(+), 127 deletions(-)

diff --git a/client/src/components/Bookmarks/DeleteBookmarkButton.tsx b/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
index e9dcf0e4d1..911659de74 100644
--- a/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
+++ b/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
@@ -1,11 +1,10 @@
 import { useCallback, useState } from 'react';
 import type { FC } from 'react';
-import { Label, OGDialog, OGDialogTrigger, TooltipAnchor } from '~/components/ui';
+import { Button, TrashIcon, Label, OGDialog, OGDialogTrigger, TooltipAnchor } from '~/components';
 import { useDeleteConversationTagMutation } from '~/data-provider';
 import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
 import { NotificationSeverity } from '~/common';
 import { useToastContext } from '~/Providers';
-import { TrashIcon } from '~/components/svg';
 import { useLocalize } from '~/hooks';
 
 const DeleteBookmarkButton: FC<{
@@ -36,31 +35,26 @@ const DeleteBookmarkButton: FC<{
     await deleteBookmarkMutation.mutateAsync(bookmark);
   }, [bookmark, deleteBookmarkMutation]);
 
-  const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
-    if (event.key === 'Enter' || event.key === ' ') {
-      event.preventDefault();
-      event.stopPropagation();
-      setOpen(!open);
-    }
-  };
-
   return (
     <>
       <OGDialog open={open} onOpenChange={setOpen}>
         <OGDialogTrigger asChild>
           <TooltipAnchor
-            role="button"
-            aria-label={localize('com_ui_bookmarks_delete')}
             description={localize('com_ui_delete')}
-            className="flex size-7 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-hover"
-            tabIndex={tabIndex}
-            onFocus={onFocus}
-            onBlur={onBlur}
-            onClick={() => setOpen(!open)}
-            onKeyDown={handleKeyDown}
-          >
-            <TrashIcon className="size-4" />
-          </TooltipAnchor>
+            render={
+              <Button
+                variant="ghost"
+                aria-label={localize('com_ui_bookmarks_delete')}
+                tabIndex={tabIndex}
+                onFocus={onFocus}
+                onBlur={onBlur}
+                onClick={() => setOpen(!open)}
+                className="h-8 w-8 p-0"
+              >
+                <TrashIcon />
+              </Button>
+            }
+          />
         </OGDialogTrigger>
         <OGDialogTemplate
           showCloseButton={false}
diff --git a/client/src/components/Bookmarks/EditBookmarkButton.tsx b/client/src/components/Bookmarks/EditBookmarkButton.tsx
index a9bc65c08f..6e976a53cf 100644
--- a/client/src/components/Bookmarks/EditBookmarkButton.tsx
+++ b/client/src/components/Bookmarks/EditBookmarkButton.tsx
@@ -1,9 +1,8 @@
 import { useState } from 'react';
 import type { FC } from 'react';
 import type { TConversationTag } from 'librechat-data-provider';
-import { TooltipAnchor, OGDialogTrigger } from '~/components/ui';
+import { TooltipAnchor, OGDialogTrigger, EditIcon, Button } from '~/components';
 import BookmarkEditDialog from './BookmarkEditDialog';
-import { EditIcon } from '~/components/svg';
 import { useLocalize } from '~/hooks';
 
 const EditBookmarkButton: FC<{
@@ -15,12 +14,6 @@ const EditBookmarkButton: FC<{
   const localize = useLocalize();
   const [open, setOpen] = useState(false);
 
-  const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
-    if (event.key === 'Enter' || event.key === ' ') {
-      setOpen(!open);
-    }
-  };
-
   return (
     <BookmarkEditDialog
       context="EditBookmarkButton"
@@ -30,18 +23,21 @@ const EditBookmarkButton: FC<{
     >
       <OGDialogTrigger asChild>
         <TooltipAnchor
-          role="button"
-          aria-label={localize('com_ui_bookmarks_edit')}
           description={localize('com_ui_edit')}
-          tabIndex={tabIndex}
-          onFocus={onFocus}
-          onBlur={onBlur}
-          onClick={() => setOpen(!open)}
-          className="flex size-7 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-hover"
-          onKeyDown={handleKeyDown}
-        >
-          <EditIcon />
-        </TooltipAnchor>
+          render={
+            <Button
+              variant="ghost"
+              aria-label={localize('com_ui_bookmarks_edit')}
+              tabIndex={tabIndex}
+              onFocus={onFocus}
+              onBlur={onBlur}
+              onClick={() => setOpen(!open)}
+              className="h-8 w-8 p-0"
+            >
+              <EditIcon />
+            </Button>
+          }
+        />
       </OGDialogTrigger>
     </BookmarkEditDialog>
   );
diff --git a/client/src/components/Chat/Messages/SiblingSwitch.tsx b/client/src/components/Chat/Messages/SiblingSwitch.tsx
index 378029c480..ba94a06a94 100644
--- a/client/src/components/Chat/Messages/SiblingSwitch.tsx
+++ b/client/src/components/Chat/Messages/SiblingSwitch.tsx
@@ -1,3 +1,4 @@
+import { ChevronLeft, ChevronRight } from 'lucide-react';
 import type { TMessageProps } from '~/common';
 import { cn } from '~/utils';
 
@@ -22,57 +23,46 @@ export default function SiblingSwitch({
     setSiblingIdx && setSiblingIdx(siblingIdx + 1);
   };
 
+  const buttonStyle = cn(
+    'hover-button rounded-lg p-1.5 text-text-secondary-alt transition-colors duration-200',
+    'hover:text-text-primary hover:bg-surface-hover',
+    'md:group-hover:visible md:group-focus-within:visible md:group-[.final-completion]:visible',
+    'focus-visible:ring-2 focus-visible:ring-black dark:focus-visible:ring-white focus-visible:outline-none',
+  );
+
   return siblingCount > 1 ? (
-    <div className="visible flex items-center justify-center gap-1 self-center pt-0 text-xs">
+    <nav
+      className="visible flex items-center justify-center gap-2 self-center pt-0 text-xs"
+      aria-label="Sibling message navigation"
+    >
       <button
-        className={cn(
-          'hover-button rounded-md p-1 text-gray-400 hover:bg-gray-100 hover:text-gray-500 dark:text-gray-400/70 dark:hover:bg-gray-700 dark:hover:text-gray-200 disabled:dark:hover:text-gray-400 md:group-hover:visible md:group-[.final-completion]:visible',
-        )}
+        className={buttonStyle}
         type="button"
         onClick={previous}
         disabled={siblingIdx == 0}
+        aria-label="Previous sibling message"
+        aria-disabled={siblingIdx == 0}
       >
-        <svg
-          stroke="currentColor"
-          fill="none"
-          strokeWidth="1.5"
-          viewBox="0 0 24 24"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          className="h-4 w-4"
-          height="1em"
-          width="1em"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <polyline points="15 18 9 12 15 6" />
-        </svg>
+        <ChevronLeft size="19" aria-hidden="true" />
       </button>
-      <span className="flex-shrink-0 flex-grow tabular-nums">
+      <span
+        className="flex-shrink-0 flex-grow tabular-nums"
+        aria-live="polite"
+        aria-atomic="true"
+        role="status"
+      >
         {siblingIdx + 1} / {siblingCount}
       </span>
       <button
-        className={cn(
-          'hover-button rounded-md p-1 text-gray-400 hover:bg-gray-100 hover:text-gray-500 dark:text-gray-400/70 dark:hover:bg-gray-700 dark:hover:text-gray-200 disabled:dark:hover:text-gray-400 md:group-hover:visible md:group-[.final-completion]:visible',
-        )}
+        className={buttonStyle}
         type="button"
         onClick={next}
         disabled={siblingIdx == siblingCount - 1}
+        aria-label="Next sibling message"
+        aria-disabled={siblingIdx == siblingCount - 1}
       >
-        <svg
-          stroke="currentColor"
-          fill="none"
-          strokeWidth="1.5"
-          viewBox="0 0 24 24"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          className="h-4 w-4"
-          height="1em"
-          width="1em"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <polyline points="9 18 15 12 9 6" />
-        </svg>
+        <ChevronRight size="19" aria-hidden="true" />
       </button>
-    </div>
+    </nav>
   ) : null;
 }
diff --git a/client/src/components/SidePanel/Bookmarks/BookmarkTableRow.tsx b/client/src/components/SidePanel/Bookmarks/BookmarkTableRow.tsx
index ea7a039692..42fea897b3 100644
--- a/client/src/components/SidePanel/Bookmarks/BookmarkTableRow.tsx
+++ b/client/src/components/SidePanel/Bookmarks/BookmarkTableRow.tsx
@@ -30,6 +30,12 @@ const BookmarkTableRow: React.FC<BookmarkTableRowProps> = ({ row, moveRow, posit
     mutation.mutate(
       { ...row, position: item.index },
       {
+        onSuccess: () => {
+          showToast({
+            message: localize('com_ui_bookmarks_update_success'),
+            severity: NotificationSeverity.SUCCESS,
+          });
+        },
         onError: () => {
           showToast({
             message: localize('com_ui_bookmarks_update_error'),
@@ -44,7 +50,9 @@ const BookmarkTableRow: React.FC<BookmarkTableRowProps> = ({ row, moveRow, posit
     accept: 'bookmark',
     drop: handleDrop,
     hover(item: DragItem) {
-      if (!ref.current || item.index === position) {return;}
+      if (!ref.current || item.index === position) {
+        return;
+      }
       moveRow(item.index, position);
       item.index = position;
     },
diff --git a/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx b/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx
index 60eedb02fa..db6a0ab68e 100644
--- a/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx
+++ b/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx
@@ -117,7 +117,7 @@ export default function MemoryEditDialog({
                     <div>
                       {memory.tokenCount.toLocaleString()}
                       {memData?.tokenLimit && ` / ${memData.tokenLimit.toLocaleString()}`}{' '}
-                      {localize('com_ui_tokens')}
+                      {localize(memory.tokenCount === 1 ? 'com_ui_token' : 'com_ui_tokens')}
                     </div>
                   )}
                 </div>
diff --git a/client/src/components/SidePanel/Memories/MemoryViewer.tsx b/client/src/components/SidePanel/Memories/MemoryViewer.tsx
index 66f3fee8e6..7aa4c1a8aa 100644
--- a/client/src/components/SidePanel/Memories/MemoryViewer.tsx
+++ b/client/src/components/SidePanel/Memories/MemoryViewer.tsx
@@ -5,6 +5,9 @@ import { matchSorter } from 'match-sorter';
 import { SystemRoles, PermissionTypes, Permissions } from 'librechat-data-provider';
 import type { TUserMemory } from 'librechat-data-provider';
 import {
+  Spinner,
+  EditIcon,
+  TrashIcon,
   Table,
   Input,
   Label,
@@ -18,7 +21,7 @@ import {
   TableHeader,
   TooltipAnchor,
   OGDialogTrigger,
-} from '~/components/ui';
+} from '~/components';
 import {
   useGetUserQuery,
   useMemoriesQuery,
@@ -27,10 +30,8 @@ import {
 } from '~/data-provider';
 import { useLocalize, useAuthContext, useHasAccess } from '~/hooks';
 import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
-import { EditIcon, TrashIcon } from '~/components/svg';
 import MemoryCreateDialog from './MemoryCreateDialog';
 import MemoryEditDialog from './MemoryEditDialog';
-import Spinner from '~/components/svg/Spinner';
 import { useToastContext } from '~/Providers';
 import AdminSettings from './AdminSettings';
 
@@ -121,13 +122,6 @@ export default function MemoryViewer() {
     const [open, setOpen] = useState(false);
     const triggerRef = useRef<HTMLDivElement>(null);
 
-    const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
-      if (event.key === 'Enter' || event.key === ' ') {
-        event.preventDefault();
-        setOpen(!open);
-      }
-    };
-
     // Only show edit button if user has UPDATE permission
     if (!hasUpdateAccess) {
       return null;
@@ -142,17 +136,18 @@ export default function MemoryViewer() {
       >
         <OGDialogTrigger asChild>
           <TooltipAnchor
-            ref={triggerRef}
-            role="button"
-            aria-label={localize('com_ui_edit')}
-            description={localize('com_ui_edit')}
-            tabIndex={0}
-            onClick={() => setOpen(!open)}
-            className="flex size-7 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-hover"
-            onKeyDown={handleKeyDown}
-          >
-            <EditIcon />
-          </TooltipAnchor>
+            description={localize('com_ui_edit_memory')}
+            render={
+              <Button
+                variant="ghost"
+                aria-label={localize('com_ui_bookmarks_edit')}
+                onClick={() => setOpen(!open)}
+                className="h-8 w-8 p-0"
+              >
+                <EditIcon />
+              </Button>
+            }
+          />
         </OGDialogTrigger>
       </MemoryEditDialog>
     );
@@ -161,14 +156,6 @@ export default function MemoryViewer() {
   const DeleteMemoryButton = ({ memory }: { memory: TUserMemory }) => {
     const [open, setOpen] = useState(false);
 
-    const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
-      if (event.key === 'Enter' || event.key === ' ') {
-        event.preventDefault();
-        event.stopPropagation();
-        setOpen(!open);
-      }
-    };
-
     if (!hasUpdateAccess) {
       return null;
     }
@@ -196,20 +183,22 @@ export default function MemoryViewer() {
       <OGDialog open={open} onOpenChange={setOpen}>
         <OGDialogTrigger asChild>
           <TooltipAnchor
-            role="button"
-            aria-label={localize('com_ui_delete')}
-            description={localize('com_ui_delete')}
-            className="flex size-7 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-hover"
-            tabIndex={0}
-            onClick={() => setOpen(!open)}
-            onKeyDown={handleKeyDown}
-          >
-            {deletingKey === memory.key ? (
-              <Spinner className="size-4 animate-spin" />
-            ) : (
-              <TrashIcon className="size-4" />
-            )}
-          </TooltipAnchor>
+            description={localize('com_ui_delete_memory')}
+            render={
+              <Button
+                variant="ghost"
+                aria-label={localize('com_ui_delete')}
+                onClick={() => setOpen(!open)}
+                className="h-8 w-8 p-0"
+              >
+                {deletingKey === memory.key ? (
+                  <Spinner className="size-4 animate-spin" />
+                ) : (
+                  <TrashIcon className="size-4" />
+                )}
+              </Button>
+            }
+          />
         </OGDialogTrigger>
         <OGDialogTemplate
           showCloseButton={false}
diff --git a/client/src/components/ui/OGDialogTemplate.tsx b/client/src/components/ui/OGDialogTemplate.tsx
index 6a1fc02799..8595c13ac9 100644
--- a/client/src/components/ui/OGDialogTemplate.tsx
+++ b/client/src/components/ui/OGDialogTemplate.tsx
@@ -8,6 +8,7 @@ import {
   OGDialogDescription,
 } from './OriginalDialog';
 import { useLocalize } from '~/hooks';
+import { Button } from './Button';
 import { Spinner } from '../svg';
 import { cn } from '~/utils/';
 
@@ -53,7 +54,6 @@ const OGDialogTemplate = forwardRef((props: DialogTemplateProps, ref: Ref<HTMLDi
     showCancelButton = true,
   } = props;
   const { selectHandler, selectClasses, selectText, isLoading } = selection || {};
-  const Cancel = localize('com_ui_cancel');
 
   const defaultSelect =
     'bg-gray-800 text-white transition-colors hover:bg-gray-700 disabled:cursor-not-allowed disabled:opacity-50 dark:bg-gray-200 dark:text-gray-800 dark:hover:bg-gray-200';
@@ -83,12 +83,12 @@ const OGDialogTemplate = forwardRef((props: DialogTemplateProps, ref: Ref<HTMLDi
           ) : null}
         </div>
         <div className="flex h-auto gap-3 max-sm:w-full max-sm:flex-col sm:flex-row">
-          {buttons != null ? buttons : null}
           {showCancelButton && (
-            <OGDialogClose className="btn btn-neutral border-token-border-light relative justify-center rounded-lg text-sm ring-offset-2 focus:ring-2 focus:ring-black dark:ring-offset-0 max-sm:order-last max-sm:w-full sm:order-first">
-              {Cancel}
+            <OGDialogClose asChild>
+              <Button variant="outline">{localize('com_ui_cancel')}</Button>
             </OGDialogClose>
           )}
+          {buttons != null ? buttons : null}
           {selection ? (
             <OGDialogClose
               onClick={selectHandler}
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index b235330c20..0a3042fd9f 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -798,6 +798,7 @@
   "com_ui_usage": "Usage",
   "com_ui_current": "Current",
   "com_ui_tokens": "tokens",
+  "com_ui_token": "token",
   "com_ui_mention": "Mention an endpoint, assistant, or preset to quickly switch to it",
   "com_ui_min_tags": "Cannot remove more values, a minimum of {{0}} are required.",
   "com_ui_misc": "Misc.",
@@ -1006,4 +1007,3 @@
   "com_ui_memory_created": "Memory created successfully",
   "com_ui_memory_key_exists": "A memory with this key already exists. Please use a different key."
 }
-

From 272522452a2a0515448c281da9d1d44f3d3db86c Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Mon, 9 Jun 2025 11:27:23 -0400
Subject: [PATCH 19/49] =?UTF-8?q?=F0=9F=94=8D=20refactor:=20OpenID=20Fetch?=
 =?UTF-8?q?=20Handling=20and=20Logging=20(#7790)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: Enhance OpenID Strategy with Debug Logging and Header Management

- Added detailed logging for OpenID requests and responses when debug mode is enabled.
- Introduced helper functions for safely logging sensitive data and headers.
- Updated OpenID strategy to handle non-standard WWW-Authenticate headers in responses.
- Refactored proxy configuration handling for improved clarity and logging.

* refactor: MemoryViewer Layout with Conditional Justification

- Updated the MemoryViewer component to conditionally apply justification styles based on memory data and access permissions.
- Introduced utility function `cn` for cleaner class name management in the component.

* refactor: Update OpenID Strategy to use Global Fetch

* refactor: Add undici for customFetch request handling in OpenID strategy

* fix: Export 'files' module in utils index

* chore: Add node-fetch dependency for openid image download

* ci: Add comprehensive tests for multer configuration and file handling

- Introduced a new test suite for multer configuration, covering storage destination and filename generation.
- Implemented tests for file filtering, ensuring only valid JSON files are accepted.
- Added error handling tests for edge cases and vulnerabilities, including handling empty field names and malformed filenames.
- Integrated real configuration testing with actual fileConfig and custom endpoints.
- Enhanced UUID generation tests to ensure uniqueness and cryptographic security.

* chore: Improve proxy configuration logging in customFetch function

* fix: Improve logging for non-standard WWW-Authenticate header in customFetch function
---
 api/package.json                              |   1 +
 api/server/routes/files/multer.spec.js        | 571 ++++++++++++++++++
 api/strategies/openidStrategy.js              |  85 ++-
 .../SidePanel/Memories/MemoryViewer.tsx       |   8 +-
 package-lock.json                             |  10 +
 packages/api/src/utils/index.ts               |   2 +
 packages/api/src/utils/openid.ts              |  51 ++
 7 files changed, 719 insertions(+), 9 deletions(-)
 create mode 100644 api/server/routes/files/multer.spec.js
 create mode 100644 packages/api/src/utils/openid.ts

diff --git a/api/package.json b/api/package.json
index 305431099c..636e8cb8f3 100644
--- a/api/package.json
+++ b/api/package.json
@@ -110,6 +110,7 @@
     "tiktoken": "^1.0.15",
     "traverse": "^0.6.7",
     "ua-parser-js": "^1.0.36",
+    "undici": "^7.10.0",
     "winston": "^3.11.0",
     "winston-daily-rotate-file": "^5.0.0",
     "youtube-transcript": "^1.2.1",
diff --git a/api/server/routes/files/multer.spec.js b/api/server/routes/files/multer.spec.js
new file mode 100644
index 0000000000..0324262a71
--- /dev/null
+++ b/api/server/routes/files/multer.spec.js
@@ -0,0 +1,571 @@
+/* eslint-disable no-unused-vars */
+/* eslint-disable jest/no-done-callback */
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const crypto = require('crypto');
+const { createMulterInstance, storage, importFileFilter } = require('./multer');
+
+// Mock only the config service that requires external dependencies
+jest.mock('~/server/services/Config', () => ({
+  getCustomConfig: jest.fn(() =>
+    Promise.resolve({
+      fileConfig: {
+        endpoints: {
+          openAI: {
+            supportedMimeTypes: ['image/jpeg', 'image/png', 'application/pdf'],
+          },
+          default: {
+            supportedMimeTypes: ['image/jpeg', 'image/png', 'text/plain'],
+          },
+        },
+        serverFileSizeLimit: 10000000, // 10MB
+      },
+    }),
+  ),
+}));
+
+describe('Multer Configuration', () => {
+  let tempDir;
+  let mockReq;
+  let mockFile;
+
+  beforeEach(() => {
+    // Create a temporary directory for each test
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'multer-test-'));
+
+    mockReq = {
+      user: { id: 'test-user-123' },
+      app: {
+        locals: {
+          paths: {
+            uploads: tempDir,
+          },
+        },
+      },
+      body: {},
+      originalUrl: '/api/files/upload',
+    };
+
+    mockFile = {
+      originalname: 'test-file.jpg',
+      mimetype: 'image/jpeg',
+      size: 1024,
+    };
+
+    // Clear mocks
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    // Clean up temporary directory
+    if (fs.existsSync(tempDir)) {
+      fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+  });
+
+  describe('Storage Configuration', () => {
+    describe('destination function', () => {
+      it('should create the correct destination path', (done) => {
+        const cb = jest.fn((err, destination) => {
+          expect(err).toBeNull();
+          expect(destination).toBe(path.join(tempDir, 'temp', 'test-user-123'));
+          expect(fs.existsSync(destination)).toBe(true);
+          done();
+        });
+
+        storage.getDestination(mockReq, mockFile, cb);
+      });
+
+      it("should create directory recursively if it doesn't exist", (done) => {
+        const deepPath = path.join(tempDir, 'deep', 'nested', 'path');
+        mockReq.app.locals.paths.uploads = deepPath;
+
+        const cb = jest.fn((err, destination) => {
+          expect(err).toBeNull();
+          expect(destination).toBe(path.join(deepPath, 'temp', 'test-user-123'));
+          expect(fs.existsSync(destination)).toBe(true);
+          done();
+        });
+
+        storage.getDestination(mockReq, mockFile, cb);
+      });
+    });
+
+    describe('filename function', () => {
+      it('should generate a UUID for req.file_id', (done) => {
+        const cb = jest.fn((err, filename) => {
+          expect(err).toBeNull();
+          expect(mockReq.file_id).toBeDefined();
+          expect(mockReq.file_id).toMatch(
+            /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i,
+          );
+          done();
+        });
+
+        storage.getFilename(mockReq, mockFile, cb);
+      });
+
+      it('should decode URI components in filename', (done) => {
+        const encodedFile = {
+          ...mockFile,
+          originalname: encodeURIComponent('test file with spaces.jpg'),
+        };
+
+        const cb = jest.fn((err, filename) => {
+          expect(err).toBeNull();
+          expect(encodedFile.originalname).toBe('test file with spaces.jpg');
+          done();
+        });
+
+        storage.getFilename(mockReq, encodedFile, cb);
+      });
+
+      it('should call real sanitizeFilename with properly encoded filename', (done) => {
+        // Test with a properly URI-encoded filename that needs sanitization
+        const unsafeFile = {
+          ...mockFile,
+          originalname: encodeURIComponent('test@#$%^&*()file with spaces!.jpg'),
+        };
+
+        const cb = jest.fn((err, filename) => {
+          expect(err).toBeNull();
+          // The actual sanitizeFilename should have cleaned this up after decoding
+          expect(filename).not.toContain('@');
+          expect(filename).not.toContain('#');
+          expect(filename).not.toContain('*');
+          expect(filename).not.toContain('!');
+          // Should still preserve dots and hyphens
+          expect(filename).toContain('.jpg');
+          done();
+        });
+
+        storage.getFilename(mockReq, unsafeFile, cb);
+      });
+
+      it('should handle very long filenames with actual crypto', (done) => {
+        const longFile = {
+          ...mockFile,
+          originalname: 'a'.repeat(300) + '.jpg',
+        };
+
+        const cb = jest.fn((err, filename) => {
+          expect(err).toBeNull();
+          expect(filename.length).toBeLessThanOrEqual(255);
+          expect(filename).toMatch(/\.jpg$/); // Should still end with .jpg
+          // Should contain a hex suffix if truncated
+          if (filename.length === 255) {
+            expect(filename).toMatch(/-[a-f0-9]{6}\.jpg$/);
+          }
+          done();
+        });
+
+        storage.getFilename(mockReq, longFile, cb);
+      });
+
+      it('should generate unique file_id for each call', (done) => {
+        let firstFileId;
+
+        const firstCb = jest.fn((err, filename) => {
+          expect(err).toBeNull();
+          firstFileId = mockReq.file_id;
+
+          // Reset req for second call
+          delete mockReq.file_id;
+
+          const secondCb = jest.fn((err, filename) => {
+            expect(err).toBeNull();
+            expect(mockReq.file_id).toBeDefined();
+            expect(mockReq.file_id).not.toBe(firstFileId);
+            done();
+          });
+
+          storage.getFilename(mockReq, mockFile, secondCb);
+        });
+
+        storage.getFilename(mockReq, mockFile, firstCb);
+      });
+    });
+  });
+
+  describe('Import File Filter', () => {
+    it('should accept JSON files by mimetype', (done) => {
+      const jsonFile = {
+        ...mockFile,
+        mimetype: 'application/json',
+        originalname: 'data.json',
+      };
+
+      const cb = jest.fn((err, result) => {
+        expect(err).toBeNull();
+        expect(result).toBe(true);
+        done();
+      });
+
+      importFileFilter(mockReq, jsonFile, cb);
+    });
+
+    it('should accept files with .json extension', (done) => {
+      const jsonFile = {
+        ...mockFile,
+        mimetype: 'text/plain',
+        originalname: 'data.json',
+      };
+
+      const cb = jest.fn((err, result) => {
+        expect(err).toBeNull();
+        expect(result).toBe(true);
+        done();
+      });
+
+      importFileFilter(mockReq, jsonFile, cb);
+    });
+
+    it('should reject non-JSON files', (done) => {
+      const textFile = {
+        ...mockFile,
+        mimetype: 'text/plain',
+        originalname: 'document.txt',
+      };
+
+      const cb = jest.fn((err, result) => {
+        expect(err).toBeInstanceOf(Error);
+        expect(err.message).toBe('Only JSON files are allowed');
+        expect(result).toBe(false);
+        done();
+      });
+
+      importFileFilter(mockReq, textFile, cb);
+    });
+
+    it('should handle files with uppercase .JSON extension', (done) => {
+      const jsonFile = {
+        ...mockFile,
+        mimetype: 'text/plain',
+        originalname: 'DATA.JSON',
+      };
+
+      const cb = jest.fn((err, result) => {
+        expect(err).toBeNull();
+        expect(result).toBe(true);
+        done();
+      });
+
+      importFileFilter(mockReq, jsonFile, cb);
+    });
+  });
+
+  describe('File Filter with Real defaultFileConfig', () => {
+    it('should use real fileConfig.checkType for validation', async () => {
+      // Test with actual librechat-data-provider functions
+      const {
+        fileConfig,
+        imageMimeTypes,
+        applicationMimeTypes,
+      } = require('librechat-data-provider');
+
+      // Test that the real checkType function works with regex patterns
+      expect(fileConfig.checkType('image/jpeg', [imageMimeTypes])).toBe(true);
+      expect(fileConfig.checkType('video/mp4', [imageMimeTypes])).toBe(false);
+      expect(fileConfig.checkType('application/pdf', [applicationMimeTypes])).toBe(true);
+      expect(fileConfig.checkType('application/pdf', [])).toBe(false);
+    });
+
+    it('should handle audio files for speech-to-text endpoint with real config', async () => {
+      mockReq.originalUrl = '/api/speech/stt';
+
+      const multerInstance = await createMulterInstance();
+      expect(multerInstance).toBeDefined();
+      expect(typeof multerInstance.single).toBe('function');
+    });
+
+    it('should reject unsupported file types using real config', async () => {
+      // Mock defaultFileConfig for this specific test
+      const originalCheckType = require('librechat-data-provider').fileConfig.checkType;
+      const mockCheckType = jest.fn().mockReturnValue(false);
+      require('librechat-data-provider').fileConfig.checkType = mockCheckType;
+
+      try {
+        const multerInstance = await createMulterInstance();
+        expect(multerInstance).toBeDefined();
+
+        // Test the actual file filter behavior would reject unsupported files
+        expect(mockCheckType).toBeDefined();
+      } finally {
+        // Restore original function
+        require('librechat-data-provider').fileConfig.checkType = originalCheckType;
+      }
+    });
+
+    it('should use real mergeFileConfig function', async () => {
+      const { mergeFileConfig, mbToBytes } = require('librechat-data-provider');
+
+      // Test with actual merge function - note that it converts MB to bytes
+      const testConfig = {
+        serverFileSizeLimit: 5, // 5 MB
+        endpoints: {
+          custom: {
+            supportedMimeTypes: ['text/plain'],
+          },
+        },
+      };
+
+      const result = mergeFileConfig(testConfig);
+
+      // The function converts MB to bytes, so 5 MB becomes 5 * 1024 * 1024 bytes
+      expect(result.serverFileSizeLimit).toBe(mbToBytes(5));
+      expect(result.endpoints.custom.supportedMimeTypes).toBeDefined();
+      // Should still have the default endpoints
+      expect(result.endpoints.default).toBeDefined();
+    });
+  });
+
+  describe('createMulterInstance with Real Functions', () => {
+    it('should create a multer instance with correct configuration', async () => {
+      const multerInstance = await createMulterInstance();
+
+      expect(multerInstance).toBeDefined();
+      expect(typeof multerInstance.single).toBe('function');
+      expect(typeof multerInstance.array).toBe('function');
+      expect(typeof multerInstance.fields).toBe('function');
+    });
+
+    it('should use real config merging', async () => {
+      const { getCustomConfig } = require('~/server/services/Config');
+
+      const multerInstance = await createMulterInstance();
+
+      expect(getCustomConfig).toHaveBeenCalled();
+      expect(multerInstance).toBeDefined();
+    });
+
+    it('should create multer instance with expected interface', async () => {
+      const multerInstance = await createMulterInstance();
+
+      expect(multerInstance).toBeDefined();
+      expect(typeof multerInstance.single).toBe('function');
+      expect(typeof multerInstance.array).toBe('function');
+      expect(typeof multerInstance.fields).toBe('function');
+    });
+  });
+
+  describe('Real Crypto Integration', () => {
+    it('should use actual crypto.randomUUID()', (done) => {
+      // Spy on crypto.randomUUID to ensure it's called
+      const uuidSpy = jest.spyOn(crypto, 'randomUUID');
+
+      const cb = jest.fn((err, filename) => {
+        expect(err).toBeNull();
+        expect(uuidSpy).toHaveBeenCalled();
+        expect(mockReq.file_id).toMatch(
+          /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i,
+        );
+
+        uuidSpy.mockRestore();
+        done();
+      });
+
+      storage.getFilename(mockReq, mockFile, cb);
+    });
+
+    it('should generate different UUIDs on subsequent calls', (done) => {
+      const uuids = [];
+      let callCount = 0;
+      const totalCalls = 5;
+
+      const cb = jest.fn((err, filename) => {
+        expect(err).toBeNull();
+        uuids.push(mockReq.file_id);
+        callCount++;
+
+        if (callCount === totalCalls) {
+          // Check that all UUIDs are unique
+          const uniqueUuids = new Set(uuids);
+          expect(uniqueUuids.size).toBe(totalCalls);
+          done();
+        } else {
+          // Reset for next call
+          delete mockReq.file_id;
+          storage.getFilename(mockReq, mockFile, cb);
+        }
+      });
+
+      // Start the chain
+      storage.getFilename(mockReq, mockFile, cb);
+    });
+
+    it('should generate cryptographically secure UUIDs', (done) => {
+      const generatedUuids = new Set();
+      let callCount = 0;
+      const totalCalls = 10;
+
+      const cb = jest.fn((err, filename) => {
+        expect(err).toBeNull();
+
+        // Verify UUID format and uniqueness
+        expect(mockReq.file_id).toMatch(
+          /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i,
+        );
+
+        generatedUuids.add(mockReq.file_id);
+        callCount++;
+
+        if (callCount === totalCalls) {
+          // All UUIDs should be unique
+          expect(generatedUuids.size).toBe(totalCalls);
+          done();
+        } else {
+          // Reset for next call
+          delete mockReq.file_id;
+          storage.getFilename(mockReq, mockFile, cb);
+        }
+      });
+
+      // Start the chain
+      storage.getFilename(mockReq, mockFile, cb);
+    });
+  });
+
+  describe('Error Handling', () => {
+    it('should handle CVE-2024-28870: empty field name DoS vulnerability', async () => {
+      // Test for the CVE where empty field name could cause unhandled exception
+      const multerInstance = await createMulterInstance();
+
+      // Create a mock request with empty field name (the vulnerability scenario)
+      const mockReqWithEmptyField = {
+        ...mockReq,
+        headers: {
+          'content-type': 'multipart/form-data',
+        },
+      };
+
+      const mockRes = {
+        status: jest.fn().mockReturnThis(),
+        json: jest.fn(),
+        end: jest.fn(),
+      };
+
+      // This should not crash or throw unhandled exceptions
+      const uploadMiddleware = multerInstance.single(''); // Empty field name
+
+      const mockNext = jest.fn((err) => {
+        // If there's an error, it should be handled gracefully, not crash
+        if (err) {
+          expect(err).toBeInstanceOf(Error);
+          // The error should be handled, not crash the process
+        }
+      });
+
+      // This should complete without crashing the process
+      expect(() => {
+        uploadMiddleware(mockReqWithEmptyField, mockRes, mockNext);
+      }).not.toThrow();
+    });
+
+    it('should handle file system errors when directory creation fails', (done) => {
+      // Test with a non-existent parent directory to simulate fs issues
+      const invalidPath = '/nonexistent/path/that/should/not/exist';
+      mockReq.app.locals.paths.uploads = invalidPath;
+
+      try {
+        // Call getDestination which should fail due to permission/path issues
+        storage.getDestination(mockReq, mockFile, (err, destination) => {
+          // If callback is reached, we didn't get the expected error
+          done(new Error('Expected mkdirSync to throw an error but callback was called'));
+        });
+        // If we get here without throwing, something unexpected happened
+        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');
+        done();
+      }
+    });
+
+    it('should handle malformed filenames with real sanitization', (done) => {
+      const malformedFile = {
+        ...mockFile,
+        originalname: null, // This should be handled gracefully
+      };
+
+      const cb = jest.fn((err, filename) => {
+        // The function should handle this gracefully
+        expect(typeof err === 'object' || err === null).toBe(true);
+        done();
+      });
+
+      try {
+        storage.getFilename(mockReq, malformedFile, cb);
+      } catch (error) {
+        // If it throws, that's also acceptable behavior
+        done();
+      }
+    });
+
+    it('should handle edge cases in filename sanitization', (done) => {
+      const edgeCaseFiles = [
+        { originalname: '', expected: /_/ },
+        { originalname: '.hidden', expected: /^_\.hidden/ },
+        { originalname: '../../../etc/passwd', expected: /passwd/ },
+        { originalname: 'file\x00name.txt', expected: /file_name\.txt/ },
+      ];
+
+      let testCount = 0;
+
+      const testNextFile = (fileData) => {
+        const fileToTest = { ...mockFile, originalname: fileData.originalname };
+
+        const cb = jest.fn((err, filename) => {
+          expect(err).toBeNull();
+          expect(filename).toMatch(fileData.expected);
+
+          testCount++;
+          if (testCount === edgeCaseFiles.length) {
+            done();
+          } else {
+            testNextFile(edgeCaseFiles[testCount]);
+          }
+        });
+
+        storage.getFilename(mockReq, fileToTest, cb);
+      };
+
+      testNextFile(edgeCaseFiles[0]);
+    });
+  });
+
+  describe('Real Configuration Testing', () => {
+    it('should handle missing custom config gracefully with real mergeFileConfig', async () => {
+      const { getCustomConfig } = require('~/server/services/Config');
+
+      // Mock getCustomConfig to return undefined
+      getCustomConfig.mockResolvedValueOnce(undefined);
+
+      const multerInstance = await createMulterInstance();
+      expect(multerInstance).toBeDefined();
+      expect(typeof multerInstance.single).toBe('function');
+    });
+
+    it('should properly integrate real fileConfig with custom endpoints', async () => {
+      const { getCustomConfig } = require('~/server/services/Config');
+
+      // Mock a custom config with additional endpoints
+      getCustomConfig.mockResolvedValueOnce({
+        fileConfig: {
+          endpoints: {
+            anthropic: {
+              supportedMimeTypes: ['text/plain', 'image/png'],
+            },
+          },
+          serverFileSizeLimit: 20, // 20 MB
+        },
+      });
+
+      const multerInstance = await createMulterInstance();
+      expect(multerInstance).toBeDefined();
+
+      // Verify that getCustomConfig was called (we can't spy on the actual merge function easily)
+      expect(getCustomConfig).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/api/strategies/openidStrategy.js b/api/strategies/openidStrategy.js
index 1d0a6bc5e6..2449872a9d 100644
--- a/api/strategies/openidStrategy.js
+++ b/api/strategies/openidStrategy.js
@@ -1,3 +1,4 @@
+const undici = require('undici');
 const fetch = require('node-fetch');
 const passport = require('passport');
 const client = require('openid-client');
@@ -6,17 +7,87 @@ const { CacheKeys } = require('librechat-data-provider');
 const { HttpsProxyAgent } = require('https-proxy-agent');
 const { hashToken, logger } = require('@librechat/data-schemas');
 const { Strategy: OpenIDStrategy } = require('openid-client/passport');
+const { isEnabled, safeStringify, logHeaders } = require('@librechat/api');
 const { getStrategyFunctions } = require('~/server/services/Files/strategies');
 const { findUser, createUser, updateUser } = require('~/models');
 const { getBalanceConfig } = require('~/server/services/Config');
 const getLogStores = require('~/cache/getLogStores');
-const { isEnabled } = require('~/server/utils');
 
 /**
  * @typedef {import('openid-client').ClientMetadata} ClientMetadata
  * @typedef {import('openid-client').Configuration} Configuration
  **/
 
+/**
+ * @param {string} url
+ * @param {client.CustomFetchOptions} options
+ */
+async function customFetch(url, options) {
+  const urlStr = url.toString();
+  logger.debug(`[openidStrategy] Request to: ${urlStr}`);
+  const debugOpenId = isEnabled(process.env.DEBUG_OPENID_REQUESTS);
+  if (debugOpenId) {
+    logger.debug(`[openidStrategy] Request method: ${options.method || 'GET'}`);
+    logger.debug(`[openidStrategy] Request headers: ${logHeaders(options.headers)}`);
+    if (options.body) {
+      let bodyForLogging = '';
+      if (options.body instanceof URLSearchParams) {
+        bodyForLogging = options.body.toString();
+      } else if (typeof options.body === 'string') {
+        bodyForLogging = options.body;
+      } else {
+        bodyForLogging = safeStringify(options.body);
+      }
+      logger.debug(`[openidStrategy] Request body: ${bodyForLogging}`);
+    }
+  }
+
+  try {
+    /** @type {undici.RequestInit} */
+    let fetchOptions = options;
+    if (process.env.PROXY) {
+      logger.info(`[openidStrategy] proxy agent configured: ${process.env.PROXY}`);
+      fetchOptions = {
+        ...options,
+        dispatcher: new HttpsProxyAgent(process.env.PROXY),
+      };
+    }
+
+    const response = await undici.fetch(url, fetchOptions);
+
+    if (debugOpenId) {
+      logger.debug(`[openidStrategy] Response status: ${response.status} ${response.statusText}`);
+      logger.debug(`[openidStrategy] Response headers: ${logHeaders(response.headers)}`);
+    }
+
+    if (response.status === 200 && response.headers.has('www-authenticate')) {
+      const wwwAuth = response.headers.get('www-authenticate');
+      logger.warn(`[openidStrategy] Non-standard WWW-Authenticate header found in successful response (200 OK): ${wwwAuth}.
+This violates RFC 7235 and may cause issues with strict OAuth clients. Removing header for compatibility.`);
+
+      /** Cloned response without the WWW-Authenticate header */
+      const responseBody = await response.arrayBuffer();
+      const newHeaders = new Headers();
+      for (const [key, value] of response.headers.entries()) {
+        if (key.toLowerCase() !== 'www-authenticate') {
+          newHeaders.append(key, value);
+        }
+      }
+
+      return new Response(responseBody, {
+        status: response.status,
+        statusText: response.statusText,
+        headers: newHeaders,
+      });
+    }
+
+    return response;
+  } catch (error) {
+    logger.error(`[openidStrategy] Fetch error: ${error.message}`);
+    throw error;
+  }
+}
+
 /** @typedef {Configuration | null}  */
 let openidConfig = null;
 
@@ -208,14 +279,12 @@ async function setupOpenId() {
       new URL(process.env.OPENID_ISSUER),
       process.env.OPENID_CLIENT_ID,
       clientMetadata,
+      undefined,
+      {
+        [client.customFetch]: customFetch,
+      },
     );
-    if (process.env.PROXY) {
-      const proxyAgent = new HttpsProxyAgent(process.env.PROXY);
-      openidConfig[client.customFetch] = (...args) => {
-        return fetch(args[0], { ...args[1], agent: proxyAgent });
-      };
-      logger.info(`[openidStrategy] proxy agent added: ${process.env.PROXY}`);
-    }
+
     const requiredRole = process.env.OPENID_REQUIRED_ROLE;
     const requiredRoleParameterPath = process.env.OPENID_REQUIRED_ROLE_PARAMETER_PATH;
     const requiredRoleTokenKind = process.env.OPENID_REQUIRED_ROLE_TOKEN_KIND;
diff --git a/client/src/components/SidePanel/Memories/MemoryViewer.tsx b/client/src/components/SidePanel/Memories/MemoryViewer.tsx
index 7aa4c1a8aa..638321f4f7 100644
--- a/client/src/components/SidePanel/Memories/MemoryViewer.tsx
+++ b/client/src/components/SidePanel/Memories/MemoryViewer.tsx
@@ -34,6 +34,7 @@ import MemoryCreateDialog from './MemoryCreateDialog';
 import MemoryEditDialog from './MemoryEditDialog';
 import { useToastContext } from '~/Providers';
 import AdminSettings from './AdminSettings';
+import { cn } from '~/utils';
 
 export default function MemoryViewer() {
   const localize = useLocalize();
@@ -251,7 +252,12 @@ export default function MemoryViewer() {
         </div>
         {/* Memory Usage and Toggle Display */}
         {(memData?.tokenLimit || hasOptOutAccess) && (
-          <div className="flex items-center justify-between rounded-lg">
+          <div
+            className={cn(
+              'flex items-center rounded-lg',
+              memData?.tokenLimit != null && hasOptOutAccess ? 'justify-between' : 'justify-end',
+            )}
+          >
             {/* Usage Display */}
             {memData?.tokenLimit && (
               <div className="flex items-center gap-2">
diff --git a/package-lock.json b/package-lock.json
index 56c5056a07..fb2b3df922 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -126,6 +126,7 @@
         "tiktoken": "^1.0.15",
         "traverse": "^0.6.7",
         "ua-parser-js": "^1.0.36",
+        "undici": "^7.10.0",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0",
         "youtube-transcript": "^1.2.1",
@@ -2403,6 +2404,15 @@
         "@img/sharp-win32-x64": "0.33.5"
       }
     },
+    "api/node_modules/undici": {
+      "version": "7.10.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.10.0.tgz",
+      "integrity": "sha512-u5otvFBOBZvmdjWLVW+5DAc9Nkq8f24g0O9oY7qw2JVIF1VocIFoyz9JFkuVOS2j41AufeO0xnlweJ2RLT8nGw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.18.1"
+      }
+    },
     "api/node_modules/uuid": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
diff --git a/packages/api/src/utils/index.ts b/packages/api/src/utils/index.ts
index ae6157b6c1..6c6aea81ed 100644
--- a/packages/api/src/utils/index.ts
+++ b/packages/api/src/utils/index.ts
@@ -1,5 +1,7 @@
 export * from './azure';
 export * from './common';
 export * from './events';
+export * from './files';
 export * from './generators';
+export * from './openid';
 export { default as Tokenizer } from './tokenizer';
diff --git a/packages/api/src/utils/openid.ts b/packages/api/src/utils/openid.ts
new file mode 100644
index 0000000000..48c54c7926
--- /dev/null
+++ b/packages/api/src/utils/openid.ts
@@ -0,0 +1,51 @@
+/**
+ * Helper function to safely log sensitive data when debug mode is enabled
+ * @param obj - Object to stringify
+ * @param maxLength - Maximum length of the stringified output
+ * @returns Stringified object with sensitive data masked
+ */
+export function safeStringify(obj: unknown, maxLength = 1000): string {
+  try {
+    const str = JSON.stringify(obj, (key, value) => {
+      // Mask sensitive values
+      if (
+        key === 'client_secret' ||
+        key === 'Authorization' ||
+        key.toLowerCase().includes('token') ||
+        key.toLowerCase().includes('password')
+      ) {
+        return typeof value === 'string' && value.length > 6
+          ? `${value.substring(0, 3)}...${value.substring(value.length - 3)}`
+          : '***MASKED***';
+      }
+      return value;
+    });
+
+    if (str && str.length > maxLength) {
+      return `${str.substring(0, maxLength)}... (truncated)`;
+    }
+    return str;
+  } catch (error) {
+    return `[Error stringifying object: ${(error as Error).message}]`;
+  }
+}
+
+/**
+ * Helper to log headers without revealing sensitive information
+ * @param headers - Headers object to log
+ * @returns Stringified headers with sensitive data masked
+ */
+export function logHeaders(headers: Headers | undefined | null): string {
+  const headerObj: Record<string, string> = {};
+  if (!headers || typeof headers.entries !== 'function') {
+    return 'No headers available';
+  }
+  for (const [key, value] of headers.entries()) {
+    if (key.toLowerCase() === 'authorization' || key.toLowerCase().includes('secret')) {
+      headerObj[key] = '***MASKED***';
+    } else {
+      headerObj[key] = value;
+    }
+  }
+  return safeStringify(headerObj);
+}

From 118ad943c9f42d857aed20346dabec6d6a0a01cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=ADas=20Sanchez=20Moises?= <mail@matysanchez.com>
Date: Mon, 9 Jun 2025 12:12:35 -0700
Subject: [PATCH 20/49] =?UTF-8?q?=F0=9F=93=84=20docs:=20update=20README=20?=
 =?UTF-8?q?(#7803)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Correcting Documentation and Blog URLs
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cc9533b2d2..d6bd19ab43 100644
--- a/README.md
+++ b/README.md
@@ -150,8 +150,8 @@ Click on the thumbnail to open the video☝️
 
 **Other:**
   - **Website:** [librechat.ai](https://librechat.ai)
-  - **Documentation:** [docs.librechat.ai](https://docs.librechat.ai)
-  - **Blog:** [blog.librechat.ai](https://blog.librechat.ai)
+  - **Documentation:** [librechat.ai/docs](https://librechat.ai/docs)
+  - **Blog:** [librechat.ai/blog](https://librechat.ai/blog)
 
 ---
 

From a57224c1d52a315b913e6d7b3712e933fd0a6577 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Tue, 10 Jun 2025 09:53:15 -0400
Subject: [PATCH 21/49] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20fix:?=
 =?UTF-8?q?=20Agents=20Config=20Defaults=20and=20Avatar=20Uploads=20Across?=
 =?UTF-8?q?=20File=20Strategies=20(#7814)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: avatar processing across storage services, uniqueness by agent ID, prevent overwriting user avatar

* fix: sanitize file paths in deleteLocalFile function to prevent invalid path errors

* fix: correct spelling of 'agentsEndpointSchema' in agents.js and config.ts

* fix: default app.locals agents configuration setup and add agent endpoint schema default
---
 api/server/controllers/agents/v1.js          |  1 +
 api/server/services/AppService.js            | 13 ++--
 api/server/services/AppService.spec.js       | 72 ++++++++++++++++++++
 api/server/services/Files/Azure/images.js    | 22 +++++-
 api/server/services/Files/Firebase/images.js | 14 ++--
 api/server/services/Files/Local/crud.js      | 16 +++--
 api/server/services/Files/Local/images.js    | 12 +++-
 api/server/services/Files/S3/images.js       | 15 +++-
 api/server/services/start/agents.js          | 14 ----
 api/strategies/process.js                    |  8 ++-
 packages/api/src/agents/config.ts            | 24 +++++++
 packages/api/src/agents/index.ts             |  1 +
 packages/data-provider/src/config.ts         | 35 ++++++----
 13 files changed, 192 insertions(+), 55 deletions(-)
 delete mode 100644 api/server/services/start/agents.js
 create mode 100644 packages/api/src/agents/config.ts

diff --git a/api/server/controllers/agents/v1.js b/api/server/controllers/agents/v1.js
index 65189a18a1..cf59c395f4 100644
--- a/api/server/controllers/agents/v1.js
+++ b/api/server/controllers/agents/v1.js
@@ -387,6 +387,7 @@ const uploadAgentAvatarHandler = async (req, res) => {
       buffer: resizedBuffer,
       userId: req.user.id,
       manual: 'false',
+      agentId: agent_id,
     });
 
     const image = {
diff --git a/api/server/services/AppService.js b/api/server/services/AppService.js
index dc686d6294..2e5a0e586b 100644
--- a/api/server/services/AppService.js
+++ b/api/server/services/AppService.js
@@ -7,6 +7,7 @@ const {
   getConfigDefaults,
   loadWebSearchConfig,
 } = require('librechat-data-provider');
+const { agentsConfigSetup } = require('@librechat/api');
 const {
   checkHealth,
   checkConfig,
@@ -25,7 +26,6 @@ const { azureConfigSetup } = require('./start/azureOpenAI');
 const { processModelSpecs } = require('./start/modelSpecs');
 const { initializeS3 } = require('./Files/S3/initialize');
 const { loadAndFormatTools } = require('./ToolService');
-const { agentsConfigSetup } = require('./start/agents');
 const { isEnabled } = require('~/server/utils');
 const { initializeRoles } = require('~/models');
 const { getMCPManager } = require('~/config');
@@ -103,8 +103,13 @@ const AppService = async (app) => {
     balance,
   };
 
+  const agentsDefaults = agentsConfigSetup(config);
+
   if (!Object.keys(config).length) {
-    app.locals = defaultLocals;
+    app.locals = {
+      ...defaultLocals,
+      [EModelEndpoint.agents]: agentsDefaults,
+    };
     return;
   }
 
@@ -139,9 +144,7 @@ const AppService = async (app) => {
     );
   }
 
-  if (endpoints?.[EModelEndpoint.agents]) {
-    endpointLocals[EModelEndpoint.agents] = agentsConfigSetup(config);
-  }
+  endpointLocals[EModelEndpoint.agents] = agentsConfigSetup(config, agentsDefaults);
 
   const endpointKeys = [
     EModelEndpoint.openAI,
diff --git a/api/server/services/AppService.spec.js b/api/server/services/AppService.spec.js
index 5e0837ce3b..70a405ccdb 100644
--- a/api/server/services/AppService.spec.js
+++ b/api/server/services/AppService.spec.js
@@ -2,8 +2,10 @@ const {
   FileSources,
   EModelEndpoint,
   EImageOutputType,
+  AgentCapabilities,
   defaultSocialLogins,
   validateAzureGroups,
+  defaultAgentCapabilities,
   deprecatedAzureVariables,
   conflictingAzureVariables,
 } = require('librechat-data-provider');
@@ -151,6 +153,11 @@ describe('AppService', () => {
         safeSearch: 1,
         serperApiKey: '${SERPER_API_KEY}',
       },
+      memory: undefined,
+      agents: {
+        disableBuilder: false,
+        capabilities: expect.arrayContaining([...defaultAgentCapabilities]),
+      },
     });
   });
 
@@ -268,6 +275,71 @@ describe('AppService', () => {
     );
   });
 
+  it('should correctly configure Agents endpoint based on custom config', async () => {
+    require('./Config/loadCustomConfig').mockImplementationOnce(() =>
+      Promise.resolve({
+        endpoints: {
+          [EModelEndpoint.agents]: {
+            disableBuilder: true,
+            recursionLimit: 10,
+            maxRecursionLimit: 20,
+            allowedProviders: ['openai', 'anthropic'],
+            capabilities: [AgentCapabilities.tools, AgentCapabilities.actions],
+          },
+        },
+      }),
+    );
+
+    await AppService(app);
+
+    expect(app.locals).toHaveProperty(EModelEndpoint.agents);
+    expect(app.locals[EModelEndpoint.agents]).toEqual(
+      expect.objectContaining({
+        disableBuilder: true,
+        recursionLimit: 10,
+        maxRecursionLimit: 20,
+        allowedProviders: expect.arrayContaining(['openai', 'anthropic']),
+        capabilities: expect.arrayContaining([AgentCapabilities.tools, AgentCapabilities.actions]),
+      }),
+    );
+  });
+
+  it('should configure Agents endpoint with defaults when no config is provided', async () => {
+    require('./Config/loadCustomConfig').mockImplementationOnce(() => Promise.resolve({}));
+
+    await AppService(app);
+
+    expect(app.locals).toHaveProperty(EModelEndpoint.agents);
+    expect(app.locals[EModelEndpoint.agents]).toEqual(
+      expect.objectContaining({
+        disableBuilder: false,
+        capabilities: expect.arrayContaining([...defaultAgentCapabilities]),
+      }),
+    );
+  });
+
+  it('should configure Agents endpoint with defaults when endpoints exist but agents is not defined', async () => {
+    require('./Config/loadCustomConfig').mockImplementationOnce(() =>
+      Promise.resolve({
+        endpoints: {
+          [EModelEndpoint.openAI]: {
+            titleConvo: true,
+          },
+        },
+      }),
+    );
+
+    await AppService(app);
+
+    expect(app.locals).toHaveProperty(EModelEndpoint.agents);
+    expect(app.locals[EModelEndpoint.agents]).toEqual(
+      expect.objectContaining({
+        disableBuilder: false,
+        capabilities: expect.arrayContaining([...defaultAgentCapabilities]),
+      }),
+    );
+  });
+
   it('should correctly configure minimum Azure OpenAI Assistant values', async () => {
     const assistantGroups = [azureGroups[0], { ...azureGroups[1], assistants: true }];
     require('./Config/loadCustomConfig').mockImplementationOnce(() =>
diff --git a/api/server/services/Files/Azure/images.js b/api/server/services/Files/Azure/images.js
index 80163bee05..80d5e76290 100644
--- a/api/server/services/Files/Azure/images.js
+++ b/api/server/services/Files/Azure/images.js
@@ -91,15 +91,28 @@ async function prepareAzureImageURL(req, file) {
  * @param {Buffer} params.buffer - The avatar image buffer.
  * @param {string} params.userId - The user's id.
  * @param {string} params.manual - Flag to indicate manual update.
+ * @param {string} [params.agentId] - Optional agent ID if this is an agent avatar.
  * @param {string} [params.basePath='images'] - The base folder within the container.
  * @param {string} [params.containerName] - The Azure Blob container name.
  * @returns {Promise<string>} The URL of the avatar.
  */
-async function processAzureAvatar({ buffer, userId, manual, basePath = 'images', containerName }) {
+async function processAzureAvatar({
+  buffer,
+  userId,
+  manual,
+  agentId,
+  basePath = 'images',
+  containerName,
+}) {
   try {
     const metadata = await sharp(buffer).metadata();
     const extension = metadata.format === 'gif' ? 'gif' : 'png';
-    const fileName = `avatar.${extension}`;
+    const timestamp = new Date().getTime();
+
+    /** Unique filename with timestamp and optional agent ID */
+    const fileName = agentId
+      ? `agent-${agentId}-avatar-${timestamp}.${extension}`
+      : `avatar-${timestamp}.${extension}`;
 
     const downloadURL = await saveBufferToAzure({
       userId,
@@ -110,9 +123,12 @@ async function processAzureAvatar({ buffer, userId, manual, basePath = 'images',
     });
     const isManual = manual === 'true';
     const url = `${downloadURL}?manual=${isManual}`;
-    if (isManual) {
+
+    // Only update user record if this is a user avatar (manual === 'true')
+    if (isManual && !agentId) {
       await updateUser(userId, { avatar: url });
     }
+
     return url;
   } catch (error) {
     logger.error('[processAzureAvatar] Error uploading profile picture to Azure:', error);
diff --git a/api/server/services/Files/Firebase/images.js b/api/server/services/Files/Firebase/images.js
index 80bff28d89..8b0866b5d0 100644
--- a/api/server/services/Files/Firebase/images.js
+++ b/api/server/services/Files/Firebase/images.js
@@ -82,14 +82,20 @@ async function prepareImageURL(req, file) {
  * @param {Buffer} params.buffer - The Buffer containing the avatar image.
  * @param {string} params.userId - The user ID.
  * @param {string} params.manual - A string flag indicating whether the update is manual ('true' or 'false').
+ * @param {string} [params.agentId] - Optional agent ID if this is an agent avatar.
  * @returns {Promise<string>} - A promise that resolves with the URL of the uploaded avatar.
  * @throws {Error} - Throws an error if Firebase is not initialized or if there is an error in uploading.
  */
-async function processFirebaseAvatar({ buffer, userId, manual }) {
+async function processFirebaseAvatar({ buffer, userId, manual, agentId }) {
   try {
     const metadata = await sharp(buffer).metadata();
     const extension = metadata.format === 'gif' ? 'gif' : 'png';
-    const fileName = `avatar.${extension}`;
+    const timestamp = new Date().getTime();
+
+    /** Unique filename with timestamp and optional agent ID */
+    const fileName = agentId
+      ? `agent-${agentId}-avatar-${timestamp}.${extension}`
+      : `avatar-${timestamp}.${extension}`;
 
     const downloadURL = await saveBufferToFirebase({
       userId,
@@ -98,10 +104,10 @@ async function processFirebaseAvatar({ buffer, userId, manual }) {
     });
 
     const isManual = manual === 'true';
-
     const url = `${downloadURL}?manual=${isManual}`;
 
-    if (isManual) {
+    // Only update user record if this is a user avatar (manual === 'true')
+    if (isManual && !agentId) {
       await updateUser(userId, { avatar: url });
     }
 
diff --git a/api/server/services/Files/Local/crud.js b/api/server/services/Files/Local/crud.js
index 783230f2f6..7df528c5e1 100644
--- a/api/server/services/Files/Local/crud.js
+++ b/api/server/services/Files/Local/crud.js
@@ -201,6 +201,10 @@ const unlinkFile = async (filepath) => {
  */
 const deleteLocalFile = async (req, file) => {
   const { publicPath, uploads } = req.app.locals.paths;
+
+  /** Filepath stripped of query parameters (e.g., ?manual=true) */
+  const cleanFilepath = file.filepath.split('?')[0];
+
   if (file.embedded && process.env.RAG_API_URL) {
     const jwtToken = req.headers.authorization.split(' ')[1];
     axios.delete(`${process.env.RAG_API_URL}/documents`, {
@@ -213,32 +217,32 @@ const deleteLocalFile = async (req, file) => {
     });
   }
 
-  if (file.filepath.startsWith(`/uploads/${req.user.id}`)) {
+  if (cleanFilepath.startsWith(`/uploads/${req.user.id}`)) {
     const userUploadDir = path.join(uploads, req.user.id);
-    const basePath = file.filepath.split(`/uploads/${req.user.id}/`)[1];
+    const basePath = cleanFilepath.split(`/uploads/${req.user.id}/`)[1];
 
     if (!basePath) {
-      throw new Error(`Invalid file path: ${file.filepath}`);
+      throw new Error(`Invalid file path: ${cleanFilepath}`);
     }
 
     const filepath = path.join(userUploadDir, basePath);
 
     const rel = path.relative(userUploadDir, filepath);
     if (rel.startsWith('..') || path.isAbsolute(rel) || rel.includes(`..${path.sep}`)) {
-      throw new Error(`Invalid file path: ${file.filepath}`);
+      throw new Error(`Invalid file path: ${cleanFilepath}`);
     }
 
     await unlinkFile(filepath);
     return;
   }
 
-  const parts = file.filepath.split(path.sep);
+  const parts = cleanFilepath.split(path.sep);
   const subfolder = parts[1];
   if (!subfolder && parts[0] === EModelEndpoint.agents) {
     logger.warn(`Agent File ${file.file_id} is missing filepath, may have been deleted already`);
     return;
   }
-  const filepath = path.join(publicPath, file.filepath);
+  const filepath = path.join(publicPath, cleanFilepath);
 
   if (!isValidPath(req, publicPath, subfolder, filepath)) {
     throw new Error('Invalid file path');
diff --git a/api/server/services/Files/Local/images.js b/api/server/services/Files/Local/images.js
index fc344cea88..ea3af87c70 100644
--- a/api/server/services/Files/Local/images.js
+++ b/api/server/services/Files/Local/images.js
@@ -112,10 +112,11 @@ async function prepareImagesLocal(req, file) {
  * @param {Buffer} params.buffer - The Buffer containing the avatar image.
  * @param {string} params.userId - The user ID.
  * @param {string} params.manual - A string flag indicating whether the update is manual ('true' or 'false').
+ * @param {string} [params.agentId] - Optional agent ID if this is an agent avatar.
  * @returns {Promise<string>} - A promise that resolves with the URL of the uploaded avatar.
  * @throws {Error} - Throws an error if Firebase is not initialized or if there is an error in uploading.
  */
-async function processLocalAvatar({ buffer, userId, manual }) {
+async function processLocalAvatar({ buffer, userId, manual, agentId }) {
   const userDir = path.resolve(
     __dirname,
     '..',
@@ -132,7 +133,11 @@ async function processLocalAvatar({ buffer, userId, manual }) {
   const metadata = await sharp(buffer).metadata();
   const extension = metadata.format === 'gif' ? 'gif' : 'png';
 
-  const fileName = `avatar-${new Date().getTime()}.${extension}`;
+  const timestamp = new Date().getTime();
+  /** Unique filename with timestamp and optional agent ID */
+  const fileName = agentId
+    ? `agent-${agentId}-avatar-${timestamp}.${extension}`
+    : `avatar-${timestamp}.${extension}`;
   const urlRoute = `/images/${userId}/${fileName}`;
   const avatarPath = path.join(userDir, fileName);
 
@@ -142,7 +147,8 @@ async function processLocalAvatar({ buffer, userId, manual }) {
   const isManual = manual === 'true';
   let url = `${urlRoute}?manual=${isManual}`;
 
-  if (isManual) {
+  // Only update user record if this is a user avatar (manual === 'true')
+  if (isManual && !agentId) {
     await updateUser(userId, { avatar: url });
   }
 
diff --git a/api/server/services/Files/S3/images.js b/api/server/services/Files/S3/images.js
index 07faec1765..688d5eb68b 100644
--- a/api/server/services/Files/S3/images.js
+++ b/api/server/services/Files/S3/images.js
@@ -94,19 +94,28 @@ async function prepareImageURLS3(req, file) {
  * @param {Buffer} params.buffer - Avatar image buffer.
  * @param {string} params.userId - User's unique identifier.
  * @param {string} params.manual - 'true' or 'false' flag for manual update.
+ * @param {string} [params.agentId] - Optional agent ID if this is an agent avatar.
  * @param {string} [params.basePath='images'] - Base path in the bucket.
  * @returns {Promise<string>} Signed URL of the uploaded avatar.
  */
-async function processS3Avatar({ buffer, userId, manual, basePath = defaultBasePath }) {
+async function processS3Avatar({ buffer, userId, manual, agentId, basePath = defaultBasePath }) {
   try {
     const metadata = await sharp(buffer).metadata();
     const extension = metadata.format === 'gif' ? 'gif' : 'png';
-    const fileName = `avatar.${extension}`;
+    const timestamp = new Date().getTime();
+
+    /** Unique filename with timestamp and optional agent ID */
+    const fileName = agentId
+      ? `agent-${agentId}-avatar-${timestamp}.${extension}`
+      : `avatar-${timestamp}.${extension}`;
 
     const downloadURL = await saveBufferToS3({ userId, buffer, fileName, basePath });
-    if (manual === 'true') {
+
+    // Only update user record if this is a user avatar (manual === 'true')
+    if (manual === 'true' && !agentId) {
       await updateUser(userId, { avatar: downloadURL });
     }
+
     return downloadURL;
   } catch (error) {
     logger.error('[processS3Avatar] Error processing S3 avatar:', error.message);
diff --git a/api/server/services/start/agents.js b/api/server/services/start/agents.js
deleted file mode 100644
index 10653f3fb6..0000000000
--- a/api/server/services/start/agents.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const { EModelEndpoint, agentsEndpointSChema } = require('librechat-data-provider');
-
-/**
- * Sets up the Agents configuration from the config (`librechat.yaml`) file.
- * @param {TCustomConfig} config - The loaded custom configuration.
- * @returns {Partial<TAgentsEndpoint>} The Agents endpoint configuration.
- */
-function agentsConfigSetup(config) {
-  const agentsConfig = config.endpoints[EModelEndpoint.agents];
-  const parsedConfig = agentsEndpointSChema.parse(agentsConfig);
-  return parsedConfig;
-}
-
-module.exports = { agentsConfigSetup };
diff --git a/api/strategies/process.js b/api/strategies/process.js
index 774d8d015e..1f7e7c81d2 100644
--- a/api/strategies/process.js
+++ b/api/strategies/process.js
@@ -31,7 +31,7 @@ const handleExistingUser = async (oldUser, avatarUrl) => {
       input: avatarUrl,
     });
     const { processAvatar } = getStrategyFunctions(fileStrategy);
-    updatedAvatar = await processAvatar({ buffer: resizedBuffer, userId });
+    updatedAvatar = await processAvatar({ buffer: resizedBuffer, userId, manual: 'false' });
   }
 
   if (updatedAvatar) {
@@ -90,7 +90,11 @@ const createSocialUser = async ({
       input: avatarUrl,
     });
     const { processAvatar } = getStrategyFunctions(fileStrategy);
-    const avatar = await processAvatar({ buffer: resizedBuffer, userId: newUserId });
+    const avatar = await processAvatar({
+      buffer: resizedBuffer,
+      userId: newUserId,
+      manual: 'false',
+    });
     await updateUser(newUserId, { avatar });
   }
 
diff --git a/packages/api/src/agents/config.ts b/packages/api/src/agents/config.ts
new file mode 100644
index 0000000000..36b1f600eb
--- /dev/null
+++ b/packages/api/src/agents/config.ts
@@ -0,0 +1,24 @@
+import { EModelEndpoint, agentsEndpointSchema } from 'librechat-data-provider';
+import type { TCustomConfig, TAgentsEndpoint } from 'librechat-data-provider';
+
+/**
+ * Sets up the Agents configuration from the config (`librechat.yaml`) file.
+ * If no agents config is defined, uses the provided defaults or parses empty object.
+ *
+ * @param config - The loaded custom configuration.
+ * @param [defaultConfig] - Default configuration from getConfigDefaults.
+ * @returns The Agents endpoint configuration.
+ */
+export function agentsConfigSetup(
+  config: TCustomConfig,
+  defaultConfig: Partial<TAgentsEndpoint>,
+): Partial<TAgentsEndpoint> {
+  const agentsConfig = config?.endpoints?.[EModelEndpoint.agents];
+
+  if (!agentsConfig) {
+    return defaultConfig || agentsEndpointSchema.parse({});
+  }
+
+  const parsedConfig = agentsEndpointSchema.parse(agentsConfig);
+  return parsedConfig;
+}
diff --git a/packages/api/src/agents/index.ts b/packages/api/src/agents/index.ts
index ed003606ed..a101ded7f0 100644
--- a/packages/api/src/agents/index.ts
+++ b/packages/api/src/agents/index.ts
@@ -1,3 +1,4 @@
+export * from './config';
 export * from './memory';
 export * from './resources';
 export * from './run';
diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.ts
index beadb4c3f3..6a299e6486 100644
--- a/packages/data-provider/src/config.ts
+++ b/packages/data-provider/src/config.ts
@@ -244,21 +244,26 @@ export const defaultAgentCapabilities = [
   AgentCapabilities.ocr,
 ];
 
-export const agentsEndpointSChema = baseEndpointSchema.merge(
-  z.object({
-    /* agents specific */
-    recursionLimit: z.number().optional(),
-    disableBuilder: z.boolean().optional(),
-    maxRecursionLimit: z.number().optional(),
-    allowedProviders: z.array(z.union([z.string(), eModelEndpointSchema])).optional(),
-    capabilities: z
-      .array(z.nativeEnum(AgentCapabilities))
-      .optional()
-      .default(defaultAgentCapabilities),
-  }),
-);
+export const agentsEndpointSchema = baseEndpointSchema
+  .merge(
+    z.object({
+      /* agents specific */
+      recursionLimit: z.number().optional(),
+      disableBuilder: z.boolean().optional().default(false),
+      maxRecursionLimit: z.number().optional(),
+      allowedProviders: z.array(z.union([z.string(), eModelEndpointSchema])).optional(),
+      capabilities: z
+        .array(z.nativeEnum(AgentCapabilities))
+        .optional()
+        .default(defaultAgentCapabilities),
+    }),
+  )
+  .default({
+    disableBuilder: false,
+    capabilities: defaultAgentCapabilities,
+  });
 
-export type TAgentsEndpoint = z.infer<typeof agentsEndpointSChema>;
+export type TAgentsEndpoint = z.infer<typeof agentsEndpointSchema>;
 
 export const endpointSchema = baseEndpointSchema.merge(
   z.object({
@@ -720,7 +725,7 @@ export const configSchema = z.object({
       [EModelEndpoint.azureOpenAI]: azureEndpointSchema.optional(),
       [EModelEndpoint.azureAssistants]: assistantEndpointSchema.optional(),
       [EModelEndpoint.assistants]: assistantEndpointSchema.optional(),
-      [EModelEndpoint.agents]: agentsEndpointSChema.optional(),
+      [EModelEndpoint.agents]: agentsEndpointSchema.optional(),
       [EModelEndpoint.custom]: z.array(endpointSchema.partial()).optional(),
       [EModelEndpoint.bedrock]: baseEndpointSchema.optional(),
     })

From c2a18f61b4cb47ecce3307b2f4b045eb6c6e8562 Mon Sep 17 00:00:00 2001
From: Sebastien Bruel <93573440+sbruel@users.noreply.github.com>
Date: Wed, 11 Jun 2025 11:12:13 +0900
Subject: [PATCH 22/49] =?UTF-8?q?=E2=8F=B1=EF=B8=8F=20refactor:=20Retry=20?=
 =?UTF-8?q?`/api/convos/gen=5Ftitle`=20every=201s=20for=20up=20to=2020s=20?=
 =?UTF-8?q?(#7807)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/server/routes/convos.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/api/server/routes/convos.js b/api/server/routes/convos.js
index 87bac6ed29..eb7e2c5c27 100644
--- a/api/server/routes/convos.js
+++ b/api/server/routes/convos.js
@@ -65,8 +65,14 @@ router.post('/gen_title', async (req, res) => {
   let title = await titleCache.get(key);
 
   if (!title) {
-    await sleep(2500);
-    title = await titleCache.get(key);
+    // Retry every 1s for up to 20s
+    for (let i = 0; i < 20; i++) {
+      await sleep(1000);
+      title = await titleCache.get(key);
+      if (title) {
+        break;
+      }
+    }
   }
 
   if (title) {

From cdf42b3a03a145138b5dcaaf0719534cb4201c69 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Tue, 10 Jun 2025 22:20:41 -0400
Subject: [PATCH 23/49] =?UTF-8?q?=E2=9C=A8=20feat:=20Add=20Dynamic=20User?=
 =?UTF-8?q?=20Field=20Placeholder=20Support=20in=20MCP=20Variables=20(#782?=
 =?UTF-8?q?5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: linting in mcp.spec.ts

* chore: linting in mcp.ts

* feat(mcp): support dynamic user field placeholders in MCP environment variables

- Added user object handling in MCP options, allowing for dynamic user field processing in environment variables, headers, and URLs.
- Updated `processMCPEnv` to utilize user fields for more flexible configurations.

* chore: update backend review workflow to include unit tests for @librechat/data-schemas
---
 .github/workflows/backend-review.yml     |   5 +-
 api/server/controllers/agents/client.js  |   1 +
 api/server/services/MCP.js               |   7 +-
 packages/api/src/mcp/manager.ts          |  22 +-
 packages/data-provider/specs/mcp.spec.ts | 284 +++++++++++++++++++++--
 packages/data-provider/src/mcp.ts        |  77 +++++-
 6 files changed, 357 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/backend-review.yml b/.github/workflows/backend-review.yml
index 0c593eac18..7637b8cdc0 100644
--- a/.github/workflows/backend-review.yml
+++ b/.github/workflows/backend-review.yml
@@ -67,5 +67,8 @@ jobs:
       - name: Run librechat-data-provider unit tests
         run: cd packages/data-provider && npm run test:ci
 
-      - name: Run librechat-api unit tests
+      - name: Run @librechat/data-schemas unit tests
+        run: cd packages/data-schemas && npm run test:ci
+
+      - name: Run @librechat/api unit tests
         run: cd packages/api && npm run test:ci
\ No newline at end of file
diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.js
index 7c8a375a9f..be64d5a0e3 100644
--- a/api/server/controllers/agents/client.js
+++ b/api/server/controllers/agents/client.js
@@ -671,6 +671,7 @@ class AgentClient extends BaseClient {
           last_agent_index: this.agentConfigs?.size ?? 0,
           user_id: this.user ?? this.options.req.user?.id,
           hide_sequential_outputs: this.options.agent.hide_sequential_outputs,
+          user: this.options.req.user,
         },
         recursionLimit: agentsEConfig?.recursionLimit,
         signal: abortController.signal,
diff --git a/api/server/services/MCP.js b/api/server/services/MCP.js
index dc3d3f0037..357913e519 100644
--- a/api/server/services/MCP.js
+++ b/api/server/services/MCP.js
@@ -50,9 +50,10 @@ async function createMCPTool({ req, toolKey, provider: _provider }) {
 
   /** @type {(toolArguments: Object | string, config?: GraphRunnableConfig) => Promise<unknown>} */
   const _call = async (toolArguments, config) => {
+    const userId = config?.configurable?.user?.id || config?.configurable?.user_id;
     try {
       const derivedSignal = config?.signal ? AbortSignal.any([config.signal]) : undefined;
-      const mcpManager = getMCPManager(config?.configurable?.user_id);
+      const mcpManager = getMCPManager(userId);
       const provider = (config?.metadata?.provider || _provider)?.toLowerCase();
       const result = await mcpManager.callTool({
         serverName,
@@ -60,8 +61,8 @@ async function createMCPTool({ req, toolKey, provider: _provider }) {
         provider,
         toolArguments,
         options: {
-          userId: config?.configurable?.user_id,
           signal: derivedSignal,
+          user: config?.configurable?.user,
         },
       });
 
@@ -74,7 +75,7 @@ async function createMCPTool({ req, toolKey, provider: _provider }) {
       return result;
     } catch (error) {
       logger.error(
-        `[MCP][User: ${config?.configurable?.user_id}][${serverName}] Error calling "${toolName}" MCP tool:`,
+        `[MCP][User: ${userId}][${serverName}] Error calling "${toolName}" MCP tool:`,
         error,
       );
       throw new Error(
diff --git a/packages/api/src/mcp/manager.ts b/packages/api/src/mcp/manager.ts
index 93655dd3bb..af8f1632a7 100644
--- a/packages/api/src/mcp/manager.ts
+++ b/packages/api/src/mcp/manager.ts
@@ -1,6 +1,6 @@
 import { CallToolResultSchema, ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
 import type { RequestOptions } from '@modelcontextprotocol/sdk/shared/protocol.js';
-import type { JsonSchemaType, MCPOptions } from 'librechat-data-provider';
+import type { JsonSchemaType, MCPOptions, TUser } from 'librechat-data-provider';
 import type { Logger } from 'winston';
 import type * as t from './types';
 import { formatToolContent } from './parsers';
@@ -8,7 +8,7 @@ import { MCPConnection } from './connection';
 import { CONSTANTS } from './enum';
 
 export interface CallToolOptions extends RequestOptions {
-  userId?: string;
+  user?: TUser;
 }
 
 export class MCPManager {
@@ -21,7 +21,7 @@ export class MCPManager {
   private userLastActivity: Map<string, number> = new Map();
   private readonly USER_CONNECTION_IDLE_TIMEOUT = 15 * 60 * 1000; // 15 minutes (TODO: make configurable)
   private mcpConfigs: t.MCPServers = {};
-  private processMCPEnv?: (obj: MCPOptions, userId?: string) => MCPOptions; // Store the processing function
+  private processMCPEnv?: (obj: MCPOptions, user?: TUser) => MCPOptions; // Store the processing function
   /** Store MCP server instructions */
   private serverInstructions: Map<string, string> = new Map();
   private logger: Logger;
@@ -219,7 +219,12 @@ export class MCPManager {
   }
 
   /** Gets or creates a connection for a specific user */
-  public async getUserConnection(userId: string, serverName: string): Promise<MCPConnection> {
+  public async getUserConnection(serverName: string, user: TUser): Promise<MCPConnection> {
+    const userId = user.id;
+    if (!userId) {
+      throw new McpError(ErrorCode.InvalidRequest, `[MCP] User object missing id property`);
+    }
+
     const userServerMap = this.userConnections.get(userId);
     let connection = userServerMap?.get(serverName);
     const now = Date.now();
@@ -267,7 +272,7 @@ export class MCPManager {
     }
 
     if (this.processMCPEnv) {
-      config = { ...(this.processMCPEnv(config, userId) ?? {}) };
+      config = { ...(this.processMCPEnv(config, user) ?? {}) };
     }
 
     connection = new MCPConnection(serverName, config, this.logger, userId);
@@ -462,14 +467,15 @@ export class MCPManager {
     options?: CallToolOptions;
   }): Promise<t.FormattedToolResponse> {
     let connection: MCPConnection | undefined;
-    const { userId, ...callOptions } = options ?? {};
+    const { user, ...callOptions } = options ?? {};
+    const userId = user?.id;
     const logPrefix = userId ? `[MCP][User: ${userId}][${serverName}]` : `[MCP][${serverName}]`;
 
     try {
-      if (userId) {
+      if (userId && user) {
         this.updateUserLastActivity(userId);
         // Get or create user-specific connection
-        connection = await this.getUserConnection(userId, serverName);
+        connection = await this.getUserConnection(serverName, user);
       } else {
         // Use app-level connection
         connection = this.connections.get(serverName);
diff --git a/packages/data-provider/specs/mcp.spec.ts b/packages/data-provider/specs/mcp.spec.ts
index b3fb61375c..f2b62c0f89 100644
--- a/packages/data-provider/specs/mcp.spec.ts
+++ b/packages/data-provider/specs/mcp.spec.ts
@@ -1,4 +1,28 @@
-import { StdioOptionsSchema, StreamableHTTPOptionsSchema, processMCPEnv, MCPOptions } from '../src/mcp';
+import type { TUser } from 'librechat-data-provider';
+import {
+  StreamableHTTPOptionsSchema,
+  StdioOptionsSchema,
+  processMCPEnv,
+  MCPOptions,
+} from '../src/mcp';
+
+// Helper function to create test user objects
+function createTestUser(
+  overrides: Partial<TUser> & Record<string, unknown> = {},
+): TUser & Record<string, unknown> {
+  return {
+    id: 'test-user-id',
+    username: 'testuser',
+    email: 'test@example.com',
+    name: 'Test User',
+    avatar: 'https://example.com/avatar.png',
+    provider: 'email',
+    role: 'user',
+    createdAt: new Date('2021-01-01').toISOString(),
+    updatedAt: new Date('2021-01-01').toISOString(),
+    ...overrides,
+  };
+}
 
 describe('Environment Variable Extraction (MCP)', () => {
   const originalEnv = process.env;
@@ -91,13 +115,13 @@ describe('Environment Variable Extraction (MCP)', () => {
 
       // Type is now required, so parsing should fail
       expect(() => StreamableHTTPOptionsSchema.parse(options)).toThrow();
-      
+
       // With type provided, it should pass
       const validOptions = {
         type: 'streamable-http' as const,
         url: 'https://example.com/api',
       };
-      
+
       const result = StreamableHTTPOptionsSchema.parse(validOptions);
       expect(result.type).toBe('streamable-http');
     });
@@ -113,7 +137,7 @@ describe('Environment Variable Extraction (MCP)', () => {
       };
 
       const result = StreamableHTTPOptionsSchema.parse(options);
-      
+
       expect(result.headers).toEqual(options.headers);
     });
   });
@@ -165,7 +189,7 @@ describe('Environment Variable Extraction (MCP)', () => {
     });
 
     it('should process user ID in headers field', () => {
-      const userId = 'test-user-123';
+      const user = createTestUser({ id: 'test-user-123' });
       const obj: MCPOptions = {
         type: 'sse',
         url: 'https://example.com',
@@ -176,7 +200,7 @@ describe('Environment Variable Extraction (MCP)', () => {
         },
       };
 
-      const result = processMCPEnv(obj, userId);
+      const result = processMCPEnv(obj, user);
 
       expect('headers' in result && result.headers).toEqual({
         Authorization: 'test-api-key-value',
@@ -217,15 +241,15 @@ describe('Environment Variable Extraction (MCP)', () => {
       };
 
       // Process for two different users
-      const user1Id = 'user-123';
-      const user2Id = 'user-456';
+      const user1 = createTestUser({ id: 'user-123' });
+      const user2 = createTestUser({ id: 'user-456' });
 
-      const resultUser1 = processMCPEnv(baseConfig, user1Id);
-      const resultUser2 = processMCPEnv(baseConfig, user2Id);
+      const resultUser1 = processMCPEnv(baseConfig, user1);
+      const resultUser2 = processMCPEnv(baseConfig, user2);
 
       // Verify each has the correct user ID
-      expect('headers' in resultUser1 && resultUser1.headers?.['User-Id']).toBe(user1Id);
-      expect('headers' in resultUser2 && resultUser2.headers?.['User-Id']).toBe(user2Id);
+      expect('headers' in resultUser1 && resultUser1.headers?.['User-Id']).toBe('user-123');
+      expect('headers' in resultUser2 && resultUser2.headers?.['User-Id']).toBe('user-456');
 
       // Verify they're different objects
       expect(resultUser1).not.toBe(resultUser2);
@@ -239,11 +263,11 @@ describe('Environment Variable Extraction (MCP)', () => {
       expect(baseConfig.headers?.['User-Id']).toBe('{{LIBRECHAT_USER_ID}}');
 
       // Second user's config should be unchanged
-      expect('headers' in resultUser2 && resultUser2.headers?.['User-Id']).toBe(user2Id);
+      expect('headers' in resultUser2 && resultUser2.headers?.['User-Id']).toBe('user-456');
     });
 
     it('should process headers in streamable-http options', () => {
-      const userId = 'test-user-123';
+      const user = createTestUser({ id: 'test-user-123' });
       const obj: MCPOptions = {
         type: 'streamable-http',
         url: 'https://example.com',
@@ -254,7 +278,7 @@ describe('Environment Variable Extraction (MCP)', () => {
         },
       };
 
-      const result = processMCPEnv(obj, userId);
+      const result = processMCPEnv(obj, user);
 
       expect('headers' in result && result.headers).toEqual({
         Authorization: 'test-api-key-value',
@@ -262,7 +286,7 @@ describe('Environment Variable Extraction (MCP)', () => {
         'Content-Type': 'application/json',
       });
     });
-    
+
     it('should maintain streamable-http type in processed options', () => {
       const obj: MCPOptions = {
         type: 'streamable-http',
@@ -273,5 +297,233 @@ describe('Environment Variable Extraction (MCP)', () => {
 
       expect(result.type).toBe('streamable-http');
     });
+
+    it('should process dynamic user fields in headers', () => {
+      const user = createTestUser({
+        id: 'user-123',
+        email: 'test@example.com',
+        username: 'testuser',
+        openidId: 'openid-123',
+        googleId: 'google-456',
+        emailVerified: true,
+        role: 'admin',
+      });
+      const obj: MCPOptions = {
+        type: 'sse',
+        url: 'https://example.com',
+        headers: {
+          'User-Email': '{{LIBRECHAT_USER_EMAIL}}',
+          'User-Name': '{{LIBRECHAT_USER_USERNAME}}',
+          OpenID: '{{LIBRECHAT_USER_OPENIDID}}',
+          'Google-ID': '{{LIBRECHAT_USER_GOOGLEID}}',
+          'Email-Verified': '{{LIBRECHAT_USER_EMAILVERIFIED}}',
+          'User-Role': '{{LIBRECHAT_USER_ROLE}}',
+          'Content-Type': 'application/json',
+        },
+      };
+
+      const result = processMCPEnv(obj, user);
+
+      expect('headers' in result && result.headers).toEqual({
+        'User-Email': 'test@example.com',
+        'User-Name': 'testuser',
+        OpenID: 'openid-123',
+        'Google-ID': 'google-456',
+        'Email-Verified': 'true',
+        'User-Role': 'admin',
+        'Content-Type': 'application/json',
+      });
+    });
+
+    it('should handle missing user fields gracefully', () => {
+      const user = createTestUser({
+        id: 'user-123',
+        email: 'test@example.com',
+        username: undefined, // explicitly set to undefined to test missing field
+      });
+      const obj: MCPOptions = {
+        type: 'sse',
+        url: 'https://example.com',
+        headers: {
+          'User-Email': '{{LIBRECHAT_USER_EMAIL}}',
+          'User-Name': '{{LIBRECHAT_USER_USERNAME}}',
+          'Content-Type': 'application/json',
+        },
+      };
+
+      const result = processMCPEnv(obj, user);
+
+      expect('headers' in result && result.headers).toEqual({
+        'User-Email': 'test@example.com',
+        'User-Name': '', // Empty string for missing field
+        'Content-Type': 'application/json',
+      });
+    });
+
+    it('should process user fields in env variables', () => {
+      const user = createTestUser({
+        id: 'user-123',
+        email: 'test@example.com',
+        ldapId: 'ldap-user-123',
+      });
+      const obj: MCPOptions = {
+        command: 'node',
+        args: ['server.js'],
+        env: {
+          USER_EMAIL: '{{LIBRECHAT_USER_EMAIL}}',
+          LDAP_ID: '{{LIBRECHAT_USER_LDAPID}}',
+          API_KEY: '${TEST_API_KEY}',
+        },
+      };
+
+      const result = processMCPEnv(obj, user);
+
+      expect('env' in result && result.env).toEqual({
+        USER_EMAIL: 'test@example.com',
+        LDAP_ID: 'ldap-user-123',
+        API_KEY: 'test-api-key-value',
+      });
+    });
+
+    it('should process user fields in URL', () => {
+      const user = createTestUser({
+        id: 'user-123',
+        username: 'testuser',
+      });
+      const obj: MCPOptions = {
+        type: 'sse',
+        url: 'https://example.com/api/{{LIBRECHAT_USER_USERNAME}}/stream',
+      };
+
+      const result = processMCPEnv(obj, user);
+
+      expect('url' in result && result.url).toBe('https://example.com/api/testuser/stream');
+    });
+
+    it('should handle boolean user fields', () => {
+      const user = createTestUser({
+        id: 'user-123',
+        emailVerified: true,
+        twoFactorEnabled: false,
+        termsAccepted: true,
+      });
+      const obj: MCPOptions = {
+        type: 'sse',
+        url: 'https://example.com',
+        headers: {
+          'Email-Verified': '{{LIBRECHAT_USER_EMAILVERIFIED}}',
+          'Two-Factor': '{{LIBRECHAT_USER_TWOFACTORENABLED}}',
+          'Terms-Accepted': '{{LIBRECHAT_USER_TERMSACCEPTED}}',
+        },
+      };
+
+      const result = processMCPEnv(obj, user);
+
+      expect('headers' in result && result.headers).toEqual({
+        'Email-Verified': 'true',
+        'Two-Factor': 'false',
+        'Terms-Accepted': 'true',
+      });
+    });
+
+    it('should not process sensitive fields like password', () => {
+      const user = createTestUser({
+        id: 'user-123',
+        email: 'test@example.com',
+        password: 'secret-password',
+      });
+      const obj: MCPOptions = {
+        type: 'sse',
+        url: 'https://example.com',
+        headers: {
+          'User-Email': '{{LIBRECHAT_USER_EMAIL}}',
+          'User-Password': '{{LIBRECHAT_USER_PASSWORD}}', // This should not be processed
+        },
+      };
+
+      const result = processMCPEnv(obj, user);
+
+      expect('headers' in result && result.headers).toEqual({
+        'User-Email': 'test@example.com',
+        'User-Password': '{{LIBRECHAT_USER_PASSWORD}}', // Unchanged
+      });
+    });
+
+    it('should handle multiple occurrences of the same placeholder', () => {
+      const user = createTestUser({
+        id: 'user-123',
+        email: 'test@example.com',
+      });
+      const obj: MCPOptions = {
+        type: 'sse',
+        url: 'https://example.com',
+        headers: {
+          'Primary-Email': '{{LIBRECHAT_USER_EMAIL}}',
+          'Secondary-Email': '{{LIBRECHAT_USER_EMAIL}}',
+          'Backup-Email': '{{LIBRECHAT_USER_EMAIL}}',
+        },
+      };
+
+      const result = processMCPEnv(obj, user);
+
+      expect('headers' in result && result.headers).toEqual({
+        'Primary-Email': 'test@example.com',
+        'Secondary-Email': 'test@example.com',
+        'Backup-Email': 'test@example.com',
+      });
+    });
+
+    it('should support both id and _id properties for LIBRECHAT_USER_ID', () => {
+      // Test with 'id' property
+      const userWithId = createTestUser({
+        id: 'user-123',
+        email: 'test@example.com',
+      });
+      const obj1: MCPOptions = {
+        type: 'sse',
+        url: 'https://example.com',
+        headers: {
+          'User-Id': '{{LIBRECHAT_USER_ID}}',
+        },
+      };
+
+      const result1 = processMCPEnv(obj1, userWithId);
+      expect('headers' in result1 && result1.headers?.['User-Id']).toBe('user-123');
+
+      // Test with '_id' property only (should not work since we only check 'id')
+      const userWithUnderscore = createTestUser({
+        id: undefined, // Remove default id to test _id
+        _id: 'user-456',
+        email: 'test@example.com',
+      });
+      const obj2: MCPOptions = {
+        type: 'sse',
+        url: 'https://example.com',
+        headers: {
+          'User-Id': '{{LIBRECHAT_USER_ID}}',
+        },
+      };
+
+      const result2 = processMCPEnv(obj2, userWithUnderscore);
+      // Since we don't check _id, the placeholder should remain unchanged
+      expect('headers' in result2 && result2.headers?.['User-Id']).toBe('{{LIBRECHAT_USER_ID}}');
+
+      // Test with both properties (id takes precedence)
+      const userWithBoth = createTestUser({
+        id: 'user-789',
+        _id: 'user-000',
+        email: 'test@example.com',
+      });
+      const obj3: MCPOptions = {
+        type: 'sse',
+        url: 'https://example.com',
+        headers: {
+          'User-Id': '{{LIBRECHAT_USER_ID}}',
+        },
+      };
+
+      const result3 = processMCPEnv(obj3, userWithBoth);
+      expect('headers' in result3 && result3.headers?.['User-Id']).toBe('user-789');
+    });
   });
 });
diff --git a/packages/data-provider/src/mcp.ts b/packages/data-provider/src/mcp.ts
index 1273274c54..2d7be8458f 100644
--- a/packages/data-provider/src/mcp.ts
+++ b/packages/data-provider/src/mcp.ts
@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import type { TUser } from './types';
 import { extractEnvVariable } from './utils';
 
 const BaseOptionsSchema = z.object({
@@ -7,7 +8,7 @@ const BaseOptionsSchema = z.object({
   initTimeout: z.number().optional(),
   /** Controls visibility in chat dropdown menu (MCPSelect) */
   chatMenu: z.boolean().optional(),
-  /** 
+  /**
    * Controls server instruction behavior:
    * - undefined/not set: No instructions included (default)
    * - true: Use server-provided instructions
@@ -121,12 +122,58 @@ export const MCPServersSchema = z.record(z.string(), MCPOptionsSchema);
 export type MCPOptions = z.infer<typeof MCPOptionsSchema>;
 
 /**
- * Recursively processes an object to replace environment variables in string values
- * @param {MCPOptions} obj - The object to process
- * @param {string} [userId] - The user ID
- * @returns {MCPOptions} - The processed object with environment variables replaced
+ * List of allowed user fields that can be used in MCP environment variables.
+ * These are non-sensitive string/boolean fields from the IUser interface.
  */
-export function processMCPEnv(obj: Readonly<MCPOptions>, userId?: string): MCPOptions {
+const ALLOWED_USER_FIELDS = [
+  'name',
+  'username',
+  'email',
+  'provider',
+  'role',
+  'googleId',
+  'facebookId',
+  'openidId',
+  'samlId',
+  'ldapId',
+  'githubId',
+  'discordId',
+  'appleId',
+  'emailVerified',
+  'twoFactorEnabled',
+  'termsAccepted',
+] as const;
+
+/**
+ * Processes a string value to replace user field placeholders
+ * @param value - The string value to process
+ * @param user - The user object
+ * @returns The processed string with placeholders replaced
+ */
+function processUserPlaceholders(value: string, user?: TUser): string {
+  if (!user || typeof value !== 'string') {
+    return value;
+  }
+
+  for (const field of ALLOWED_USER_FIELDS) {
+    const placeholder = `{{LIBRECHAT_USER_${field.toUpperCase()}}}`;
+    if (value.includes(placeholder)) {
+      const fieldValue = user[field as keyof TUser];
+      const replacementValue = fieldValue != null ? String(fieldValue) : '';
+      value = value.replace(new RegExp(placeholder, 'g'), replacementValue);
+    }
+  }
+
+  return value;
+}
+
+/**
+ * Recursively processes an object to replace environment variables in string values
+ * @param obj - The object to process
+ * @param user - The user object containing all user fields
+ * @returns - The processed object with environment variables replaced
+ */
+export function processMCPEnv(obj: Readonly<MCPOptions>, user?: TUser): MCPOptions {
   if (obj === null || obj === undefined) {
     return obj;
   }
@@ -136,23 +183,31 @@ export function processMCPEnv(obj: Readonly<MCPOptions>, userId?: string): MCPOp
   if ('env' in newObj && newObj.env) {
     const processedEnv: Record<string, string> = {};
     for (const [key, value] of Object.entries(newObj.env)) {
-      processedEnv[key] = extractEnvVariable(value);
+      let processedValue = extractEnvVariable(value);
+      processedValue = processUserPlaceholders(processedValue, user);
+      processedEnv[key] = processedValue;
     }
     newObj.env = processedEnv;
   } else if ('headers' in newObj && newObj.headers) {
     const processedHeaders: Record<string, string> = {};
     for (const [key, value] of Object.entries(newObj.headers)) {
-      if (value === '{{LIBRECHAT_USER_ID}}' && userId != null && userId) {
-        processedHeaders[key] = userId;
+      const userId = user?.id;
+      if (value === '{{LIBRECHAT_USER_ID}}' && userId != null) {
+        processedHeaders[key] = String(userId);
         continue;
       }
-      processedHeaders[key] = extractEnvVariable(value);
+
+      let processedValue = extractEnvVariable(value);
+      processedValue = processUserPlaceholders(processedValue, user);
+      processedHeaders[key] = processedValue;
     }
     newObj.headers = processedHeaders;
   }
 
   if ('url' in newObj && newObj.url) {
-    newObj.url = extractEnvVariable(newObj.url);
+    let processedUrl = extractEnvVariable(newObj.url);
+    processedUrl = processUserPlaceholders(processedUrl, user);
+    newObj.url = processedUrl;
   }
 
   return newObj;

From 13c7ceb91889e2a1d733e5d30d0e0f9ab9d61259 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Wed, 11 Jun 2025 14:17:48 -0400
Subject: [PATCH 24/49] =?UTF-8?q?=F0=9F=93=8B=20fix:=20Agent=20Resource=20?=
 =?UTF-8?q?Deduplication=20&=20Sharing=20Duplicate=20False=20Positive=20(#?=
 =?UTF-8?q?7835)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: `primeResources` to Prevent Duplicate Files Across Sources

- Added multiple test cases to ensure that the `primeResources` function correctly handles duplicate files from OCR and attachments, including scenarios with shared files, files without IDs, and duplicates within attachments.
- Implemented logic to categorize files into appropriate tool resources while preventing duplicates across different categories.
- Enhanced error handling and ensured that unique files are returned in the final attachments array.

* fix: Update ToolService to handle single OCR tool case (no loaded tool necessary)

* refactor: Add skipVersioning option to updateAgent for isolated updates

- for now, mainly concerns sharing/unsharing of agents

* chore: Update translation for shared agent message in UI
---
 api/models/Agent.js                       |  13 +-
 api/models/Agent.spec.js                  |  59 +++
 api/server/controllers/agents/v1.js       |  10 +-
 api/server/services/ToolService.js        |   2 +
 client/src/locales/en/translation.json    |   2 +-
 packages/api/src/agents/resources.test.ts | 447 ++++++++++++++++++++++
 packages/api/src/agents/resources.ts      | 240 ++++++++++--
 7 files changed, 730 insertions(+), 43 deletions(-)

diff --git a/api/models/Agent.js b/api/models/Agent.js
index 12b7a478af..297604c444 100644
--- a/api/models/Agent.js
+++ b/api/models/Agent.js
@@ -259,11 +259,12 @@ const isDuplicateVersion = (updateData, currentData, versions, actionsHash = nul
  * @param {Object} [options] - Optional configuration object.
  * @param {string} [options.updatingUserId] - The ID of the user performing the update (used for tracking non-author updates).
  * @param {boolean} [options.forceVersion] - Force creation of a new version even if no fields changed.
+ * @param {boolean} [options.skipVersioning] - Skip version creation entirely (useful for isolated operations like sharing).
  * @returns {Promise<Agent>} The updated or newly created agent document as a plain object.
  * @throws {Error} If the update would create a duplicate version
  */
 const updateAgent = async (searchParameter, updateData, options = {}) => {
-  const { updatingUserId = null, forceVersion = false } = options;
+  const { updatingUserId = null, forceVersion = false, skipVersioning = false } = options;
   const mongoOptions = { new: true, upsert: false };
 
   const currentAgent = await Agent.findOne(searchParameter);
@@ -300,7 +301,8 @@ const updateAgent = async (searchParameter, updateData, options = {}) => {
     }
 
     const shouldCreateVersion =
-      forceVersion || Object.keys(directUpdates).length > 0 || $push || $pull || $addToSet;
+      !skipVersioning &&
+      (forceVersion || Object.keys(directUpdates).length > 0 || $push || $pull || $addToSet);
 
     if (shouldCreateVersion) {
       const duplicateVersion = isDuplicateVersion(updateData, versionData, versions, actionsHash);
@@ -335,7 +337,7 @@ const updateAgent = async (searchParameter, updateData, options = {}) => {
       versionEntry.updatedBy = new mongoose.Types.ObjectId(updatingUserId);
     }
 
-    if (shouldCreateVersion || forceVersion) {
+    if (shouldCreateVersion) {
       updateData.$push = {
         ...($push || {}),
         versions: versionEntry,
@@ -546,7 +548,10 @@ const updateAgentProjects = async ({ user, agentId, projectIds, removeProjectIds
     delete updateQuery.author;
   }
 
-  const updatedAgent = await updateAgent(updateQuery, updateOps, { updatingUserId: user.id });
+  const updatedAgent = await updateAgent(updateQuery, updateOps, {
+    updatingUserId: user.id,
+    skipVersioning: true,
+  });
   if (updatedAgent) {
     return updatedAgent;
   }
diff --git a/api/models/Agent.spec.js b/api/models/Agent.spec.js
index 0e35ef36a7..1e18168147 100644
--- a/api/models/Agent.spec.js
+++ b/api/models/Agent.spec.js
@@ -2447,6 +2447,65 @@ describe('models/Agent', () => {
       expect(updated2.description).toBe('Another description');
     });
 
+    test('should skip version creation when skipVersioning option is used', async () => {
+      const agentId = `agent_${uuidv4()}`;
+      const authorId = new mongoose.Types.ObjectId();
+      const projectId1 = new mongoose.Types.ObjectId();
+      const projectId2 = new mongoose.Types.ObjectId();
+
+      // Create agent with initial projectIds
+      await createAgent({
+        id: agentId,
+        name: 'Test Agent',
+        provider: 'test',
+        model: 'test-model',
+        author: authorId,
+        projectIds: [projectId1],
+      });
+
+      // Share agent using updateAgentProjects (which uses skipVersioning)
+      const shared = await updateAgentProjects({
+        user: { id: authorId.toString() }, // Use the same author ID
+        agentId: agentId,
+        projectIds: [projectId2.toString()],
+      });
+
+      // Should NOT create a new version due to skipVersioning
+      expect(shared.versions).toHaveLength(1);
+      expect(shared.projectIds.map((id) => id.toString())).toContain(projectId1.toString());
+      expect(shared.projectIds.map((id) => id.toString())).toContain(projectId2.toString());
+
+      // Unshare agent using updateAgentProjects
+      const unshared = await updateAgentProjects({
+        user: { id: authorId.toString() },
+        agentId: agentId,
+        removeProjectIds: [projectId1.toString()],
+      });
+
+      // Still should NOT create a new version
+      expect(unshared.versions).toHaveLength(1);
+      expect(unshared.projectIds.map((id) => id.toString())).not.toContain(projectId1.toString());
+      expect(unshared.projectIds.map((id) => id.toString())).toContain(projectId2.toString());
+
+      // Regular update without skipVersioning should create a version
+      const regularUpdate = await updateAgent(
+        { id: agentId },
+        { description: 'Updated description' },
+      );
+
+      expect(regularUpdate.versions).toHaveLength(2);
+      expect(regularUpdate.description).toBe('Updated description');
+
+      // Direct updateAgent with MongoDB operators should still create versions
+      const directUpdate = await updateAgent(
+        { id: agentId },
+        { $addToSet: { projectIds: { $each: [projectId1] } } },
+      );
+
+      expect(directUpdate.versions).toHaveLength(3);
+      expect(directUpdate.projectIds.length).toBe(2);
+    });
+
     test('should preserve agent_ids in version history', async () => {
       const agentId = `agent_${uuidv4()}`;
       const authorId = new mongoose.Types.ObjectId();
diff --git a/api/server/controllers/agents/v1.js b/api/server/controllers/agents/v1.js
index cf59c395f4..38a058b540 100644
--- a/api/server/controllers/agents/v1.js
+++ b/api/server/controllers/agents/v1.js
@@ -169,12 +169,18 @@ const updateAgentHandler = async (req, res) => {
       });
     }
 
+    /** @type {boolean} */
+    const isProjectUpdate = (projectIds?.length ?? 0) > 0 || (removeProjectIds?.length ?? 0) > 0;
+
     let updatedAgent =
       Object.keys(updateData).length > 0
-        ? await updateAgent({ id }, updateData, { updatingUserId: req.user.id })
+        ? await updateAgent({ id }, updateData, {
+            updatingUserId: req.user.id,
+            skipVersioning: isProjectUpdate,
+          })
         : existingAgent;
 
-    if (projectIds || removeProjectIds) {
+    if (isProjectUpdate) {
       updatedAgent = await updateAgentProjects({
         user: req.user,
         agentId: id,
diff --git a/api/server/services/ToolService.js b/api/server/services/ToolService.js
index 8dd2fbf865..9172c25e96 100644
--- a/api/server/services/ToolService.js
+++ b/api/server/services/ToolService.js
@@ -500,6 +500,8 @@ async function processRequiredActions(client, requiredActions) {
 async function loadAgentTools({ req, res, agent, tool_resources, openAIApiKey }) {
   if (!agent.tools || agent.tools.length === 0) {
     return {};
+  } else if (agent.tools && agent.tools.length === 1 && agent.tools[0] === AgentCapabilities.ocr) {
+    return {};
   }
 
   const endpointsConfig = await getEndpointsConfig(req);
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index 0a3042fd9f..3cfa3632a0 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -517,7 +517,7 @@
   "com_ui_agent_editing_allowed": "Other users can already edit this agent",
   "com_ui_agent_recursion_limit": "Max Agent Steps",
   "com_ui_agent_recursion_limit_info": "Limits how many steps the agent can take in a run before giving a final response. Default is 25 steps. A step is either an AI API request or a tool usage round. For example, a basic tool interaction takes 3 steps: initial request, tool usage, and follow-up request.",
-  "com_ui_agent_shared_to_all": "something needs to go here. was empty",
+  "com_ui_agent_shared_to_all": "Agent is shared to all users",
   "com_ui_agent_var": "{{0}} agent",
   "com_ui_agent_version": "Version",
   "com_ui_agent_version_active": "Active Version",
diff --git a/packages/api/src/agents/resources.test.ts b/packages/api/src/agents/resources.test.ts
index 8789856ab7..cdfa50243c 100644
--- a/packages/api/src/agents/resources.test.ts
+++ b/packages/api/src/agents/resources.test.ts
@@ -404,6 +404,453 @@ describe('primeResources', () => {
       expect(result.attachments?.[0]?.file_id).toBe('ocr-file-1');
       expect(result.attachments?.[1]?.file_id).toBe('file1');
     });
+
+    it('should prevent duplicate files when same file exists in OCR and attachments', async () => {
+      const sharedFile: TFile = {
+        user: 'user1',
+        file_id: 'shared-file-id',
+        filename: 'document.pdf',
+        filepath: '/uploads/document.pdf',
+        object: 'file',
+        type: 'application/pdf',
+        bytes: 1024,
+        embedded: false,
+        usage: 0,
+      };
+
+      const mockOcrFiles: TFile[] = [sharedFile];
+      const mockAttachmentFiles: TFile[] = [
+        sharedFile,
+        {
+          user: 'user1',
+          file_id: 'unique-file',
+          filename: 'other.txt',
+          filepath: '/uploads/other.txt',
+          object: 'file',
+          type: 'text/plain',
+          bytes: 256,
+          embedded: false,
+          usage: 0,
+        },
+      ];
+
+      mockGetFiles.mockResolvedValue(mockOcrFiles);
+      const attachments = Promise.resolve(mockAttachmentFiles);
+
+      const tool_resources = {
+        [EToolResources.ocr]: {
+          file_ids: ['shared-file-id'],
+        },
+      };
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources,
+      });
+
+      // Should only have 2 files, not 3 (no duplicate)
+      expect(result.attachments).toHaveLength(2);
+      expect(result.attachments?.filter((f) => f?.file_id === 'shared-file-id')).toHaveLength(1);
+      expect(result.attachments?.find((f) => f?.file_id === 'unique-file')).toBeDefined();
+    });
+
+    it('should still categorize duplicate files for tool_resources', async () => {
+      const sharedFile: TFile = {
+        user: 'user1',
+        file_id: 'shared-file-id',
+        filename: 'script.py',
+        filepath: '/uploads/script.py',
+        object: 'file',
+        type: 'text/x-python',
+        bytes: 512,
+        embedded: false,
+        usage: 0,
+        metadata: {
+          fileIdentifier: 'python-script',
+        },
+      };
+
+      const mockOcrFiles: TFile[] = [sharedFile];
+      const mockAttachmentFiles: TFile[] = [sharedFile];
+
+      mockGetFiles.mockResolvedValue(mockOcrFiles);
+      const attachments = Promise.resolve(mockAttachmentFiles);
+
+      const tool_resources = {
+        [EToolResources.ocr]: {
+          file_ids: ['shared-file-id'],
+        },
+      };
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources,
+      });
+
+      // File should appear only once in attachments
+      expect(result.attachments).toHaveLength(1);
+      expect(result.attachments?.[0]?.file_id).toBe('shared-file-id');
+
+      // But should still be categorized in tool_resources
+      expect(result.tool_resources?.[EToolResources.execute_code]?.files).toHaveLength(1);
+      expect(result.tool_resources?.[EToolResources.execute_code]?.files?.[0]?.file_id).toBe(
+        'shared-file-id',
+      );
+    });
+
+    it('should handle multiple duplicate files', async () => {
+      const file1: TFile = {
+        user: 'user1',
+        file_id: 'file-1',
+        filename: 'doc1.pdf',
+        filepath: '/uploads/doc1.pdf',
+        object: 'file',
+        type: 'application/pdf',
+        bytes: 1024,
+        embedded: false,
+        usage: 0,
+      };
+
+      const file2: TFile = {
+        user: 'user1',
+        file_id: 'file-2',
+        filename: 'doc2.pdf',
+        filepath: '/uploads/doc2.pdf',
+        object: 'file',
+        type: 'application/pdf',
+        bytes: 2048,
+        embedded: false,
+        usage: 0,
+      };
+
+      const uniqueFile: TFile = {
+        user: 'user1',
+        file_id: 'unique-file',
+        filename: 'unique.txt',
+        filepath: '/uploads/unique.txt',
+        object: 'file',
+        type: 'text/plain',
+        bytes: 256,
+        embedded: false,
+        usage: 0,
+      };
+
+      const mockOcrFiles: TFile[] = [file1, file2];
+      const mockAttachmentFiles: TFile[] = [file1, file2, uniqueFile];
+
+      mockGetFiles.mockResolvedValue(mockOcrFiles);
+      const attachments = Promise.resolve(mockAttachmentFiles);
+
+      const tool_resources = {
+        [EToolResources.ocr]: {
+          file_ids: ['file-1', 'file-2'],
+        },
+      };
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources,
+      });
+
+      // Should have 3 files total (2 from OCR + 1 unique from attachments)
+      expect(result.attachments).toHaveLength(3);
+
+      // Each file should appear only once
+      const fileIds = result.attachments?.map((f) => f?.file_id);
+      expect(fileIds).toContain('file-1');
+      expect(fileIds).toContain('file-2');
+      expect(fileIds).toContain('unique-file');
+
+      // Check no duplicates
+      const uniqueFileIds = new Set(fileIds);
+      expect(uniqueFileIds.size).toBe(fileIds?.length);
+    });
+
+    it('should handle files without file_id gracefully', async () => {
+      const fileWithoutId: Partial<TFile> = {
+        user: 'user1',
+        filename: 'no-id.txt',
+        filepath: '/uploads/no-id.txt',
+        object: 'file',
+        type: 'text/plain',
+        bytes: 256,
+        embedded: false,
+        usage: 0,
+      };
+
+      const normalFile: TFile = {
+        user: 'user1',
+        file_id: 'normal-file',
+        filename: 'normal.txt',
+        filepath: '/uploads/normal.txt',
+        object: 'file',
+        type: 'text/plain',
+        bytes: 512,
+        embedded: false,
+        usage: 0,
+      };
+
+      const mockOcrFiles: TFile[] = [normalFile];
+      const mockAttachmentFiles = [fileWithoutId as TFile, normalFile];
+
+      mockGetFiles.mockResolvedValue(mockOcrFiles);
+      const attachments = Promise.resolve(mockAttachmentFiles);
+
+      const tool_resources = {
+        [EToolResources.ocr]: {
+          file_ids: ['normal-file'],
+        },
+      };
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources,
+      });
+
+      // Should include file without ID and one instance of normal file
+      expect(result.attachments).toHaveLength(2);
+      expect(result.attachments?.filter((f) => f?.file_id === 'normal-file')).toHaveLength(1);
+      expect(result.attachments?.some((f) => !f?.file_id)).toBe(true);
+    });
+
+    it('should prevent duplicates from existing tool_resources', async () => {
+      const existingFile: TFile = {
+        user: 'user1',
+        file_id: 'existing-file',
+        filename: 'existing.py',
+        filepath: '/uploads/existing.py',
+        object: 'file',
+        type: 'text/x-python',
+        bytes: 512,
+        embedded: false,
+        usage: 0,
+        metadata: {
+          fileIdentifier: 'python-script',
+        },
+      };
+
+      const newFile: TFile = {
+        user: 'user1',
+        file_id: 'new-file',
+        filename: 'new.py',
+        filepath: '/uploads/new.py',
+        object: 'file',
+        type: 'text/x-python',
+        bytes: 256,
+        embedded: false,
+        usage: 0,
+        metadata: {
+          fileIdentifier: 'python-script',
+        },
+      };
+
+      const existingToolResources = {
+        [EToolResources.execute_code]: {
+          files: [existingFile],
+        },
+      };
+
+      const attachments = Promise.resolve([existingFile, newFile]);
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources: existingToolResources,
+      });
+
+      // Should only add the new file to attachments
+      expect(result.attachments).toHaveLength(1);
+      expect(result.attachments?.[0]?.file_id).toBe('new-file');
+
+      // Should not duplicate the existing file in tool_resources
+      expect(result.tool_resources?.[EToolResources.execute_code]?.files).toHaveLength(2);
+      const fileIds = result.tool_resources?.[EToolResources.execute_code]?.files?.map(
+        (f) => f.file_id,
+      );
+      expect(fileIds).toEqual(['existing-file', 'new-file']);
+    });
+
+    it('should handle duplicates within attachments array', async () => {
+      const duplicatedFile: TFile = {
+        user: 'user1',
+        file_id: 'dup-file',
+        filename: 'duplicate.txt',
+        filepath: '/uploads/duplicate.txt',
+        object: 'file',
+        type: 'text/plain',
+        bytes: 256,
+        embedded: false,
+        usage: 0,
+      };
+
+      const uniqueFile: TFile = {
+        user: 'user1',
+        file_id: 'unique-file',
+        filename: 'unique.txt',
+        filepath: '/uploads/unique.txt',
+        object: 'file',
+        type: 'text/plain',
+        bytes: 128,
+        embedded: false,
+        usage: 0,
+      };
+
+      // Same file appears multiple times in attachments
+      const attachments = Promise.resolve([
+        duplicatedFile,
+        duplicatedFile,
+        uniqueFile,
+        duplicatedFile,
+      ]);
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources: {},
+      });
+
+      // Should only have 2 unique files
+      expect(result.attachments).toHaveLength(2);
+      const fileIds = result.attachments?.map((f) => f?.file_id);
+      expect(fileIds).toContain('dup-file');
+      expect(fileIds).toContain('unique-file');
+
+      // Verify no duplicates
+      expect(fileIds?.filter((id) => id === 'dup-file')).toHaveLength(1);
+    });
+
+    it('should prevent duplicates across different tool_resource categories', async () => {
+      const multiPurposeFile: TFile = {
+        user: 'user1',
+        file_id: 'multi-file',
+        filename: 'data.txt',
+        filepath: '/uploads/data.txt',
+        object: 'file',
+        type: 'text/plain',
+        bytes: 512,
+        embedded: true, // Will be categorized as file_search
+        usage: 0,
+      };
+
+      const existingToolResources = {
+        [EToolResources.file_search]: {
+          files: [multiPurposeFile],
+        },
+      };
+
+      // Try to add the same file again
+      const attachments = Promise.resolve([multiPurposeFile]);
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources: existingToolResources,
+      });
+
+      // Should not add to attachments (already exists)
+      expect(result.attachments).toHaveLength(0);
+
+      // Should not duplicate in file_search
+      expect(result.tool_resources?.[EToolResources.file_search]?.files).toHaveLength(1);
+      expect(result.tool_resources?.[EToolResources.file_search]?.files?.[0]?.file_id).toBe(
+        'multi-file',
+      );
+    });
+
+    it('should handle complex scenario with OCR, existing tool_resources, and attachments', async () => {
+      const ocrFile: TFile = {
+        user: 'user1',
+        file_id: 'ocr-file',
+        filename: 'scan.pdf',
+        filepath: '/uploads/scan.pdf',
+        object: 'file',
+        type: 'application/pdf',
+        bytes: 2048,
+        embedded: false,
+        usage: 0,
+      };
+
+      const existingFile: TFile = {
+        user: 'user1',
+        file_id: 'existing-file',
+        filename: 'code.py',
+        filepath: '/uploads/code.py',
+        object: 'file',
+        type: 'text/x-python',
+        bytes: 512,
+        embedded: false,
+        usage: 0,
+        metadata: {
+          fileIdentifier: 'python-script',
+        },
+      };
+
+      const newFile: TFile = {
+        user: 'user1',
+        file_id: 'new-file',
+        filename: 'image.png',
+        filepath: '/uploads/image.png',
+        object: 'file',
+        type: 'image/png',
+        bytes: 4096,
+        embedded: false,
+        usage: 0,
+        height: 800,
+        width: 600,
+      };
+
+      mockGetFiles.mockResolvedValue([ocrFile, existingFile]); // OCR returns both files
+      const attachments = Promise.resolve([existingFile, ocrFile, newFile]); // Attachments has duplicates
+
+      const existingToolResources = {
+        [EToolResources.ocr]: {
+          file_ids: ['ocr-file', 'existing-file'],
+        },
+        [EToolResources.execute_code]: {
+          files: [existingFile],
+        },
+      };
+
+      requestFileSet.add('new-file'); // Only new-file is in request set
+
+      const result = await primeResources({
+        req: mockReq,
+        getFiles: mockGetFiles,
+        requestFileSet,
+        attachments,
+        tool_resources: existingToolResources,
+      });
+
+      // Should have 3 unique files total
+      expect(result.attachments).toHaveLength(3);
+      const attachmentIds = result.attachments?.map((f) => f?.file_id).sort();
+      expect(attachmentIds).toEqual(['existing-file', 'new-file', 'ocr-file']);
+
+      // Check tool_resources
+      expect(result.tool_resources?.[EToolResources.execute_code]?.files).toHaveLength(1);
+      expect(result.tool_resources?.[EToolResources.image_edit]?.files).toHaveLength(1);
+      expect(result.tool_resources?.[EToolResources.image_edit]?.files?.[0]?.file_id).toBe(
+        'new-file',
+      );
+    });
   });
 
   describe('error handling', () => {
diff --git a/packages/api/src/agents/resources.ts b/packages/api/src/agents/resources.ts
index 644813bdfa..e7af7927f5 100644
--- a/packages/api/src/agents/resources.ts
+++ b/packages/api/src/agents/resources.ts
@@ -1,10 +1,17 @@
 import { logger } from '@librechat/data-schemas';
 import { EModelEndpoint, EToolResources, AgentCapabilities } from 'librechat-data-provider';
+import type { AgentToolResources, TFile, AgentBaseResource } from 'librechat-data-provider';
 import type { FilterQuery, QueryOptions, ProjectionType } from 'mongoose';
-import type { AgentToolResources, TFile } from 'librechat-data-provider';
 import type { IMongoFile } from '@librechat/data-schemas';
 import type { Request as ServerRequest } from 'express';
 
+/**
+ * Function type for retrieving files from the database
+ * @param filter - MongoDB filter query for files
+ * @param _sortOptions - Sorting options (currently unused)
+ * @param selectFields - Field selection options
+ * @returns Promise resolving to array of files
+ */
 export type TGetFiles = (
   filter: FilterQuery<IMongoFile>,
   _sortOptions: ProjectionType<IMongoFile> | null | undefined,
@@ -12,11 +19,125 @@ export type TGetFiles = (
 ) => Promise<Array<TFile>>;
 
 /**
- * @param params
- * @param params.req
- * @param params.attachments
- * @param params.requestFileSet
- * @param params.tool_resources
+ * Helper function to add a file to a specific tool resource category
+ * Prevents duplicate files within the same resource category
+ * @param params - Parameters object
+ * @param params.file - The file to add to the resource
+ * @param params.resourceType - The type of tool resource (e.g., execute_code, file_search, image_edit)
+ * @param params.tool_resources - The agent's tool resources object to update
+ * @param params.processedResourceFiles - Set tracking processed files per resource type
+ */
+const addFileToResource = ({
+  file,
+  resourceType,
+  tool_resources,
+  processedResourceFiles,
+}: {
+  file: TFile;
+  resourceType: EToolResources;
+  tool_resources: AgentToolResources;
+  processedResourceFiles: Set<string>;
+}): void => {
+  if (!file.file_id) {
+    return;
+  }
+
+  const resourceKey = `${resourceType}:${file.file_id}`;
+  if (processedResourceFiles.has(resourceKey)) {
+    return;
+  }
+
+  const resource = tool_resources[resourceType as keyof AgentToolResources] ?? {};
+  if (!resource.files) {
+    (tool_resources[resourceType as keyof AgentToolResources] as AgentBaseResource) = {
+      ...resource,
+      files: [],
+    };
+  }
+
+  // Check if already exists in the files array
+  const resourceFiles = tool_resources[resourceType as keyof AgentToolResources]?.files;
+  const alreadyExists = resourceFiles?.some((f: TFile) => f.file_id === file.file_id);
+
+  if (!alreadyExists) {
+    resourceFiles?.push(file);
+    processedResourceFiles.add(resourceKey);
+  }
+};
+
+/**
+ * Categorizes a file into the appropriate tool resource based on its properties
+ * Files are categorized as:
+ * - execute_code: Files with fileIdentifier metadata
+ * - file_search: Files marked as embedded
+ * - image_edit: Image files in the request file set with dimensions
+ * @param params - Parameters object
+ * @param params.file - The file to categorize
+ * @param params.tool_resources - The agent's tool resources to update
+ * @param params.requestFileSet - Set of file IDs from the current request
+ * @param params.processedResourceFiles - Set tracking processed files per resource type
+ */
+const categorizeFileForToolResources = ({
+  file,
+  tool_resources,
+  requestFileSet,
+  processedResourceFiles,
+}: {
+  file: TFile;
+  tool_resources: AgentToolResources;
+  requestFileSet: Set<string>;
+  processedResourceFiles: Set<string>;
+}): void => {
+  if (file.metadata?.fileIdentifier) {
+    addFileToResource({
+      file,
+      resourceType: EToolResources.execute_code,
+      tool_resources,
+      processedResourceFiles,
+    });
+    return;
+  }
+
+  if (file.embedded === true) {
+    addFileToResource({
+      file,
+      resourceType: EToolResources.file_search,
+      tool_resources,
+      processedResourceFiles,
+    });
+    return;
+  }
+
+  if (
+    requestFileSet.has(file.file_id) &&
+    file.type.startsWith('image') &&
+    file.height &&
+    file.width
+  ) {
+    addFileToResource({
+      file,
+      resourceType: EToolResources.image_edit,
+      tool_resources,
+      processedResourceFiles,
+    });
+  }
+};
+
+/**
+ * Primes resources for agent execution by processing attachments and tool resources
+ * This function:
+ * 1. Fetches OCR files if OCR is enabled
+ * 2. Processes attachment files
+ * 3. Categorizes files into appropriate tool resources
+ * 4. Prevents duplicate files across all sources
+ *
+ * @param params - Parameters object
+ * @param params.req - Express request object containing app configuration
+ * @param params.getFiles - Function to retrieve files from database
+ * @param params.requestFileSet - Set of file IDs from the current request
+ * @param params.attachments - Promise resolving to array of attachment files
+ * @param params.tool_resources - Existing tool resources for the agent
+ * @returns Promise resolving to processed attachments and updated tool resources
  */
 export const primeResources = async ({
   req,
@@ -35,11 +156,48 @@ export const primeResources = async ({
   tool_resources: AgentToolResources | undefined;
 }> => {
   try {
-    let attachments: Array<TFile | undefined> | undefined;
+    /**
+     * Array to collect all unique files that will be returned as attachments
+     * Files are added from OCR results and attachment promises, with duplicates prevented
+     */
+    const attachments: Array<TFile> = [];
+    /**
+     * Set of file IDs already added to the attachments array
+     * Used to prevent duplicate files from being added multiple times
+     * Pre-populated with files from non-OCR tool_resources to prevent re-adding them
+     */
+    const attachmentFileIds = new Set<string>();
+    /**
+     * Set tracking which files have been added to specific tool resource categories
+     * Format: "resourceType:fileId" (e.g., "execute_code:file123")
+     * Prevents the same file from being added multiple times to the same resource
+     */
+    const processedResourceFiles = new Set<string>();
+    /**
+     * The agent's tool resources object that will be updated with categorized files
+     * Initialized from input parameter or empty object if not provided
+     */
     const tool_resources = _tool_resources ?? {};
+
+    // Track existing files in tool_resources to prevent duplicates within resources
+    for (const [resourceType, resource] of Object.entries(tool_resources)) {
+      if (resource?.files && Array.isArray(resource.files)) {
+        for (const file of resource.files) {
+          if (file?.file_id) {
+            processedResourceFiles.add(`${resourceType}:${file.file_id}`);
+            // Files from non-OCR resources should not be added to attachments from _attachments
+            if (resourceType !== EToolResources.ocr) {
+              attachmentFileIds.add(file.file_id);
+            }
+          }
+        }
+      }
+    }
+
     const isOCREnabled = (req.app.locals?.[EModelEndpoint.agents]?.capabilities ?? []).includes(
       AgentCapabilities.ocr,
     );
+
     if (tool_resources[EToolResources.ocr]?.file_ids && isOCREnabled) {
       const context = await getFiles(
         {
@@ -48,48 +206,58 @@ export const primeResources = async ({
         {},
         {},
       );
-      attachments = (attachments ?? []).concat(context);
+
+      for (const file of context) {
+        if (!file?.file_id) {
+          continue;
+        }
+
+        // Clear from attachmentFileIds if it was pre-added
+        attachmentFileIds.delete(file.file_id);
+
+        // Add to attachments
+        attachments.push(file);
+        attachmentFileIds.add(file.file_id);
+
+        // Categorize for tool resources
+        categorizeFileForToolResources({
+          file,
+          tool_resources,
+          requestFileSet,
+          processedResourceFiles,
+        });
+      }
     }
+
     if (!_attachments) {
-      return { attachments, tool_resources };
+      return { attachments: attachments.length > 0 ? attachments : undefined, tool_resources };
     }
+
     const files = await _attachments;
-    if (!attachments) {
-      attachments = [];
-    }
 
     for (const file of files) {
       if (!file) {
         continue;
       }
-      if (file.metadata?.fileIdentifier) {
-        const execute_code = tool_resources[EToolResources.execute_code] ?? {};
-        if (!execute_code.files) {
-          tool_resources[EToolResources.execute_code] = { ...execute_code, files: [] };
-        }
-        tool_resources[EToolResources.execute_code]?.files?.push(file);
-      } else if (file.embedded === true) {
-        const file_search = tool_resources[EToolResources.file_search] ?? {};
-        if (!file_search.files) {
-          tool_resources[EToolResources.file_search] = { ...file_search, files: [] };
-        }
-        tool_resources[EToolResources.file_search]?.files?.push(file);
-      } else if (
-        requestFileSet.has(file.file_id) &&
-        file.type.startsWith('image') &&
-        file.height &&
-        file.width
-      ) {
-        const image_edit = tool_resources[EToolResources.image_edit] ?? {};
-        if (!image_edit.files) {
-          tool_resources[EToolResources.image_edit] = { ...image_edit, files: [] };
-        }
-        tool_resources[EToolResources.image_edit]?.files?.push(file);
+
+      categorizeFileForToolResources({
+        file,
+        tool_resources,
+        requestFileSet,
+        processedResourceFiles,
+      });
+
+      if (file.file_id && attachmentFileIds.has(file.file_id)) {
+        continue;
       }
 
       attachments.push(file);
+      if (file.file_id) {
+        attachmentFileIds.add(file.file_id);
+      }
     }
-    return { attachments, tool_resources };
+
+    return { attachments: attachments.length > 0 ? attachments : [], tool_resources };
   } catch (error) {
     logger.error('Error priming resources', error);
 

From 6488873bad5117383a25bf1ea01adf3156342ea4 Mon Sep 17 00:00:00 2001
From: Samuel Path <samuelpath@users.noreply.github.com>
Date: Wed, 11 Jun 2025 20:27:27 +0200
Subject: [PATCH 25/49] =?UTF-8?q?=F0=9F=94=A7=20fix:=20Properly=20handle?=
 =?UTF-8?q?=20Token=20Expiry=20Defaults=20when=20Env=20Variable=20not=20se?=
 =?UTF-8?q?t=20(#7834)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/server/services/AuthService.js           | 4 +++-
 packages/data-schemas/src/methods/session.ts | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/api/server/services/AuthService.js b/api/server/services/AuthService.js
index 11b37ac886..2c285512ee 100644
--- a/api/server/services/AuthService.js
+++ b/api/server/services/AuthService.js
@@ -409,7 +409,9 @@ const setOpenIDAuthTokens = (tokenset, res) => {
       return;
     }
     const { REFRESH_TOKEN_EXPIRY } = process.env ?? {};
-    const expiryInMilliseconds = eval(REFRESH_TOKEN_EXPIRY) ?? 1000 * 60 * 60 * 24 * 7; // 7 days default
+    const expiryInMilliseconds = REFRESH_TOKEN_EXPIRY
+      ? eval(REFRESH_TOKEN_EXPIRY)
+      : 1000 * 60 * 60 * 24 * 7; // 7 days default
     const expirationDate = new Date(Date.now() + expiryInMilliseconds);
     if (tokenset == null) {
       logger.error('[setOpenIDAuthTokens] No tokenset found in request');
diff --git a/packages/data-schemas/src/methods/session.ts b/packages/data-schemas/src/methods/session.ts
index 8c44aa54db..c5af51e932 100644
--- a/packages/data-schemas/src/methods/session.ts
+++ b/packages/data-schemas/src/methods/session.ts
@@ -13,7 +13,9 @@ export class SessionError extends Error {
 }
 
 const { REFRESH_TOKEN_EXPIRY } = process.env ?? {};
-const expires = eval(REFRESH_TOKEN_EXPIRY ?? '0') ?? 1000 * 60 * 60 * 24 * 7; // 7 days default
+const expires = REFRESH_TOKEN_EXPIRY
+  ? eval(REFRESH_TOKEN_EXPIRY)
+  : 1000 * 60 * 60 * 24 * 7; // 7 days default
 
 // Factory function that takes mongoose instance and returns the methods
 export function createSessionMethods(mongoose: typeof import('mongoose')) {

From 1bd874591a7e41133b647bc9eed696bd65432f44 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Wed, 11 Jun 2025 22:12:50 -0400
Subject: [PATCH 26/49] =?UTF-8?q?=F0=9F=94=A7=20feat:=20Add=20Basic=20Toke?=
 =?UTF-8?q?n=20Exchange=20Method=20for=20Actions=20OAuth=20flow=20(#7844)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Enhanced the OAuth callback and action creation processes to include the `token_exchange_method` parameter.
- Updated the `TokenService` to handle different token exchange methods, allowing for either 'default_post' or 'basic_auth_header' approaches.
- Improved the handling of access tokens and refresh tokens based on the specified exchange method.
---
 api/server/routes/actions.js         |  1 +
 api/server/services/ActionService.js |  2 ++
 api/server/services/TokenService.js  | 47 +++++++++++++++++++++-------
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/api/server/routes/actions.js b/api/server/routes/actions.js
index dc474d1a67..242e52e4ae 100644
--- a/api/server/routes/actions.js
+++ b/api/server/routes/actions.js
@@ -53,6 +53,7 @@ router.get('/:action_id/oauth/callback', async (req, res) => {
       identifier,
       client_url: flowState.metadata.client_url,
       redirect_uri: flowState.metadata.redirect_uri,
+      token_exchange_method: flowState.metadata.token_exchange_method,
       /** Encrypted values */
       encrypted_oauth_client_id: flowState.metadata.encrypted_oauth_client_id,
       encrypted_oauth_client_secret: flowState.metadata.encrypted_oauth_client_secret,
diff --git a/api/server/services/ActionService.js b/api/server/services/ActionService.js
index ed9b0c447d..6656b1f8c7 100644
--- a/api/server/services/ActionService.js
+++ b/api/server/services/ActionService.js
@@ -210,6 +210,7 @@ async function createActionTool({
                     userId: userId,
                     client_url: metadata.auth.client_url,
                     redirect_uri: `${process.env.DOMAIN_SERVER}/api/actions/${action_id}/oauth/callback`,
+                    token_exchange_method: metadata.auth.token_exchange_method,
                     /** Encrypted values */
                     encrypted_oauth_client_id: encrypted.oauth_client_id,
                     encrypted_oauth_client_secret: encrypted.oauth_client_secret,
@@ -264,6 +265,7 @@ async function createActionTool({
                     refresh_token,
                     client_url: metadata.auth.client_url,
                     encrypted_oauth_client_id: encrypted.oauth_client_id,
+                    token_exchange_method: metadata.auth.token_exchange_method,
                     encrypted_oauth_client_secret: encrypted.oauth_client_secret,
                   });
                 const flowsCache = getLogStores(CacheKeys.FLOWS);
diff --git a/api/server/services/TokenService.js b/api/server/services/TokenService.js
index 3dd2e79ffa..5c52198f58 100644
--- a/api/server/services/TokenService.js
+++ b/api/server/services/TokenService.js
@@ -1,4 +1,5 @@
 const axios = require('axios');
+const { TokenExchangeMethodEnum } = require('librechat-data-provider');
 const { handleOAuthToken } = require('~/models/Token');
 const { decryptV2 } = require('~/server/utils/crypto');
 const { logAxiosError } = require('~/utils');
@@ -49,6 +50,7 @@ async function processAccessTokens(tokenData, { userId, identifier }) {
  * @param {string} fields.client_url - The URL of the OAuth provider.
  * @param {string} fields.identifier - The identifier for the token.
  * @param {string} fields.refresh_token - The refresh token to use.
+ * @param {string} fields.token_exchange_method - The token exchange method ('default_post' or 'basic_auth_header').
  * @param {string} fields.encrypted_oauth_client_id - The client ID for the OAuth provider.
  * @param {string} fields.encrypted_oauth_client_secret - The client secret for the OAuth provider.
  * @returns {Promise<{
@@ -63,26 +65,36 @@ const refreshAccessToken = async ({
   client_url,
   identifier,
   refresh_token,
+  token_exchange_method,
   encrypted_oauth_client_id,
   encrypted_oauth_client_secret,
 }) => {
   try {
     const oauth_client_id = await decryptV2(encrypted_oauth_client_id);
     const oauth_client_secret = await decryptV2(encrypted_oauth_client_secret);
+
+    const headers = {
+      'Content-Type': 'application/x-www-form-urlencoded',
+      Accept: 'application/json',
+    };
+
     const params = new URLSearchParams({
-      client_id: oauth_client_id,
-      client_secret: oauth_client_secret,
       grant_type: 'refresh_token',
       refresh_token,
     });
 
+    if (token_exchange_method === TokenExchangeMethodEnum.BasicAuthHeader) {
+      const basicAuth = Buffer.from(`${oauth_client_id}:${oauth_client_secret}`).toString('base64');
+      headers['Authorization'] = `Basic ${basicAuth}`;
+    } else {
+      params.append('client_id', oauth_client_id);
+      params.append('client_secret', oauth_client_secret);
+    }
+
     const response = await axios({
       method: 'POST',
       url: client_url,
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        Accept: 'application/json',
-      },
+      headers,
       data: params.toString(),
     });
     await processAccessTokens(response.data, {
@@ -110,6 +122,7 @@ const refreshAccessToken = async ({
  * @param {string} fields.identifier - The identifier for the token.
  * @param {string} fields.client_url - The URL of the OAuth provider.
  * @param {string} fields.redirect_uri - The redirect URI for the OAuth provider.
+ * @param {string} fields.token_exchange_method - The token exchange method ('default_post' or 'basic_auth_header').
  * @param {string} fields.encrypted_oauth_client_id - The client ID for the OAuth provider.
  * @param {string} fields.encrypted_oauth_client_secret - The client secret for the OAuth provider.
  * @returns {Promise<{
@@ -125,27 +138,37 @@ const getAccessToken = async ({
   identifier,
   client_url,
   redirect_uri,
+  token_exchange_method,
   encrypted_oauth_client_id,
   encrypted_oauth_client_secret,
 }) => {
   const oauth_client_id = await decryptV2(encrypted_oauth_client_id);
   const oauth_client_secret = await decryptV2(encrypted_oauth_client_secret);
+
+  const headers = {
+    'Content-Type': 'application/x-www-form-urlencoded',
+    Accept: 'application/json',
+  };
+
   const params = new URLSearchParams({
     code,
-    client_id: oauth_client_id,
-    client_secret: oauth_client_secret,
     grant_type: 'authorization_code',
     redirect_uri,
   });
 
+  if (token_exchange_method === TokenExchangeMethodEnum.BasicAuthHeader) {
+    const basicAuth = Buffer.from(`${oauth_client_id}:${oauth_client_secret}`).toString('base64');
+    headers['Authorization'] = `Basic ${basicAuth}`;
+  } else {
+    params.append('client_id', oauth_client_id);
+    params.append('client_secret', oauth_client_secret);
+  }
+
   try {
     const response = await axios({
       method: 'POST',
       url: client_url,
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        Accept: 'application/json',
-      },
+      headers,
       data: params.toString(),
     });
 

From 55f79bd2d1e1ead1ddb3a6f417ea80194b5256f3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 12 Jun 2025 08:25:10 -0400
Subject: [PATCH 27/49] =?UTF-8?q?=F0=9F=8C=8D=20i18n:=20Update=20translati?=
 =?UTF-8?q?on.json=20with=20latest=20translations=20(#7727)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 client/src/locales/en/translation.json | 66 +++++++++++++-------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index 3cfa3632a0..6c4000beef 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -373,6 +373,7 @@
   "com_nav_font_size_xs": "Extra Small",
   "com_nav_help_faq": "Help & FAQ",
   "com_nav_hide_panel": "Hide right-most side panel",
+  "com_nav_info_balance": "Balance shows how many token credits you have left to use. Token credits translate to monetary value (e.g., 1000 credits = $0.001 USD)",
   "com_nav_info_code_artifacts": "Enables the display of experimental code artifacts next to the chat",
   "com_nav_info_code_artifacts_agent": "Enables the use of code artifacts for this agent. By default, additional instructions specific to the use of artifacts are added, unless \"Custom Prompt Mode\" is enabled.",
   "com_nav_info_custom_prompt_mode": "When enabled, the default artifacts system prompt will not be included. All artifact-generating instructions must be provided manually in this mode.",
@@ -385,7 +386,6 @@
   "com_nav_info_save_draft": "When enabled, the text and attachments you enter in the chat form will be automatically saved locally as drafts. These drafts will be available even if you reload the page or switch to a different conversation. Drafts are stored locally on your device and are deleted once the message is sent.",
   "com_nav_info_show_thinking": "When enabled, the chat will display the thinking dropdowns open by default, allowing you to view the AI's reasoning in real-time. When disabled, the thinking dropdowns will remain closed by default for a cleaner and more streamlined interface",
   "com_nav_info_user_name_display": "When enabled, the username of the sender will be shown above each message you send. When disabled, you will only see \"You\" above your messages.",
-  "com_nav_info_balance": "Balance shows how many token credits you have left to use. Token credits translate to monetary value (e.g., 1000 credits = $0.001 USD)",
   "com_nav_lang_arabic": "العربية",
   "com_nav_lang_auto": "Auto detect",
   "com_nav_lang_brazilian_portuguese": "Português Brasileiro",
@@ -445,8 +445,8 @@
   "com_nav_setting_chat": "Chat",
   "com_nav_setting_data": "Data controls",
   "com_nav_setting_general": "General",
-  "com_nav_setting_speech": "Speech",
   "com_nav_setting_personalization": "Personalization",
+  "com_nav_setting_speech": "Speech",
   "com_nav_settings": "Settings",
   "com_nav_shared_links": "Shared links",
   "com_nav_show_code": "Always show code when using code interpreter",
@@ -517,7 +517,7 @@
   "com_ui_agent_editing_allowed": "Other users can already edit this agent",
   "com_ui_agent_recursion_limit": "Max Agent Steps",
   "com_ui_agent_recursion_limit_info": "Limits how many steps the agent can take in a run before giving a final response. Default is 25 steps. A step is either an AI API request or a tool usage round. For example, a basic tool interaction takes 3 steps: initial request, tool usage, and follow-up request.",
-  "com_ui_agent_shared_to_all": "Agent is shared to all users",
+  "com_ui_agent_shared_to_all": "something needs to go here. was empty",
   "com_ui_agent_var": "{{0}} agent",
   "com_ui_agent_version": "Version",
   "com_ui_agent_version_active": "Active Version",
@@ -626,8 +626,10 @@
   "com_ui_copy_to_clipboard": "Copy to clipboard",
   "com_ui_create": "Create",
   "com_ui_create_link": "Create link",
+  "com_ui_create_memory": "Create Memory",
   "com_ui_create_prompt": "Create Prompt",
   "com_ui_creating_image": "Creating image. May take a moment",
+  "com_ui_current": "Current",
   "com_ui_currently_production": "Currently in production",
   "com_ui_custom": "Custom",
   "com_ui_custom_header_name": "Custom Header Name",
@@ -684,15 +686,19 @@
   "com_ui_duplication_success": "Successfully duplicated conversation",
   "com_ui_edit": "Edit",
   "com_ui_edit_editing_image": "Editing image",
+  "com_ui_edit_memory": "Edit Memory",
   "com_ui_empty_category": "-",
   "com_ui_endpoint": "Endpoint",
   "com_ui_endpoint_menu": "LLM Endpoint Menu",
   "com_ui_enter": "Enter",
   "com_ui_enter_api_key": "Enter API Key",
+  "com_ui_enter_key": "Enter key",
   "com_ui_enter_openapi_schema": "Enter your OpenAPI schema here",
+  "com_ui_enter_value": "Enter value",
   "com_ui_error": "Error",
   "com_ui_error_connection": "Error connecting to server, try refreshing the page.",
   "com_ui_error_save_admin_settings": "There was an error saving your admin settings.",
+  "com_ui_error_updating_preferences": "Error updating preferences",
   "com_ui_examples": "Examples",
   "com_ui_expand_chat": "Expand Chat",
   "com_ui_export_convo_modal": "Export Conversation Modal",
@@ -788,17 +794,19 @@
   "com_ui_max_tags": "Maximum number allowed is {{0}}, using latest values.",
   "com_ui_mcp_servers": "MCP Servers",
   "com_ui_memories": "Memories",
-  "com_ui_memories_filter": "Filter memories...",
-  "com_ui_memories_allow_use": "Allow using Memories",
   "com_ui_memories_allow_create": "Allow creating Memories",
-  "com_ui_memories_allow_update": "Allow updating Memories",
-  "com_ui_memories_allow_read": "Allow reading Memories",
   "com_ui_memories_allow_opt_out": "Allow users to opt out of Memories",
+  "com_ui_memories_allow_read": "Allow reading Memories",
+  "com_ui_memories_allow_update": "Allow updating Memories",
+  "com_ui_memories_allow_use": "Allow using Memories",
+  "com_ui_memories_filter": "Filter memories...",
   "com_ui_memory": "Memory",
-  "com_ui_usage": "Usage",
-  "com_ui_current": "Current",
-  "com_ui_tokens": "tokens",
-  "com_ui_token": "token",
+  "com_ui_memory_created": "Memory created successfully",
+  "com_ui_memory_deleted": "Memory deleted",
+  "com_ui_memory_deleted_items": "Deleted Memories",
+  "com_ui_memory_key_exists": "A memory with this key already exists. Please use a different key.",
+  "com_ui_memory_updated": "Updated saved memory",
+  "com_ui_memory_updated_items": "Updated Memories",
   "com_ui_mention": "Mention an endpoint, assistant, or preset to quickly switch to it",
   "com_ui_min_tags": "Cannot remove more values, a minimum of {{0}} are required.",
   "com_ui_misc": "Misc.",
@@ -816,7 +824,9 @@
   "com_ui_no_bookmarks": "it seems like you have no bookmarks yet. Click on a chat and add a new one",
   "com_ui_no_category": "No category",
   "com_ui_no_changes": "No changes to update",
-  "com_ui_no_data": "No data available",
+  "com_ui_no_data": "something needs to go here. was empty",
+  "com_ui_no_personalization_available": "No personalization options are currently available",
+  "com_ui_no_read_access": "You don't have permission to view memories",
   "com_ui_no_terms_content": "No terms and conditions content to display",
   "com_ui_no_valid_items": "something needs to go here. was empty",
   "com_ui_none": "None",
@@ -828,6 +838,7 @@
   "com_ui_on": "On",
   "com_ui_openai": "OpenAI",
   "com_ui_page": "Page",
+  "com_ui_preferences_updated": "Preferences updated successfully",
   "com_ui_prev": "Prev",
   "com_ui_preview": "Preview",
   "com_ui_privacy_policy": "Privacy policy",
@@ -848,6 +859,8 @@
   "com_ui_quality": "Quality",
   "com_ui_read_aloud": "Read aloud",
   "com_ui_redirecting_to_provider": "Redirecting to {{0}}, please wait...",
+  "com_ui_reference_saved_memories": "Reference saved memories",
+  "com_ui_reference_saved_memories_description": "Allow the assistant to reference and use your saved memories when responding",
   "com_ui_refresh_link": "Refresh link",
   "com_ui_regenerate": "Regenerate",
   "com_ui_regenerate_backup": "Regenerate Backup Codes",
@@ -926,8 +939,10 @@
   "com_ui_terms_of_service": "Terms of service",
   "com_ui_thinking": "Thinking...",
   "com_ui_thoughts": "Thoughts",
+  "com_ui_token": "token",
   "com_ui_token_exchange_method": "Token Exchange Method",
   "com_ui_token_url": "Token URL",
+  "com_ui_tokens": "tokens",
   "com_ui_tools": "Tools",
   "com_ui_travel": "Travel",
   "com_ui_unarchive": "Unarchive",
@@ -949,19 +964,21 @@
   "com_ui_upload_ocr_text": "Upload as Text",
   "com_ui_upload_success": "Successfully uploaded file",
   "com_ui_upload_type": "Select Upload Type",
+  "com_ui_usage": "Usage",
   "com_ui_use_2fa_code": "Use 2FA Code Instead",
   "com_ui_use_backup_code": "Use Backup Code Instead",
+  "com_ui_use_memory": "Use memory",
   "com_ui_use_micrphone": "Use microphone",
   "com_ui_use_prompt": "Use prompt",
   "com_ui_used": "Used",
+  "com_ui_value": "Value",
   "com_ui_variables": "Variables",
   "com_ui_variables_info": "Use double braces in your text to create variables, e.g. `{{example variable}}`, to later fill when using the prompt.",
   "com_ui_verify": "Verify",
   "com_ui_version_var": "Version {{0}}",
   "com_ui_versions": "Versions",
-  "com_ui_view_source": "View source chat",
   "com_ui_view_memory": "View Memory",
-  "com_ui_no_read_access": "You don't have permission to view memories",
+  "com_ui_view_source": "View source chat",
   "com_ui_web_search": "Web Search",
   "com_ui_web_search_api_subtitle": "Search the web for up-to-date information",
   "com_ui_web_search_cohere_key": "Enter Cohere API Key",
@@ -988,22 +1005,5 @@
   "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_ui_value": "Value",
-  "com_ui_edit_memory": "Edit Memory",
-  "com_ui_enter_key": "Enter key",
-  "com_ui_enter_value": "Enter value",
-  "com_ui_memory_updated": "Updated saved memory",
-  "com_ui_memory_updated_items": "Updated Memories",
-  "com_ui_memory_deleted_items": "Deleted Memories",
-  "com_ui_memory_deleted": "Memory deleted",
-  "com_ui_reference_saved_memories": "Reference saved memories",
-  "com_ui_reference_saved_memories_description": "Allow the assistant to reference and use your saved memories when responding",
-  "com_ui_no_personalization_available": "No personalization options are currently available",
-  "com_ui_preferences_updated": "Preferences updated successfully",
-  "com_ui_error_updating_preferences": "Error updating preferences",
-  "com_ui_use_memory": "Use memory",
-  "com_ui_create_memory": "Create Memory",
-  "com_ui_memory_created": "Memory created successfully",
-  "com_ui_memory_key_exists": "A memory with this key already exists. Please use a different key."
-}
+  "com_warning_resubmit_unsupported": "Resubmitting the AI message is not supported for this endpoint."
+}
\ No newline at end of file

From 46ff008b07a5683d9ed262e824fdfe6c7eeabc50 Mon Sep 17 00:00:00 2001
From: Marco Beretta <81851188+berry-13@users.noreply.github.com>
Date: Thu, 12 Jun 2025 23:34:04 +0200
Subject: [PATCH 28/49] =?UTF-8?q?=F0=9F=A4=96=20refactor:=20Improve=20Spee?=
 =?UTF-8?q?ch=20Settings=20Initialization=20(#7869)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✨ feat: Implement speech settings initialization and update settings handling

* 🔧 fix: Ensure setters reference is included in useEffect dependencies for speech settings initialization

* chore: Update setter reference in useSpeechSettingsInit for improved type safety

---------

Co-authored-by: Danny Avila <danny@librechat.ai>
---
 .../Nav/SettingsTabs/Speech/Speech.tsx        | 21 ++++----
 client/src/hooks/Config/index.ts              |  1 +
 client/src/hooks/Config/useAppStartup.ts      |  3 ++
 .../src/hooks/Config/useSpeechSettingsInit.ts | 50 +++++++++++++++++++
 4 files changed, 65 insertions(+), 10 deletions(-)
 create mode 100644 client/src/hooks/Config/useSpeechSettingsInit.ts

diff --git a/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx b/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx
index 0eaf2ffd0c..5fa967284b 100644
--- a/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx
+++ b/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx
@@ -76,16 +76,10 @@ function Speech() {
         playbackRate: { value: playbackRate, setFunc: setPlaybackRate },
       };
 
-      if (
-        (settings[key].value !== newValue || settings[key].value === newValue || !settings[key]) &&
-        settings[key].value === 'sttExternal' &&
-        settings[key].value === 'ttsExternal'
-      ) {
-        return;
-      }
-
       const setting = settings[key];
-      setting.setFunc(newValue);
+      if (setting) {
+        setting.setFunc(newValue);
+      }
     },
     [
       sttExternal,
@@ -130,13 +124,20 @@ function Speech() {
   useEffect(() => {
     if (data && data.message !== 'not_found') {
       Object.entries(data).forEach(([key, value]) => {
-        updateSetting(key, value);
+        // Only apply config values as defaults if no user preference exists in localStorage
+        const existingValue = localStorage.getItem(key);
+        if (existingValue === null && key !== 'sttExternal' && key !== 'ttsExternal') {
+          updateSetting(key, value);
+        } else if (key === 'sttExternal' || key === 'ttsExternal') {
+          updateSetting(key, value);
+        }
       });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [data]);
 
   // Reset engineTTS if it is set to a removed/invalid value (e.g., 'edge')
+  // TODO: remove this once the 'edge' engine is fully deprecated
   useEffect(() => {
     const validEngines = ['browser', 'external'];
     if (!validEngines.includes(engineTTS)) {
diff --git a/client/src/hooks/Config/index.ts b/client/src/hooks/Config/index.ts
index 88e4a5716d..64fb1eb4f3 100644
--- a/client/src/hooks/Config/index.ts
+++ b/client/src/hooks/Config/index.ts
@@ -1,2 +1,3 @@
 export { default as useAppStartup } from './useAppStartup';
 export { default as useClearStates } from './useClearStates';
+export { default as useSpeechSettingsInit } from './useSpeechSettingsInit';
diff --git a/client/src/hooks/Config/useAppStartup.ts b/client/src/hooks/Config/useAppStartup.ts
index 25c16ce959..77e9e7af80 100644
--- a/client/src/hooks/Config/useAppStartup.ts
+++ b/client/src/hooks/Config/useAppStartup.ts
@@ -5,6 +5,7 @@ import { LocalStorageKeys } from 'librechat-data-provider';
 import { useAvailablePluginsQuery } from 'librechat-data-provider/react-query';
 import type { TStartupConfig, TPlugin, TUser } from 'librechat-data-provider';
 import { mapPlugins, selectPlugins, processPlugins } from '~/utils';
+import useSpeechSettingsInit from './useSpeechSettingsInit';
 import store from '~/store';
 
 const pluginStore: TPlugin = {
@@ -31,6 +32,8 @@ export default function useAppStartup({
     select: selectPlugins,
   });
 
+  useSpeechSettingsInit(!!user);
+
   /** Set the app title */
   useEffect(() => {
     const appTitle = startupConfig?.appTitle ?? '';
diff --git a/client/src/hooks/Config/useSpeechSettingsInit.ts b/client/src/hooks/Config/useSpeechSettingsInit.ts
new file mode 100644
index 0000000000..a6ce69e52b
--- /dev/null
+++ b/client/src/hooks/Config/useSpeechSettingsInit.ts
@@ -0,0 +1,50 @@
+import { useEffect, useRef } from 'react';
+import { useSetRecoilState } from 'recoil';
+import { useGetCustomConfigSpeechQuery } from 'librechat-data-provider/react-query';
+import { logger } from '~/utils';
+import store from '~/store';
+
+/**
+ * Initializes speech-related Recoil values from the server-side custom
+ * configuration on first load (only when the user is authenticated)
+ */
+export default function useSpeechSettingsInit(isAuthenticated: boolean) {
+  const { data } = useGetCustomConfigSpeechQuery({ enabled: isAuthenticated });
+
+  const setters = useRef({
+    conversationMode: useSetRecoilState(store.conversationMode),
+    advancedMode: useSetRecoilState(store.advancedMode),
+    speechToText: useSetRecoilState(store.speechToText),
+    textToSpeech: useSetRecoilState(store.textToSpeech),
+    cacheTTS: useSetRecoilState(store.cacheTTS),
+    engineSTT: useSetRecoilState(store.engineSTT),
+    languageSTT: useSetRecoilState(store.languageSTT),
+    autoTranscribeAudio: useSetRecoilState(store.autoTranscribeAudio),
+    decibelValue: useSetRecoilState(store.decibelValue),
+    autoSendText: useSetRecoilState(store.autoSendText),
+    engineTTS: useSetRecoilState(store.engineTTS),
+    voice: useSetRecoilState(store.voice),
+    cloudBrowserVoices: useSetRecoilState(store.cloudBrowserVoices),
+    languageTTS: useSetRecoilState(store.languageTTS),
+    automaticPlayback: useSetRecoilState(store.automaticPlayback),
+    playbackRate: useSetRecoilState(store.playbackRate),
+  }).current;
+
+  useEffect(() => {
+    if (!isAuthenticated || !data || data.message === 'not_found') return;
+
+    logger.log('Initializing speech settings from config:', data);
+
+    Object.entries(data).forEach(([key, value]) => {
+      if (key === 'sttExternal' || key === 'ttsExternal') return;
+
+      if (localStorage.getItem(key) !== null) return;
+
+      const setter = setters[key as keyof typeof setters];
+      if (setter) {
+        logger.log(`Setting default speech setting: ${key} = ${value}`);
+        setter(value as any);
+      }
+    });
+  }, [isAuthenticated, data, setters]);
+}

From 5f2d1c5dc92bf8eb08318ca84199a06ae22739f7 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Fri, 13 Jun 2025 15:14:57 -0400
Subject: [PATCH 29/49] =?UTF-8?q?=F0=9F=91=81=EF=B8=8F=20feat:=20Azure=20M?=
 =?UTF-8?q?istral=20OCR=20Strategy=20(#7888)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 👁️ feat: Add Azure Mistral OCR strategy and endpoint integration

This commit introduces a new OCR strategy named 'azure_mistral_ocr', allowing the use of a Mistral OCR endpoint deployed on Azure. The configuration, schemas, and file upload strategies have been updated to support this integration, enabling seamless OCR processing via Azure-hosted Mistral services.

* 🗑️ chore: Clean up .gitignore by removing commented-out uncommon directory name

* chore: remove unused vars

* refactor: Move createAxiosInstance to packages/api/utils and update imports

- Removed the createAxiosInstance function from the config module and relocated it to a new utils module for better organization.
- Updated import paths in relevant files to reflect the new location of createAxiosInstance.
- Added tests for createAxiosInstance to ensure proper functionality and proxy configuration handling.

* chore: move axios helpers to packages/api

- Added logAxiosError function to @librechat/api for centralized error logging.
- Updated imports across various files to use the new logAxiosError function.
- Removed the old axios.js utility file as it is no longer needed.

* chore: Update Jest moduleNameMapper for improved path resolution

- Added a new mapping for '~/' to resolve module paths in Jest configuration, enhancing import handling for the project.

* feat: Implement Mistral OCR API integration in TS

* chore: Update MistralOCR tests based on new imports

* fix: Enhance MistralOCR configuration handling and tests

- Introduced helper functions for resolving configuration values from environment variables or hardcoded settings.
- Updated the uploadMistralOCR and uploadAzureMistralOCR functions to utilize the new configuration resolution logic.
- Improved test cases to ensure correct behavior when mixing environment variables and hardcoded values.
- Mocked file upload and signed URL responses in tests to validate functionality without external dependencies.

* feat: Enhance MistralOCR functionality with improved configuration and error handling

- Introduced helper functions for loading authentication configuration and resolving values from environment variables.
- Updated uploadMistralOCR and uploadAzureMistralOCR functions to utilize the new configuration logic.
- Added utility functions for processing OCR results and creating error messages.
- Improved document type determination and result aggregation for better OCR processing.

* refactor: Reorganize OCR type imports in Mistral CRUD file

- Moved OCRResult, OCRResultPage, and OCRImage imports to a more logical grouping for better readability and maintainability.

* feat: Add file exports to API and create files index

* chore: Update OCR types for enhanced structure and clarity

- Redesigned OCRImage interface to include mandatory fields and improved naming conventions.
- Added PageDimensions interface for better representation of page metrics.
- Updated OCRResultPage to include dimensions and mandatory images array.
- Refined OCRResult to include document annotation and usage information.

* refactor: use TS counterpart of uploadOCR methods

* ci: Update MistralOCR tests to reflect new OCR result structure

* chore: Bump version of @librechat/api to 1.2.3 in package.json and package-lock.json

* chore: Update CONFIG_VERSION to 1.2.8

* chore: remove unused sendEvent function from config module (now imported from '@librechat/api')

* chore: remove MistralOCR service files and tests (now in '@librechat/api')

* ci: update logger import in ModelService tests to use @librechat/data-schemas

---------

Co-authored-by: arthurolivierfortin <arthurolivier.fortin@gmail.com>
---
 api/app/clients/OllamaClient.js               |    9 +-
 .../tools/structured/OpenAIImageTools.js      |    5 +-
 api/config/index.js                           |   53 -
 api/server/services/ActionService.js          |    3 +-
 api/server/services/Files/Code/crud.js        |    3 +-
 api/server/services/Files/Code/process.js     |    4 +-
 api/server/services/Files/MistralOCR/crud.js  |  238 ---
 .../services/Files/MistralOCR/crud.spec.js    |  848 ---------
 api/server/services/Files/MistralOCR/index.js |    5 -
 api/server/services/Files/VectorDB/crud.js    |    4 +-
 api/server/services/Files/images/encode.js    |    3 +-
 api/server/services/Files/process.js          |    4 +-
 api/server/services/Files/strategies.js       |   24 +-
 api/server/services/ModelService.js           |    5 +-
 api/server/services/ModelService.spec.js      |    5 +-
 api/server/services/Runs/methods.js           |    2 +-
 api/server/services/TokenService.js           |    4 +-
 api/server/utils/sendEmail.js                 |    4 +-
 api/test/__mocks__/logger.js                  |    3 -
 api/utils/axios.js                            |   46 -
 api/utils/index.js                            |    2 -
 package-lock.json                             |   14 +-
 packages/api/jest.config.mjs                  |    1 +
 packages/api/package.json                     |   12 +-
 packages/api/rollup.config.js                 |    2 +
 packages/api/src/files/index.ts               |    1 +
 packages/api/src/files/mistral/crud.spec.ts   | 1570 +++++++++++++++++
 packages/api/src/files/mistral/crud.ts        |  424 +++++
 packages/api/src/index.ts                     |    2 +
 packages/api/src/mcp/connection.ts            |    2 +-
 packages/api/src/types/index.ts               |    1 +
 packages/api/src/types/mistral.ts             |   82 +
 .../api/src/utils/axios.spec.ts               |   13 +-
 packages/api/src/utils/axios.ts               |   77 +
 packages/api/src/utils/index.ts               |    1 +
 packages/data-provider/src/config.ts          |    3 +-
 packages/data-provider/src/types/files.ts     |    1 +
 37 files changed, 2245 insertions(+), 1235 deletions(-)
 delete mode 100644 api/server/services/Files/MistralOCR/crud.js
 delete mode 100644 api/server/services/Files/MistralOCR/crud.spec.js
 delete mode 100644 api/server/services/Files/MistralOCR/index.js
 delete mode 100644 api/utils/axios.js
 create mode 100644 packages/api/src/files/index.ts
 create mode 100644 packages/api/src/files/mistral/crud.spec.ts
 create mode 100644 packages/api/src/files/mistral/crud.ts
 create mode 100644 packages/api/src/types/mistral.ts
 rename api/config/index.spec.js => packages/api/src/utils/axios.spec.ts (93%)
 create mode 100644 packages/api/src/utils/axios.ts

diff --git a/api/app/clients/OllamaClient.js b/api/app/clients/OllamaClient.js
index 77d007580c..032781f1f1 100644
--- a/api/app/clients/OllamaClient.js
+++ b/api/app/clients/OllamaClient.js
@@ -1,10 +1,11 @@
 const { z } = require('zod');
 const axios = require('axios');
 const { Ollama } = require('ollama');
+const { sleep } = require('@librechat/agents');
+const { logAxiosError } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const { Constants } = require('librechat-data-provider');
-const { deriveBaseURL, logAxiosError } = require('~/utils');
-const { sleep } = require('~/server/utils');
-const { logger } = require('~/config');
+const { deriveBaseURL } = require('~/utils');
 
 const ollamaPayloadSchema = z.object({
   mirostat: z.number().optional(),
@@ -67,7 +68,7 @@ class OllamaClient {
       return models;
     } catch (error) {
       const logMessage =
-        'Failed to fetch models from Ollama API. If you are not using Ollama directly, and instead, through some aggregator or reverse proxy that handles fetching via OpenAI spec, ensure the name of the endpoint doesn\'t start with `ollama` (case-insensitive).';
+        "Failed to fetch models from Ollama API. If you are not using Ollama directly, and instead, through some aggregator or reverse proxy that handles fetching via OpenAI spec, ensure the name of the endpoint doesn't start with `ollama` (case-insensitive).";
       logAxiosError({ message: logMessage, error });
       return [];
     }
diff --git a/api/app/clients/tools/structured/OpenAIImageTools.js b/api/app/clients/tools/structured/OpenAIImageTools.js
index 499cda3ea7..08e15a7fad 100644
--- a/api/app/clients/tools/structured/OpenAIImageTools.js
+++ b/api/app/clients/tools/structured/OpenAIImageTools.js
@@ -4,12 +4,13 @@ const { v4 } = require('uuid');
 const OpenAI = require('openai');
 const FormData = require('form-data');
 const { tool } = require('@langchain/core/tools');
+const { logAxiosError } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const { HttpsProxyAgent } = require('https-proxy-agent');
 const { ContentTypes, EImageOutputType } = require('librechat-data-provider');
 const { getStrategyFunctions } = require('~/server/services/Files/strategies');
-const { logAxiosError, extractBaseURL } = require('~/utils');
+const { extractBaseURL } = require('~/utils');
 const { getFiles } = require('~/models/File');
-const { logger } = require('~/config');
 
 /** Default descriptions for image generation tool  */
 const DEFAULT_IMAGE_GEN_DESCRIPTION = `
diff --git a/api/config/index.js b/api/config/index.js
index 8f24581be2..a02c75887e 100644
--- a/api/config/index.js
+++ b/api/config/index.js
@@ -1,4 +1,3 @@
-const axios = require('axios');
 const { EventSource } = require('eventsource');
 const { Time } = require('librechat-data-provider');
 const { MCPManager, FlowStateManager } = require('@librechat/api');
@@ -37,60 +36,8 @@ function getFlowStateManager(flowsCache) {
   return flowManager;
 }
 
-/**
- * Sends message data in Server Sent Events format.
- * @param {ServerResponse} res - The server response.
- * @param {{ data: string | Record<string, unknown>, event?: string }} event - The message event.
- * @param {string} event.event - The type of event.
- * @param {string} event.data - The message to be sent.
- */
-const sendEvent = (res, event) => {
-  if (typeof event.data === 'string' && event.data.length === 0) {
-    return;
-  }
-  res.write(`event: message\ndata: ${JSON.stringify(event)}\n\n`);
-};
-
-/**
- * Creates and configures an Axios instance with optional proxy settings.
- *
- * @typedef {import('axios').AxiosInstance} AxiosInstance
- * @typedef {import('axios').AxiosProxyConfig} AxiosProxyConfig
- *
- * @returns {AxiosInstance} A configured Axios instance
- * @throws {Error} If there's an issue creating the Axios instance or parsing the proxy URL
- */
-function createAxiosInstance() {
-  const instance = axios.create();
-
-  if (process.env.proxy) {
-    try {
-      const url = new URL(process.env.proxy);
-
-      /** @type {AxiosProxyConfig} */
-      const proxyConfig = {
-        host: url.hostname.replace(/^\[|\]$/g, ''),
-        protocol: url.protocol.replace(':', ''),
-      };
-
-      if (url.port) {
-        proxyConfig.port = parseInt(url.port, 10);
-      }
-
-      instance.defaults.proxy = proxyConfig;
-    } catch (error) {
-      console.error('Error parsing proxy URL:', error);
-      throw new Error(`Invalid proxy URL: ${process.env.proxy}`);
-    }
-  }
-
-  return instance;
-}
-
 module.exports = {
   logger,
-  sendEvent,
   getMCPManager,
-  createAxiosInstance,
   getFlowStateManager,
 };
diff --git a/api/server/services/ActionService.js b/api/server/services/ActionService.js
index 6656b1f8c7..9bf7491543 100644
--- a/api/server/services/ActionService.js
+++ b/api/server/services/ActionService.js
@@ -1,9 +1,9 @@
 const jwt = require('jsonwebtoken');
 const { nanoid } = require('nanoid');
-const { sendEvent } = require('@librechat/api');
 const { tool } = require('@langchain/core/tools');
 const { logger } = require('@librechat/data-schemas');
 const { GraphEvents, sleep } = require('@librechat/agents');
+const { sendEvent, logAxiosError } = require('@librechat/api');
 const {
   Time,
   CacheKeys,
@@ -19,7 +19,6 @@ const { encryptV2, decryptV2 } = require('~/server/utils/crypto');
 const { getActions, deleteActions } = require('~/models/Action');
 const { deleteAssistant } = require('~/models/Assistant');
 const { getFlowStateManager } = require('~/config');
-const { logAxiosError } = require('~/utils');
 const { getLogStores } = require('~/cache');
 const { findToken } = require('~/models');
 
diff --git a/api/server/services/Files/Code/crud.js b/api/server/services/Files/Code/crud.js
index caea9ab30a..c696eae0c4 100644
--- a/api/server/services/Files/Code/crud.js
+++ b/api/server/services/Files/Code/crud.js
@@ -1,7 +1,6 @@
 const FormData = require('form-data');
 const { getCodeBaseURL } = require('@librechat/agents');
-const { createAxiosInstance } = require('~/config');
-const { logAxiosError } = require('~/utils');
+const { createAxiosInstance, logAxiosError } = require('@librechat/api');
 
 const axios = createAxiosInstance();
 
diff --git a/api/server/services/Files/Code/process.js b/api/server/services/Files/Code/process.js
index c92e628589..cf65154983 100644
--- a/api/server/services/Files/Code/process.js
+++ b/api/server/services/Files/Code/process.js
@@ -1,6 +1,8 @@
 const path = require('path');
 const { v4 } = require('uuid');
 const axios = require('axios');
+const { logAxiosError } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const { getCodeBaseURL } = require('@librechat/agents');
 const {
   Tools,
@@ -12,8 +14,6 @@ const {
 const { getStrategyFunctions } = require('~/server/services/Files/strategies');
 const { convertImage } = require('~/server/services/Files/images/convert');
 const { createFile, getFiles, updateFile } = require('~/models/File');
-const { logAxiosError } = require('~/utils');
-const { logger } = require('~/config');
 
 /**
  * Process OpenAI image files, convert to target format, save and return file metadata.
diff --git a/api/server/services/Files/MistralOCR/crud.js b/api/server/services/Files/MistralOCR/crud.js
deleted file mode 100644
index 02fdb85461..0000000000
--- a/api/server/services/Files/MistralOCR/crud.js
+++ /dev/null
@@ -1,238 +0,0 @@
-// ~/server/services/Files/MistralOCR/crud.js
-const fs = require('fs');
-const path = require('path');
-const FormData = require('form-data');
-const {
-  FileSources,
-  envVarRegex,
-  extractEnvVariable,
-  extractVariableName,
-} = require('librechat-data-provider');
-const { loadAuthValues } = require('~/server/services/Tools/credentials');
-const { logger, createAxiosInstance } = require('~/config');
-const { logAxiosError } = require('~/utils/axios');
-
-const axios = createAxiosInstance();
-
-/**
- * Uploads a document to Mistral API using file streaming to avoid loading the entire file into memory
- *
- * @param {Object} params Upload parameters
- * @param {string} params.filePath The path to the file on disk
- * @param {string} [params.fileName] Optional filename to use (defaults to the name from filePath)
- * @param {string} params.apiKey Mistral API key
- * @param {string} [params.baseURL=https://api.mistral.ai/v1] Mistral API base URL
- * @returns {Promise<Object>} The response from Mistral API
- */
-async function uploadDocumentToMistral({
-  filePath,
-  fileName = '',
-  apiKey,
-  baseURL = 'https://api.mistral.ai/v1',
-}) {
-  const form = new FormData();
-  form.append('purpose', 'ocr');
-  const actualFileName = fileName || path.basename(filePath);
-  const fileStream = fs.createReadStream(filePath);
-  form.append('file', fileStream, { filename: actualFileName });
-
-  return axios
-    .post(`${baseURL}/files`, form, {
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-        ...form.getHeaders(),
-      },
-      maxBodyLength: Infinity,
-      maxContentLength: Infinity,
-    })
-    .then((res) => res.data)
-    .catch((error) => {
-      throw error;
-    });
-}
-
-async function getSignedUrl({
-  apiKey,
-  fileId,
-  expiry = 24,
-  baseURL = 'https://api.mistral.ai/v1',
-}) {
-  return axios
-    .get(`${baseURL}/files/${fileId}/url?expiry=${expiry}`, {
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-      },
-    })
-    .then((res) => res.data)
-    .catch((error) => {
-      logger.error('Error fetching signed URL:', error.message);
-      throw error;
-    });
-}
-
-/**
- * @param {Object} params
- * @param {string} params.apiKey
- * @param {string} params.url - The document or image URL
- * @param {string} [params.documentType='document_url'] - 'document_url' or 'image_url'
- * @param {string} [params.model]
- * @param {string} [params.baseURL]
- * @returns {Promise<OCRResult>}
- */
-async function performOCR({
-  apiKey,
-  url,
-  documentType = 'document_url',
-  model = 'mistral-ocr-latest',
-  baseURL = 'https://api.mistral.ai/v1',
-}) {
-  const documentKey = documentType === 'image_url' ? 'image_url' : 'document_url';
-  return axios
-    .post(
-      `${baseURL}/ocr`,
-      {
-        model,
-        image_limit: 0,
-        include_image_base64: false,
-        document: {
-          type: documentType,
-          [documentKey]: url,
-        },
-      },
-      {
-        headers: {
-          'Content-Type': 'application/json',
-          Authorization: `Bearer ${apiKey}`,
-        },
-      },
-    )
-    .then((res) => res.data)
-    .catch((error) => {
-      logger.error('Error performing OCR:', error.message);
-      throw error;
-    });
-}
-
-/**
- * Uploads a file to the Mistral OCR API and processes the OCR result.
- *
- * @param {Object} params - The params object.
- * @param {ServerRequest} params.req - The request object from Express. It should have a `user` property with an `id`
- *                       representing the user
- * @param {Express.Multer.File} 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 {string} params.file_id - The file ID.
- * @param {string} [params.entity_id] - The entity ID, not used here but passed for consistency.
- * @returns {Promise<{ filepath: string, bytes: number }>} - The result object containing the processed `text` and `images` (not currently used),
- *                       along with the `filename` and `bytes` properties.
- */
-const uploadMistralOCR = async ({ req, file, file_id, entity_id }) => {
-  try {
-    /** @type {TCustomConfig['ocr']} */
-    const ocrConfig = req.app.locals?.ocr;
-
-    const apiKeyConfig = ocrConfig.apiKey || '';
-    const baseURLConfig = ocrConfig.baseURL || '';
-
-    const isApiKeyEnvVar = envVarRegex.test(apiKeyConfig);
-    const isBaseURLEnvVar = envVarRegex.test(baseURLConfig);
-
-    const isApiKeyEmpty = !apiKeyConfig.trim();
-    const isBaseURLEmpty = !baseURLConfig.trim();
-
-    let apiKey, baseURL;
-
-    if (isApiKeyEnvVar || isBaseURLEnvVar || isApiKeyEmpty || isBaseURLEmpty) {
-      const apiKeyVarName = isApiKeyEnvVar ? extractVariableName(apiKeyConfig) : 'OCR_API_KEY';
-      const baseURLVarName = isBaseURLEnvVar ? extractVariableName(baseURLConfig) : 'OCR_BASEURL';
-
-      const authValues = await loadAuthValues({
-        userId: req.user.id,
-        authFields: [baseURLVarName, apiKeyVarName],
-        optional: new Set([baseURLVarName]),
-      });
-
-      apiKey = authValues[apiKeyVarName];
-      baseURL = authValues[baseURLVarName];
-    } else {
-      apiKey = apiKeyConfig;
-      baseURL = baseURLConfig;
-    }
-
-    const mistralFile = await uploadDocumentToMistral({
-      filePath: file.path,
-      fileName: file.originalname,
-      apiKey,
-      baseURL,
-    });
-
-    const modelConfig = ocrConfig.mistralModel || '';
-    const model = envVarRegex.test(modelConfig)
-      ? extractEnvVariable(modelConfig)
-      : modelConfig.trim() || 'mistral-ocr-latest';
-
-    const signedUrlResponse = await getSignedUrl({
-      apiKey,
-      baseURL,
-      fileId: mistralFile.id,
-    });
-
-    const mimetype = (file.mimetype || '').toLowerCase();
-    const originalname = file.originalname || '';
-    const isImage =
-      mimetype.startsWith('image') || /\.(png|jpe?g|gif|bmp|webp|tiff?)$/i.test(originalname);
-    const documentType = isImage ? 'image_url' : 'document_url';
-
-    const ocrResult = await performOCR({
-      apiKey,
-      baseURL,
-      model,
-      url: signedUrlResponse.url,
-      documentType,
-    });
-
-    let aggregatedText = '';
-    const images = [];
-    ocrResult.pages.forEach((page, index) => {
-      if (ocrResult.pages.length > 1) {
-        aggregatedText += `# PAGE ${index + 1}\n`;
-      }
-
-      aggregatedText += page.markdown + '\n\n';
-
-      if (page.images && page.images.length > 0) {
-        page.images.forEach((image) => {
-          if (image.image_base64) {
-            images.push(image.image_base64);
-          }
-        });
-      }
-    });
-
-    return {
-      filename: file.originalname,
-      bytes: aggregatedText.length * 4,
-      filepath: FileSources.mistral_ocr,
-      text: aggregatedText,
-      images,
-    };
-  } catch (error) {
-    let message = 'Error uploading document to Mistral OCR API';
-    const detail = error?.response?.data?.detail;
-    if (detail && detail !== '') {
-      message = detail;
-    }
-
-    const responseMessage = error?.response?.data?.message;
-    throw new Error(
-      `${logAxiosError({ error, message })}${responseMessage && responseMessage !== '' ? ` - ${responseMessage}` : ''}`,
-    );
-  }
-};
-
-module.exports = {
-  uploadDocumentToMistral,
-  uploadMistralOCR,
-  getSignedUrl,
-  performOCR,
-};
diff --git a/api/server/services/Files/MistralOCR/crud.spec.js b/api/server/services/Files/MistralOCR/crud.spec.js
deleted file mode 100644
index 72d6be7cb0..0000000000
--- a/api/server/services/Files/MistralOCR/crud.spec.js
+++ /dev/null
@@ -1,848 +0,0 @@
-const fs = require('fs');
-
-const mockAxios = {
-  interceptors: {
-    request: { use: jest.fn(), eject: jest.fn() },
-    response: { use: jest.fn(), eject: jest.fn() },
-  },
-  create: jest.fn().mockReturnValue({
-    defaults: {
-      proxy: null,
-    },
-    get: jest.fn().mockResolvedValue({ data: {} }),
-    post: jest.fn().mockResolvedValue({ data: {} }),
-    put: jest.fn().mockResolvedValue({ data: {} }),
-    delete: jest.fn().mockResolvedValue({ data: {} }),
-  }),
-  get: jest.fn().mockResolvedValue({ data: {} }),
-  post: jest.fn().mockResolvedValue({ data: {} }),
-  put: jest.fn().mockResolvedValue({ data: {} }),
-  delete: jest.fn().mockResolvedValue({ data: {} }),
-  reset: jest.fn().mockImplementation(function () {
-    this.get.mockClear();
-    this.post.mockClear();
-    this.put.mockClear();
-    this.delete.mockClear();
-    this.create.mockClear();
-  }),
-};
-
-jest.mock('axios', () => mockAxios);
-jest.mock('fs');
-jest.mock('~/config', () => ({
-  logger: {
-    error: jest.fn(),
-  },
-  createAxiosInstance: () => mockAxios,
-}));
-jest.mock('~/server/services/Tools/credentials', () => ({
-  loadAuthValues: jest.fn(),
-}));
-
-const { uploadDocumentToMistral, uploadMistralOCR, getSignedUrl, performOCR } = require('./crud');
-
-describe('MistralOCR Service', () => {
-  afterEach(() => {
-    mockAxios.reset();
-    jest.clearAllMocks();
-  });
-
-  describe('uploadDocumentToMistral', () => {
-    beforeEach(() => {
-      // Create a more complete mock for file streams that FormData can work with
-      const mockReadStream = {
-        on: jest.fn().mockImplementation(function (event, handler) {
-          // Simulate immediate 'end' event to make FormData complete processing
-          if (event === 'end') {
-            handler();
-          }
-          return this;
-        }),
-        pipe: jest.fn().mockImplementation(function () {
-          return this;
-        }),
-        pause: jest.fn(),
-        resume: jest.fn(),
-        emit: jest.fn(),
-        once: jest.fn(),
-        destroy: jest.fn(),
-      };
-
-      fs.createReadStream = jest.fn().mockReturnValue(mockReadStream);
-
-      // Mock FormData's append to avoid actual stream processing
-      jest.mock('form-data', () => {
-        const mockFormData = function () {
-          return {
-            append: jest.fn(),
-            getHeaders: jest
-              .fn()
-              .mockReturnValue({ 'content-type': 'multipart/form-data; boundary=---boundary' }),
-            getBuffer: jest.fn().mockReturnValue(Buffer.from('mock-form-data')),
-            getLength: jest.fn().mockReturnValue(100),
-          };
-        };
-        return mockFormData;
-      });
-    });
-
-    it('should upload a document to Mistral API using file streaming', async () => {
-      const mockResponse = { data: { id: 'file-123', purpose: 'ocr' } };
-      mockAxios.post.mockResolvedValueOnce(mockResponse);
-
-      const result = await uploadDocumentToMistral({
-        filePath: '/path/to/test.pdf',
-        fileName: 'test.pdf',
-        apiKey: 'test-api-key',
-      });
-
-      // Check that createReadStream was called with the correct file path
-      expect(fs.createReadStream).toHaveBeenCalledWith('/path/to/test.pdf');
-
-      // Since we're mocking FormData, we'll just check that axios was called correctly
-      expect(mockAxios.post).toHaveBeenCalledWith(
-        'https://api.mistral.ai/v1/files',
-        expect.anything(),
-        expect.objectContaining({
-          headers: expect.objectContaining({
-            Authorization: 'Bearer test-api-key',
-          }),
-          maxBodyLength: Infinity,
-          maxContentLength: Infinity,
-        }),
-      );
-      expect(result).toEqual(mockResponse.data);
-    });
-
-    it('should handle errors during document upload', async () => {
-      const errorMessage = 'API error';
-      mockAxios.post.mockRejectedValueOnce(new Error(errorMessage));
-
-      await expect(
-        uploadDocumentToMistral({
-          filePath: '/path/to/test.pdf',
-          fileName: 'test.pdf',
-          apiKey: 'test-api-key',
-        }),
-      ).rejects.toThrow(errorMessage);
-    });
-  });
-
-  describe('getSignedUrl', () => {
-    it('should fetch signed URL from Mistral API', async () => {
-      const mockResponse = { data: { url: 'https://document-url.com' } };
-      mockAxios.get.mockResolvedValueOnce(mockResponse);
-
-      const result = await getSignedUrl({
-        fileId: 'file-123',
-        apiKey: 'test-api-key',
-      });
-
-      expect(mockAxios.get).toHaveBeenCalledWith(
-        'https://api.mistral.ai/v1/files/file-123/url?expiry=24',
-        {
-          headers: {
-            Authorization: 'Bearer test-api-key',
-          },
-        },
-      );
-      expect(result).toEqual(mockResponse.data);
-    });
-
-    it('should handle errors when fetching signed URL', async () => {
-      const errorMessage = 'API error';
-      mockAxios.get.mockRejectedValueOnce(new Error(errorMessage));
-
-      await expect(
-        getSignedUrl({
-          fileId: 'file-123',
-          apiKey: 'test-api-key',
-        }),
-      ).rejects.toThrow();
-
-      const { logger } = require('~/config');
-      expect(logger.error).toHaveBeenCalledWith('Error fetching signed URL:', errorMessage);
-    });
-  });
-
-  describe('performOCR', () => {
-    it('should perform OCR using Mistral API (document_url)', async () => {
-      const mockResponse = {
-        data: {
-          pages: [{ markdown: 'Page 1 content' }, { markdown: 'Page 2 content' }],
-        },
-      };
-      mockAxios.post.mockResolvedValueOnce(mockResponse);
-
-      const result = await performOCR({
-        apiKey: 'test-api-key',
-        url: 'https://document-url.com',
-        model: 'mistral-ocr-latest',
-        documentType: 'document_url',
-      });
-
-      expect(mockAxios.post).toHaveBeenCalledWith(
-        'https://api.mistral.ai/v1/ocr',
-        {
-          model: 'mistral-ocr-latest',
-          include_image_base64: false,
-          image_limit: 0,
-          document: {
-            type: 'document_url',
-            document_url: 'https://document-url.com',
-          },
-        },
-        {
-          headers: {
-            'Content-Type': 'application/json',
-            Authorization: 'Bearer test-api-key',
-          },
-        },
-      );
-      expect(result).toEqual(mockResponse.data);
-    });
-
-    it('should perform OCR using Mistral API (image_url)', async () => {
-      const mockResponse = {
-        data: {
-          pages: [{ markdown: 'Image OCR content' }],
-        },
-      };
-      mockAxios.post.mockResolvedValueOnce(mockResponse);
-
-      const result = await performOCR({
-        apiKey: 'test-api-key',
-        url: 'https://image-url.com/image.png',
-        model: 'mistral-ocr-latest',
-        documentType: 'image_url',
-      });
-
-      expect(mockAxios.post).toHaveBeenCalledWith(
-        'https://api.mistral.ai/v1/ocr',
-        {
-          model: 'mistral-ocr-latest',
-          include_image_base64: false,
-          image_limit: 0,
-          document: {
-            type: 'image_url',
-            image_url: 'https://image-url.com/image.png',
-          },
-        },
-        {
-          headers: {
-            'Content-Type': 'application/json',
-            Authorization: 'Bearer test-api-key',
-          },
-        },
-      );
-      expect(result).toEqual(mockResponse.data);
-    });
-
-    it('should handle errors during OCR processing', async () => {
-      const errorMessage = 'OCR processing error';
-      mockAxios.post.mockRejectedValueOnce(new Error(errorMessage));
-
-      await expect(
-        performOCR({
-          apiKey: 'test-api-key',
-          url: 'https://document-url.com',
-        }),
-      ).rejects.toThrow();
-
-      const { logger } = require('~/config');
-      expect(logger.error).toHaveBeenCalledWith('Error performing OCR:', errorMessage);
-    });
-  });
-
-  describe('uploadMistralOCR', () => {
-    beforeEach(() => {
-      const mockReadStream = {
-        on: jest.fn().mockImplementation(function (event, handler) {
-          if (event === 'end') {
-            handler();
-          }
-          return this;
-        }),
-        pipe: jest.fn().mockImplementation(function () {
-          return this;
-        }),
-        pause: jest.fn(),
-        resume: jest.fn(),
-        emit: jest.fn(),
-        once: jest.fn(),
-        destroy: jest.fn(),
-      };
-
-      fs.createReadStream = jest.fn().mockReturnValue(mockReadStream);
-    });
-
-    it('should process OCR for a file with standard configuration', async () => {
-      // Setup mocks
-      const { loadAuthValues } = require('~/server/services/Tools/credentials');
-      loadAuthValues.mockResolvedValue({
-        OCR_API_KEY: 'test-api-key',
-        OCR_BASEURL: 'https://api.mistral.ai/v1',
-      });
-
-      // Mock file upload response
-      mockAxios.post.mockResolvedValueOnce({
-        data: { id: 'file-123', purpose: 'ocr' },
-      });
-
-      // Mock signed URL response
-      mockAxios.get.mockResolvedValueOnce({
-        data: { url: 'https://signed-url.com' },
-      });
-
-      // Mock OCR response with text and images
-      mockAxios.post.mockResolvedValueOnce({
-        data: {
-          pages: [
-            {
-              markdown: 'Page 1 content',
-              images: [{ image_base64: 'base64image1' }],
-            },
-            {
-              markdown: 'Page 2 content',
-              images: [{ image_base64: 'base64image2' }],
-            },
-          ],
-        },
-      });
-
-      const req = {
-        user: { id: 'user123' },
-        app: {
-          locals: {
-            ocr: {
-              // Use environment variable syntax to ensure loadAuthValues is called
-              apiKey: '${OCR_API_KEY}',
-              baseURL: '${OCR_BASEURL}',
-              mistralModel: 'mistral-medium',
-            },
-          },
-        },
-      };
-
-      const file = {
-        path: '/tmp/upload/file.pdf',
-        originalname: 'document.pdf',
-        mimetype: 'application/pdf',
-      };
-
-      const result = await uploadMistralOCR({
-        req,
-        file,
-        file_id: 'file123',
-        entity_id: 'entity123',
-      });
-
-      expect(fs.createReadStream).toHaveBeenCalledWith('/tmp/upload/file.pdf');
-
-      expect(loadAuthValues).toHaveBeenCalledWith({
-        userId: 'user123',
-        authFields: ['OCR_BASEURL', 'OCR_API_KEY'],
-        optional: expect.any(Set),
-      });
-
-      // Verify OCR result
-      expect(result).toEqual({
-        filename: 'document.pdf',
-        bytes: expect.any(Number),
-        filepath: 'mistral_ocr',
-        text: expect.stringContaining('# PAGE 1'),
-        images: ['base64image1', 'base64image2'],
-      });
-    });
-
-    it('should process OCR for an image file and use image_url type', async () => {
-      const { loadAuthValues } = require('~/server/services/Tools/credentials');
-      loadAuthValues.mockResolvedValue({
-        OCR_API_KEY: 'test-api-key',
-        OCR_BASEURL: 'https://api.mistral.ai/v1',
-      });
-
-      // Mock file upload response
-      mockAxios.post.mockResolvedValueOnce({
-        data: { id: 'file-456', purpose: 'ocr' },
-      });
-
-      // Mock signed URL response
-      mockAxios.get.mockResolvedValueOnce({
-        data: { url: 'https://signed-url.com/image.png' },
-      });
-
-      // Mock OCR response for image
-      mockAxios.post.mockResolvedValueOnce({
-        data: {
-          pages: [
-            {
-              markdown: 'Image OCR result',
-              images: [{ image_base64: 'imgbase64' }],
-            },
-          ],
-        },
-      });
-
-      const req = {
-        user: { id: 'user456' },
-        app: {
-          locals: {
-            ocr: {
-              apiKey: '${OCR_API_KEY}',
-              baseURL: '${OCR_BASEURL}',
-              mistralModel: 'mistral-medium',
-            },
-          },
-        },
-      };
-
-      const file = {
-        path: '/tmp/upload/image.png',
-        originalname: 'image.png',
-        mimetype: 'image/png',
-      };
-
-      const result = await uploadMistralOCR({
-        req,
-        file,
-        file_id: 'file456',
-        entity_id: 'entity456',
-      });
-
-      expect(fs.createReadStream).toHaveBeenCalledWith('/tmp/upload/image.png');
-
-      expect(loadAuthValues).toHaveBeenCalledWith({
-        userId: 'user456',
-        authFields: ['OCR_BASEURL', 'OCR_API_KEY'],
-        optional: expect.any(Set),
-      });
-
-      // Check that the OCR API was called with image_url type
-      expect(mockAxios.post).toHaveBeenCalledWith(
-        'https://api.mistral.ai/v1/ocr',
-        expect.objectContaining({
-          document: expect.objectContaining({
-            type: 'image_url',
-            image_url: 'https://signed-url.com/image.png',
-          }),
-        }),
-        expect.any(Object),
-      );
-
-      expect(result).toEqual({
-        filename: 'image.png',
-        bytes: expect.any(Number),
-        filepath: 'mistral_ocr',
-        text: expect.stringContaining('Image OCR result'),
-        images: ['imgbase64'],
-      });
-    });
-
-    it('should process variable references in configuration', async () => {
-      // Setup mocks with environment variables
-      const { loadAuthValues } = require('~/server/services/Tools/credentials');
-      loadAuthValues.mockResolvedValue({
-        CUSTOM_API_KEY: 'custom-api-key',
-        CUSTOM_BASEURL: 'https://custom-api.mistral.ai/v1',
-      });
-
-      // Mock API responses
-      mockAxios.post.mockResolvedValueOnce({
-        data: { id: 'file-123', purpose: 'ocr' },
-      });
-      mockAxios.get.mockResolvedValueOnce({
-        data: { url: 'https://signed-url.com' },
-      });
-      mockAxios.post.mockResolvedValueOnce({
-        data: {
-          pages: [{ markdown: 'Content from custom API' }],
-        },
-      });
-
-      const req = {
-        user: { id: 'user123' },
-        app: {
-          locals: {
-            ocr: {
-              apiKey: '${CUSTOM_API_KEY}',
-              baseURL: '${CUSTOM_BASEURL}',
-              mistralModel: '${CUSTOM_MODEL}',
-            },
-          },
-        },
-      };
-
-      // Set environment variable for model
-      process.env.CUSTOM_MODEL = 'mistral-large';
-
-      const file = {
-        path: '/tmp/upload/file.pdf',
-        originalname: 'document.pdf',
-      };
-
-      const result = await uploadMistralOCR({
-        req,
-        file,
-        file_id: 'file123',
-        entity_id: 'entity123',
-      });
-
-      expect(fs.createReadStream).toHaveBeenCalledWith('/tmp/upload/file.pdf');
-
-      // Verify that custom environment variables were extracted and used
-      expect(loadAuthValues).toHaveBeenCalledWith({
-        userId: 'user123',
-        authFields: ['CUSTOM_BASEURL', 'CUSTOM_API_KEY'],
-        optional: expect.any(Set),
-      });
-
-      // Check that mistral-large was used in the OCR API call
-      expect(mockAxios.post).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.objectContaining({
-          model: 'mistral-large',
-        }),
-        expect.anything(),
-      );
-
-      expect(result.text).toEqual('Content from custom API\n\n');
-    });
-
-    it('should fall back to default values when variables are not properly formatted', async () => {
-      const { loadAuthValues } = require('~/server/services/Tools/credentials');
-      loadAuthValues.mockResolvedValue({
-        OCR_API_KEY: 'default-api-key',
-        OCR_BASEURL: undefined, // Testing optional parameter
-      });
-
-      mockAxios.post.mockResolvedValueOnce({
-        data: { id: 'file-123', purpose: 'ocr' },
-      });
-      mockAxios.get.mockResolvedValueOnce({
-        data: { url: 'https://signed-url.com' },
-      });
-      mockAxios.post.mockResolvedValueOnce({
-        data: {
-          pages: [{ markdown: 'Default API result' }],
-        },
-      });
-
-      const req = {
-        user: { id: 'user123' },
-        app: {
-          locals: {
-            ocr: {
-              // Use environment variable syntax to ensure loadAuthValues is called
-              apiKey: '${INVALID_FORMAT}', // Using valid env var format but with an invalid name
-              baseURL: '${OCR_BASEURL}', // Using valid env var format
-              mistralModel: 'mistral-ocr-latest', // Plain string value
-            },
-          },
-        },
-      };
-
-      const file = {
-        path: '/tmp/upload/file.pdf',
-        originalname: 'document.pdf',
-      };
-
-      await uploadMistralOCR({
-        req,
-        file,
-        file_id: 'file123',
-        entity_id: 'entity123',
-      });
-
-      expect(fs.createReadStream).toHaveBeenCalledWith('/tmp/upload/file.pdf');
-
-      // Should use the default values
-      expect(loadAuthValues).toHaveBeenCalledWith({
-        userId: 'user123',
-        authFields: ['OCR_BASEURL', 'INVALID_FORMAT'],
-        optional: expect.any(Set),
-      });
-
-      // Should use the default model when not using environment variable format
-      expect(mockAxios.post).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.objectContaining({
-          model: 'mistral-ocr-latest',
-        }),
-        expect.anything(),
-      );
-    });
-
-    it('should handle API errors during OCR process', async () => {
-      const { loadAuthValues } = require('~/server/services/Tools/credentials');
-      loadAuthValues.mockResolvedValue({
-        OCR_API_KEY: 'test-api-key',
-      });
-
-      // Mock file upload to fail
-      mockAxios.post.mockRejectedValueOnce(new Error('Upload failed'));
-
-      const req = {
-        user: { id: 'user123' },
-        app: {
-          locals: {
-            ocr: {
-              apiKey: 'OCR_API_KEY',
-              baseURL: 'OCR_BASEURL',
-            },
-          },
-        },
-      };
-
-      const file = {
-        path: '/tmp/upload/file.pdf',
-        originalname: 'document.pdf',
-      };
-
-      await expect(
-        uploadMistralOCR({
-          req,
-          file,
-          file_id: 'file123',
-          entity_id: 'entity123',
-        }),
-      ).rejects.toThrow('Error uploading document to Mistral OCR API');
-      expect(fs.createReadStream).toHaveBeenCalledWith('/tmp/upload/file.pdf');
-    });
-
-    it('should handle single page documents without page numbering', async () => {
-      const { loadAuthValues } = require('~/server/services/Tools/credentials');
-      loadAuthValues.mockResolvedValue({
-        OCR_API_KEY: 'test-api-key',
-        OCR_BASEURL: 'https://api.mistral.ai/v1', // Make sure this is included
-      });
-
-      // Clear all previous mocks
-      mockAxios.post.mockClear();
-      mockAxios.get.mockClear();
-
-      // 1. First mock: File upload response
-      mockAxios.post.mockImplementationOnce(() =>
-        Promise.resolve({ data: { id: 'file-123', purpose: 'ocr' } }),
-      );
-
-      // 2. Second mock: Signed URL response
-      mockAxios.get.mockImplementationOnce(() =>
-        Promise.resolve({ data: { url: 'https://signed-url.com' } }),
-      );
-
-      // 3. Third mock: OCR response
-      mockAxios.post.mockImplementationOnce(() =>
-        Promise.resolve({
-          data: {
-            pages: [{ markdown: 'Single page content' }],
-          },
-        }),
-      );
-
-      const req = {
-        user: { id: 'user123' },
-        app: {
-          locals: {
-            ocr: {
-              apiKey: 'OCR_API_KEY',
-              baseURL: 'OCR_BASEURL',
-              mistralModel: 'mistral-ocr-latest',
-            },
-          },
-        },
-      };
-
-      const file = {
-        path: '/tmp/upload/file.pdf',
-        originalname: 'single-page.pdf',
-      };
-
-      const result = await uploadMistralOCR({
-        req,
-        file,
-        file_id: 'file123',
-        entity_id: 'entity123',
-      });
-
-      expect(fs.createReadStream).toHaveBeenCalledWith('/tmp/upload/file.pdf');
-
-      // Verify that single page documents don't include page numbering
-      expect(result.text).not.toContain('# PAGE');
-      expect(result.text).toEqual('Single page content\n\n');
-    });
-
-    it('should use literal values in configuration when provided directly', async () => {
-      const { loadAuthValues } = require('~/server/services/Tools/credentials');
-      // We'll still mock this but it should not be used for literal values
-      loadAuthValues.mockResolvedValue({});
-
-      // Clear all previous mocks
-      mockAxios.post.mockClear();
-      mockAxios.get.mockClear();
-
-      // 1. First mock: File upload response
-      mockAxios.post.mockImplementationOnce(() =>
-        Promise.resolve({ data: { id: 'file-123', purpose: 'ocr' } }),
-      );
-
-      // 2. Second mock: Signed URL response
-      mockAxios.get.mockImplementationOnce(() =>
-        Promise.resolve({ data: { url: 'https://signed-url.com' } }),
-      );
-
-      // 3. Third mock: OCR response
-      mockAxios.post.mockImplementationOnce(() =>
-        Promise.resolve({
-          data: {
-            pages: [{ markdown: 'Processed with literal config values' }],
-          },
-        }),
-      );
-
-      const req = {
-        user: { id: 'user123' },
-        app: {
-          locals: {
-            ocr: {
-              // Direct values that should be used as-is, without variable substitution
-              apiKey: 'actual-api-key-value',
-              baseURL: 'https://direct-api-url.mistral.ai/v1',
-              mistralModel: 'mistral-direct-model',
-            },
-          },
-        },
-      };
-
-      const file = {
-        path: '/tmp/upload/file.pdf',
-        originalname: 'direct-values.pdf',
-      };
-
-      const result = await uploadMistralOCR({
-        req,
-        file,
-        file_id: 'file123',
-        entity_id: 'entity123',
-      });
-
-      expect(fs.createReadStream).toHaveBeenCalledWith('/tmp/upload/file.pdf');
-
-      // Verify the correct URL was used with the direct baseURL value
-      expect(mockAxios.post).toHaveBeenCalledWith(
-        'https://direct-api-url.mistral.ai/v1/files',
-        expect.any(Object),
-        expect.objectContaining({
-          headers: expect.objectContaining({
-            Authorization: 'Bearer actual-api-key-value',
-          }),
-        }),
-      );
-
-      // Check the OCR call was made with the direct model value
-      expect(mockAxios.post).toHaveBeenCalledWith(
-        'https://direct-api-url.mistral.ai/v1/ocr',
-        expect.objectContaining({
-          model: 'mistral-direct-model',
-        }),
-        expect.any(Object),
-      );
-
-      // Verify the result
-      expect(result.text).toEqual('Processed with literal config values\n\n');
-
-      // Verify loadAuthValues was never called since we used direct values
-      expect(loadAuthValues).not.toHaveBeenCalled();
-    });
-
-    it('should handle empty configuration values and use defaults', async () => {
-      const { loadAuthValues } = require('~/server/services/Tools/credentials');
-      // Set up the mock values to be returned by loadAuthValues
-      loadAuthValues.mockResolvedValue({
-        OCR_API_KEY: 'default-from-env-key',
-        OCR_BASEURL: 'https://default-from-env.mistral.ai/v1',
-      });
-
-      // Clear all previous mocks
-      mockAxios.post.mockClear();
-      mockAxios.get.mockClear();
-
-      // 1. First mock: File upload response
-      mockAxios.post.mockImplementationOnce(() =>
-        Promise.resolve({ data: { id: 'file-123', purpose: 'ocr' } }),
-      );
-
-      // 2. Second mock: Signed URL response
-      mockAxios.get.mockImplementationOnce(() =>
-        Promise.resolve({ data: { url: 'https://signed-url.com' } }),
-      );
-
-      // 3. Third mock: OCR response
-      mockAxios.post.mockImplementationOnce(() =>
-        Promise.resolve({
-          data: {
-            pages: [{ markdown: 'Content from default configuration' }],
-          },
-        }),
-      );
-
-      const req = {
-        user: { id: 'user123' },
-        app: {
-          locals: {
-            ocr: {
-              // Empty string values - should fall back to defaults
-              apiKey: '',
-              baseURL: '',
-              mistralModel: '',
-            },
-          },
-        },
-      };
-
-      const file = {
-        path: '/tmp/upload/file.pdf',
-        originalname: 'empty-config.pdf',
-      };
-
-      const result = await uploadMistralOCR({
-        req,
-        file,
-        file_id: 'file123',
-        entity_id: 'entity123',
-      });
-
-      expect(fs.createReadStream).toHaveBeenCalledWith('/tmp/upload/file.pdf');
-
-      // Verify loadAuthValues was called with the default variable names
-      expect(loadAuthValues).toHaveBeenCalledWith({
-        userId: 'user123',
-        authFields: ['OCR_BASEURL', 'OCR_API_KEY'],
-        optional: expect.any(Set),
-      });
-
-      // Verify the API calls used the default values from loadAuthValues
-      expect(mockAxios.post).toHaveBeenCalledWith(
-        'https://default-from-env.mistral.ai/v1/files',
-        expect.any(Object),
-        expect.objectContaining({
-          headers: expect.objectContaining({
-            Authorization: 'Bearer default-from-env-key',
-          }),
-        }),
-      );
-
-      // Verify the OCR model defaulted to mistral-ocr-latest
-      expect(mockAxios.post).toHaveBeenCalledWith(
-        'https://default-from-env.mistral.ai/v1/ocr',
-        expect.objectContaining({
-          model: 'mistral-ocr-latest',
-        }),
-        expect.any(Object),
-      );
-
-      // Check result
-      expect(result.text).toEqual('Content from default configuration\n\n');
-    });
-  });
-});
diff --git a/api/server/services/Files/MistralOCR/index.js b/api/server/services/Files/MistralOCR/index.js
deleted file mode 100644
index a6223d1ee5..0000000000
--- a/api/server/services/Files/MistralOCR/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const crud = require('./crud');
-
-module.exports = {
-  ...crud,
-};
diff --git a/api/server/services/Files/VectorDB/crud.js b/api/server/services/Files/VectorDB/crud.js
index 37a1e81487..1aeabc6c46 100644
--- a/api/server/services/Files/VectorDB/crud.js
+++ b/api/server/services/Files/VectorDB/crud.js
@@ -1,9 +1,9 @@
 const fs = require('fs');
 const axios = require('axios');
 const FormData = require('form-data');
+const { logAxiosError } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const { FileSources } = require('librechat-data-provider');
-const { logAxiosError } = require('~/utils');
-const { logger } = require('~/config');
 
 /**
  * Deletes a file from the vector database. This function takes a file object, constructs the full path, and
diff --git a/api/server/services/Files/images/encode.js b/api/server/services/Files/images/encode.js
index 154941fd89..e87654b378 100644
--- a/api/server/services/Files/images/encode.js
+++ b/api/server/services/Files/images/encode.js
@@ -1,4 +1,5 @@
 const axios = require('axios');
+const { logAxiosError } = require('@librechat/api');
 const {
   FileSources,
   VisionModes,
@@ -7,8 +8,6 @@ const {
   EModelEndpoint,
 } = require('librechat-data-provider');
 const { getStrategyFunctions } = require('~/server/services/Files/strategies');
-const { logAxiosError } = require('~/utils');
-const { logger } = require('~/config');
 
 /**
  * Converts a readable stream to a base64 encoded string.
diff --git a/api/server/services/Files/process.js b/api/server/services/Files/process.js
index 94b1bc4dad..8910163047 100644
--- a/api/server/services/Files/process.js
+++ b/api/server/services/Files/process.js
@@ -522,7 +522,7 @@ const processAgentFileUpload = async ({ req, res, metadata }) => {
       throw new Error('OCR capability is not enabled for Agents');
     }
 
-    const { handleFileUpload: uploadMistralOCR } = getStrategyFunctions(
+    const { handleFileUpload: uploadOCR } = getStrategyFunctions(
       req.app.locals?.ocr?.strategy ?? FileSources.mistral_ocr,
     );
     const { file_id, temp_file_id } = metadata;
@@ -534,7 +534,7 @@ const processAgentFileUpload = async ({ req, res, metadata }) => {
       images,
       filename,
       filepath: ocrFileURL,
-    } = await uploadMistralOCR({ req, file, file_id, entity_id: agent_id, basePath });
+    } = await uploadOCR({ req, file, loadAuthValues });
 
     const fileInfo = removeNullishValues({
       text,
diff --git a/api/server/services/Files/strategies.js b/api/server/services/Files/strategies.js
index c6cfe77069..41dcd5518a 100644
--- a/api/server/services/Files/strategies.js
+++ b/api/server/services/Files/strategies.js
@@ -1,4 +1,5 @@
 const { FileSources } = require('librechat-data-provider');
+const { uploadMistralOCR, uploadAzureMistralOCR } = require('@librechat/api');
 const {
   getFirebaseURL,
   prepareImageURL,
@@ -46,7 +47,6 @@ const {
 const { uploadOpenAIFile, deleteOpenAIFile, getOpenAIFileStream } = require('./OpenAI');
 const { getCodeOutputDownloadStream, uploadCodeEnvFile } = require('./Code');
 const { uploadVectors, deleteVectors } = require('./VectorDB');
-const { uploadMistralOCR } = require('./MistralOCR');
 
 /**
  * Firebase Storage Strategy Functions
@@ -202,6 +202,26 @@ const mistralOCRStrategy = () => ({
   handleFileUpload: uploadMistralOCR,
 });
 
+const azureMistralOCRStrategy = () => ({
+  /** @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: uploadAzureMistralOCR,
+});
+
 // Strategy Selector
 const getStrategyFunctions = (fileSource) => {
   if (fileSource === FileSources.firebase) {
@@ -222,6 +242,8 @@ const getStrategyFunctions = (fileSource) => {
     return codeOutputStrategy();
   } else if (fileSource === FileSources.mistral_ocr) {
     return mistralOCRStrategy();
+  } else if (fileSource === FileSources.azure_mistral_ocr) {
+    return azureMistralOCRStrategy();
   } else {
     throw new Error('Invalid file source');
   }
diff --git a/api/server/services/ModelService.js b/api/server/services/ModelService.js
index a1ccd7643b..0db13ec318 100644
--- a/api/server/services/ModelService.js
+++ b/api/server/services/ModelService.js
@@ -1,12 +1,13 @@
 const axios = require('axios');
 const { Providers } = require('@librechat/agents');
+const { logAxiosError } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const { HttpsProxyAgent } = require('https-proxy-agent');
 const { EModelEndpoint, defaultModels, CacheKeys } = require('librechat-data-provider');
-const { inputSchema, logAxiosError, extractBaseURL, processModelData } = require('~/utils');
+const { inputSchema, extractBaseURL, processModelData } = require('~/utils');
 const { OllamaClient } = require('~/app/clients/OllamaClient');
 const { isUserProvided } = require('~/server/utils');
 const getLogStores = require('~/cache/getLogStores');
-const { logger } = require('~/config');
 
 /**
  * Splits a string by commas and trims each resulting value.
diff --git a/api/server/services/ModelService.spec.js b/api/server/services/ModelService.spec.js
index fb4481f840..33ab9a7aaf 100644
--- a/api/server/services/ModelService.spec.js
+++ b/api/server/services/ModelService.spec.js
@@ -1,6 +1,6 @@
 const axios = require('axios');
+const { logger } = require('@librechat/data-schemas');
 const { EModelEndpoint, defaultModels } = require('librechat-data-provider');
-const { logger } = require('~/config');
 
 const {
   fetchModels,
@@ -28,7 +28,8 @@ jest.mock('~/cache/getLogStores', () =>
     set: jest.fn().mockResolvedValue(true),
   })),
 );
-jest.mock('~/config', () => ({
+jest.mock('@librechat/data-schemas', () => ({
+  ...jest.requireActual('@librechat/data-schemas'),
   logger: {
     error: jest.fn(),
   },
diff --git a/api/server/services/Runs/methods.js b/api/server/services/Runs/methods.js
index 3c18e9969b..167b9cc2ba 100644
--- a/api/server/services/Runs/methods.js
+++ b/api/server/services/Runs/methods.js
@@ -1,6 +1,6 @@
 const axios = require('axios');
+const { logAxiosError } = require('@librechat/api');
 const { EModelEndpoint } = require('librechat-data-provider');
-const { logAxiosError } = require('~/utils');
 
 /**
  * @typedef {Object} RetrieveOptions
diff --git a/api/server/services/TokenService.js b/api/server/services/TokenService.js
index 5c52198f58..ec74844197 100644
--- a/api/server/services/TokenService.js
+++ b/api/server/services/TokenService.js
@@ -1,9 +1,9 @@
 const axios = require('axios');
+const { logAxiosError } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const { TokenExchangeMethodEnum } = require('librechat-data-provider');
 const { handleOAuthToken } = require('~/models/Token');
 const { decryptV2 } = require('~/server/utils/crypto');
-const { logAxiosError } = require('~/utils');
-const { logger } = require('~/config');
 
 /**
  * Processes the access tokens and stores them in the database.
diff --git a/api/server/utils/sendEmail.js b/api/server/utils/sendEmail.js
index 3c1f189c94..c0afd0eebe 100644
--- a/api/server/utils/sendEmail.js
+++ b/api/server/utils/sendEmail.js
@@ -4,9 +4,9 @@ const axios = require('axios');
 const FormData = require('form-data');
 const nodemailer = require('nodemailer');
 const handlebars = require('handlebars');
+const { logAxiosError } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const { isEnabled } = require('~/server/utils/handleText');
-const { logAxiosError } = require('~/utils');
-const logger = require('~/config/winston');
 
 /**
  * Sends an email using Mailgun API.
diff --git a/api/test/__mocks__/logger.js b/api/test/__mocks__/logger.js
index f9f6d78c87..56fb28cbab 100644
--- a/api/test/__mocks__/logger.js
+++ b/api/test/__mocks__/logger.js
@@ -41,10 +41,7 @@ jest.mock('winston-daily-rotate-file', () => {
 });
 
 jest.mock('~/config', () => {
-  const actualModule = jest.requireActual('~/config');
   return {
-    sendEvent: actualModule.sendEvent,
-    createAxiosInstance: actualModule.createAxiosInstance,
     logger: {
       info: jest.fn(),
       warn: jest.fn(),
diff --git a/api/utils/axios.js b/api/utils/axios.js
deleted file mode 100644
index 91c1fbb223..0000000000
--- a/api/utils/axios.js
+++ /dev/null
@@ -1,46 +0,0 @@
-const { logger } = require('~/config');
-
-/**
- * Logs Axios errors based on the error object and a custom message.
- *
- * @param {Object} options - The options object.
- * @param {string} options.message - The custom message to be logged.
- * @param {import('axios').AxiosError} options.error - The Axios error object.
- * @returns {string} The log message.
- */
-const logAxiosError = ({ message, error }) => {
-  let logMessage = message;
-  try {
-    const stack = error.stack || 'No stack trace available';
-
-    if (error.response?.status) {
-      const { status, headers, data } = error.response;
-      logMessage = `${message} The server responded with status ${status}: ${error.message}`;
-      logger.error(logMessage, {
-        status,
-        headers,
-        data,
-        stack,
-      });
-    } else if (error.request) {
-      const { method, url } = error.config || {};
-      logMessage = `${message} No response received for ${method ? method.toUpperCase() : ''} ${url || ''}: ${error.message}`;
-      logger.error(logMessage, {
-        requestInfo: { method, url },
-        stack,
-      });
-    } else if (error?.message?.includes("Cannot read properties of undefined (reading 'status')")) {
-      logMessage = `${message} It appears the request timed out or was unsuccessful: ${error.message}`;
-      logger.error(logMessage, { stack });
-    } else {
-      logMessage = `${message} An error occurred while setting up the request: ${error.message}`;
-      logger.error(logMessage, { stack });
-    }
-  } catch (err) {
-    logMessage = `Error in logAxiosError: ${err.message}`;
-    logger.error(logMessage, { stack: err.stack || 'No stack trace available' });
-  }
-  return logMessage;
-};
-
-module.exports = { logAxiosError };
diff --git a/api/utils/index.js b/api/utils/index.js
index 6a304efd6d..50b8c46d99 100644
--- a/api/utils/index.js
+++ b/api/utils/index.js
@@ -1,5 +1,4 @@
 const loadYaml = require('./loadYaml');
-const axiosHelpers = require('./axios');
 const tokenHelpers = require('./tokens');
 const deriveBaseURL = require('./deriveBaseURL');
 const extractBaseURL = require('./extractBaseURL');
@@ -9,7 +8,6 @@ module.exports = {
   loadYaml,
   deriveBaseURL,
   extractBaseURL,
-  ...axiosHelpers,
   ...tokenHelpers,
   findMessageContent,
 };
diff --git a/package-lock.json b/package-lock.json
index fb2b3df922..62ff311767 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25447,6 +25447,16 @@
       "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",
       "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g=="
     },
+    "node_modules/@types/multer": {
+      "version": "1.4.13",
+      "resolved": "https://registry.npmjs.org/@types/multer/-/multer-1.4.13.tgz",
+      "integrity": "sha512-bhhdtPw7JqCiEfC9Jimx5LqX9BDIPJEh2q/fQ4bqbBPtyEZYr3cvF22NwG0DmPZNYA0CAf2CnqDB4KIGGpJcaw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/express": "*"
+      }
+    },
     "node_modules/@types/node": {
       "version": "20.11.16",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.16.tgz",
@@ -46052,7 +46062,7 @@
     },
     "packages/api": {
       "name": "@librechat/api",
-      "version": "1.2.2",
+      "version": "1.2.3",
       "license": "ISC",
       "devDependencies": {
         "@babel/preset-env": "^7.21.5",
@@ -46069,6 +46079,7 @@
         "@types/diff": "^6.0.0",
         "@types/express": "^5.0.0",
         "@types/jest": "^29.5.2",
+        "@types/multer": "^1.4.13",
         "@types/node": "^20.3.0",
         "@types/react": "^18.2.18",
         "@types/winston": "^2.4.4",
@@ -46086,6 +46097,7 @@
         "@librechat/agents": "^2.4.37",
         "@librechat/data-schemas": "*",
         "@modelcontextprotocol/sdk": "^1.11.2",
+        "axios": "^1.8.2",
         "diff": "^7.0.0",
         "eventsource": "^3.0.2",
         "express": "^4.21.2",
diff --git a/packages/api/jest.config.mjs b/packages/api/jest.config.mjs
index f5fb1f20d7..a65d8d8af9 100644
--- a/packages/api/jest.config.mjs
+++ b/packages/api/jest.config.mjs
@@ -5,6 +5,7 @@ export default {
   testResultsProcessor: 'jest-junit',
   moduleNameMapper: {
     '^@src/(.*)$': '<rootDir>/src/$1',
+    '~/(.*)': '<rootDir>/src/$1',
   },
   // coverageThreshold: {
   //   global: {
diff --git a/packages/api/package.json b/packages/api/package.json
index 6b2462684e..61f4cda757 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@librechat/api",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "type": "commonjs",
   "description": "MCP services for LibreChat",
   "main": "dist/index.js",
@@ -51,6 +51,7 @@
     "@types/diff": "^6.0.0",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.2",
+    "@types/multer": "^1.4.13",
     "@types/node": "^20.3.0",
     "@types/react": "^18.2.18",
     "@types/winston": "^2.4.4",
@@ -70,14 +71,15 @@
   "peerDependencies": {
     "@librechat/agents": "^2.4.37",
     "@librechat/data-schemas": "*",
-    "librechat-data-provider": "*",
     "@modelcontextprotocol/sdk": "^1.11.2",
+    "axios": "^1.8.2",
     "diff": "^7.0.0",
     "eventsource": "^3.0.2",
     "express": "^4.21.2",
-    "node-fetch": "2.7.0",
     "keyv": "^5.3.2",
-    "zod": "^3.22.4",
-    "tiktoken": "^1.0.15"
+    "librechat-data-provider": "*",
+    "node-fetch": "2.7.0",
+    "tiktoken": "^1.0.15",
+    "zod": "^3.22.4"
   }
 }
diff --git a/packages/api/rollup.config.js b/packages/api/rollup.config.js
index 6e17d6ee2f..0a56ea3d91 100644
--- a/packages/api/rollup.config.js
+++ b/packages/api/rollup.config.js
@@ -1,5 +1,6 @@
 // rollup.config.js
 import { readFileSync } from 'fs';
+import json from '@rollup/plugin-json';
 import terser from '@rollup/plugin-terser';
 import replace from '@rollup/plugin-replace';
 import commonjs from '@rollup/plugin-commonjs';
@@ -29,6 +30,7 @@ const plugins = [
     inlineSourceMap: true,
   }),
   terser(),
+  json(),
 ];
 
 const cjsBuild = {
diff --git a/packages/api/src/files/index.ts b/packages/api/src/files/index.ts
new file mode 100644
index 0000000000..77feb9f154
--- /dev/null
+++ b/packages/api/src/files/index.ts
@@ -0,0 +1 @@
+export * from './mistral/crud';
diff --git a/packages/api/src/files/mistral/crud.spec.ts b/packages/api/src/files/mistral/crud.spec.ts
new file mode 100644
index 0000000000..173c60edf2
--- /dev/null
+++ b/packages/api/src/files/mistral/crud.spec.ts
@@ -0,0 +1,1570 @@
+// Mock setup must be hoisted
+jest.mock('fs');
+jest.mock('form-data', () => {
+  return jest.fn().mockImplementation(() => ({
+    append: jest.fn(),
+    getHeaders: jest
+      .fn()
+      .mockReturnValue({ 'content-type': 'multipart/form-data; boundary=---boundary' }),
+    getBuffer: jest.fn().mockReturnValue(Buffer.from('mock-form-data')),
+    getLength: jest.fn().mockReturnValue(100),
+  }));
+});
+jest.mock('axios', () => {
+  const mockAxiosInstance = {
+    get: jest.fn().mockResolvedValue({ data: {} }),
+    post: jest.fn().mockResolvedValue({ data: {} }),
+    put: jest.fn().mockResolvedValue({ data: {} }),
+    delete: jest.fn().mockResolvedValue({ data: {} }),
+    interceptors: {
+      request: { use: jest.fn(), eject: jest.fn(), clear: jest.fn() },
+      response: { use: jest.fn(), eject: jest.fn(), clear: jest.fn() },
+    },
+    defaults: {
+      proxy: null,
+    },
+  };
+
+  return {
+    ...mockAxiosInstance,
+    create: jest.fn().mockReturnValue(mockAxiosInstance),
+  };
+});
+
+jest.mock('@librechat/data-schemas', () => ({
+  logger: {
+    error: jest.fn(),
+  },
+}));
+
+jest.mock('~/utils/axios', () => ({
+  createAxiosInstance: () => jest.requireMock('axios'),
+  logAxiosError: jest.fn(({ message }) => message || 'Error'),
+}));
+
+import * as fs from 'fs';
+import axios from 'axios';
+import type { Request as ExpressRequest } from 'express';
+import type { Readable } from 'stream';
+import type { MistralFileUploadResponse, MistralSignedUrlResponse, OCRResult } from '~/types';
+import { logger as mockLogger } from '@librechat/data-schemas';
+import {
+  uploadDocumentToMistral,
+  uploadMistralOCR,
+  uploadAzureMistralOCR,
+  getSignedUrl,
+  performOCR,
+} from './crud';
+
+interface MockReadStream extends Partial<Readable> {
+  on: jest.Mock;
+  pipe: jest.Mock;
+  pause: jest.Mock;
+  resume: jest.Mock;
+  emit: jest.Mock;
+  once: jest.Mock;
+  destroy: jest.Mock;
+  path?: string;
+  fd?: number;
+  flags?: string;
+  mode?: number;
+  autoClose?: boolean;
+  bytesRead?: number;
+  closed?: boolean;
+  pending?: boolean;
+}
+
+const mockAxios = jest.mocked(axios);
+
+const mockLoadAuthValues = jest.fn();
+
+describe('MistralOCR Service', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('uploadDocumentToMistral', () => {
+    beforeEach(() => {
+      // Create a more complete mock for file streams that FormData can work with
+      const mockReadStream: MockReadStream = {
+        on: jest.fn().mockImplementation(function (
+          this: MockReadStream,
+          event: string,
+          handler: () => void,
+        ) {
+          // Simulate immediate 'end' event to make FormData complete processing
+          if (event === 'end') {
+            handler();
+          }
+          return this;
+        }),
+        pipe: jest.fn().mockImplementation(function (this: MockReadStream) {
+          return this;
+        }),
+        pause: jest.fn(),
+        resume: jest.fn(),
+        emit: jest.fn(),
+        once: jest.fn(),
+        destroy: jest.fn(),
+        path: '/path/to/test.pdf',
+        fd: 1,
+        flags: 'r',
+        mode: 0o666,
+        autoClose: true,
+        bytesRead: 0,
+        closed: false,
+        pending: false,
+      };
+
+      (jest.mocked(fs).createReadStream as jest.Mock).mockReturnValue(mockReadStream);
+    });
+
+    it('should upload a document to Mistral API using file streaming', async () => {
+      const mockResponse: { data: MistralFileUploadResponse } = {
+        data: {
+          id: 'file-123',
+          object: 'file',
+          bytes: 1024,
+          created_at: Date.now(),
+          filename: 'test.pdf',
+          purpose: 'ocr',
+        },
+      };
+      mockAxios.post!.mockResolvedValueOnce(mockResponse);
+
+      try {
+        const result = await uploadDocumentToMistral({
+          filePath: '/path/to/test.pdf',
+          fileName: 'test.pdf',
+          apiKey: 'test-api-key',
+        });
+
+        // Check that createReadStream was called with the correct file path
+        expect(jest.mocked(fs).createReadStream).toHaveBeenCalledWith('/path/to/test.pdf');
+
+        // Since we're mocking FormData, we'll just check that axios was called correctly
+        expect(mockAxios.post).toHaveBeenCalledWith(
+          'https://api.mistral.ai/v1/files',
+          expect.anything(),
+          expect.objectContaining({
+            headers: expect.objectContaining({
+              Authorization: 'Bearer test-api-key',
+            }),
+            maxBodyLength: Infinity,
+            maxContentLength: Infinity,
+          }),
+        );
+        expect(result).toEqual(mockResponse.data);
+      } catch (error) {
+        console.error('Test error:', error);
+        throw error;
+      }
+    });
+
+    it('should handle errors during document upload', async () => {
+      const errorMessage = 'API error';
+      mockAxios.post!.mockRejectedValueOnce(new Error(errorMessage));
+
+      await expect(
+        uploadDocumentToMistral({
+          filePath: '/path/to/test.pdf',
+          fileName: 'test.pdf',
+          apiKey: 'test-api-key',
+        }),
+      ).rejects.toThrow(errorMessage);
+    });
+  });
+
+  describe('getSignedUrl', () => {
+    it('should fetch signed URL from Mistral API', async () => {
+      const mockResponse: { data: MistralSignedUrlResponse } = {
+        data: {
+          url: 'https://document-url.com',
+          expires_at: Date.now() + 86400000,
+        },
+      };
+      mockAxios.get!.mockResolvedValueOnce(mockResponse);
+
+      const result = await getSignedUrl({
+        fileId: 'file-123',
+        apiKey: 'test-api-key',
+      });
+
+      expect(mockAxios.get).toHaveBeenCalledWith(
+        'https://api.mistral.ai/v1/files/file-123/url?expiry=24',
+        {
+          headers: {
+            Authorization: 'Bearer test-api-key',
+          },
+        },
+      );
+      expect(result).toEqual(mockResponse.data);
+    });
+
+    it('should handle errors when fetching signed URL', async () => {
+      const errorMessage = 'API error';
+      mockAxios.get!.mockRejectedValueOnce(new Error(errorMessage));
+
+      await expect(
+        getSignedUrl({
+          fileId: 'file-123',
+          apiKey: 'test-api-key',
+        }),
+      ).rejects.toThrow();
+
+      expect(mockLogger.error).toHaveBeenCalledWith('Error fetching signed URL:', errorMessage);
+    });
+  });
+
+  describe('performOCR', () => {
+    it('should perform OCR using Mistral API (document_url)', async () => {
+      const mockResponse: { data: OCRResult } = {
+        data: {
+          model: 'mistral-ocr-latest',
+          pages: [
+            {
+              index: 0,
+              markdown: 'Page 1 content',
+              images: [],
+              dimensions: { dpi: 300, height: 1100, width: 850 },
+            },
+            {
+              index: 1,
+              markdown: 'Page 2 content',
+              images: [],
+              dimensions: { dpi: 300, height: 1100, width: 850 },
+            },
+          ],
+          document_annotation: '',
+          usage_info: {
+            pages_processed: 2,
+            doc_size_bytes: 1024,
+          },
+        },
+      };
+      mockAxios.post!.mockResolvedValueOnce(mockResponse);
+
+      const result = await performOCR({
+        apiKey: 'test-api-key',
+        url: 'https://document-url.com',
+        model: 'mistral-ocr-latest',
+        documentType: 'document_url',
+      });
+
+      expect(mockAxios.post).toHaveBeenCalledWith(
+        'https://api.mistral.ai/v1/ocr',
+        {
+          model: 'mistral-ocr-latest',
+          include_image_base64: false,
+          image_limit: 0,
+          document: {
+            type: 'document_url',
+            document_url: 'https://document-url.com',
+          },
+        },
+        {
+          headers: {
+            'Content-Type': 'application/json',
+            Authorization: 'Bearer test-api-key',
+          },
+        },
+      );
+      expect(result).toEqual(mockResponse.data);
+    });
+
+    it('should perform OCR using Mistral API (image_url)', async () => {
+      const mockResponse: { data: OCRResult } = {
+        data: {
+          model: 'mistral-ocr-latest',
+          pages: [
+            {
+              index: 0,
+              markdown: 'Image OCR content',
+              images: [],
+              dimensions: { dpi: 300, height: 1100, width: 850 },
+            },
+          ],
+          document_annotation: '',
+          usage_info: {
+            pages_processed: 1,
+            doc_size_bytes: 2048,
+          },
+        },
+      };
+      mockAxios.post!.mockResolvedValueOnce(mockResponse);
+
+      const result = await performOCR({
+        apiKey: 'test-api-key',
+        url: 'https://image-url.com/image.png',
+        model: 'mistral-ocr-latest',
+        documentType: 'image_url',
+      });
+
+      expect(mockAxios.post).toHaveBeenCalledWith(
+        'https://api.mistral.ai/v1/ocr',
+        {
+          model: 'mistral-ocr-latest',
+          include_image_base64: false,
+          image_limit: 0,
+          document: {
+            type: 'image_url',
+            image_url: 'https://image-url.com/image.png',
+          },
+        },
+        {
+          headers: {
+            'Content-Type': 'application/json',
+            Authorization: 'Bearer test-api-key',
+          },
+        },
+      );
+      expect(result).toEqual(mockResponse.data);
+    });
+
+    it('should handle errors during OCR processing', async () => {
+      const errorMessage = 'OCR processing error';
+      mockAxios.post!.mockRejectedValueOnce(new Error(errorMessage));
+
+      await expect(
+        performOCR({
+          apiKey: 'test-api-key',
+          url: 'https://document-url.com',
+        }),
+      ).rejects.toThrow();
+
+      expect(mockLogger.error).toHaveBeenCalledWith('Error performing OCR:', errorMessage);
+    });
+  });
+
+  describe('uploadMistralOCR', () => {
+    beforeEach(() => {
+      const mockReadStream: MockReadStream = {
+        on: jest.fn().mockImplementation(function (
+          this: MockReadStream,
+          event: string,
+          handler: () => void,
+        ) {
+          // Simulate immediate 'end' event to make FormData complete processing
+          if (event === 'end') {
+            handler();
+          }
+          return this;
+        }),
+        pipe: jest.fn().mockImplementation(function (this: MockReadStream) {
+          return this;
+        }),
+        pause: jest.fn(),
+        resume: jest.fn(),
+        emit: jest.fn(),
+        once: jest.fn(),
+        destroy: jest.fn(),
+        path: '/tmp/upload/file.pdf',
+        fd: 1,
+        flags: 'r',
+        mode: 0o666,
+        autoClose: true,
+        bytesRead: 0,
+        closed: false,
+        pending: false,
+      };
+
+      (jest.mocked(fs).createReadStream as jest.Mock).mockReturnValue(mockReadStream);
+    });
+
+    it('should process OCR for a file with standard configuration', async () => {
+      // Setup mocks
+      mockLoadAuthValues.mockResolvedValue({
+        OCR_API_KEY: 'test-api-key',
+        OCR_BASEURL: 'https://api.mistral.ai/v1',
+      });
+
+      // Mock file upload response
+      mockAxios.post!.mockResolvedValueOnce({
+        data: {
+          id: 'file-123',
+          object: 'file',
+          bytes: 1024,
+          created_at: Date.now(),
+          filename: 'document.pdf',
+          purpose: 'ocr',
+        } as MistralFileUploadResponse,
+      });
+
+      // Mock signed URL response
+      mockAxios.get!.mockResolvedValueOnce({
+        data: {
+          url: 'https://signed-url.com',
+          expires_at: Date.now() + 86400000,
+        } as MistralSignedUrlResponse,
+      });
+
+      // Mock OCR response with text and images
+      mockAxios.post!.mockResolvedValueOnce({
+        data: {
+          model: 'mistral-medium',
+          pages: [
+            {
+              index: 0,
+              markdown: 'Page 1 content',
+              images: [
+                {
+                  id: 'img1',
+                  top_left_x: 0,
+                  top_left_y: 0,
+                  bottom_right_x: 100,
+                  bottom_right_y: 100,
+                  image_base64: 'base64image1',
+                  image_annotation: '',
+                },
+              ],
+              dimensions: { dpi: 300, height: 1100, width: 850 },
+            },
+            {
+              index: 1,
+              markdown: 'Page 2 content',
+              images: [
+                {
+                  id: 'img2',
+                  top_left_x: 0,
+                  top_left_y: 0,
+                  bottom_right_x: 100,
+                  bottom_right_y: 100,
+                  image_base64: 'base64image2',
+                  image_annotation: '',
+                },
+              ],
+              dimensions: { dpi: 300, height: 1100, width: 850 },
+            },
+          ],
+          document_annotation: '',
+          usage_info: {
+            pages_processed: 2,
+            doc_size_bytes: 1024,
+          },
+        },
+      });
+
+      const req = {
+        user: { id: 'user123' },
+        app: {
+          locals: {
+            ocr: {
+              // Use environment variable syntax to ensure loadAuthValues is called
+              apiKey: '${OCR_API_KEY}',
+              baseURL: '${OCR_BASEURL}',
+              mistralModel: 'mistral-medium',
+            },
+          },
+        },
+      } as unknown as ExpressRequest;
+
+      const file = {
+        path: '/tmp/upload/file.pdf',
+        originalname: 'document.pdf',
+        mimetype: 'application/pdf',
+      } as Express.Multer.File;
+
+      const result = await uploadMistralOCR({
+        req,
+        file,
+        loadAuthValues: mockLoadAuthValues,
+      });
+
+      expect((fs as jest.Mocked<typeof fs>).createReadStream).toHaveBeenCalledWith(
+        '/tmp/upload/file.pdf',
+      );
+
+      expect(mockLoadAuthValues).toHaveBeenCalledWith({
+        userId: 'user123',
+        authFields: ['OCR_BASEURL', 'OCR_API_KEY'],
+        optional: expect.any(Set),
+      });
+
+      // Verify OCR result
+      expect(result).toEqual({
+        filename: 'document.pdf',
+        bytes: expect.any(Number),
+        filepath: 'mistral_ocr',
+        text: expect.stringContaining('# PAGE 1'),
+        images: ['base64image1', 'base64image2'],
+      });
+    });
+
+    it('should process OCR for an image file and use image_url type', async () => {
+      mockLoadAuthValues.mockResolvedValue({
+        OCR_API_KEY: 'test-api-key',
+        OCR_BASEURL: 'https://api.mistral.ai/v1',
+      });
+
+      // Mock file upload response
+      mockAxios.post!.mockResolvedValueOnce({
+        data: {
+          id: 'file-456',
+          object: 'file',
+          bytes: 2048,
+          created_at: Date.now(),
+          filename: 'image.png',
+          purpose: 'ocr',
+        } as MistralFileUploadResponse,
+      });
+
+      // Mock signed URL response
+      mockAxios.get!.mockResolvedValueOnce({
+        data: {
+          url: 'https://signed-url.com/image.png',
+          expires_at: Date.now() + 86400000,
+        } as MistralSignedUrlResponse,
+      });
+
+      // Mock OCR response for image
+      mockAxios.post!.mockResolvedValueOnce({
+        data: {
+          model: 'mistral-medium',
+          pages: [
+            {
+              index: 0,
+              markdown: 'Image OCR result',
+              images: [
+                {
+                  id: 'img1',
+                  top_left_x: 0,
+                  top_left_y: 0,
+                  bottom_right_x: 100,
+                  bottom_right_y: 100,
+                  image_base64: 'imgbase64',
+                  image_annotation: '',
+                },
+              ],
+              dimensions: { dpi: 300, height: 1100, width: 850 },
+            },
+          ],
+          document_annotation: '',
+          usage_info: {
+            pages_processed: 1,
+            doc_size_bytes: 2048,
+          },
+        },
+      });
+
+      const req = {
+        user: { id: 'user456' },
+        app: {
+          locals: {
+            ocr: {
+              apiKey: '${OCR_API_KEY}',
+              baseURL: '${OCR_BASEURL}',
+              mistralModel: 'mistral-medium',
+            },
+          },
+        },
+      } as unknown as ExpressRequest;
+
+      const file = {
+        path: '/tmp/upload/image.png',
+        originalname: 'image.png',
+        mimetype: 'image/png',
+      } as Express.Multer.File;
+
+      const result = await uploadMistralOCR({
+        req,
+        file,
+        loadAuthValues: mockLoadAuthValues,
+      });
+
+      expect((fs as jest.Mocked<typeof fs>).createReadStream).toHaveBeenCalledWith(
+        '/tmp/upload/image.png',
+      );
+
+      expect(mockLoadAuthValues).toHaveBeenCalledWith({
+        userId: 'user456',
+        authFields: ['OCR_BASEURL', 'OCR_API_KEY'],
+        optional: expect.any(Set),
+      });
+
+      // Check that the OCR API was called with image_url type
+      expect(mockAxios.post).toHaveBeenCalledWith(
+        'https://api.mistral.ai/v1/ocr',
+        expect.objectContaining({
+          document: expect.objectContaining({
+            type: 'image_url',
+            image_url: 'https://signed-url.com/image.png',
+          }),
+        }),
+        expect.any(Object),
+      );
+
+      expect(result).toEqual({
+        filename: 'image.png',
+        bytes: expect.any(Number),
+        filepath: 'mistral_ocr',
+        text: expect.stringContaining('Image OCR result'),
+        images: ['imgbase64'],
+      });
+    });
+
+    it('should process variable references in configuration', async () => {
+      // Setup mocks with environment variables
+      mockLoadAuthValues.mockResolvedValue({
+        CUSTOM_API_KEY: 'custom-api-key',
+        CUSTOM_BASEURL: 'https://custom-api.mistral.ai/v1',
+      });
+
+      // Mock API responses
+      mockAxios.post!.mockResolvedValueOnce({
+        data: {
+          id: 'file-123',
+          object: 'file',
+          bytes: 1024,
+          created_at: Date.now(),
+          filename: 'document.pdf',
+          purpose: 'ocr',
+        } as MistralFileUploadResponse,
+      });
+      mockAxios.get!.mockResolvedValueOnce({
+        data: {
+          url: 'https://signed-url.com',
+          expires_at: Date.now() + 86400000,
+        } as MistralSignedUrlResponse,
+      });
+      mockAxios.post!.mockResolvedValueOnce({
+        data: {
+          model: 'mistral-large',
+          pages: [
+            {
+              index: 0,
+              markdown: 'Content from custom API',
+              images: [],
+              dimensions: { dpi: 300, height: 1100, width: 850 },
+            },
+          ],
+          document_annotation: '',
+          usage_info: {
+            pages_processed: 1,
+            doc_size_bytes: 1024,
+          },
+        },
+      });
+
+      const req = {
+        user: { id: 'user123' },
+        app: {
+          locals: {
+            ocr: {
+              apiKey: '${CUSTOM_API_KEY}',
+              baseURL: '${CUSTOM_BASEURL}',
+              mistralModel: '${CUSTOM_MODEL}',
+            },
+          },
+        },
+      } as unknown as ExpressRequest;
+
+      // Set environment variable for model
+      process.env.CUSTOM_MODEL = 'mistral-large';
+
+      const file = {
+        path: '/tmp/upload/file.pdf',
+        originalname: 'document.pdf',
+        mimetype: 'application/pdf',
+      } as Express.Multer.File;
+
+      const result = await uploadMistralOCR({
+        req,
+        file,
+        loadAuthValues: mockLoadAuthValues,
+      });
+
+      expect((fs as jest.Mocked<typeof fs>).createReadStream).toHaveBeenCalledWith(
+        '/tmp/upload/file.pdf',
+      );
+
+      // Verify that custom environment variables were extracted and used
+      expect(mockLoadAuthValues).toHaveBeenCalledWith({
+        userId: 'user123',
+        authFields: ['CUSTOM_BASEURL', 'CUSTOM_API_KEY'],
+        optional: expect.any(Set),
+      });
+
+      // Check that mistral-large was used in the OCR API call
+      expect(mockAxios.post).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({
+          model: 'mistral-large',
+        }),
+        expect.anything(),
+      );
+
+      expect(result.text).toEqual('Content from custom API\n\n');
+    });
+
+    it('should fall back to default values when variables are not properly formatted', async () => {
+      mockLoadAuthValues.mockResolvedValue({
+        OCR_API_KEY: 'default-api-key',
+        OCR_BASEURL: undefined, // Testing optional parameter
+      });
+
+      mockAxios.post!.mockResolvedValueOnce({
+        data: {
+          id: 'file-123',
+          object: 'file',
+          bytes: 1024,
+          created_at: Date.now(),
+          filename: 'document.pdf',
+          purpose: 'ocr',
+        } as MistralFileUploadResponse,
+      });
+      mockAxios.get!.mockResolvedValueOnce({
+        data: {
+          url: 'https://signed-url.com',
+          expires_at: Date.now() + 86400000,
+        } as MistralSignedUrlResponse,
+      });
+      mockAxios.post!.mockResolvedValueOnce({
+        data: {
+          model: 'mistral-ocr-latest',
+          pages: [
+            {
+              index: 0,
+              markdown: 'Default API result',
+              images: [],
+              dimensions: { dpi: 300, height: 1100, width: 850 },
+            },
+          ],
+          document_annotation: '',
+          usage_info: {
+            pages_processed: 1,
+            doc_size_bytes: 1024,
+          },
+        },
+      });
+
+      const req = {
+        user: { id: 'user123' },
+        app: {
+          locals: {
+            ocr: {
+              // Use environment variable syntax to ensure loadAuthValues is called
+              apiKey: '${INVALID_FORMAT}', // Using valid env var format but with an invalid name
+              baseURL: '${OCR_BASEURL}', // Using valid env var format
+              mistralModel: 'mistral-ocr-latest', // Plain string value
+            },
+          },
+        },
+      } as unknown as ExpressRequest;
+
+      const file = {
+        path: '/tmp/upload/file.pdf',
+        originalname: 'document.pdf',
+        mimetype: 'application/pdf',
+      } as Express.Multer.File;
+
+      await uploadMistralOCR({
+        req,
+        file,
+        loadAuthValues: mockLoadAuthValues,
+      });
+
+      expect((fs as jest.Mocked<typeof fs>).createReadStream).toHaveBeenCalledWith(
+        '/tmp/upload/file.pdf',
+      );
+
+      // Should use the default values
+      expect(mockLoadAuthValues).toHaveBeenCalledWith({
+        userId: 'user123',
+        authFields: ['OCR_BASEURL', 'INVALID_FORMAT'],
+        optional: expect.any(Set),
+      });
+
+      // Should use the default model when not using environment variable format
+      expect(mockAxios.post).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({
+          model: 'mistral-ocr-latest',
+        }),
+        expect.anything(),
+      );
+    });
+
+    it('should handle API errors during OCR process', async () => {
+      mockLoadAuthValues.mockResolvedValue({
+        OCR_API_KEY: 'test-api-key',
+      });
+
+      // Mock file upload to fail
+      mockAxios.post!.mockRejectedValueOnce(new Error('Upload failed'));
+
+      const req = {
+        user: { id: 'user123' },
+        app: {
+          locals: {
+            ocr: {
+              apiKey: 'OCR_API_KEY',
+              baseURL: 'OCR_BASEURL',
+            },
+          },
+        },
+      } as unknown as ExpressRequest;
+
+      const file = {
+        path: '/tmp/upload/file.pdf',
+        originalname: 'document.pdf',
+        mimetype: 'application/pdf',
+      } as Express.Multer.File;
+
+      await expect(
+        uploadMistralOCR({
+          req,
+          file,
+          loadAuthValues: mockLoadAuthValues,
+        }),
+      ).rejects.toThrow('Error uploading document to Mistral OCR API');
+      expect((fs as jest.Mocked<typeof fs>).createReadStream).toHaveBeenCalledWith(
+        '/tmp/upload/file.pdf',
+      );
+    });
+
+    it('should handle single page documents without page numbering', async () => {
+      mockLoadAuthValues.mockResolvedValue({
+        OCR_API_KEY: 'test-api-key',
+        OCR_BASEURL: 'https://api.mistral.ai/v1', // Make sure this is included
+      });
+
+      // Clear all previous mocks
+      mockAxios.post!.mockClear();
+      mockAxios.get!.mockClear();
+
+      // 1. First mock: File upload response
+      mockAxios.post!.mockImplementationOnce(() =>
+        Promise.resolve({
+          data: {
+            id: 'file-123',
+            object: 'file',
+            bytes: 1024,
+            created_at: Date.now(),
+            filename: 'single-page.pdf',
+            purpose: 'ocr',
+          } as MistralFileUploadResponse,
+        }),
+      );
+
+      // 2. Second mock: Signed URL response
+      mockAxios.get!.mockImplementationOnce(() =>
+        Promise.resolve({
+          data: {
+            url: 'https://signed-url.com',
+            expires_at: Date.now() + 86400000,
+          } as MistralSignedUrlResponse,
+        }),
+      );
+
+      // 3. Third mock: OCR response
+      mockAxios.post!.mockImplementationOnce(() =>
+        Promise.resolve({
+          data: {
+            model: 'mistral-ocr-latest',
+            pages: [
+              {
+                index: 0,
+                markdown: 'Single page content',
+                images: [],
+                dimensions: { dpi: 300, height: 1100, width: 850 },
+              },
+            ],
+            document_annotation: '',
+            usage_info: {
+              pages_processed: 1,
+              doc_size_bytes: 1024,
+            },
+          },
+        }),
+      );
+
+      const req = {
+        user: { id: 'user123' },
+        app: {
+          locals: {
+            ocr: {
+              apiKey: 'OCR_API_KEY',
+              baseURL: 'OCR_BASEURL',
+              mistralModel: 'mistral-ocr-latest',
+            },
+          },
+        },
+      } as unknown as ExpressRequest;
+
+      const file = {
+        path: '/tmp/upload/file.pdf',
+        originalname: 'single-page.pdf',
+        mimetype: 'application/pdf',
+      } as Express.Multer.File;
+
+      const result = await uploadMistralOCR({
+        req,
+        file,
+        loadAuthValues: mockLoadAuthValues,
+      });
+
+      expect((fs as jest.Mocked<typeof fs>).createReadStream).toHaveBeenCalledWith(
+        '/tmp/upload/file.pdf',
+      );
+
+      // Verify that single page documents don't include page numbering
+      expect(result.text).not.toContain('# PAGE');
+      expect(result.text).toEqual('Single page content\n\n');
+    });
+
+    it('should use literal values in configuration when provided directly', async () => {
+      // We'll still mock this but it should not be used for literal values
+      mockLoadAuthValues.mockResolvedValue({});
+
+      // Clear all previous mocks
+      mockAxios.post!.mockClear();
+      mockAxios.get!.mockClear();
+
+      // 1. First mock: File upload response
+      mockAxios.post!.mockImplementationOnce(() =>
+        Promise.resolve({
+          data: {
+            id: 'file-123',
+            object: 'file',
+            bytes: 1024,
+            created_at: Date.now(),
+            filename: 'direct-values.pdf',
+            purpose: 'ocr',
+          } as MistralFileUploadResponse,
+        }),
+      );
+
+      // 2. Second mock: Signed URL response
+      mockAxios.get!.mockImplementationOnce(() =>
+        Promise.resolve({
+          data: {
+            url: 'https://signed-url.com',
+            expires_at: Date.now() + 86400000,
+          } as MistralSignedUrlResponse,
+        }),
+      );
+
+      // 3. Third mock: OCR response
+      mockAxios.post!.mockImplementationOnce(() =>
+        Promise.resolve({
+          data: {
+            model: 'mistral-direct-model',
+            pages: [
+              {
+                index: 0,
+                markdown: 'Processed with literal config values',
+                images: [],
+                dimensions: { dpi: 300, height: 1100, width: 850 },
+              },
+            ],
+            document_annotation: '',
+            usage_info: {
+              pages_processed: 1,
+              doc_size_bytes: 1024,
+            },
+          },
+        }),
+      );
+
+      const req = {
+        user: { id: 'user123' },
+        app: {
+          locals: {
+            ocr: {
+              // Direct values that should be used as-is, without variable substitution
+              apiKey: 'actual-api-key-value',
+              baseURL: 'https://direct-api-url.mistral.ai/v1',
+              mistralModel: 'mistral-direct-model',
+            },
+          },
+        },
+      } as unknown as ExpressRequest;
+
+      const file = {
+        path: '/tmp/upload/file.pdf',
+        originalname: 'direct-values.pdf',
+        mimetype: 'application/pdf',
+      } as Express.Multer.File;
+
+      const result = await uploadMistralOCR({
+        req,
+        file,
+        loadAuthValues: mockLoadAuthValues,
+      });
+
+      expect((fs as jest.Mocked<typeof fs>).createReadStream).toHaveBeenCalledWith(
+        '/tmp/upload/file.pdf',
+      );
+
+      // Verify the correct URL was used with the direct baseURL value
+      expect(mockAxios.post).toHaveBeenCalledWith(
+        'https://direct-api-url.mistral.ai/v1/files',
+        expect.any(Object),
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            Authorization: 'Bearer actual-api-key-value',
+          }),
+        }),
+      );
+
+      // Check the OCR call was made with the direct model value
+      expect(mockAxios.post).toHaveBeenCalledWith(
+        'https://direct-api-url.mistral.ai/v1/ocr',
+        expect.objectContaining({
+          model: 'mistral-direct-model',
+        }),
+        expect.any(Object),
+      );
+
+      // Verify the result
+      expect(result.text).toEqual('Processed with literal config values\n\n');
+
+      // Verify loadAuthValues was never called since we used direct values
+      expect(mockLoadAuthValues).not.toHaveBeenCalled();
+    });
+
+    it('should handle empty configuration values and use defaults', async () => {
+      // Set up the mock values to be returned by loadAuthValues
+      mockLoadAuthValues.mockResolvedValue({
+        OCR_API_KEY: 'default-from-env-key',
+        OCR_BASEURL: 'https://default-from-env.mistral.ai/v1',
+      });
+
+      // Clear all previous mocks
+      mockAxios.post!.mockClear();
+      mockAxios.get!.mockClear();
+
+      // 1. First mock: File upload response
+      mockAxios.post!.mockImplementationOnce(() =>
+        Promise.resolve({
+          data: {
+            id: 'file-123',
+            object: 'file',
+            bytes: 1024,
+            created_at: Date.now(),
+            filename: 'empty-config.pdf',
+            purpose: 'ocr',
+          } as MistralFileUploadResponse,
+        }),
+      );
+
+      // 2. Second mock: Signed URL response
+      mockAxios.get!.mockImplementationOnce(() =>
+        Promise.resolve({
+          data: {
+            url: 'https://signed-url.com',
+            expires_at: Date.now() + 86400000,
+          } as MistralSignedUrlResponse,
+        }),
+      );
+
+      // 3. Third mock: OCR response
+      mockAxios.post!.mockImplementationOnce(() =>
+        Promise.resolve({
+          data: {
+            model: 'mistral-ocr-latest',
+            pages: [
+              {
+                index: 0,
+                markdown: 'Content from default configuration',
+                images: [],
+                dimensions: { dpi: 300, height: 1100, width: 850 },
+              },
+            ],
+            document_annotation: '',
+            usage_info: {
+              pages_processed: 1,
+              doc_size_bytes: 1024,
+            },
+          },
+        }),
+      );
+
+      const req = {
+        user: { id: 'user123' },
+        app: {
+          locals: {
+            ocr: {
+              // Empty string values - should fall back to defaults
+              apiKey: '',
+              baseURL: '',
+              mistralModel: '',
+            },
+          },
+        },
+      } as unknown as ExpressRequest;
+
+      const file = {
+        path: '/tmp/upload/file.pdf',
+        originalname: 'empty-config.pdf',
+        mimetype: 'application/pdf',
+      } as Express.Multer.File;
+
+      const result = await uploadMistralOCR({
+        req,
+        file,
+        loadAuthValues: mockLoadAuthValues,
+      });
+
+      expect((fs as jest.Mocked<typeof fs>).createReadStream).toHaveBeenCalledWith(
+        '/tmp/upload/file.pdf',
+      );
+
+      // Verify loadAuthValues was called with the default variable names
+      expect(mockLoadAuthValues).toHaveBeenCalledWith({
+        userId: 'user123',
+        authFields: ['OCR_BASEURL', 'OCR_API_KEY'],
+        optional: expect.any(Set),
+      });
+
+      // Verify the API calls used the default values from loadAuthValues
+      expect(mockAxios.post).toHaveBeenCalledWith(
+        'https://default-from-env.mistral.ai/v1/files',
+        expect.any(Object),
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            Authorization: 'Bearer default-from-env-key',
+          }),
+        }),
+      );
+
+      // Verify the OCR model defaulted to mistral-ocr-latest
+      expect(mockAxios.post).toHaveBeenCalledWith(
+        'https://default-from-env.mistral.ai/v1/ocr',
+        expect.objectContaining({
+          model: 'mistral-ocr-latest',
+        }),
+        expect.any(Object),
+      );
+
+      // Check result
+      expect(result.text).toEqual('Content from default configuration\n\n');
+    });
+
+    describe('Mixed env var and hardcoded configuration', () => {
+      beforeEach(() => {
+        const mockReadStream: MockReadStream = {
+          on: jest.fn().mockImplementation(function (
+            this: MockReadStream,
+            event: string,
+            handler: () => void,
+          ) {
+            // Simulate immediate 'end' event to make FormData complete processing
+            if (event === 'end') {
+              handler();
+            }
+            return this;
+          }),
+          pipe: jest.fn().mockImplementation(function (this: MockReadStream) {
+            return this;
+          }),
+          pause: jest.fn(),
+          resume: jest.fn(),
+          emit: jest.fn(),
+          once: jest.fn(),
+          destroy: jest.fn(),
+          path: '/tmp/upload/file.pdf',
+          fd: 1,
+          flags: 'r',
+          mode: 0o666,
+          autoClose: true,
+          bytesRead: 0,
+          closed: false,
+          pending: false,
+        };
+
+        (jest.mocked(fs).createReadStream as jest.Mock).mockReturnValue(mockReadStream);
+      });
+
+      it('should preserve hardcoded baseURL when only apiKey is an env var', async () => {
+        // This test demonstrates the current bug
+        mockLoadAuthValues.mockResolvedValue({
+          AZURE_MISTRAL_OCR_API_KEY: 'test-api-key-from-env',
+          // Note: OCR_BASEURL is not returned, simulating it not being set
+        });
+
+        // Mock file upload response
+        mockAxios.post!.mockResolvedValueOnce({
+          data: {
+            id: 'file-123',
+            object: 'file',
+            bytes: 1024,
+            created_at: Date.now(),
+            filename: 'document.pdf',
+            purpose: 'ocr',
+          } as MistralFileUploadResponse,
+        });
+
+        // Mock signed URL response
+        mockAxios.get!.mockResolvedValueOnce({
+          data: {
+            url: 'https://signed-url.com',
+            expires_at: Date.now() + 86400000,
+          } as MistralSignedUrlResponse,
+        });
+
+        // Mock OCR response
+        mockAxios.post!.mockResolvedValueOnce({
+          data: {
+            model: 'mistral-ocr-2503',
+            pages: [
+              {
+                index: 0,
+                markdown: 'Test content',
+                images: [],
+                dimensions: { dpi: 300, height: 1100, width: 850 },
+              },
+            ],
+            document_annotation: '',
+            usage_info: {
+              pages_processed: 1,
+              doc_size_bytes: 1024,
+            },
+          },
+        });
+
+        const req = {
+          user: { id: 'user123' },
+          app: {
+            locals: {
+              ocr: {
+                apiKey: '${AZURE_MISTRAL_OCR_API_KEY}',
+                baseURL: 'https://endpoint.models.ai.azure.com/v1',
+                mistralModel: 'mistral-ocr-2503',
+              },
+            },
+          },
+        } as unknown as ExpressRequest;
+
+        const file = {
+          path: '/tmp/upload/file.pdf',
+          originalname: 'document.pdf',
+          mimetype: 'application/pdf',
+        } as Express.Multer.File;
+
+        await uploadMistralOCR({
+          req,
+          file,
+          loadAuthValues: mockLoadAuthValues,
+        });
+
+        // Check that loadAuthValues was called only with the env var field
+        expect(mockLoadAuthValues).toHaveBeenCalledWith({
+          userId: 'user123',
+          authFields: ['AZURE_MISTRAL_OCR_API_KEY'],
+          optional: expect.any(Set),
+        });
+
+        // The fix: baseURL should be the hardcoded value
+        const uploadCall = mockAxios.post!.mock.calls[0];
+        expect(uploadCall[0]).toBe('https://endpoint.models.ai.azure.com/v1/files');
+      });
+
+      it('should preserve hardcoded apiKey when only baseURL is an env var', async () => {
+        // This test demonstrates the current bug
+        mockLoadAuthValues.mockResolvedValue({
+          CUSTOM_OCR_BASEURL: 'https://custom-ocr-endpoint.com/v1',
+          // Note: OCR_API_KEY is not returned, simulating it not being set
+        });
+
+        // Mock file upload response
+        mockAxios.post!.mockResolvedValueOnce({
+          data: {
+            id: 'file-456',
+            object: 'file',
+            bytes: 1024,
+            created_at: Date.now(),
+            filename: 'document.pdf',
+            purpose: 'ocr',
+          } as MistralFileUploadResponse,
+        });
+
+        // Mock signed URL response
+        mockAxios.get!.mockResolvedValueOnce({
+          data: {
+            url: 'https://signed-url.com',
+            expires_at: Date.now() + 86400000,
+          } as MistralSignedUrlResponse,
+        });
+
+        // Mock OCR response
+        mockAxios.post!.mockResolvedValueOnce({
+          data: {
+            model: 'mistral-ocr-latest',
+            pages: [
+              {
+                index: 0,
+                markdown: 'Test content',
+                images: [],
+                dimensions: { dpi: 300, height: 1100, width: 850 },
+              },
+            ],
+            document_annotation: '',
+            usage_info: {
+              pages_processed: 1,
+              doc_size_bytes: 1024,
+            },
+          },
+        });
+
+        const req = {
+          user: { id: 'user456' },
+          app: {
+            locals: {
+              ocr: {
+                apiKey: 'hardcoded-api-key-12345',
+                baseURL: '${CUSTOM_OCR_BASEURL}',
+                mistralModel: 'mistral-ocr-latest',
+              },
+            },
+          },
+        } as unknown as ExpressRequest;
+
+        const file = {
+          path: '/tmp/upload/file.pdf',
+          originalname: 'document.pdf',
+          mimetype: 'application/pdf',
+        } as Express.Multer.File;
+
+        await uploadMistralOCR({
+          req,
+          file,
+          loadAuthValues: mockLoadAuthValues,
+        });
+
+        // Check that loadAuthValues was called only with the env var field
+        expect(mockLoadAuthValues).toHaveBeenCalledWith({
+          userId: 'user456',
+          authFields: ['CUSTOM_OCR_BASEURL'],
+          optional: expect.any(Set),
+        });
+
+        // The fix: apiKey should be the hardcoded value
+        const uploadCall = mockAxios.post!.mock.calls[0];
+        const authHeader = uploadCall[2]?.headers?.Authorization;
+        expect(authHeader).toBe('Bearer hardcoded-api-key-12345');
+      });
+    });
+  });
+
+  describe('uploadAzureMistralOCR', () => {
+    beforeEach(() => {
+      (jest.mocked(fs).readFileSync as jest.Mock).mockReturnValue(Buffer.from('mock-file-content'));
+    });
+
+    it('should process OCR using Azure Mistral with base64 encoding', async () => {
+      mockLoadAuthValues.mockResolvedValue({
+        OCR_API_KEY: 'azure-api-key',
+        OCR_BASEURL: 'https://azure.mistral.ai/v1',
+      });
+
+      // Mock OCR response
+      mockAxios.post!.mockResolvedValueOnce({
+        data: {
+          model: 'mistral-ocr-latest',
+          pages: [
+            {
+              index: 0,
+              markdown: 'Azure OCR content',
+              images: [
+                {
+                  id: 'azure1',
+                  top_left_x: 0,
+                  top_left_y: 0,
+                  bottom_right_x: 100,
+                  bottom_right_y: 100,
+                  image_base64: 'azure-base64',
+                  image_annotation: '',
+                },
+              ],
+              dimensions: { dpi: 300, height: 1100, width: 850 },
+            },
+          ],
+          document_annotation: '',
+          usage_info: {
+            pages_processed: 1,
+            doc_size_bytes: 1024,
+          },
+        },
+      });
+
+      const req = {
+        user: { id: 'user123' },
+        app: {
+          locals: {
+            ocr: {
+              apiKey: '${OCR_API_KEY}',
+              baseURL: '${OCR_BASEURL}',
+              mistralModel: 'mistral-ocr-latest',
+            },
+          },
+        },
+      } as unknown as ExpressRequest;
+
+      const file = {
+        path: '/tmp/upload/azure-file.pdf',
+        originalname: 'azure-document.pdf',
+        mimetype: 'application/pdf',
+      } as Express.Multer.File;
+
+      const result = await uploadAzureMistralOCR({
+        req,
+        file,
+        loadAuthValues: mockLoadAuthValues,
+      });
+
+      expect(jest.mocked(fs).readFileSync).toHaveBeenCalledWith('/tmp/upload/azure-file.pdf');
+
+      // Verify OCR was called with base64 data URL
+      expect(mockAxios.post).toHaveBeenCalledWith(
+        'https://azure.mistral.ai/v1/ocr',
+        expect.objectContaining({
+          document: expect.objectContaining({
+            type: 'document_url',
+            document_url: expect.stringMatching(/^data:image\/jpeg;base64,/),
+          }),
+        }),
+        expect.any(Object),
+      );
+
+      expect(result).toEqual({
+        filename: 'azure-document.pdf',
+        bytes: expect.any(Number),
+        filepath: 'azure_mistral_ocr',
+        text: 'Azure OCR content\n\n',
+        images: ['azure-base64'],
+      });
+    });
+
+    describe('Mixed env var and hardcoded configuration', () => {
+      it('should preserve hardcoded baseURL when only apiKey is an env var', async () => {
+        // This test demonstrates the current bug
+        mockLoadAuthValues.mockResolvedValue({
+          AZURE_MISTRAL_OCR_API_KEY: 'test-api-key-from-env',
+          // Note: OCR_BASEURL is not returned, simulating it not being set
+        });
+
+        // Mock OCR response
+        mockAxios.post!.mockResolvedValueOnce({
+          data: {
+            model: 'mistral-ocr-2503',
+            pages: [
+              {
+                index: 0,
+                markdown: 'Test content',
+                images: [],
+                dimensions: { dpi: 300, height: 1100, width: 850 },
+              },
+            ],
+            document_annotation: '',
+            usage_info: {
+              pages_processed: 1,
+              doc_size_bytes: 1024,
+            },
+          },
+        });
+
+        const req = {
+          user: { id: 'user123' },
+          app: {
+            locals: {
+              ocr: {
+                apiKey: '${AZURE_MISTRAL_OCR_API_KEY}',
+                baseURL: 'https://endpoint.models.ai.azure.com/v1',
+                mistralModel: 'mistral-ocr-2503',
+              },
+            },
+          },
+        } as unknown as ExpressRequest;
+
+        const file = {
+          path: '/tmp/upload/file.pdf',
+          originalname: 'document.pdf',
+          mimetype: 'application/pdf',
+        } as Express.Multer.File;
+
+        await uploadAzureMistralOCR({
+          req,
+          file,
+          loadAuthValues: mockLoadAuthValues,
+        });
+
+        // Check that loadAuthValues was called only with the env var field
+        expect(mockLoadAuthValues).toHaveBeenCalledWith({
+          userId: 'user123',
+          authFields: ['AZURE_MISTRAL_OCR_API_KEY'],
+          optional: expect.any(Set),
+        });
+
+        // The fix: baseURL should be the hardcoded value
+        const ocrCall = mockAxios.post!.mock.calls[0];
+        expect(ocrCall[0]).toBe('https://endpoint.models.ai.azure.com/v1/ocr');
+      });
+
+      it('should preserve hardcoded apiKey when only baseURL is an env var', async () => {
+        // This test demonstrates the current bug
+        mockLoadAuthValues.mockResolvedValue({
+          CUSTOM_OCR_BASEURL: 'https://custom-ocr-endpoint.com/v1',
+          // Note: OCR_API_KEY is not returned, simulating it not being set
+        });
+
+        // Mock OCR response
+        mockAxios.post!.mockResolvedValueOnce({
+          data: {
+            model: 'mistral-ocr-latest',
+            pages: [
+              {
+                index: 0,
+                markdown: 'Test content',
+                images: [],
+                dimensions: { dpi: 300, height: 1100, width: 850 },
+              },
+            ],
+            document_annotation: '',
+            usage_info: {
+              pages_processed: 1,
+              doc_size_bytes: 1024,
+            },
+          },
+        });
+
+        const req = {
+          user: { id: 'user456' },
+          app: {
+            locals: {
+              ocr: {
+                apiKey: 'hardcoded-api-key-12345',
+                baseURL: '${CUSTOM_OCR_BASEURL}',
+                mistralModel: 'mistral-ocr-latest',
+              },
+            },
+          },
+        } as unknown as ExpressRequest;
+
+        const file = {
+          path: '/tmp/upload/file.pdf',
+          originalname: 'document.pdf',
+          mimetype: 'application/pdf',
+        } as Express.Multer.File;
+
+        await uploadAzureMistralOCR({
+          req,
+          file,
+          loadAuthValues: mockLoadAuthValues,
+        });
+
+        // Check that loadAuthValues was called only with the env var field
+        expect(mockLoadAuthValues).toHaveBeenCalledWith({
+          userId: 'user456',
+          authFields: ['CUSTOM_OCR_BASEURL'],
+          optional: expect.any(Set),
+        });
+
+        // The fix: apiKey should be the hardcoded value
+        const ocrCall = mockAxios.post!.mock.calls[0];
+        const authHeader = ocrCall[2]?.headers?.Authorization;
+        expect(authHeader).toBe('Bearer hardcoded-api-key-12345');
+      });
+    });
+  });
+});
diff --git a/packages/api/src/files/mistral/crud.ts b/packages/api/src/files/mistral/crud.ts
new file mode 100644
index 0000000000..200cc85196
--- /dev/null
+++ b/packages/api/src/files/mistral/crud.ts
@@ -0,0 +1,424 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import FormData from 'form-data';
+import { logger } from '@librechat/data-schemas';
+import {
+  FileSources,
+  envVarRegex,
+  extractEnvVariable,
+  extractVariableName,
+} from 'librechat-data-provider';
+import type { TCustomConfig } from 'librechat-data-provider';
+import type { Request as ServerRequest } from 'express';
+import type { AxiosError } from 'axios';
+import type {
+  MistralFileUploadResponse,
+  MistralSignedUrlResponse,
+  MistralOCRUploadResult,
+  MistralOCRError,
+  OCRResultPage,
+  OCRResult,
+  OCRImage,
+} from '~/types';
+import { logAxiosError, createAxiosInstance } from '~/utils/axios';
+
+const axios = createAxiosInstance();
+const DEFAULT_MISTRAL_BASE_URL = 'https://api.mistral.ai/v1';
+const DEFAULT_MISTRAL_MODEL = 'mistral-ocr-latest';
+
+/** Helper type for auth configuration */
+interface AuthConfig {
+  apiKey: string;
+  baseURL: string;
+}
+
+/** Helper type for OCR request context */
+interface OCRContext {
+  req: Pick<ServerRequest, 'user' | 'app'> & {
+    user?: { id: string };
+    app: {
+      locals?: {
+        ocr?: TCustomConfig['ocr'];
+      };
+    };
+  };
+  file: Express.Multer.File;
+  loadAuthValues: (params: {
+    userId: string;
+    authFields: string[];
+    optional?: Set<string>;
+  }) => Promise<Record<string, string | undefined>>;
+}
+
+/**
+ * Uploads a document to Mistral API using file streaming to avoid loading the entire file into memory
+ * @param params Upload parameters
+ * @param params.filePath The path to the file on disk
+ * @param params.fileName Optional filename to use (defaults to the name from filePath)
+ * @param params.apiKey Mistral API key
+ * @param params.baseURL Mistral API base URL
+ * @returns The response from Mistral API
+ */
+export async function uploadDocumentToMistral({
+  apiKey,
+  filePath,
+  baseURL = DEFAULT_MISTRAL_BASE_URL,
+  fileName = '',
+}: {
+  apiKey: string;
+  filePath: string;
+  baseURL?: string;
+  fileName?: string;
+}): Promise<MistralFileUploadResponse> {
+  const form = new FormData();
+  form.append('purpose', 'ocr');
+  const actualFileName = fileName || path.basename(filePath);
+  const fileStream = fs.createReadStream(filePath);
+  form.append('file', fileStream, { filename: actualFileName });
+
+  return axios
+    .post(`${baseURL}/files`, form, {
+      headers: {
+        Authorization: `Bearer ${apiKey}`,
+        ...form.getHeaders(),
+      },
+      maxBodyLength: Infinity,
+      maxContentLength: Infinity,
+    })
+    .then((res) => res.data)
+    .catch((error) => {
+      throw error;
+    });
+}
+
+export async function getSignedUrl({
+  apiKey,
+  fileId,
+  expiry = 24,
+  baseURL = DEFAULT_MISTRAL_BASE_URL,
+}: {
+  apiKey: string;
+  fileId: string;
+  expiry?: number;
+  baseURL?: string;
+}): Promise<MistralSignedUrlResponse> {
+  return axios
+    .get(`${baseURL}/files/${fileId}/url?expiry=${expiry}`, {
+      headers: {
+        Authorization: `Bearer ${apiKey}`,
+      },
+    })
+    .then((res) => res.data)
+    .catch((error) => {
+      logger.error('Error fetching signed URL:', error.message);
+      throw error;
+    });
+}
+
+/**
+ * @param {Object} params
+ * @param {string} params.apiKey
+ * @param {string} params.url - The document or image URL
+ * @param {string} [params.documentType='document_url'] - 'document_url' or 'image_url'
+ * @param {string} [params.model]
+ * @param {string} [params.baseURL]
+ * @returns {Promise<OCRResult>}
+ */
+export async function performOCR({
+  url,
+  apiKey,
+  model = DEFAULT_MISTRAL_MODEL,
+  baseURL = DEFAULT_MISTRAL_BASE_URL,
+  documentType = 'document_url',
+}: {
+  url: string;
+  apiKey: string;
+  model?: string;
+  baseURL?: string;
+  documentType?: 'document_url' | 'image_url';
+}): Promise<OCRResult> {
+  const documentKey = documentType === 'image_url' ? 'image_url' : 'document_url';
+  return axios
+    .post(
+      `${baseURL}/ocr`,
+      {
+        model,
+        image_limit: 0,
+        include_image_base64: false,
+        document: {
+          type: documentType,
+          [documentKey]: url,
+        },
+      },
+      {
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${apiKey}`,
+        },
+      },
+    )
+    .then((res) => res.data)
+    .catch((error) => {
+      logger.error('Error performing OCR:', error.message);
+      throw error;
+    });
+}
+
+/**
+ * Determines if a value needs to be loaded from environment
+ */
+function needsEnvLoad(value: string): boolean {
+  return envVarRegex.test(value) || !value.trim();
+}
+
+/**
+ * Gets the environment variable name for a config value
+ */
+function getEnvVarName(configValue: string, defaultName: string): string {
+  if (!envVarRegex.test(configValue)) {
+    return defaultName;
+  }
+  return extractVariableName(configValue) || defaultName;
+}
+
+/**
+ * Resolves a configuration value from either hardcoded or environment
+ */
+async function resolveConfigValue(
+  configValue: string,
+  defaultEnvName: string,
+  authValues: Record<string, string | undefined>,
+  defaultValue?: string,
+): Promise<string> {
+  // If it's a hardcoded value (not env var and not empty), use it directly
+  if (!needsEnvLoad(configValue)) {
+    return configValue;
+  }
+
+  // Otherwise, get from auth values
+  const envVarName = getEnvVarName(configValue, defaultEnvName);
+  return authValues[envVarName] || defaultValue || '';
+}
+
+/**
+ * Loads authentication configuration from OCR config
+ */
+async function loadAuthConfig(context: OCRContext): Promise<AuthConfig> {
+  const ocrConfig = context.req.app.locals?.ocr;
+  const apiKeyConfig = ocrConfig?.apiKey || '';
+  const baseURLConfig = ocrConfig?.baseURL || '';
+
+  // If both are hardcoded, return them directly
+  if (!needsEnvLoad(apiKeyConfig) && !needsEnvLoad(baseURLConfig)) {
+    return {
+      apiKey: apiKeyConfig,
+      baseURL: baseURLConfig,
+    };
+  }
+
+  // Build auth fields array
+  const authFields: string[] = [];
+
+  if (needsEnvLoad(baseURLConfig)) {
+    authFields.push(getEnvVarName(baseURLConfig, 'OCR_BASEURL'));
+  }
+
+  if (needsEnvLoad(apiKeyConfig)) {
+    authFields.push(getEnvVarName(apiKeyConfig, 'OCR_API_KEY'));
+  }
+
+  // Load auth values
+  const authValues = await context.loadAuthValues({
+    userId: context.req.user?.id || '',
+    authFields,
+    optional: new Set(['OCR_BASEURL']),
+  });
+
+  // Resolve each value
+  const apiKey = await resolveConfigValue(apiKeyConfig, 'OCR_API_KEY', authValues);
+  const baseURL = await resolveConfigValue(
+    baseURLConfig,
+    'OCR_BASEURL',
+    authValues,
+    DEFAULT_MISTRAL_BASE_URL,
+  );
+
+  return { apiKey, baseURL };
+}
+
+/**
+ * Gets the model configuration
+ */
+function getModelConfig(ocrConfig: TCustomConfig['ocr']): string {
+  const modelConfig = ocrConfig?.mistralModel || '';
+
+  if (!modelConfig.trim()) {
+    return DEFAULT_MISTRAL_MODEL;
+  }
+
+  if (envVarRegex.test(modelConfig)) {
+    return extractEnvVariable(modelConfig) || DEFAULT_MISTRAL_MODEL;
+  }
+
+  return modelConfig.trim();
+}
+
+/**
+ * Determines document type based on file
+ */
+function getDocumentType(file: Express.Multer.File): 'image_url' | 'document_url' {
+  const mimetype = (file.mimetype || '').toLowerCase();
+  const originalname = file.originalname || '';
+  const isImage =
+    mimetype.startsWith('image') || /\.(png|jpe?g|gif|bmp|webp|tiff?)$/i.test(originalname);
+
+  return isImage ? 'image_url' : 'document_url';
+}
+
+/**
+ * Processes OCR result pages into aggregated text and images
+ */
+function processOCRResult(ocrResult: OCRResult): { text: string; images: string[] } {
+  let aggregatedText = '';
+  const images: string[] = [];
+
+  ocrResult.pages.forEach((page: OCRResultPage, index: number) => {
+    if (ocrResult.pages.length > 1) {
+      aggregatedText += `# PAGE ${index + 1}\n`;
+    }
+
+    aggregatedText += page.markdown + '\n\n';
+
+    if (!page.images || page.images.length === 0) {
+      return;
+    }
+
+    page.images.forEach((image: OCRImage) => {
+      if (image.image_base64) {
+        images.push(image.image_base64);
+      }
+    });
+  });
+
+  return { text: aggregatedText, images };
+}
+
+/**
+ * Creates an error message for OCR operations
+ */
+function createOCRError(error: unknown, baseMessage: string): Error {
+  const axiosError = error as AxiosError<MistralOCRError>;
+  const detail = axiosError?.response?.data?.detail;
+  const message = detail || baseMessage;
+
+  const responseMessage = axiosError?.response?.data?.message;
+  const errorLog = logAxiosError({ error: axiosError, message });
+  const fullMessage = responseMessage ? `${errorLog} - ${responseMessage}` : errorLog;
+
+  return new Error(fullMessage);
+}
+
+/**
+ * Uploads a file to the Mistral OCR API and processes 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 uploadMistralOCR = async (context: OCRContext): Promise<MistralOCRUploadResult> => {
+  try {
+    const { apiKey, baseURL } = await loadAuthConfig(context);
+    const model = getModelConfig(context.req.app.locals?.ocr);
+
+    // Upload file
+    const mistralFile = await uploadDocumentToMistral({
+      filePath: context.file.path,
+      fileName: context.file.originalname,
+      apiKey,
+      baseURL,
+    });
+
+    // Get signed URL
+    const signedUrlResponse = await getSignedUrl({
+      apiKey,
+      baseURL,
+      fileId: mistralFile.id,
+    });
+
+    // Perform OCR
+    const documentType = getDocumentType(context.file);
+    const ocrResult = await performOCR({
+      apiKey,
+      baseURL,
+      model,
+      url: signedUrlResponse.url,
+      documentType,
+    });
+
+    // Process result
+    const { text, images } = processOCRResult(ocrResult);
+
+    return {
+      filename: context.file.originalname,
+      bytes: text.length * 4,
+      filepath: FileSources.mistral_ocr,
+      text,
+      images,
+    };
+  } catch (error) {
+    throw createOCRError(error, 'Error uploading document to Mistral OCR API');
+  }
+};
+
+/**
+ * Use Azure Mistral OCR API to processe 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 uploadAzureMistralOCR = async (
+  context: OCRContext,
+): Promise<MistralOCRUploadResult> => {
+  try {
+    const { apiKey, baseURL } = await loadAuthConfig(context);
+    const model = getModelConfig(context.req.app.locals?.ocr);
+
+    // Read file as base64
+    const buffer = fs.readFileSync(context.file.path);
+    const base64 = buffer.toString('base64');
+
+    // Perform OCR directly with base64
+    const documentType = getDocumentType(context.file);
+    const ocrResult = await performOCR({
+      apiKey,
+      baseURL,
+      model,
+      url: `data:image/jpeg;base64,${base64}`,
+      documentType,
+    });
+
+    // Process result
+    const { text, images } = processOCRResult(ocrResult);
+
+    return {
+      filename: context.file.originalname,
+      bytes: text.length * 4,
+      filepath: FileSources.azure_mistral_ocr,
+      text,
+      images,
+    };
+  } catch (error) {
+    throw createOCRError(error, 'Error uploading document to Azure Mistral OCR API');
+  }
+};
diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
index 09a3665e42..9e3db4ef6b 100644
--- a/packages/api/src/index.ts
+++ b/packages/api/src/index.ts
@@ -9,6 +9,8 @@ export * from './flow/manager';
 export * from './agents';
 /* Endpoints */
 export * from './endpoints';
+/* Files */
+export * from './files';
 /* types */
 export type * from './mcp/types';
 export type * from './flow/types';
diff --git a/packages/api/src/mcp/connection.ts b/packages/api/src/mcp/connection.ts
index 381834ba2a..81a6831a70 100644
--- a/packages/api/src/mcp/connection.ts
+++ b/packages/api/src/mcp/connection.ts
@@ -88,7 +88,7 @@ export class MCPConnection extends EventEmitter {
     this.client = new Client(
       {
         name: '@librechat/api-client',
-        version: '1.2.2',
+        version: '1.2.3',
       },
       {
         capabilities: {},
diff --git a/packages/api/src/types/index.ts b/packages/api/src/types/index.ts
index 488bcbf0e1..41ea33eb45 100644
--- a/packages/api/src/types/index.ts
+++ b/packages/api/src/types/index.ts
@@ -1,4 +1,5 @@
 export * from './azure';
 export * from './events';
+export * from './mistral';
 export * from './openai';
 export * from './run';
diff --git a/packages/api/src/types/mistral.ts b/packages/api/src/types/mistral.ts
new file mode 100644
index 0000000000..297369bd0a
--- /dev/null
+++ b/packages/api/src/types/mistral.ts
@@ -0,0 +1,82 @@
+/**
+ * Mistral OCR API Types
+ * Based on https://docs.mistral.ai/api/#tag/ocr/operation/ocr_v1_ocr_post
+ */
+
+export interface MistralFileUploadResponse {
+  id: string;
+  object: string;
+  bytes: number;
+  created_at: number;
+  filename: string;
+  purpose: string;
+}
+
+export interface MistralSignedUrlResponse {
+  url: string;
+  expires_at: number;
+}
+
+export interface OCRImage {
+  id: string;
+  top_left_x: number;
+  top_left_y: number;
+  bottom_right_x: number;
+  bottom_right_y: number;
+  image_base64: string;
+  image_annotation?: string;
+}
+
+export interface PageDimensions {
+  dpi: number;
+  height: number;
+  width: number;
+}
+
+export interface OCRResultPage {
+  index: number;
+  markdown: string;
+  images: OCRImage[];
+  dimensions: PageDimensions;
+}
+
+export interface OCRUsageInfo {
+  pages_processed: number;
+  doc_size_bytes: number;
+}
+
+export interface OCRResult {
+  pages: OCRResultPage[];
+  model: string;
+  document_annotation?: string | null;
+  usage_info: OCRUsageInfo;
+}
+
+export interface MistralOCRRequest {
+  model: string;
+  image_limit?: number;
+  include_image_base64?: boolean;
+  document: {
+    type: 'document_url' | 'image_url';
+    document_url?: string;
+    image_url?: string;
+  };
+}
+
+export interface MistralOCRError {
+  detail?: string;
+  message?: string;
+  error?: {
+    message?: string;
+    type?: string;
+    code?: string;
+  };
+}
+
+export interface MistralOCRUploadResult {
+  filename: string;
+  bytes: number;
+  filepath: string;
+  text: string;
+  images: string[];
+}
diff --git a/api/config/index.spec.js b/packages/api/src/utils/axios.spec.ts
similarity index 93%
rename from api/config/index.spec.js
rename to packages/api/src/utils/axios.spec.ts
index 36ed8302f3..643857f7a5 100644
--- a/api/config/index.spec.js
+++ b/packages/api/src/utils/axios.spec.ts
@@ -1,7 +1,6 @@
-const axios = require('axios');
-const { createAxiosInstance } = require('./index');
+import axios from 'axios';
+import { createAxiosInstance } from './axios';
 
-// Mock axios
 jest.mock('axios', () => ({
   interceptors: {
     request: { use: jest.fn(), eject: jest.fn() },
@@ -20,7 +19,13 @@ jest.mock('axios', () => ({
   post: jest.fn().mockResolvedValue({ data: {} }),
   put: jest.fn().mockResolvedValue({ data: {} }),
   delete: jest.fn().mockResolvedValue({ data: {} }),
-  reset: jest.fn().mockImplementation(function () {
+  reset: jest.fn().mockImplementation(function (this: {
+    get: jest.Mock;
+    post: jest.Mock;
+    put: jest.Mock;
+    delete: jest.Mock;
+    create: jest.Mock;
+  }) {
     this.get.mockClear();
     this.post.mockClear();
     this.put.mockClear();
diff --git a/packages/api/src/utils/axios.ts b/packages/api/src/utils/axios.ts
new file mode 100644
index 0000000000..d1275ada4d
--- /dev/null
+++ b/packages/api/src/utils/axios.ts
@@ -0,0 +1,77 @@
+import axios from 'axios';
+import { logger } from '@librechat/data-schemas';
+import type { AxiosInstance, AxiosProxyConfig, AxiosError } from 'axios';
+
+/**
+ * Logs Axios errors based on the error object and a custom message.
+ * @param options - The options object.
+ * @param options.message - The custom message to be logged.
+ * @param options.error - The Axios error object.
+ * @returns The log message.
+ */
+export const logAxiosError = ({ message, error }: { message: string; error: AxiosError }) => {
+  let logMessage = message;
+  try {
+    const stack = error.stack || 'No stack trace available';
+
+    if (error.response?.status) {
+      const { status, headers, data } = error.response;
+      logMessage = `${message} The server responded with status ${status}: ${error.message}`;
+      logger.error(logMessage, {
+        status,
+        headers,
+        data,
+        stack,
+      });
+    } else if (error.request) {
+      const { method, url } = error.config || {};
+      logMessage = `${message} No response received for ${method ? method.toUpperCase() : ''} ${url || ''}: ${error.message}`;
+      logger.error(logMessage, {
+        requestInfo: { method, url },
+        stack,
+      });
+    } else if (error?.message?.includes("Cannot read properties of undefined (reading 'status')")) {
+      logMessage = `${message} It appears the request timed out or was unsuccessful: ${error.message}`;
+      logger.error(logMessage, { stack });
+    } else {
+      logMessage = `${message} An error occurred while setting up the request: ${error.message}`;
+      logger.error(logMessage, { stack });
+    }
+  } catch (err: unknown) {
+    logMessage = `Error in logAxiosError: ${(err as Error).message}`;
+    logger.error(logMessage, { stack: (err as Error).stack || 'No stack trace available' });
+  }
+  return logMessage;
+};
+
+/**
+ * Creates and configures an Axios instance with optional proxy settings.
+
+ * @returns A configured Axios instance
+ * @throws If there's an issue creating the Axios instance or parsing the proxy URL
+ */
+export function createAxiosInstance(): AxiosInstance {
+  const instance = axios.create();
+
+  if (process.env.proxy) {
+    try {
+      const url = new URL(process.env.proxy);
+
+      const proxyConfig: Partial<AxiosProxyConfig> = {
+        host: url.hostname.replace(/^\[|\]$/g, ''),
+        protocol: url.protocol.replace(':', ''),
+      };
+
+      if (url.port) {
+        proxyConfig.port = parseInt(url.port, 10);
+      }
+
+      instance.defaults.proxy = proxyConfig as AxiosProxyConfig;
+    } catch (error) {
+      console.error('Error parsing proxy URL:', error);
+      throw new Error(`Invalid proxy URL: ${process.env.proxy}`);
+    }
+  }
+
+  return instance;
+}
diff --git a/packages/api/src/utils/index.ts b/packages/api/src/utils/index.ts
index 6c6aea81ed..7e08343ea8 100644
--- a/packages/api/src/utils/index.ts
+++ b/packages/api/src/utils/index.ts
@@ -1,3 +1,4 @@
+export * from './axios';
 export * from './azure';
 export * from './common';
 export * from './events';
diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.ts
index 6a299e6486..c7484b8b86 100644
--- a/packages/data-provider/src/config.ts
+++ b/packages/data-provider/src/config.ts
@@ -593,6 +593,7 @@ export type TStartupConfig = {
 export enum OCRStrategy {
   MISTRAL_OCR = 'mistral_ocr',
   CUSTOM_OCR = 'custom_ocr',
+  AZURE_MISTRAL_OCR = 'azure_mistral_ocr',
 }
 
 export enum SearchCategories {
@@ -1363,7 +1364,7 @@ export enum Constants {
   /** Key for the app's version. */
   VERSION = 'v0.7.8',
   /** Key for the Custom Config's version (librechat.yaml). */
-  CONFIG_VERSION = '1.2.6',
+  CONFIG_VERSION = '1.2.8',
   /** Standard value for the first message's `parentMessageId` value, to indicate no parent exists. */
   NO_PARENT = '00000000-0000-0000-0000-000000000000',
   /** Standard value for the initial conversationId before a request is sent */
diff --git a/packages/data-provider/src/types/files.ts b/packages/data-provider/src/types/files.ts
index 927002630f..bae3e783bf 100644
--- a/packages/data-provider/src/types/files.ts
+++ b/packages/data-provider/src/types/files.ts
@@ -10,6 +10,7 @@ export enum FileSources {
   vectordb = 'vectordb',
   execute_code = 'execute_code',
   mistral_ocr = 'mistral_ocr',
+  azure_mistral_ocr = 'azure_mistral_ocr',
   text = 'text',
 }
 

From 4419e2c294064db31ddaaae6cac97d3bf165d536 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Fri, 13 Jun 2025 15:47:41 -0400
Subject: [PATCH 30/49] =?UTF-8?q?=E2=9C=A8=20feat:=20Agent=20Panel=20UI=20?=
 =?UTF-8?q?Enhancements=20(#7800)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: add MCP Panel to Agent Builder

- Add MCP server panel and configuration UI
- Implement MCP input forms and tool lists
- Add MCP icon and metadata support
- Integrate MCP with agent configuration
- Add localization support for MCP features
- Refactor components for better reusability
- Update types and add MCP-related mutations
- Fix small issues with Actions and AgentSelect
- Refactor AgentPanelSwitch and related components to use new
  AgentPanelContext to reduce prop drilling

* chore: import order

* chore: clean up import statements and unused var in ActionsPanel component

* refactor: AgentPanelContext with actions query, remove unnecessary `actions` state

- Added actions query using `useGetActionsQuery` to fetch actions based on the current agent ID.
- Removed now unused `setActions` state and related logic from `AgentPanelContext` and `AgentPanelSwitch` components.
- Updated `AgentPanelContextType` to reflect the removal of `setActions`.

* chore: re-order import statements in AgentConfig component

* chore: re-order import statements in ModelPanel component

* chore: update ModelPanel props to consolidated props to avoid passing unnecessary props

* chore: update import statements in Providers index file to include ToastProvider and AgentPanelContext exports

* chore: clean up import statements in VersionPanel component

* refactor: streamline AgentConfig and AgentPanel components

- Consolidated props in AgentConfig to only include necessary fields.
- Updated AgentPanel to remove unused state and props, enhancing clarity and maintainability.
- Reorganized import statements for better structure and readability.

* refactor: replace default agent form values with utility function

- Updated AgentsProvider, AgentPanel, AgentSelect, and DeleteButton components to use getDefaultAgentFormValues utility function instead of directly importing defaultAgentFormValues.
- Enhanced the initialization of agent forms by incorporating localStorage values for model and provider in the new utility function.

* chore: comment out rendering MCPSection

---------

Co-authored-by: Dustin Healy <54083382+dustinhealy@users.noreply.github.com>
---
 client/src/Providers/AgentPanelContext.tsx    |  45 +++
 client/src/Providers/AgentsContext.tsx        |   4 +-
 client/src/Providers/index.ts                 |   3 +-
 client/src/common/mcp.ts                      |  26 ++
 client/src/common/types.ts                    |  27 ++
 .../SidePanel/Agents/ActionsPanel.tsx         |  16 +-
 .../SidePanel/Agents/AgentConfig.tsx          |  27 +-
 .../SidePanel/Agents/AgentPanel.tsx           |  42 ++-
 .../SidePanel/Agents/AgentPanelSwitch.tsx     |  62 ++--
 .../SidePanel/Agents/AgentSelect.tsx          |  13 +-
 .../SidePanel/Agents/DeleteButton.tsx         |   9 +-
 .../components/SidePanel/Agents/MCPIcon.tsx   |  64 ++++
 .../components/SidePanel/Agents/MCPInput.tsx  | 288 ++++++++++++++++++
 .../components/SidePanel/Agents/MCPPanel.tsx  | 172 +++++++++++
 .../SidePanel/Agents/MCPSection.tsx           |  57 ++++
 .../SidePanel/Agents/ModelPanel.tsx           |  11 +-
 .../SidePanel/Agents/Version/VersionPanel.tsx |  20 +-
 .../Version/__tests__/VersionPanel.spec.tsx   |  53 +++-
 .../src/components/SidePanel/Builder/MCP.tsx  |  60 ++++
 .../components/SidePanel/Builder/MCPAuth.tsx  |  55 ++++
 client/src/components/svg/MCPIcon.tsx         |  15 +
 .../src/components/svg/SquirclePlusIcon.tsx   |  19 ++
 client/src/data-provider/Agents/mutations.ts  |  18 +-
 client/src/locales/en/translation.json        |  24 +-
 client/src/utils/forms.tsx                    |  12 +
 packages/data-provider/src/config.ts          |   4 +
 .../data-provider/src/types/assistants.ts     |  17 ++
 27 files changed, 1027 insertions(+), 136 deletions(-)
 create mode 100644 client/src/Providers/AgentPanelContext.tsx
 create mode 100644 client/src/common/mcp.ts
 create mode 100644 client/src/components/SidePanel/Agents/MCPIcon.tsx
 create mode 100644 client/src/components/SidePanel/Agents/MCPInput.tsx
 create mode 100644 client/src/components/SidePanel/Agents/MCPPanel.tsx
 create mode 100644 client/src/components/SidePanel/Agents/MCPSection.tsx
 create mode 100644 client/src/components/SidePanel/Builder/MCP.tsx
 create mode 100644 client/src/components/SidePanel/Builder/MCPAuth.tsx
 create mode 100644 client/src/components/svg/MCPIcon.tsx
 create mode 100644 client/src/components/svg/SquirclePlusIcon.tsx

diff --git a/client/src/Providers/AgentPanelContext.tsx b/client/src/Providers/AgentPanelContext.tsx
new file mode 100644
index 0000000000..628eda00f2
--- /dev/null
+++ b/client/src/Providers/AgentPanelContext.tsx
@@ -0,0 +1,45 @@
+import React, { createContext, useContext, useState } from 'react';
+import { Action, MCP, EModelEndpoint } from 'librechat-data-provider';
+import type { AgentPanelContextType } from '~/common';
+import { useGetActionsQuery } from '~/data-provider';
+import { Panel } from '~/common';
+
+const AgentPanelContext = createContext<AgentPanelContextType | undefined>(undefined);
+
+export function useAgentPanelContext() {
+  const context = useContext(AgentPanelContext);
+  if (context === undefined) {
+    throw new Error('useAgentPanelContext must be used within an AgentPanelProvider');
+  }
+  return context;
+}
+
+/** Houses relevant state for the Agent Form Panels (formerly 'commonProps') */
+export function AgentPanelProvider({ children }: { children: React.ReactNode }) {
+  const [mcp, setMcp] = useState<MCP | undefined>(undefined);
+  const [mcps, setMcps] = useState<MCP[] | undefined>(undefined);
+  const [action, setAction] = useState<Action | undefined>(undefined);
+  const [activePanel, setActivePanel] = useState<Panel>(Panel.builder);
+  const [agent_id, setCurrentAgentId] = useState<string | undefined>(undefined);
+
+  const { data: actions } = useGetActionsQuery(EModelEndpoint.agents, {
+    enabled: !!agent_id,
+  });
+
+  const value = {
+    action,
+    setAction,
+    mcp,
+    setMcp,
+    mcps,
+    setMcps,
+    activePanel,
+    setActivePanel,
+    setCurrentAgentId,
+    agent_id,
+    /** Query data for actions */
+    actions,
+  };
+
+  return <AgentPanelContext.Provider value={value}>{children}</AgentPanelContext.Provider>;
+}
diff --git a/client/src/Providers/AgentsContext.tsx b/client/src/Providers/AgentsContext.tsx
index e793a3f087..a90a53ecb5 100644
--- a/client/src/Providers/AgentsContext.tsx
+++ b/client/src/Providers/AgentsContext.tsx
@@ -1,8 +1,8 @@
 import { useForm, FormProvider } from 'react-hook-form';
 import { createContext, useContext } from 'react';
-import { defaultAgentFormValues } from 'librechat-data-provider';
 import type { UseFormReturn } from 'react-hook-form';
 import type { AgentForm } from '~/common';
+import { getDefaultAgentFormValues } from '~/utils';
 
 type AgentsContextType = UseFormReturn<AgentForm>;
 
@@ -20,7 +20,7 @@ export function useAgentsContext() {
 
 export default function AgentsProvider({ children }) {
   const methods = useForm<AgentForm>({
-    defaultValues: defaultAgentFormValues,
+    defaultValues: getDefaultAgentFormValues(),
   });
 
   return <FormProvider {...methods}>{children}</FormProvider>;
diff --git a/client/src/Providers/index.ts b/client/src/Providers/index.ts
index 00191318e0..41c9cdceb3 100644
--- a/client/src/Providers/index.ts
+++ b/client/src/Providers/index.ts
@@ -1,6 +1,7 @@
-export { default as ToastProvider } from './ToastContext';
 export { default as AssistantsProvider } from './AssistantsContext';
 export { default as AgentsProvider } from './AgentsContext';
+export { default as ToastProvider } from './ToastContext';
+export * from './AgentPanelContext';
 export * from './ChatContext';
 export * from './ShareContext';
 export * from './ToastContext';
diff --git a/client/src/common/mcp.ts b/client/src/common/mcp.ts
new file mode 100644
index 0000000000..b4f44a1f94
--- /dev/null
+++ b/client/src/common/mcp.ts
@@ -0,0 +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,
+};
diff --git a/client/src/common/types.ts b/client/src/common/types.ts
index 0ac6387c33..6fe4784fbc 100644
--- a/client/src/common/types.ts
+++ b/client/src/common/types.ts
@@ -143,6 +143,7 @@ export enum Panel {
   actions = 'actions',
   model = 'model',
   version = 'version',
+  mcp = 'mcp',
 }
 
 export type FileSetter =
@@ -166,6 +167,15 @@ export type ActionAuthForm = {
   token_exchange_method: t.TokenExchangeMethodEnum;
 };
 
+export type MCPForm = ActionAuthForm & {
+  name?: string;
+  description?: string;
+  url?: string;
+  tools?: string[];
+  icon?: string;
+  trust?: boolean;
+};
+
 export type ActionWithNullableMetadata = Omit<t.Action, 'metadata'> & {
   metadata: t.ActionMetadata | null;
 };
@@ -188,16 +198,33 @@ export type AgentPanelProps = {
   index?: number;
   agent_id?: string;
   activePanel?: string;
+  mcp?: t.MCP;
+  mcps?: t.MCP[];
   action?: t.Action;
   actions?: t.Action[];
   createMutation: UseMutationResult<t.Agent, Error, t.AgentCreateParams>;
   setActivePanel: React.Dispatch<React.SetStateAction<Panel>>;
+  setMcp: React.Dispatch<React.SetStateAction<t.MCP | undefined>>;
   setAction: React.Dispatch<React.SetStateAction<t.Action | undefined>>;
   endpointsConfig?: t.TEndpointsConfig;
   setCurrentAgentId: React.Dispatch<React.SetStateAction<string | undefined>>;
   agentsConfig?: t.TAgentsEndpoint | null;
 };
 
+export type AgentPanelContextType = {
+  action?: t.Action;
+  actions?: t.Action[];
+  setAction: React.Dispatch<React.SetStateAction<t.Action | undefined>>;
+  mcp?: t.MCP;
+  mcps?: t.MCP[];
+  setMcp: React.Dispatch<React.SetStateAction<t.MCP | undefined>>;
+  setMcps: React.Dispatch<React.SetStateAction<t.MCP[] | undefined>>;
+  activePanel?: string;
+  setActivePanel: React.Dispatch<React.SetStateAction<Panel>>;
+  setCurrentAgentId: React.Dispatch<React.SetStateAction<string | undefined>>;
+  agent_id?: string;
+};
+
 export type AgentModelPanelProps = {
   agent_id?: string;
   providers: Option[];
diff --git a/client/src/components/SidePanel/Agents/ActionsPanel.tsx b/client/src/components/SidePanel/Agents/ActionsPanel.tsx
index 0ae564b05a..89b9a87f92 100644
--- a/client/src/components/SidePanel/Agents/ActionsPanel.tsx
+++ b/client/src/components/SidePanel/Agents/ActionsPanel.tsx
@@ -1,31 +1,27 @@
 import { useEffect } from 'react';
+import { ChevronLeft } from 'lucide-react';
 import { useForm, FormProvider } from 'react-hook-form';
 import {
   AuthTypeEnum,
   AuthorizationTypeEnum,
   TokenExchangeMethodEnum,
 } from 'librechat-data-provider';
-import { ChevronLeft } from 'lucide-react';
-import type { AgentPanelProps, ActionAuthForm } from '~/common';
 import ActionsAuth from '~/components/SidePanel/Builder/ActionsAuth';
+import { useAgentPanelContext } from '~/Providers/AgentPanelContext';
 import { OGDialog, OGDialogTrigger, Label } from '~/components/ui';
 import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
 import { useDeleteAgentAction } from '~/data-provider';
+import type { ActionAuthForm } from '~/common';
 import useLocalize from '~/hooks/useLocalize';
 import { useToastContext } from '~/Providers';
 import { TrashIcon } from '~/components/svg';
 import ActionsInput from './ActionsInput';
 import { Panel } from '~/common';
 
-export default function ActionsPanel({
-  // activePanel,
-  action,
-  setAction,
-  agent_id,
-  setActivePanel,
-}: AgentPanelProps) {
+export default function ActionsPanel() {
   const localize = useLocalize();
   const { showToast } = useToastContext();
+  const { setActivePanel, action, setAction, agent_id } = useAgentPanelContext();
   const deleteAgentAction = useDeleteAgentAction({
     onSuccess: () => {
       showToast({
@@ -62,7 +58,7 @@ export default function ActionsPanel({
     },
   });
 
-  const { reset, watch } = methods;
+  const { reset } = methods;
 
   useEffect(() => {
     if (action?.metadata.auth) {
diff --git a/client/src/components/SidePanel/Agents/AgentConfig.tsx b/client/src/components/SidePanel/Agents/AgentConfig.tsx
index c04018e69a..2b056a5181 100644
--- a/client/src/components/SidePanel/Agents/AgentConfig.tsx
+++ b/client/src/components/SidePanel/Agents/AgentConfig.tsx
@@ -1,11 +1,11 @@
-import React, { useState, useMemo, useCallback } from 'react';
 import { useQueryClient } from '@tanstack/react-query';
+import React, { useState, useMemo, useCallback } from 'react';
 import { Controller, useWatch, useFormContext } from 'react-hook-form';
 import { QueryKeys, EModelEndpoint, AgentCapabilities } from 'librechat-data-provider';
 import type { TPlugin } from 'librechat-data-provider';
-import type { AgentForm, AgentPanelProps, IconComponentTypes } from '~/common';
 import { cn, defaultTextProps, removeFocusOutlines, getEndpointField, getIconKey } from '~/utils';
-import { useToastContext, useFileMapContext } from '~/Providers';
+import { useToastContext, useFileMapContext, useAgentPanelContext } from '~/Providers';
+import type { AgentForm, AgentPanelProps, IconComponentTypes } from '~/common';
 import Action from '~/components/SidePanel/Builder/Action';
 import { ToolSelectDialog } from '~/components/Tools';
 import { icons } from '~/hooks/Endpoint/Icons';
@@ -15,6 +15,7 @@ import AgentAvatar from './AgentAvatar';
 import FileContext from './FileContext';
 import SearchForm from './Search/Form';
 import { useLocalize } from '~/hooks';
+import MCPSection from './MCPSection';
 import FileSearch from './FileSearch';
 import Artifacts from './Artifacts';
 import AgentTool from './AgentTool';
@@ -29,23 +30,19 @@ const inputClass = cn(
 );
 
 export default function AgentConfig({
-  setAction,
-  actions = [],
   agentsConfig,
   createMutation,
-  setActivePanel,
   endpointsConfig,
-}: AgentPanelProps) {
+}: Pick<AgentPanelProps, 'agentsConfig' | 'createMutation' | 'endpointsConfig'>) {
+  const localize = useLocalize();
   const fileMap = useFileMapContext();
   const queryClient = useQueryClient();
+  const { showToast } = useToastContext();
+  const methods = useFormContext<AgentForm>();
+  const [showToolDialog, setShowToolDialog] = useState(false);
+  const { actions, setAction, setActivePanel } = useAgentPanelContext();
 
   const allTools = queryClient.getQueryData<TPlugin[]>([QueryKeys.tools]) ?? [];
-  const { showToast } = useToastContext();
-  const localize = useLocalize();
-
-  const [showToolDialog, setShowToolDialog] = useState(false);
-
-  const methods = useFormContext<AgentForm>();
 
   const { control } = methods;
   const provider = useWatch({ control, name: 'provider' });
@@ -299,7 +296,7 @@ export default function AgentConfig({
                 agent_id={agent_id}
               />
             ))}
-            {actions
+            {(actions ?? [])
               .filter((action) => action.agent_id === agent_id)
               .map((action, i) => (
                 <Action
@@ -340,6 +337,8 @@ export default function AgentConfig({
             </div>
           </div>
         </div>
+        {/* MCP Section */}
+        {/* <MCPSection /> */}
       </div>
       <ToolSelectDialog
         isOpen={showToolDialog}
diff --git a/client/src/components/SidePanel/Agents/AgentPanel.tsx b/client/src/components/SidePanel/Agents/AgentPanel.tsx
index 34f83b9257..78874e41c5 100644
--- a/client/src/components/SidePanel/Agents/AgentPanel.tsx
+++ b/client/src/components/SidePanel/Agents/AgentPanel.tsx
@@ -7,20 +7,22 @@ import {
   Constants,
   SystemRoles,
   EModelEndpoint,
+  TAgentsEndpoint,
+  TEndpointsConfig,
   isAssistantsEndpoint,
-  defaultAgentFormValues,
 } from 'librechat-data-provider';
-import type { AgentForm, AgentPanelProps, StringOption } from '~/common';
+import type { AgentForm, StringOption } from '~/common';
 import {
   useCreateAgentMutation,
   useUpdateAgentMutation,
   useGetAgentByIdQuery,
 } from '~/data-provider';
+import { createProviderOption, getDefaultAgentFormValues } from '~/utils';
 import { useSelectAgent, useLocalize, useAuthContext } from '~/hooks';
+import { useAgentPanelContext } from '~/Providers/AgentPanelContext';
 import AgentPanelSkeleton from './AgentPanelSkeleton';
-import { createProviderOption } from '~/utils';
-import { useToastContext } from '~/Providers';
 import AdvancedPanel from './Advanced/AdvancedPanel';
+import { useToastContext } from '~/Providers';
 import AgentConfig from './AgentConfig';
 import AgentSelect from './AgentSelect';
 import AgentFooter from './AgentFooter';
@@ -29,18 +31,21 @@ import ModelPanel from './ModelPanel';
 import { Panel } from '~/common';
 
 export default function AgentPanel({
-  setAction,
-  activePanel,
-  actions = [],
-  setActivePanel,
-  agent_id: current_agent_id,
-  setCurrentAgentId,
   agentsConfig,
   endpointsConfig,
-}: AgentPanelProps) {
+}: {
+  agentsConfig: TAgentsEndpoint | null;
+  endpointsConfig: TEndpointsConfig;
+}) {
   const localize = useLocalize();
   const { user } = useAuthContext();
   const { showToast } = useToastContext();
+  const {
+    activePanel,
+    setActivePanel,
+    setCurrentAgentId,
+    agent_id: current_agent_id,
+  } = useAgentPanelContext();
 
   const { onSelect: onSelectAgent } = useSelectAgent();
 
@@ -51,7 +56,7 @@ export default function AgentPanel({
 
   const models = useMemo(() => modelsQuery.data ?? {}, [modelsQuery.data]);
   const methods = useForm<AgentForm>({
-    defaultValues: defaultAgentFormValues,
+    defaultValues: getDefaultAgentFormValues(),
   });
 
   const { control, handleSubmit, reset } = methods;
@@ -277,7 +282,7 @@ export default function AgentPanel({
                 variant="outline"
                 className="w-full justify-center"
                 onClick={() => {
-                  reset(defaultAgentFormValues);
+                  reset(getDefaultAgentFormValues());
                   setCurrentAgentId(undefined);
                 }}
                 disabled={agentQuery.isInitialLoading}
@@ -315,22 +320,13 @@ export default function AgentPanel({
           </div>
         )}
         {canEditAgent && !agentQuery.isInitialLoading && activePanel === Panel.model && (
-          <ModelPanel
-            setActivePanel={setActivePanel}
-            agent_id={agent_id}
-            providers={providers}
-            models={models}
-          />
+          <ModelPanel models={models} providers={providers} setActivePanel={setActivePanel} />
         )}
         {canEditAgent && !agentQuery.isInitialLoading && activePanel === Panel.builder && (
           <AgentConfig
-            actions={actions}
-            setAction={setAction}
             createMutation={create}
             agentsConfig={agentsConfig}
-            setActivePanel={setActivePanel}
             endpointsConfig={endpointsConfig}
-            setCurrentAgentId={setCurrentAgentId}
           />
         )}
         {canEditAgent && !agentQuery.isInitialLoading && activePanel === Panel.advanced && (
diff --git a/client/src/components/SidePanel/Agents/AgentPanelSwitch.tsx b/client/src/components/SidePanel/Agents/AgentPanelSwitch.tsx
index 4dc54c9b60..495b047b51 100644
--- a/client/src/components/SidePanel/Agents/AgentPanelSwitch.tsx
+++ b/client/src/components/SidePanel/Agents/AgentPanelSwitch.tsx
@@ -1,22 +1,29 @@
-import { useState, useEffect, useMemo } from 'react';
+import { useEffect, useMemo } from 'react';
 import { EModelEndpoint, AgentCapabilities } from 'librechat-data-provider';
-import type { ActionsEndpoint } from '~/common';
-import type { Action, TConfig, TEndpointsConfig, TAgentsEndpoint } from 'librechat-data-provider';
-import { useGetActionsQuery, useGetEndpointsQuery, useCreateAgentMutation } from '~/data-provider';
+import type { TConfig, TEndpointsConfig, TAgentsEndpoint } from 'librechat-data-provider';
+import { AgentPanelProvider, useAgentPanelContext } from '~/Providers/AgentPanelContext';
+import { useGetEndpointsQuery } from '~/data-provider';
+import VersionPanel from './Version/VersionPanel';
 import { useChatContext } from '~/Providers';
 import ActionsPanel from './ActionsPanel';
 import AgentPanel from './AgentPanel';
-import VersionPanel from './Version/VersionPanel';
+import MCPPanel from './MCPPanel';
 import { Panel } from '~/common';
 
 export default function AgentPanelSwitch() {
-  const { conversation, index } = useChatContext();
-  const [activePanel, setActivePanel] = useState(Panel.builder);
-  const [action, setAction] = useState<Action | undefined>(undefined);
-  const [currentAgentId, setCurrentAgentId] = useState<string | undefined>(conversation?.agent_id);
-  const { data: actions = [] } = useGetActionsQuery(conversation?.endpoint as ActionsEndpoint);
+  return (
+    <AgentPanelProvider>
+      <AgentPanelSwitchWithContext />
+    </AgentPanelProvider>
+  );
+}
+
+function AgentPanelSwitchWithContext() {
+  const { conversation } = useChatContext();
+  const { activePanel, setCurrentAgentId } = useAgentPanelContext();
+
+  // TODO: Implement MCP endpoint
   const { data: endpointsConfig = {} as TEndpointsConfig } = useGetEndpointsQuery();
-  const createMutation = useCreateAgentMutation();
 
   const agentsConfig = useMemo<TAgentsEndpoint | null>(() => {
     const config = endpointsConfig?.[EModelEndpoint.agents] ?? null;
@@ -35,39 +42,20 @@ export default function AgentPanelSwitch() {
     if (agent_id) {
       setCurrentAgentId(agent_id);
     }
-  }, [conversation?.agent_id]);
+  }, [setCurrentAgentId, conversation?.agent_id]);
 
   if (!conversation?.endpoint) {
     return null;
   }
 
-  const commonProps = {
-    index,
-    action,
-    actions,
-    setAction,
-    activePanel,
-    setActivePanel,
-    setCurrentAgentId,
-    agent_id: currentAgentId,
-    createMutation,
-  };
-
   if (activePanel === Panel.actions) {
-    return <ActionsPanel {...commonProps} />;
+    return <ActionsPanel />;
   }
-
   if (activePanel === Panel.version) {
-    return (
-      <VersionPanel
-        setActivePanel={setActivePanel}
-        agentsConfig={agentsConfig}
-        selectedAgentId={currentAgentId}
-      />
-    );
+    return <VersionPanel />;
   }
-
-  return (
-    <AgentPanel {...commonProps} agentsConfig={agentsConfig} endpointsConfig={endpointsConfig} />
-  );
+  if (activePanel === Panel.mcp) {
+    return <MCPPanel />;
+  }
+  return <AgentPanel agentsConfig={agentsConfig} endpointsConfig={endpointsConfig} />;
 }
diff --git a/client/src/components/SidePanel/Agents/AgentSelect.tsx b/client/src/components/SidePanel/Agents/AgentSelect.tsx
index d265ba201f..496dd4ee6d 100644
--- a/client/src/components/SidePanel/Agents/AgentSelect.tsx
+++ b/client/src/components/SidePanel/Agents/AgentSelect.tsx
@@ -5,8 +5,8 @@ import { AgentCapabilities, defaultAgentFormValues } from 'librechat-data-provid
 import type { UseMutationResult, QueryObserverResult } from '@tanstack/react-query';
 import type { Agent, AgentCreateParams } from 'librechat-data-provider';
 import type { TAgentCapabilities, AgentForm } from '~/common';
+import { cn, createProviderOption, processAgentOption, getDefaultAgentFormValues } from '~/utils';
 import { useListAgentsQuery, useGetStartupConfig } from '~/data-provider';
-import { cn, createProviderOption, processAgentOption } from '~/utils';
 import ControlCombobox from '~/components/ui/ControlCombobox';
 import { useLocalize } from '~/hooks';
 
@@ -32,7 +32,10 @@ export default function AgentSelect({
     select: (res) =>
       res.data.map((agent) =>
         processAgentOption({
-          agent,
+          agent: {
+            ...agent,
+            name: agent.name || agent.id,
+          },
           instanceProjectId: startupConfig?.instanceProjectId,
         }),
       ),
@@ -124,9 +127,7 @@ export default function AgentSelect({
       createMutation.reset();
       if (!agentExists) {
         setCurrentAgentId(undefined);
-        return reset({
-          ...defaultAgentFormValues,
-        });
+        return reset(getDefaultAgentFormValues());
       }
 
       setCurrentAgentId(selectedId);
@@ -179,7 +180,7 @@ export default function AgentSelect({
           containerClassName="px-0"
           selectedValue={(field?.value?.value ?? '') + ''}
           displayValue={field?.value?.label ?? ''}
-          selectPlaceholder={createAgent}
+          selectPlaceholder={field?.value?.value ?? createAgent}
           iconSide="right"
           searchPlaceholder={localize('com_agents_search_name')}
           SelectIcon={field?.value?.icon}
diff --git a/client/src/components/SidePanel/Agents/DeleteButton.tsx b/client/src/components/SidePanel/Agents/DeleteButton.tsx
index 388d8f25e0..bfe08c666f 100644
--- a/client/src/components/SidePanel/Agents/DeleteButton.tsx
+++ b/client/src/components/SidePanel/Agents/DeleteButton.tsx
@@ -1,12 +1,11 @@
 import { useFormContext } from 'react-hook-form';
-import { defaultAgentFormValues } from 'librechat-data-provider';
 import type { Agent, AgentCreateParams } from 'librechat-data-provider';
 import type { UseMutationResult } from '@tanstack/react-query';
+import { cn, logger, removeFocusOutlines, getDefaultAgentFormValues } from '~/utils';
 import { OGDialog, OGDialogTrigger, Label } from '~/components/ui';
-import { useChatContext, useToastContext } from '~/Providers';
 import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
+import { useChatContext, useToastContext } from '~/Providers';
 import { useLocalize, useSetIndexOptions } from '~/hooks';
-import { cn, removeFocusOutlines, logger } from '~/utils';
 import { useDeleteAgentMutation } from '~/data-provider';
 import { TrashIcon } from '~/components/svg';
 
@@ -45,9 +44,7 @@ export default function DeleteButton({
       const firstAgent = updatedList[0] as Agent | undefined;
       if (!firstAgent) {
         setCurrentAgentId(undefined);
-        reset({
-          ...defaultAgentFormValues,
-        });
+        reset(getDefaultAgentFormValues());
         return setOption('agent_id')('');
       }
 
diff --git a/client/src/components/SidePanel/Agents/MCPIcon.tsx b/client/src/components/SidePanel/Agents/MCPIcon.tsx
new file mode 100644
index 0000000000..101abb4c9e
--- /dev/null
+++ b/client/src/components/SidePanel/Agents/MCPIcon.tsx
@@ -0,0 +1,64 @@
+import { useState, useEffect, useRef } from 'react';
+import SquirclePlusIcon from '~/components/svg/SquirclePlusIcon';
+import { useLocalize } from '~/hooks';
+
+interface MCPIconProps {
+  icon?: string;
+  onIconChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+}
+
+export default function MCPIcon({ icon, onIconChange }: MCPIconProps) {
+  const [previewUrl, setPreviewUrl] = useState('');
+  const fileInputRef = useRef<HTMLInputElement>(null);
+  const localize = useLocalize();
+
+  useEffect(() => {
+    if (icon) {
+      setPreviewUrl(icon);
+    } else {
+      setPreviewUrl('');
+    }
+  }, [icon]);
+
+  const handleClick = () => {
+    if (fileInputRef.current) {
+      fileInputRef.current.value = '';
+      fileInputRef.current.click();
+    }
+  };
+
+  return (
+    <div className="flex items-center gap-4">
+      <div
+        onClick={handleClick}
+        className="bg-token-surface-secondary dark:bg-token-surface-tertiary border-token-border-medium flex h-16 w-16 shrink-0 cursor-pointer items-center justify-center rounded-[1.5rem] border-2 border-dashed"
+      >
+        {previewUrl ? (
+          <img
+            src={previewUrl}
+            className="h-full w-full rounded-[1.5rem] object-cover"
+            alt="MCP Icon"
+            width="64"
+            height="64"
+          />
+        ) : (
+          <SquirclePlusIcon />
+        )}
+      </div>
+      <div className="flex flex-col gap-1">
+        <span className="token-text-secondary text-sm">
+          {localize('com_ui_icon')} {localize('com_ui_optional')}
+        </span>
+        <span className="token-text-tertiary text-xs">{localize('com_agents_mcp_icon_size')}</span>
+      </div>
+      <input
+        accept="image/png,.png,image/jpeg,.jpg,.jpeg,image/gif,.gif,image/webp,.webp"
+        multiple={false}
+        type="file"
+        style={{ display: 'none' }}
+        onChange={onIconChange}
+        ref={fileInputRef}
+      />
+    </div>
+  );
+}
diff --git a/client/src/components/SidePanel/Agents/MCPInput.tsx b/client/src/components/SidePanel/Agents/MCPInput.tsx
new file mode 100644
index 0000000000..078f4109dc
--- /dev/null
+++ b/client/src/components/SidePanel/Agents/MCPInput.tsx
@@ -0,0 +1,288 @@
+import { useState, useEffect } from 'react';
+import { useFormContext, Controller } from 'react-hook-form';
+import { MCP } from 'librechat-data-provider/dist/types/types/assistants';
+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;
+  setMCP: React.Dispatch<React.SetStateAction<MCP | undefined>>;
+}
+
+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[]>([]);
+
+  // Initialize tools list if editing existing MCP
+  useEffect(() => {
+    if (mcp?.mcp_id && mcp.metadata.tools) {
+      setShowTools(true);
+      setSelectedTools(mcp.metadata.tools);
+    }
+  }, [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) => {
+    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 = () => {
+    if (mcp?.metadata.tools) {
+      setSelectedTools(mcp.metadata.tools);
+    }
+  };
+
+  const handleDeselectAll = () => {
+    setSelectedTools([]);
+  };
+
+  const handleToolToggle = (tool: string) => {
+    setSelectedTools((prev) =>
+      prev.includes(tool) ? prev.filter((t) => t !== tool) : [...prev, tool],
+    );
+  };
+
+  const handleToggleAll = () => {
+    if (selectedTools.length === mcp?.metadata.tools?.length) {
+      handleDeselectAll();
+    } else {
+      handleSelectAll();
+    }
+  };
+
+  const handleIconChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const file = e.target.files?.[0];
+    if (file) {
+      const reader = new FileReader();
+      reader.onloadend = () => {
+        const base64String = reader.result as string;
+        setMCP({
+          mcp_id: mcp?.mcp_id ?? '',
+          agent_id: agent_id ?? '',
+          metadata: {
+            ...mcp?.metadata,
+            icon: base64String,
+          },
+        });
+      };
+      reader.readAsDataURL(file);
+    }
+  };
+
+  return (
+    <div className="flex flex-col gap-4">
+      {/* Icon Picker */}
+      <div className="mb-4">
+        <MCPIcon icon={mcp?.metadata.icon} onIconChange={handleIconChange} />
+      </div>
+      {/* name, description, url */}
+      <div className="flex flex-col gap-4">
+        <div className="flex flex-col gap-2">
+          <Label htmlFor="name">{localize('com_ui_name')}</Label>
+          <input
+            id="name"
+            {...register('name', { required: true })}
+            className="border-token-border-medium flex h-9 w-full rounded-lg border bg-transparent px-3 py-1.5 text-sm outline-none placeholder:text-text-secondary-alt focus:ring-1 focus:ring-border-light"
+            placeholder={localize('com_agents_mcp_name_placeholder')}
+          />
+          {errors.name && (
+            <span className="text-xs text-red-500">{localize('com_ui_field_required')}</span>
+          )}
+        </div>
+        <div className="flex flex-col gap-2">
+          <Label htmlFor="description">
+            {localize('com_ui_description')}
+            <span className="ml-1 text-xs text-text-secondary-alt">
+              {localize('com_ui_optional')}
+            </span>
+          </Label>
+          <input
+            id="description"
+            {...register('description')}
+            className="border-token-border-medium flex h-9 w-full rounded-lg border bg-transparent px-3 py-1.5 text-sm outline-none placeholder:text-text-secondary-alt focus:ring-1 focus:ring-border-light"
+            placeholder={localize('com_agents_mcp_description_placeholder')}
+          />
+        </div>
+        <div className="flex flex-col gap-2">
+          <Label htmlFor="url">{localize('com_ui_mcp_url')}</Label>
+          <input
+            id="url"
+            {...register('url', {
+              required: true,
+            })}
+            className="border-token-border-medium flex h-9 w-full rounded-lg border bg-transparent px-3 py-1.5 text-sm outline-none placeholder:text-text-secondary-alt focus:ring-1 focus:ring-border-light"
+            placeholder={'https://mcp.example.com'}
+          />
+          {errors.url && (
+            <span className="text-xs text-red-500">
+              {errors.url.type === 'required'
+                ? localize('com_ui_field_required')
+                : errors.url.message}
+            </span>
+          )}
+        </div>
+        <MCPAuth />
+        <div className="my-2 flex items-center gap-2">
+          <Controller
+            name="trust"
+            control={control}
+            rules={{ required: true }}
+            render={({ field }) => (
+              <Checkbox id="trust" checked={field.value} onCheckedChange={field.onChange} />
+            )}
+          />
+          <Label htmlFor="trust" className="flex flex-col">
+            {localize('com_ui_trust_app')}
+            <span className="text-xs text-text-secondary">
+              {localize('com_agents_mcp_trust_subtext')}
+            </span>
+          </Label>
+        </div>
+        {errors.trust && (
+          <span className="text-xs text-red-500">{localize('com_ui_field_required')}</span>
+        )}
+      </div>
+
+      <div className="flex items-center justify-end">
+        <button
+          onClick={saveMCP}
+          disabled={isLoading}
+          className="focus:shadow-outline mt-1 flex min-w-[100px] items-center justify-center rounded bg-green-500 px-4 py-2 font-semibold text-white hover:bg-green-400 focus:border-green-500 focus:outline-none focus:ring-0 disabled:bg-green-400"
+          type="button"
+        >
+          {(() => {
+            if (isLoading) {
+              return <Spinner className="icon-md" />;
+            }
+            return mcp?.mcp_id ? localize('com_ui_update') : localize('com_ui_create');
+          })()}
+        </button>
+      </div>
+
+      {showTools && mcp?.metadata.tools && (
+        <div className="mt-4 flex flex-col gap-4">
+          <div className="flex items-center justify-between">
+            <h3 className="text-token-text-primary block font-medium">
+              {localize('com_ui_available_tools')}
+            </h3>
+            <button
+              onClick={handleToggleAll}
+              type="button"
+              className="btn btn-neutral border-token-border-light relative h-8 rounded-full px-4 font-medium"
+            >
+              {selectedTools.length === mcp.metadata.tools.length
+                ? localize('com_ui_deselect_all')
+                : localize('com_ui_select_all')}
+            </button>
+          </div>
+          <div className="flex flex-col gap-2">
+            {mcp.metadata.tools.map((tool) => (
+              <label
+                key={tool}
+                htmlFor={tool}
+                className="border-token-border-light hover:bg-token-surface-secondary flex cursor-pointer items-center rounded-lg border p-2"
+              >
+                <Checkbox
+                  id={tool}
+                  checked={selectedTools.includes(tool)}
+                  onCheckedChange={() => handleToolToggle(tool)}
+                  className="relative float-left mr-2 inline-flex h-4 w-4 cursor-pointer"
+                />
+                <span className="text-token-text-primary">
+                  {tool
+                    .split('_')
+                    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+                    .join(' ')}
+                </span>
+              </label>
+            ))}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/client/src/components/SidePanel/Agents/MCPPanel.tsx b/client/src/components/SidePanel/Agents/MCPPanel.tsx
new file mode 100644
index 0000000000..016e445e4f
--- /dev/null
+++ b/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>
+  );
+}
diff --git a/client/src/components/SidePanel/Agents/MCPSection.tsx b/client/src/components/SidePanel/Agents/MCPSection.tsx
new file mode 100644
index 0000000000..4575eb8f25
--- /dev/null
+++ b/client/src/components/SidePanel/Agents/MCPSection.tsx
@@ -0,0 +1,57 @@
+import { useCallback } from 'react';
+import { useLocalize } from '~/hooks';
+import { useToastContext } from '~/Providers';
+import { useAgentPanelContext } from '~/Providers/AgentPanelContext';
+import MCP from '~/components/SidePanel/Builder/MCP';
+import { Panel } from '~/common';
+
+export default function MCPSection() {
+  const { showToast } = useToastContext();
+  const localize = useLocalize();
+  const { mcps = [], agent_id, setMcp, setActivePanel } = useAgentPanelContext();
+
+  const handleAddMCP = useCallback(() => {
+    if (!agent_id) {
+      showToast({
+        message: localize('com_agents_mcps_disabled'),
+        status: 'warning',
+      });
+      return;
+    }
+    setActivePanel(Panel.mcp);
+  }, [agent_id, setActivePanel, showToast, localize]);
+
+  return (
+    <div className="mb-4">
+      <label className="text-token-text-primary mb-2 block font-medium">
+        {localize('com_ui_mcp_servers')}
+      </label>
+      <div className="space-y-2">
+        {mcps
+          .filter((mcp) => mcp.agent_id === agent_id)
+          .map((mcp, i) => (
+            <MCP
+              key={i}
+              mcp={mcp}
+              onClick={() => {
+                setMcp(mcp);
+                setActivePanel(Panel.mcp);
+              }}
+            />
+          ))}
+        <div className="flex space-x-2">
+          <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>
+    </div>
+  );
+}
diff --git a/client/src/components/SidePanel/Agents/ModelPanel.tsx b/client/src/components/SidePanel/Agents/ModelPanel.tsx
index 9b4b12cf67..3987f24dcf 100644
--- a/client/src/components/SidePanel/Agents/ModelPanel.tsx
+++ b/client/src/components/SidePanel/Agents/ModelPanel.tsx
@@ -1,27 +1,28 @@
+import keyBy from 'lodash/keyBy';
 import React, { useMemo, useEffect } from 'react';
 import { ChevronLeft, RotateCcw } from 'lucide-react';
 import { useFormContext, useWatch, Controller } from 'react-hook-form';
+import { componentMapping } from '~/components/SidePanel/Parameters/components';
 import {
   alternateName,
   getSettingsKeys,
+  LocalStorageKeys,
   SettingDefinition,
   agentParamSettings,
 } from 'librechat-data-provider';
 import type * as t from 'librechat-data-provider';
 import type { AgentForm, AgentModelPanelProps, StringOption } from '~/common';
-import { componentMapping } from '~/components/SidePanel/Parameters/components';
 import ControlCombobox from '~/components/ui/ControlCombobox';
 import { useGetEndpointsQuery } from '~/data-provider';
 import { getEndpointField, cn } from '~/utils';
 import { useLocalize } from '~/hooks';
 import { Panel } from '~/common';
-import keyBy from 'lodash/keyBy';
 
 export default function ModelPanel({
-  setActivePanel,
   providers,
+  setActivePanel,
   models: modelsData,
-}: AgentModelPanelProps) {
+}: Pick<AgentModelPanelProps, 'models' | 'providers' | 'setActivePanel'>) {
   const localize = useLocalize();
 
   const { control, setValue } = useFormContext<AgentForm>();
@@ -50,6 +51,8 @@ export default function ModelPanel({
         const newModels = modelsData[provider] ?? [];
         setValue('model', newModels[0] ?? '');
       }
+      localStorage.setItem(LocalStorageKeys.LAST_AGENT_MODEL, _model);
+      localStorage.setItem(LocalStorageKeys.LAST_AGENT_PROVIDER, provider);
     }
 
     if (provider && !_model) {
diff --git a/client/src/components/SidePanel/Agents/Version/VersionPanel.tsx b/client/src/components/SidePanel/Agents/Version/VersionPanel.tsx
index 9d76aba75a..0f89199216 100644
--- a/client/src/components/SidePanel/Agents/Version/VersionPanel.tsx
+++ b/client/src/components/SidePanel/Agents/Version/VersionPanel.tsx
@@ -1,12 +1,12 @@
-import type { Agent, TAgentsEndpoint } from 'librechat-data-provider';
 import { ChevronLeft } from 'lucide-react';
 import { useCallback, useMemo } from 'react';
-import type { AgentPanelProps } from '~/common';
-import { Panel } from '~/common';
 import { useGetAgentByIdQuery, useRevertAgentVersionMutation } from '~/data-provider';
+import type { Agent } from 'librechat-data-provider';
+import { isActiveVersion } from './isActiveVersion';
+import { useAgentPanelContext } from '~/Providers';
 import { useLocalize, useToast } from '~/hooks';
 import VersionContent from './VersionContent';
-import { isActiveVersion } from './isActiveVersion';
+import { Panel } from '~/common';
 
 export type VersionRecord = Record<string, any>;
 
@@ -39,15 +39,13 @@ export interface AgentWithVersions extends Agent {
   versions?: Array<VersionRecord>;
 }
 
-export type VersionPanelProps = {
-  agentsConfig: TAgentsEndpoint | null;
-  setActivePanel: AgentPanelProps['setActivePanel'];
-  selectedAgentId?: string;
-};
-
-export default function VersionPanel({ setActivePanel, selectedAgentId = '' }: VersionPanelProps) {
+export default function VersionPanel() {
   const localize = useLocalize();
   const { showToast } = useToast();
+  const { agent_id, setActivePanel } = useAgentPanelContext();
+
+  const selectedAgentId = agent_id ?? '';
+
   const {
     data: agent,
     isLoading,
diff --git a/client/src/components/SidePanel/Agents/Version/__tests__/VersionPanel.spec.tsx b/client/src/components/SidePanel/Agents/Version/__tests__/VersionPanel.spec.tsx
index d9cf31eff3..3258de3d66 100644
--- a/client/src/components/SidePanel/Agents/Version/__tests__/VersionPanel.spec.tsx
+++ b/client/src/components/SidePanel/Agents/Version/__tests__/VersionPanel.spec.tsx
@@ -55,13 +55,18 @@ jest.mock('~/hooks', () => ({
   useToast: jest.fn(() => ({ showToast: jest.fn() })),
 }));
 
+// Mock the AgentPanelContext
+jest.mock('~/Providers/AgentPanelContext', () => ({
+  ...jest.requireActual('~/Providers/AgentPanelContext'),
+  useAgentPanelContext: jest.fn(),
+}));
+
 describe('VersionPanel', () => {
   const mockSetActivePanel = jest.fn();
-  const defaultProps = {
-    agentsConfig: null,
-    setActivePanel: mockSetActivePanel,
-    selectedAgentId: 'agent-123',
-  };
+  const mockUseAgentPanelContext = jest.requireMock(
+    '~/Providers/AgentPanelContext',
+  ).useAgentPanelContext;
+
   const mockUseGetAgentByIdQuery = jest.requireMock('~/data-provider').useGetAgentByIdQuery;
 
   beforeEach(() => {
@@ -72,10 +77,17 @@ describe('VersionPanel', () => {
       error: null,
       refetch: jest.fn(),
     });
+
+    // Set up the default context mock
+    mockUseAgentPanelContext.mockReturnValue({
+      setActivePanel: mockSetActivePanel,
+      agent_id: 'agent-123',
+      activePanel: Panel.version,
+    });
   });
 
   test('renders panel UI and handles navigation', () => {
-    render(<VersionPanel {...defaultProps} />);
+    render(<VersionPanel />);
     expect(screen.getByText('com_ui_agent_version_history')).toBeInTheDocument();
     expect(screen.getByTestId('version-content')).toBeInTheDocument();
 
@@ -84,7 +96,7 @@ describe('VersionPanel', () => {
   });
 
   test('VersionContent receives correct props', () => {
-    render(<VersionPanel {...defaultProps} />);
+    render(<VersionPanel />);
     expect(VersionContent).toHaveBeenCalledWith(
       expect.objectContaining({
         selectedAgentId: 'agent-123',
@@ -101,19 +113,31 @@ describe('VersionPanel', () => {
   });
 
   test('handles data state variations', () => {
-    render(<VersionPanel {...defaultProps} selectedAgentId="" />);
+    // Test with empty agent_id
+    mockUseAgentPanelContext.mockReturnValueOnce({
+      setActivePanel: mockSetActivePanel,
+      agent_id: '',
+      activePanel: Panel.version,
+    });
+    render(<VersionPanel />);
     expect(VersionContent).toHaveBeenCalledWith(
       expect.objectContaining({ selectedAgentId: '' }),
       expect.anything(),
     );
 
+    // Test with null data
     mockUseGetAgentByIdQuery.mockReturnValueOnce({
       data: null,
       isLoading: false,
       error: null,
       refetch: jest.fn(),
     });
-    render(<VersionPanel {...defaultProps} />);
+    mockUseAgentPanelContext.mockReturnValueOnce({
+      setActivePanel: mockSetActivePanel,
+      agent_id: 'agent-123',
+      activePanel: Panel.version,
+    });
+    render(<VersionPanel />);
     expect(VersionContent).toHaveBeenCalledWith(
       expect.objectContaining({
         versionContext: expect.objectContaining({
@@ -125,13 +149,14 @@ describe('VersionPanel', () => {
       expect.anything(),
     );
 
+    // 3. versions is undefined
     mockUseGetAgentByIdQuery.mockReturnValueOnce({
       data: { ...mockAgentData, versions: undefined },
       isLoading: false,
       error: null,
       refetch: jest.fn(),
     });
-    render(<VersionPanel {...defaultProps} />);
+    render(<VersionPanel />);
     expect(VersionContent).toHaveBeenCalledWith(
       expect.objectContaining({
         versionContext: expect.objectContaining({ versions: [] }),
@@ -139,18 +164,20 @@ describe('VersionPanel', () => {
       expect.anything(),
     );
 
+    // 4. loading state
     mockUseGetAgentByIdQuery.mockReturnValueOnce({
       data: null,
       isLoading: true,
       error: null,
       refetch: jest.fn(),
     });
-    render(<VersionPanel {...defaultProps} />);
+    render(<VersionPanel />);
     expect(VersionContent).toHaveBeenCalledWith(
       expect.objectContaining({ isLoading: true }),
       expect.anything(),
     );
 
+    // 5. error state
     const testError = new Error('Test error');
     mockUseGetAgentByIdQuery.mockReturnValueOnce({
       data: null,
@@ -158,7 +185,7 @@ describe('VersionPanel', () => {
       error: testError,
       refetch: jest.fn(),
     });
-    render(<VersionPanel {...defaultProps} />);
+    render(<VersionPanel />);
     expect(VersionContent).toHaveBeenCalledWith(
       expect.objectContaining({ error: testError }),
       expect.anything(),
@@ -173,7 +200,7 @@ describe('VersionPanel', () => {
       refetch: jest.fn(),
     });
 
-    render(<VersionPanel {...defaultProps} />);
+    render(<VersionPanel />);
     expect(VersionContent).toHaveBeenCalledWith(
       expect.objectContaining({
         versionContext: expect.objectContaining({
diff --git a/client/src/components/SidePanel/Builder/MCP.tsx b/client/src/components/SidePanel/Builder/MCP.tsx
new file mode 100644
index 0000000000..f632b6c00d
--- /dev/null
+++ b/client/src/components/SidePanel/Builder/MCP.tsx
@@ -0,0 +1,60 @@
+import { useState } from 'react';
+import type { MCP } from 'librechat-data-provider';
+import GearIcon from '~/components/svg/GearIcon';
+import MCPIcon from '~/components/svg/MCPIcon';
+import { cn } from '~/utils';
+
+type MCPProps = {
+  mcp: MCP;
+  onClick: () => void;
+};
+
+export default function MCP({ mcp, onClick }: MCPProps) {
+  const [isHovering, setIsHovering] = useState(false);
+
+  return (
+    <div
+      role="button"
+      tabIndex={0}
+      onClick={onClick}
+      onKeyDown={(e) => {
+        if (e.key === 'Enter' || e.key === ' ') {
+          onClick();
+        }
+      }}
+      className="group flex w-full rounded-lg border border-border-medium text-sm hover:cursor-pointer focus:outline-none focus:ring-2 focus:ring-text-primary"
+      onMouseEnter={() => setIsHovering(true)}
+      onMouseLeave={() => setIsHovering(false)}
+      aria-label={`MCP for ${mcp.metadata.name}`}
+    >
+      <div className="flex h-9 items-center gap-2 px-3">
+        {mcp.metadata.icon ? (
+          <img
+            src={mcp.metadata.icon}
+            alt={`${mcp.metadata.name} icon`}
+            className="h-6 w-6 rounded-md object-cover"
+          />
+        ) : (
+          <div className="flex h-6 w-6 items-center justify-center rounded-md bg-surface-secondary">
+            <MCPIcon />
+          </div>
+        )}
+        <div
+          className="grow overflow-hidden text-ellipsis whitespace-nowrap"
+          style={{ wordBreak: 'break-all' }}
+        >
+          {mcp.metadata.name}
+        </div>
+      </div>
+      <div
+        className={cn(
+          'ml-auto h-9 w-9 min-w-9 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-tertiary focus:outline-none focus:ring-2 focus:ring-text-primary group-focus:flex',
+          isHovering ? 'flex' : 'hidden',
+        )}
+        aria-label="Settings"
+      >
+        <GearIcon className="icon-sm" aria-hidden="true" />
+      </div>
+    </div>
+  );
+}
diff --git a/client/src/components/SidePanel/Builder/MCPAuth.tsx b/client/src/components/SidePanel/Builder/MCPAuth.tsx
new file mode 100644
index 0000000000..4ea3faae61
--- /dev/null
+++ b/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>
+  );
+}
diff --git a/client/src/components/svg/MCPIcon.tsx b/client/src/components/svg/MCPIcon.tsx
new file mode 100644
index 0000000000..50214b539a
--- /dev/null
+++ b/client/src/components/svg/MCPIcon.tsx
@@ -0,0 +1,15 @@
+export default function MCPIcon() {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      fill="currentColor"
+      viewBox="0 0 24 24"
+      className="h-4 w-4"
+    >
+      <path d="M11.016 2.099a3.998 3.998 0 0 1 5.58.072l.073.074a3.991 3.991 0 0 1 1.058 3.318 3.994 3.994 0 0 1 3.32 1.06l.073.071.048.047.071.075a3.998 3.998 0 0 1 0 5.506l-.071.074-8.183 8.182-.034.042a.267.267 0 0 0 .034.335l1.68 1.68a.8.8 0 0 1-1.131 1.13l-1.68-1.679a1.866 1.866 0 0 1-.034-2.604l8.26-8.261a2.4 2.4 0 0 0-.044-3.349l-.047-.047-.044-.043a2.4 2.4 0 0 0-3.349.043l-6.832 6.832-.03.029a.8.8 0 0 1-1.1-1.16l6.876-6.875a2.4 2.4 0 0 0-.044-3.35l-.179-.161a2.399 2.399 0 0 0-3.169.119l-.045.043-9.047 9.047-.03.028a.8.8 0 0 1-1.1-1.16l9.046-9.046.074-.072Z" />
+      <path d="M13.234 4.404a.8.8 0 0 1 1.1 1.16l-6.69 6.691a2.399 2.399 0 1 0 3.393 3.393l6.691-6.692a.8.8 0 0 1 1.131 1.131l-6.691 6.692a4 4 0 0 1-5.581.07l-.073-.07a3.998 3.998 0 0 1 0-5.655l6.69-6.691.03-.029Z" />
+    </svg>
+  );
+}
diff --git a/client/src/components/svg/SquirclePlusIcon.tsx b/client/src/components/svg/SquirclePlusIcon.tsx
new file mode 100644
index 0000000000..dee4238aaf
--- /dev/null
+++ b/client/src/components/svg/SquirclePlusIcon.tsx
@@ -0,0 +1,19 @@
+export default function SquirclePlusIcon() {
+  return (
+    <svg
+      stroke="currentColor"
+      fill="none"
+      strokeWidth="2"
+      viewBox="0 0 24 24"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      className="text-3xl"
+      height="1em"
+      width="1em"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <line x1="12" y1="5" x2="12" y2="19" />
+      <line x1="5" y1="12" x2="19" y2="12" />
+    </svg>
+  );
+}
diff --git a/client/src/data-provider/Agents/mutations.ts b/client/src/data-provider/Agents/mutations.ts
index 24af4ee898..8fd3a842a8 100644
--- a/client/src/data-provider/Agents/mutations.ts
+++ b/client/src/data-provider/Agents/mutations.ts
@@ -224,18 +224,20 @@ export const useUpdateAgentAction = (
       });
 
       queryClient.setQueryData<t.Action[]>([QueryKeys.actions], (prev) => {
-        return prev
-          ?.map((action) => {
+        if (!prev) {
+          return [updateAgentActionResponse[1]];
+        }
+
+        if (variables.action_id) {
+          return prev.map((action) => {
             if (action.action_id === variables.action_id) {
               return updateAgentActionResponse[1];
             }
             return action;
-          })
-          .concat(
-            variables.action_id != null && variables.action_id
-              ? []
-              : [updateAgentActionResponse[1]],
-          );
+          });
+        }
+
+        return [...prev, updateAgentActionResponse[1]];
       });
 
       queryClient.setQueryData<t.Agent>([QueryKeys.agent, variables.agent_id], updatedAgent);
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index 6c4000beef..5791ff7713 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -1005,5 +1005,27 @@
   "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_warning_resubmit_unsupported": "Resubmitting the AI message is not supported for this endpoint.",
+    "com_ui_add_mcp": "Add MCP",
+  "com_ui_add_mcp_server": "Add MCP Server",
+  "com_ui_edit_mcp_server": "Edit MCP Server",
+  "com_agents_mcps_disabled": "You need to create an agent before adding MCPs.",
+  "com_ui_delete_mcp": "Delete MCP",
+  "com_ui_delete_mcp_confirm": "Are you sure you want to delete this MCP server?",
+  "com_ui_delete_mcp_success": "MCP server deleted successfully",
+  "com_ui_delete_mcp_error": "Failed to delete MCP server",
+  "com_agents_mcp_info": "Add MCP servers to your agent to enable it to perform tasks and interact with external services",
+  "com_ui_update_mcp_error": "There was an error creating or updating the MCP.",
+  "com_ui_update_mcp_success": "Successfully created or updated MCP",
+  "com_ui_available_tools": "Available Tools",
+  "com_ui_select_all": "Select All",
+  "com_ui_deselect_all": "Deselect All",
+  "com_agents_mcp_name_placeholder": "Custom Tool",
+  "com_ui_optional": "(optional)",
+  "com_agents_mcp_description_placeholder": "Explain what it does in a few words",
+  "com_ui_mcp_url": "MCP Server URL",
+  "com_ui_trust_app": "I trust this application",
+  "com_agents_mcp_trust_subtext": "Custom connectors are not verified by LibreChat",
+  "com_ui_icon": "Icon",
+  "com_agents_mcp_icon_size": "Minimum size 128 x 128 px"
 }
\ No newline at end of file
diff --git a/client/src/utils/forms.tsx b/client/src/utils/forms.tsx
index cfd99f9d7b..fc1ce0c078 100644
--- a/client/src/utils/forms.tsx
+++ b/client/src/utils/forms.tsx
@@ -4,6 +4,8 @@ import {
   alternateName,
   EModelEndpoint,
   EToolResources,
+  LocalStorageKeys,
+  defaultAgentFormValues,
 } from 'librechat-data-provider';
 import type { Agent, TFile } from 'librechat-data-provider';
 import type { DropdownValueSetter, TAgentOption, ExtendedFile } from '~/common';
@@ -42,6 +44,16 @@ export const createProviderOption = (provider: string) => ({
   value: provider,
 });
 
+/**
+ * Gets default agent form values with localStorage values for model and provider.
+ * This is used to initialize agent forms with the last used model and provider.
+ **/
+export const getDefaultAgentFormValues = () => ({
+  ...defaultAgentFormValues,
+  model: localStorage.getItem(LocalStorageKeys.LAST_AGENT_MODEL) ?? '',
+  provider: createProviderOption(localStorage.getItem(LocalStorageKeys.LAST_AGENT_PROVIDER) ?? ''),
+});
+
 export const processAgentOption = ({
   agent: _agent,
   fileMap,
diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.ts
index c7484b8b86..d851891ac4 100644
--- a/packages/data-provider/src/config.ts
+++ b/packages/data-provider/src/config.ts
@@ -1434,6 +1434,10 @@ export enum LocalStorageKeys {
   LAST_CODE_TOGGLE_ = 'LAST_CODE_TOGGLE_',
   /** Last checked toggle for Web Search per conversation ID */
   LAST_WEB_SEARCH_TOGGLE_ = 'LAST_WEB_SEARCH_TOGGLE_',
+  /** Key for the last selected agent provider */
+  LAST_AGENT_PROVIDER = 'lastAgentProvider',
+  /** Key for the last selected agent model */
+  LAST_AGENT_MODEL = 'lastAgentModel',
 }
 
 export enum ForkOptions {
diff --git a/packages/data-provider/src/types/assistants.ts b/packages/data-provider/src/types/assistants.ts
index cbcc51687b..c1e6f16965 100644
--- a/packages/data-provider/src/types/assistants.ts
+++ b/packages/data-provider/src/types/assistants.ts
@@ -515,6 +515,8 @@ export type ActionAuth = {
   token_exchange_method?: TokenExchangeMethodEnum;
 };
 
+export type MCPAuth = ActionAuth;
+
 export type ActionMetadata = {
   api_key?: string;
   auth?: ActionAuth;
@@ -525,6 +527,16 @@ export type ActionMetadata = {
   oauth_client_secret?: string;
 };
 
+export type MCPMetadata = Omit<ActionMetadata, 'auth'> & {
+  name?: string;
+  description?: string;
+  url?: string;
+  tools?: string[];
+  auth?: MCPAuth;
+  icon?: string;
+  trust?: boolean;
+};
+
 export type ActionMetadataRuntime = ActionMetadata & {
   oauth_access_token?: string;
   oauth_refresh_token?: string;
@@ -541,6 +553,11 @@ export type Action = {
   version: number | string;
 } & ({ assistant_id: string; agent_id?: never } | { assistant_id?: never; agent_id: string });
 
+export type MCP = {
+  mcp_id: string;
+  metadata: MCPMetadata;
+} & ({ assistant_id: string; agent_id?: never } | { assistant_id?: never; agent_id: string });
+
 export type AssistantAvatar = {
   filepath: string;
   source: string;

From 5eb0703f78cbd35aa972c33c5fa4d615b190e36b Mon Sep 17 00:00:00 2001
From: richzw <1590890+richzw@users.noreply.github.com>
Date: Sat, 14 Jun 2025 05:51:02 +0800
Subject: [PATCH 31/49] =?UTF-8?q?=F0=9F=8C=90=20fix:=20Support=20`global`?=
 =?UTF-8?q?=20location=20for=20Google=20VertexAI=20(#7768)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: Check if loc is 'global' and set the endpoint prefix accordingly

* fix: ESLint error

---------

Co-authored-by: Danny Avila <danny@librechat.ai>
---
 api/app/clients/GoogleClient.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/app/clients/GoogleClient.js b/api/app/clients/GoogleClient.js
index 2ded0657c7..817239d14f 100644
--- a/api/app/clients/GoogleClient.js
+++ b/api/app/clients/GoogleClient.js
@@ -34,7 +34,8 @@ const BaseClient = require('./BaseClient');
 
 const loc = process.env.GOOGLE_LOC || 'us-central1';
 const publisher = 'google';
-const endpointPrefix = `${loc}-aiplatform.googleapis.com`;
+const endpointPrefix =
+  loc === 'global' ? 'aiplatform.googleapis.com' : `${loc}-aiplatform.googleapis.com`;
 
 const settings = endpointSettings[EModelEndpoint.google];
 const EXCLUDED_GENAI_MODELS = /gemini-(?:1\.0|1-0|pro)/;

From 0103b4b08a6ee1339569d7d4af16beaaac0228ed Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Fri, 13 Jun 2025 18:17:25 -0400
Subject: [PATCH 32/49] =?UTF-8?q?=F0=9F=A7=B9=20chore:=20Cleanup=20base64?=
 =?UTF-8?q?=20Handling=20for=20Azure=20Mistral=20OCR=20(#7892)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🧹 chore: Remove Comments and Cleanup base64 handling for Azure Mistral OCR

* chore: Remove unnecessary await from MCP instructions formatting in AgentClient

* ci: Update document_url regex in MistralOCR tests to support PDF format
---
 api/server/controllers/agents/client.js     |  2 +-
 packages/api/src/files/mistral/crud.spec.ts |  2 +-
 packages/api/src/files/mistral/crud.ts      | 14 +++-----------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.js
index be64d5a0e3..41e457e5b8 100644
--- a/api/server/controllers/agents/client.js
+++ b/api/server/controllers/agents/client.js
@@ -330,7 +330,7 @@ class AgentClient extends BaseClient {
 
     if (mcpServers.length > 0) {
       try {
-        const mcpInstructions = await getMCPManager().formatInstructionsForContext(mcpServers);
+        const mcpInstructions = getMCPManager().formatInstructionsForContext(mcpServers);
         if (mcpInstructions) {
           systemContent = [systemContent, mcpInstructions].filter(Boolean).join('\n\n');
           logger.debug('[AgentClient] Injected MCP instructions for servers:', mcpServers);
diff --git a/packages/api/src/files/mistral/crud.spec.ts b/packages/api/src/files/mistral/crud.spec.ts
index 173c60edf2..309e5565b6 100644
--- a/packages/api/src/files/mistral/crud.spec.ts
+++ b/packages/api/src/files/mistral/crud.spec.ts
@@ -1421,7 +1421,7 @@ describe('MistralOCR Service', () => {
         expect.objectContaining({
           document: expect.objectContaining({
             type: 'document_url',
-            document_url: expect.stringMatching(/^data:image\/jpeg;base64,/),
+            document_url: expect.stringMatching(/^data:application\/pdf;base64,/),
           }),
         }),
         expect.any(Object),
diff --git a/packages/api/src/files/mistral/crud.ts b/packages/api/src/files/mistral/crud.ts
index 200cc85196..1d36459886 100644
--- a/packages/api/src/files/mistral/crud.ts
+++ b/packages/api/src/files/mistral/crud.ts
@@ -208,7 +208,6 @@ async function loadAuthConfig(context: OCRContext): Promise<AuthConfig> {
   const apiKeyConfig = ocrConfig?.apiKey || '';
   const baseURLConfig = ocrConfig?.baseURL || '';
 
-  // If both are hardcoded, return them directly
   if (!needsEnvLoad(apiKeyConfig) && !needsEnvLoad(baseURLConfig)) {
     return {
       apiKey: apiKeyConfig,
@@ -216,7 +215,6 @@ async function loadAuthConfig(context: OCRContext): Promise<AuthConfig> {
     };
   }
 
-  // Build auth fields array
   const authFields: string[] = [];
 
   if (needsEnvLoad(baseURLConfig)) {
@@ -227,14 +225,12 @@ async function loadAuthConfig(context: OCRContext): Promise<AuthConfig> {
     authFields.push(getEnvVarName(apiKeyConfig, 'OCR_API_KEY'));
   }
 
-  // Load auth values
   const authValues = await context.loadAuthValues({
     userId: context.req.user?.id || '',
     authFields,
     optional: new Set(['OCR_BASEURL']),
   });
 
-  // Resolve each value
   const apiKey = await resolveConfigValue(apiKeyConfig, 'OCR_API_KEY', authValues);
   const baseURL = await resolveConfigValue(
     baseURLConfig,
@@ -335,7 +331,6 @@ export const uploadMistralOCR = async (context: OCRContext): Promise<MistralOCRU
     const { apiKey, baseURL } = await loadAuthConfig(context);
     const model = getModelConfig(context.req.app.locals?.ocr);
 
-    // Upload file
     const mistralFile = await uploadDocumentToMistral({
       filePath: context.file.path,
       fileName: context.file.originalname,
@@ -343,14 +338,12 @@ export const uploadMistralOCR = async (context: OCRContext): Promise<MistralOCRU
       baseURL,
     });
 
-    // Get signed URL
     const signedUrlResponse = await getSignedUrl({
       apiKey,
       baseURL,
       fileId: mistralFile.id,
     });
 
-    // Perform OCR
     const documentType = getDocumentType(context.file);
     const ocrResult = await performOCR({
       apiKey,
@@ -394,21 +387,20 @@ export const uploadAzureMistralOCR = async (
     const { apiKey, baseURL } = await loadAuthConfig(context);
     const model = getModelConfig(context.req.app.locals?.ocr);
 
-    // Read file as base64
     const buffer = fs.readFileSync(context.file.path);
     const base64 = buffer.toString('base64');
+    /** Uses actual mimetype of the file, 'image/jpeg' as fallback since it seems to be accepted regardless of mismatch */
+    const base64Prefix = `data:${context.file.mimetype || 'image/jpeg'};base64,`;
 
-    // Perform OCR directly with base64
     const documentType = getDocumentType(context.file);
     const ocrResult = await performOCR({
       apiKey,
       baseURL,
       model,
-      url: `data:image/jpeg;base64,${base64}`,
+      url: `${base64Prefix}${base64}`,
       documentType,
     });
 
-    // Process result
     const { text, images } = processOCRResult(ocrResult);
 
     return {

From 3af2666890bbf291cb7b9f3e03592d54714f0ff5 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Sat, 14 Jun 2025 11:24:30 -0400
Subject: [PATCH 33/49] =?UTF-8?q?=F0=9F=AA=90=20refactor:=20Migrate=20Shar?=
 =?UTF-8?q?e=20Functionality=20to=20Type-Safe=20Methods=20(#7903)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Update import for isEnabled utility in convoAccess middleware

* refactor: Migrate Share functionality to new methods structure in `@librechat/data-schemas`

- Deleted the old Share.js model and moved its functionality to a new share.ts file within the data-schemas package.
- Updated imports across the codebase to reflect the new structure.
- Enhanced error handling and logging in shared link operations.
- Introduced TypeScript types for shared links and related operations to improve type safety and maintainability.

* chore: Update promptGroupSchema validation with typing

* fix: error handling and logging in createSharedLink

* fix: don't allow empty shared link or shared link without messages

* ci: add tests for shared link methods

* chore: Bump version of @librechat/data-schemas to 0.0.9 in package.json and package-lock.json

* chore: Add nanoid as peer dependency

- Introduced `nanoid` as a dependency in `package.json` and `package-lock.json`.
- Replaced UUID generation with `nanoid` for creating unique conversation and message IDs in share methods tests.
---
 api/models/Share.js                           |  346 ------
 api/server/controllers/UserController.js      |    2 +-
 api/server/middleware/validate/convoAccess.js |    2 +-
 api/server/routes/share.js                    |   23 +-
 package-lock.json                             |  154 ++-
 packages/data-schemas/package.json            |   10 +-
 packages/data-schemas/src/methods/index.ts    |   11 +-
 .../data-schemas/src/methods/share.test.ts    | 1043 +++++++++++++++++
 packages/data-schemas/src/methods/share.ts    |  442 +++++++
 .../src/models/plugins/mongoMeili.ts          |   25 +-
 .../data-schemas/src/schema/promptGroup.ts    |    6 +-
 packages/data-schemas/src/types/index.ts      |    1 +
 packages/data-schemas/src/types/share.ts      |   66 ++
 13 files changed, 1720 insertions(+), 411 deletions(-)
 delete mode 100644 api/models/Share.js
 create mode 100644 packages/data-schemas/src/methods/share.test.ts
 create mode 100644 packages/data-schemas/src/methods/share.ts
 create mode 100644 packages/data-schemas/src/types/share.ts

diff --git a/api/models/Share.js b/api/models/Share.js
deleted file mode 100644
index f8712c36ac..0000000000
--- a/api/models/Share.js
+++ /dev/null
@@ -1,346 +0,0 @@
-const { nanoid } = require('nanoid');
-const { logger } = require('@librechat/data-schemas');
-const { Constants } = require('librechat-data-provider');
-const { Conversation, SharedLink } = require('~/db/models');
-const { getMessages } = require('./Message');
-
-class ShareServiceError extends Error {
-  constructor(message, code) {
-    super(message);
-    this.name = 'ShareServiceError';
-    this.code = code;
-  }
-}
-
-const memoizedAnonymizeId = (prefix) => {
-  const memo = new Map();
-  return (id) => {
-    if (!memo.has(id)) {
-      memo.set(id, `${prefix}_${nanoid()}`);
-    }
-    return memo.get(id);
-  };
-};
-
-const anonymizeConvoId = memoizedAnonymizeId('convo');
-const anonymizeAssistantId = memoizedAnonymizeId('a');
-const anonymizeMessageId = (id) =>
-  id === Constants.NO_PARENT ? id : memoizedAnonymizeId('msg')(id);
-
-function anonymizeConvo(conversation) {
-  if (!conversation) {
-    return null;
-  }
-
-  const newConvo = { ...conversation };
-  if (newConvo.assistant_id) {
-    newConvo.assistant_id = anonymizeAssistantId(newConvo.assistant_id);
-  }
-  return newConvo;
-}
-
-function anonymizeMessages(messages, newConvoId) {
-  if (!Array.isArray(messages)) {
-    return [];
-  }
-
-  const idMap = new Map();
-  return messages.map((message) => {
-    const newMessageId = anonymizeMessageId(message.messageId);
-    idMap.set(message.messageId, newMessageId);
-
-    const anonymizedAttachments = message.attachments?.map((attachment) => {
-      return {
-        ...attachment,
-        messageId: newMessageId,
-        conversationId: newConvoId,
-      };
-    });
-
-    return {
-      ...message,
-      messageId: newMessageId,
-      parentMessageId:
-        idMap.get(message.parentMessageId) || anonymizeMessageId(message.parentMessageId),
-      conversationId: newConvoId,
-      model: message.model?.startsWith('asst_')
-        ? anonymizeAssistantId(message.model)
-        : message.model,
-      attachments: anonymizedAttachments,
-    };
-  });
-}
-
-async function getSharedMessages(shareId) {
-  try {
-    const share = await SharedLink.findOne({ shareId, isPublic: true })
-      .populate({
-        path: 'messages',
-        select: '-_id -__v -user',
-      })
-      .select('-_id -__v -user')
-      .lean();
-
-    if (!share?.conversationId || !share.isPublic) {
-      return null;
-    }
-
-    const newConvoId = anonymizeConvoId(share.conversationId);
-    const result = {
-      ...share,
-      conversationId: newConvoId,
-      messages: anonymizeMessages(share.messages, newConvoId),
-    };
-
-    return result;
-  } catch (error) {
-    logger.error('[getShare] Error getting share link', {
-      error: error.message,
-      shareId,
-    });
-    throw new ShareServiceError('Error getting share link', 'SHARE_FETCH_ERROR');
-  }
-}
-
-async function getSharedLinks(user, pageParam, pageSize, isPublic, sortBy, sortDirection, search) {
-  try {
-    const query = { user, isPublic };
-
-    if (pageParam) {
-      if (sortDirection === 'desc') {
-        query[sortBy] = { $lt: pageParam };
-      } else {
-        query[sortBy] = { $gt: pageParam };
-      }
-    }
-
-    if (search && search.trim()) {
-      try {
-        const searchResults = await Conversation.meiliSearch(search);
-
-        if (!searchResults?.hits?.length) {
-          return {
-            links: [],
-            nextCursor: undefined,
-            hasNextPage: false,
-          };
-        }
-
-        const conversationIds = searchResults.hits.map((hit) => hit.conversationId);
-        query['conversationId'] = { $in: conversationIds };
-      } catch (searchError) {
-        logger.error('[getSharedLinks] Meilisearch error', {
-          error: searchError.message,
-          user,
-        });
-        return {
-          links: [],
-          nextCursor: undefined,
-          hasNextPage: false,
-        };
-      }
-    }
-
-    const sort = {};
-    sort[sortBy] = sortDirection === 'desc' ? -1 : 1;
-
-    if (Array.isArray(query.conversationId)) {
-      query.conversationId = { $in: query.conversationId };
-    }
-
-    const sharedLinks = await SharedLink.find(query)
-      .sort(sort)
-      .limit(pageSize + 1)
-      .select('-__v -user')
-      .lean();
-
-    const hasNextPage = sharedLinks.length > pageSize;
-    const links = sharedLinks.slice(0, pageSize);
-
-    const nextCursor = hasNextPage ? links[links.length - 1][sortBy] : undefined;
-
-    return {
-      links: links.map((link) => ({
-        shareId: link.shareId,
-        title: link?.title || 'Untitled',
-        isPublic: link.isPublic,
-        createdAt: link.createdAt,
-        conversationId: link.conversationId,
-      })),
-      nextCursor,
-      hasNextPage,
-    };
-  } catch (error) {
-    logger.error('[getSharedLinks] Error getting shares', {
-      error: error.message,
-      user,
-    });
-    throw new ShareServiceError('Error getting shares', 'SHARES_FETCH_ERROR');
-  }
-}
-
-async function deleteAllSharedLinks(user) {
-  try {
-    const result = await SharedLink.deleteMany({ user });
-    return {
-      message: 'All shared links deleted successfully',
-      deletedCount: result.deletedCount,
-    };
-  } catch (error) {
-    logger.error('[deleteAllSharedLinks] Error deleting shared links', {
-      error: error.message,
-      user,
-    });
-    throw new ShareServiceError('Error deleting shared links', 'BULK_DELETE_ERROR');
-  }
-}
-
-async function createSharedLink(user, conversationId) {
-  if (!user || !conversationId) {
-    throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
-  }
-  try {
-    const [existingShare, conversationMessages] = await Promise.all([
-      SharedLink.findOne({ conversationId, isPublic: true }).select('-_id -__v -user').lean(),
-      getMessages({ conversationId }),
-    ]);
-
-    if (existingShare && existingShare.isPublic) {
-      throw new ShareServiceError('Share already exists', 'SHARE_EXISTS');
-    } else if (existingShare) {
-      await SharedLink.deleteOne({ conversationId });
-    }
-
-    const conversation = await Conversation.findOne({ conversationId }).lean();
-    const title = conversation?.title || 'Untitled';
-
-    const shareId = nanoid();
-    await SharedLink.create({
-      shareId,
-      conversationId,
-      messages: conversationMessages,
-      title,
-      user,
-    });
-
-    return { shareId, conversationId };
-  } catch (error) {
-    logger.error('[createSharedLink] Error creating shared link', {
-      error: error.message,
-      user,
-      conversationId,
-    });
-    throw new ShareServiceError('Error creating shared link', 'SHARE_CREATE_ERROR');
-  }
-}
-
-async function getSharedLink(user, conversationId) {
-  if (!user || !conversationId) {
-    throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
-  }
-
-  try {
-    const share = await SharedLink.findOne({ conversationId, user, isPublic: true })
-      .select('shareId -_id')
-      .lean();
-
-    if (!share) {
-      return { shareId: null, success: false };
-    }
-
-    return { shareId: share.shareId, success: true };
-  } catch (error) {
-    logger.error('[getSharedLink] Error getting shared link', {
-      error: error.message,
-      user,
-      conversationId,
-    });
-    throw new ShareServiceError('Error getting shared link', 'SHARE_FETCH_ERROR');
-  }
-}
-
-async function updateSharedLink(user, shareId) {
-  if (!user || !shareId) {
-    throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
-  }
-
-  try {
-    const share = await SharedLink.findOne({ shareId }).select('-_id -__v -user').lean();
-
-    if (!share) {
-      throw new ShareServiceError('Share not found', 'SHARE_NOT_FOUND');
-    }
-
-    const [updatedMessages] = await Promise.all([
-      getMessages({ conversationId: share.conversationId }),
-    ]);
-
-    const newShareId = nanoid();
-    const update = {
-      messages: updatedMessages,
-      user,
-      shareId: newShareId,
-    };
-
-    const updatedShare = await SharedLink.findOneAndUpdate({ shareId, user }, update, {
-      new: true,
-      upsert: false,
-      runValidators: true,
-    }).lean();
-
-    if (!updatedShare) {
-      throw new ShareServiceError('Share update failed', 'SHARE_UPDATE_ERROR');
-    }
-
-    anonymizeConvo(updatedShare);
-
-    return { shareId: newShareId, conversationId: updatedShare.conversationId };
-  } catch (error) {
-    logger.error('[updateSharedLink] Error updating shared link', {
-      error: error.message,
-      user,
-      shareId,
-    });
-    throw new ShareServiceError(
-      error.code === 'SHARE_UPDATE_ERROR' ? error.message : 'Error updating shared link',
-      error.code || 'SHARE_UPDATE_ERROR',
-    );
-  }
-}
-
-async function deleteSharedLink(user, shareId) {
-  if (!user || !shareId) {
-    throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
-  }
-
-  try {
-    const result = await SharedLink.findOneAndDelete({ shareId, user }).lean();
-
-    if (!result) {
-      return null;
-    }
-
-    return {
-      success: true,
-      shareId,
-      message: 'Share deleted successfully',
-    };
-  } catch (error) {
-    logger.error('[deleteSharedLink] Error deleting shared link', {
-      error: error.message,
-      user,
-      shareId,
-    });
-    throw new ShareServiceError('Error deleting shared link', 'SHARE_DELETE_ERROR');
-  }
-}
-
-module.exports = {
-  getSharedLink,
-  getSharedLinks,
-  createSharedLink,
-  updateSharedLink,
-  deleteSharedLink,
-  getSharedMessages,
-  deleteAllSharedLinks,
-};
diff --git a/api/server/controllers/UserController.js b/api/server/controllers/UserController.js
index 4577d20159..bcffb2189c 100644
--- a/api/server/controllers/UserController.js
+++ b/api/server/controllers/UserController.js
@@ -21,8 +21,8 @@ const { verifyEmail, resendVerificationEmail } = require('~/server/services/Auth
 const { needsRefresh, getNewS3URL } = require('~/server/services/Files/S3/crud');
 const { processDeleteRequest } = require('~/server/services/Files/process');
 const { Transaction, Balance, User } = require('~/db/models');
-const { deleteAllSharedLinks } = require('~/models/Share');
 const { deleteToolCalls } = require('~/models/ToolCall');
+const { deleteAllSharedLinks } = require('~/models');
 
 const getUserController = async (req, res) => {
   /** @type {MongoUser} */
diff --git a/api/server/middleware/validate/convoAccess.js b/api/server/middleware/validate/convoAccess.js
index 43cca0097d..afd2aeacef 100644
--- a/api/server/middleware/validate/convoAccess.js
+++ b/api/server/middleware/validate/convoAccess.js
@@ -1,8 +1,8 @@
+const { isEnabled } = require('@librechat/api');
 const { Constants, ViolationTypes, Time } = require('librechat-data-provider');
 const { searchConversation } = require('~/models/Conversation');
 const denyRequest = require('~/server/middleware/denyRequest');
 const { logViolation, getLogStores } = require('~/cache');
-const { isEnabled } = require('~/server/utils');
 
 const { USE_REDIS, CONVO_ACCESS_VIOLATION_SCORE: score = 0 } = process.env ?? {};
 
diff --git a/api/server/routes/share.js b/api/server/routes/share.js
index e551f4a354..14c25271fc 100644
--- a/api/server/routes/share.js
+++ b/api/server/routes/share.js
@@ -1,15 +1,15 @@
 const express = require('express');
-
+const { isEnabled } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const {
-  getSharedLink,
   getSharedMessages,
   createSharedLink,
   updateSharedLink,
-  getSharedLinks,
   deleteSharedLink,
-} = require('~/models/Share');
+  getSharedLinks,
+  getSharedLink,
+} = require('~/models');
 const requireJwtAuth = require('~/server/middleware/requireJwtAuth');
-const { isEnabled } = require('~/server/utils');
 const router = express.Router();
 
 /**
@@ -35,6 +35,7 @@ if (allowSharedLinks) {
           res.status(404).end();
         }
       } catch (error) {
+        logger.error('Error getting shared messages:', error);
         res.status(500).json({ message: 'Error getting shared messages' });
       }
     },
@@ -54,9 +55,7 @@ router.get('/', requireJwtAuth, async (req, res) => {
       sortDirection: ['asc', 'desc'].includes(req.query.sortDirection)
         ? req.query.sortDirection
         : 'desc',
-      search: req.query.search
-        ? decodeURIComponent(req.query.search.trim())
-        : undefined,
+      search: req.query.search ? decodeURIComponent(req.query.search.trim()) : undefined,
     };
 
     const result = await getSharedLinks(
@@ -75,7 +74,7 @@ router.get('/', requireJwtAuth, async (req, res) => {
       hasNextPage: result.hasNextPage,
     });
   } catch (error) {
-    console.error('Error getting shared links:', error);
+    logger.error('Error getting shared links:', error);
     res.status(500).json({
       message: 'Error getting shared links',
       error: error.message,
@@ -93,6 +92,7 @@ router.get('/link/:conversationId', requireJwtAuth, async (req, res) => {
       conversationId: req.params.conversationId,
     });
   } catch (error) {
+    logger.error('Error getting shared link:', error);
     res.status(500).json({ message: 'Error getting shared link' });
   }
 });
@@ -106,6 +106,7 @@ router.post('/:conversationId', requireJwtAuth, async (req, res) => {
       res.status(404).end();
     }
   } catch (error) {
+    logger.error('Error creating shared link:', error);
     res.status(500).json({ message: 'Error creating shared link' });
   }
 });
@@ -119,6 +120,7 @@ router.patch('/:shareId', requireJwtAuth, async (req, res) => {
       res.status(404).end();
     }
   } catch (error) {
+    logger.error('Error updating shared link:', error);
     res.status(500).json({ message: 'Error updating shared link' });
   }
 });
@@ -133,7 +135,8 @@ router.delete('/:shareId', requireJwtAuth, async (req, res) => {
 
     return res.status(200).json(result);
   } catch (error) {
-    return res.status(400).json({ message: error.message });
+    logger.error('Error deleting shared link:', error);
+    return res.status(400).json({ message: 'Error deleting shared link' });
   }
 });
 
diff --git a/package-lock.json b/package-lock.json
index 62ff311767..50dacbb5c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2142,27 +2142,6 @@
         "node": ">= 0.6"
       }
     },
-    "api/node_modules/follow-redirects": {
-      "version": "1.15.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
-      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
     "api/node_modules/https-proxy-agent": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
@@ -27220,9 +27199,10 @@
       }
     },
     "node_modules/bson": {
-      "version": "6.10.3",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz",
-      "integrity": "sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ==",
+      "version": "6.10.4",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.4.tgz",
+      "integrity": "sha512-WIsKqkSC0ABoBJuT1LEX+2HEvNmNKKgnTAyd0fL8qzK4SH2i9NXg+t08YtdZp/V9IZ33cxe3iV4yM0qg8lMQng==",
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=16.20.1"
       }
@@ -31002,15 +30982,16 @@
       "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "funding": [
         {
           "type": "individual",
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -36978,11 +36959,57 @@
         "node": "*"
       }
     },
+    "node_modules/mongodb": {
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.17.0.tgz",
+      "integrity": "sha512-neerUzg/8U26cgruLysKEjJvoNSXhyID3RvzvdcpsIi2COYM3FS3o9nlH7fxFtefTb942dX3W9i37oPfCVj4wA==",
+      "devOptional": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@mongodb-js/saslprep": "^1.1.9",
+        "bson": "^6.10.4",
+        "mongodb-connection-string-url": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.20.1"
+      },
+      "peerDependencies": {
+        "@aws-sdk/credential-providers": "^3.188.0",
+        "@mongodb-js/zstd": "^1.1.0 || ^2.0.0",
+        "gcp-metadata": "^5.2.0",
+        "kerberos": "^2.0.1",
+        "mongodb-client-encryption": ">=6.0.0 <7",
+        "snappy": "^7.2.2",
+        "socks": "^2.7.1"
+      },
+      "peerDependenciesMeta": {
+        "@aws-sdk/credential-providers": {
+          "optional": true
+        },
+        "@mongodb-js/zstd": {
+          "optional": true
+        },
+        "gcp-metadata": {
+          "optional": true
+        },
+        "kerberos": {
+          "optional": true
+        },
+        "mongodb-client-encryption": {
+          "optional": true
+        },
+        "snappy": {
+          "optional": true
+        },
+        "socks": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/mongodb-connection-string-url": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz",
       "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==",
-      "peer": true,
       "dependencies": {
         "@types/whatwg-url": "^11.0.2",
         "whatwg-url": "^14.1.0 || ^13.0.0"
@@ -36992,7 +37019,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
       "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
-      "peer": true,
       "dependencies": {
         "punycode": "^2.3.1"
       },
@@ -37004,7 +37030,6 @@
       "version": "14.2.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
       "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
-      "peer": true,
       "dependencies": {
         "tr46": "^5.1.0",
         "webidl-conversions": "^7.0.0"
@@ -37013,6 +37038,69 @@
         "node": ">=18"
       }
     },
+    "node_modules/mongodb-memory-server": {
+      "version": "10.1.4",
+      "resolved": "https://registry.npmjs.org/mongodb-memory-server/-/mongodb-memory-server-10.1.4.tgz",
+      "integrity": "sha512-+oKQ/kc3CX+816oPFRtaF0CN4vNcGKNjpOQe4bHo/21A3pMD+lC7Xz1EX5HP7siCX4iCpVchDMmCOFXVQSGkUg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "mongodb-memory-server-core": "10.1.4",
+        "tslib": "^2.7.0"
+      },
+      "engines": {
+        "node": ">=16.20.1"
+      }
+    },
+    "node_modules/mongodb-memory-server-core": {
+      "version": "10.1.4",
+      "resolved": "https://registry.npmjs.org/mongodb-memory-server-core/-/mongodb-memory-server-core-10.1.4.tgz",
+      "integrity": "sha512-o8fgY7ZalEd8pGps43fFPr/hkQu1L8i6HFEGbsTfA2zDOW0TopgpswaBCqDr0qD7ptibyPfB5DmC+UlIxbThzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async-mutex": "^0.5.0",
+        "camelcase": "^6.3.0",
+        "debug": "^4.3.7",
+        "find-cache-dir": "^3.3.2",
+        "follow-redirects": "^1.15.9",
+        "https-proxy-agent": "^7.0.5",
+        "mongodb": "^6.9.0",
+        "new-find-package-json": "^2.0.0",
+        "semver": "^7.6.3",
+        "tar-stream": "^3.1.7",
+        "tslib": "^2.7.0",
+        "yauzl": "^3.1.3"
+      },
+      "engines": {
+        "node": ">=16.20.1"
+      }
+    },
+    "node_modules/mongodb-memory-server-core/node_modules/agent-base": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/mongodb-memory-server-core/node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/moo-color": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/moo-color/-/moo-color-1.0.3.tgz",
@@ -46196,7 +46284,7 @@
         "passport-facebook": "^3.0.0"
       },
       "devDependencies": {
-        "@librechat/data-schemas": "^0.0.8",
+        "@librechat/data-schemas": "^0.0.9",
         "@rollup/plugin-alias": "^5.1.0",
         "@rollup/plugin-commonjs": "^25.0.2",
         "@rollup/plugin-json": "^6.1.0",
@@ -46364,7 +46452,7 @@
     },
     "packages/data-schemas": {
       "name": "@librechat/data-schemas",
-      "version": "0.0.8",
+      "version": "0.0.9",
       "license": "MIT",
       "devDependencies": {
         "@rollup/plugin-alias": "^5.1.0",
@@ -46381,6 +46469,7 @@
         "@types/traverse": "^0.6.37",
         "jest": "^29.5.0",
         "jest-junit": "^16.0.0",
+        "mongodb-memory-server": "^10.1.4",
         "rimraf": "^5.0.1",
         "rollup": "^4.22.4",
         "rollup-plugin-generate-package-json": "^3.2.0",
@@ -46397,6 +46486,7 @@
         "lodash": "^4.17.21",
         "meilisearch": "^0.38.0",
         "mongoose": "^8.12.1",
+        "nanoid": "^3.3.7",
         "traverse": "^0.6.11",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"
diff --git a/packages/data-schemas/package.json b/packages/data-schemas/package.json
index 8d625fa835..9234db4032 100644
--- a/packages/data-schemas/package.json
+++ b/packages/data-schemas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@librechat/data-schemas",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Mongoose schemas and models for LibreChat",
   "type": "module",
   "main": "dist/index.cjs",
@@ -51,6 +51,7 @@
     "@types/traverse": "^0.6.37",
     "jest": "^29.5.0",
     "jest-junit": "^16.0.0",
+    "mongodb-memory-server": "^10.1.4",
     "rimraf": "^5.0.1",
     "rollup": "^4.22.4",
     "rollup-plugin-generate-package-json": "^3.2.0",
@@ -60,13 +61,14 @@
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "keyv": "^5.3.2",
-    "mongoose": "^8.12.1",
-    "librechat-data-provider": "*",
     "jsonwebtoken": "^9.0.2",
+    "keyv": "^5.3.2",
     "klona": "^2.0.6",
+    "librechat-data-provider": "*",
     "lodash": "^4.17.21",
     "meilisearch": "^0.38.0",
+    "mongoose": "^8.12.1",
+    "nanoid": "^3.3.7",
     "traverse": "^0.6.11",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0"
diff --git a/packages/data-schemas/src/methods/index.ts b/packages/data-schemas/src/methods/index.ts
index 33dcdc918d..67f8255c8d 100644
--- a/packages/data-schemas/src/methods/index.ts
+++ b/packages/data-schemas/src/methods/index.ts
@@ -4,6 +4,7 @@ import { createTokenMethods, type TokenMethods } from './token';
 import { createRoleMethods, type RoleMethods } from './role';
 /* Memories */
 import { createMemoryMethods, type MemoryMethods } from './memory';
+import { createShareMethods, type ShareMethods } from './share';
 
 /**
  * Creates all database methods for all collections
@@ -15,8 +16,14 @@ export function createMethods(mongoose: typeof import('mongoose')) {
     ...createTokenMethods(mongoose),
     ...createRoleMethods(mongoose),
     ...createMemoryMethods(mongoose),
+    ...createShareMethods(mongoose),
   };
 }
 
-export type { MemoryMethods };
-export type AllMethods = UserMethods & SessionMethods & TokenMethods & RoleMethods & MemoryMethods;
+export type { MemoryMethods, ShareMethods };
+export type AllMethods = UserMethods &
+  SessionMethods &
+  TokenMethods &
+  RoleMethods &
+  MemoryMethods &
+  ShareMethods;
diff --git a/packages/data-schemas/src/methods/share.test.ts b/packages/data-schemas/src/methods/share.test.ts
new file mode 100644
index 0000000000..45b7faeb1a
--- /dev/null
+++ b/packages/data-schemas/src/methods/share.test.ts
@@ -0,0 +1,1043 @@
+import { nanoid } from 'nanoid';
+import mongoose from 'mongoose';
+import { Constants } from 'librechat-data-provider';
+import { MongoMemoryServer } from 'mongodb-memory-server';
+import { createShareMethods, type ShareMethods } from './share';
+import type { SchemaWithMeiliMethods } from '~/models/plugins/mongoMeili';
+import type * as t from '~/types';
+
+describe('Share Methods', () => {
+  let mongoServer: MongoMemoryServer;
+  let shareMethods: ShareMethods;
+  let SharedLink: mongoose.Model<t.ISharedLink>;
+  let Message: mongoose.Model<t.IMessage>;
+  let Conversation: SchemaWithMeiliMethods;
+
+  beforeAll(async () => {
+    mongoServer = await MongoMemoryServer.create();
+    const mongoUri = mongoServer.getUri();
+    await mongoose.connect(mongoUri);
+
+    // Create schemas
+    const sharedLinkSchema = new mongoose.Schema<t.ISharedLink>(
+      {
+        conversationId: { type: String, required: true },
+        title: { type: String, index: true },
+        user: { type: String, index: true },
+        messages: [{ type: mongoose.Schema.Types.ObjectId, ref: 'Message' }],
+        shareId: { type: String, index: true },
+        isPublic: { type: Boolean, default: true },
+      },
+      { timestamps: true },
+    );
+
+    const messageSchema = new mongoose.Schema<t.IMessage>(
+      {
+        messageId: { type: String, required: true },
+        conversationId: { type: String, required: true },
+        user: { type: String, required: true },
+        text: String,
+        isCreatedByUser: Boolean,
+        model: String,
+        parentMessageId: String,
+        attachments: [mongoose.Schema.Types.Mixed],
+        content: [mongoose.Schema.Types.Mixed],
+      },
+      { timestamps: true },
+    );
+
+    const conversationSchema = new mongoose.Schema<t.IConversation>(
+      {
+        conversationId: { type: String, required: true },
+        title: String,
+        user: String,
+      },
+      { timestamps: true },
+    );
+
+    // Register models
+    SharedLink =
+      mongoose.models.SharedLink || mongoose.model<t.ISharedLink>('SharedLink', sharedLinkSchema);
+    Message = mongoose.models.Message || mongoose.model<t.IMessage>('Message', messageSchema);
+    Conversation = (mongoose.models.Conversation ||
+      mongoose.model<t.IConversation>(
+        'Conversation',
+        conversationSchema,
+      )) as SchemaWithMeiliMethods;
+
+    // Create share methods
+    shareMethods = createShareMethods(mongoose);
+  });
+
+  afterAll(async () => {
+    await mongoose.disconnect();
+    await mongoServer.stop();
+  });
+
+  beforeEach(async () => {
+    await SharedLink.deleteMany({});
+    await Message.deleteMany({});
+    await Conversation.deleteMany({});
+  });
+
+  describe('createSharedLink', () => {
+    test('should create a new shared link', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+
+      // Create test conversation
+      await Conversation.create({
+        conversationId,
+        title: 'Test Conversation',
+        user: userId,
+      });
+
+      // Create test messages
+      await Message.create([
+        {
+          messageId: `msg_${nanoid()}`,
+          conversationId,
+          user: userId,
+          text: 'Hello',
+          isCreatedByUser: true,
+        },
+        {
+          messageId: `msg_${nanoid()}`,
+          conversationId,
+          user: userId,
+          text: 'World',
+          isCreatedByUser: false,
+          model: 'gpt-4',
+        },
+      ]);
+
+      const result = await shareMethods.createSharedLink(userId, conversationId);
+
+      expect(result).toBeDefined();
+      expect(result.shareId).toBeDefined();
+      expect(result.conversationId).toBe(conversationId);
+
+      // Verify the share was created in the database
+      const savedShare = await SharedLink.findOne({ shareId: result.shareId });
+      expect(savedShare).toBeDefined();
+      expect(savedShare?.user).toBe(userId);
+      expect(savedShare?.title).toBe('Test Conversation');
+      expect(savedShare?.messages).toHaveLength(2);
+    });
+
+    test('should throw error if share already exists', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+
+      await Conversation.create({
+        conversationId,
+        title: 'Test Conversation',
+        user: userId,
+      });
+
+      // Create messages so we can create a share
+      await Message.create({
+        messageId: `msg_${nanoid()}`,
+        conversationId,
+        user: userId,
+        text: 'Test message',
+        isCreatedByUser: true,
+      });
+
+      // Create first share
+      await shareMethods.createSharedLink(userId, conversationId);
+
+      // Try to create duplicate
+      await expect(shareMethods.createSharedLink(userId, conversationId)).rejects.toThrow(
+        'Share already exists',
+      );
+    });
+
+    test('should throw error with missing parameters', async () => {
+      await expect(shareMethods.createSharedLink('', 'conv123')).rejects.toThrow(
+        'Missing required parameters',
+      );
+
+      await expect(shareMethods.createSharedLink('user123', '')).rejects.toThrow(
+        'Missing required parameters',
+      );
+    });
+
+    test('should only include messages from the same user', async () => {
+      const userId1 = new mongoose.Types.ObjectId().toString();
+      const userId2 = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+
+      await Conversation.create({
+        conversationId,
+        title: 'Test Conversation',
+        user: userId1,
+      });
+
+      // Create messages from different users
+      await Message.create([
+        {
+          messageId: `msg_${nanoid()}`,
+          conversationId,
+          user: userId1,
+          text: 'User 1 message',
+          isCreatedByUser: true,
+        },
+        {
+          messageId: `msg_${nanoid()}`,
+          conversationId,
+          user: userId2,
+          text: 'User 2 message',
+          isCreatedByUser: true,
+        },
+      ]);
+
+      const result = await shareMethods.createSharedLink(userId1, conversationId);
+
+      const savedShare = await SharedLink.findOne({ shareId: result.shareId }).populate('messages');
+      expect(savedShare?.messages).toHaveLength(1);
+      expect((savedShare?.messages?.[0] as unknown as t.IMessage | undefined)?.text).toBe(
+        'User 1 message',
+      );
+    });
+
+    test('should not allow user to create shared link for conversation they do not own', async () => {
+      const ownerUserId = new mongoose.Types.ObjectId().toString();
+      const otherUserId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+
+      // Create conversation owned by ownerUserId
+      await Conversation.create({
+        conversationId,
+        title: 'Owner Conversation',
+        user: ownerUserId,
+      });
+
+      // Create messages for the conversation
+      await Message.create([
+        {
+          messageId: `msg_${nanoid()}`,
+          conversationId,
+          user: ownerUserId,
+          text: 'Owner message',
+          isCreatedByUser: true,
+        },
+      ]);
+
+      // Try to create a shared link as a different user
+      await expect(shareMethods.createSharedLink(otherUserId, conversationId)).rejects.toThrow(
+        'Conversation not found or access denied',
+      );
+
+      // Verify no share was created
+      const shares = await SharedLink.find({ conversationId });
+      expect(shares).toHaveLength(0);
+    });
+
+    test('should not allow creating share for conversation with no messages', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+
+      // Create conversation without any messages
+      await Conversation.create({
+        conversationId,
+        title: 'Empty Conversation',
+        user: userId,
+      });
+
+      // Try to create a shared link for conversation with no messages
+      await expect(shareMethods.createSharedLink(userId, conversationId)).rejects.toThrow(
+        'No messages to share',
+      );
+
+      // Verify no share was created
+      const shares = await SharedLink.find({ conversationId });
+      expect(shares).toHaveLength(0);
+    });
+  });
+
+  describe('getSharedMessages', () => {
+    test('should retrieve and anonymize shared messages', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+      const shareId = `share_${nanoid()}`;
+
+      // Create messages
+      const messages = await Message.create([
+        {
+          messageId: `msg_${nanoid()}`,
+          conversationId,
+          user: userId,
+          text: 'Hello',
+          isCreatedByUser: true,
+          parentMessageId: Constants.NO_PARENT,
+        },
+        {
+          messageId: `msg_${nanoid()}`,
+          conversationId,
+          user: userId,
+          text: 'World',
+          isCreatedByUser: false,
+          model: 'gpt-4',
+          parentMessageId: Constants.NO_PARENT,
+        },
+      ]);
+
+      // Create shared link
+      await SharedLink.create({
+        shareId,
+        conversationId,
+        user: userId,
+        title: 'Test Share',
+        messages: messages.map((m) => m._id),
+        isPublic: true,
+      });
+
+      const result = await shareMethods.getSharedMessages(shareId);
+
+      expect(result).toBeDefined();
+      expect(result?.shareId).toBe(shareId);
+      expect(result?.conversationId).not.toBe(conversationId); // Should be anonymized
+      expect(result?.messages).toHaveLength(2);
+
+      // Check anonymization
+      result?.messages.forEach((msg) => {
+        expect(msg.messageId).toMatch(/^msg_/); // Should be anonymized with msg_ prefix
+        expect(msg.messageId).not.toBe(messages[0].messageId); // Should be different from original
+        expect(msg.conversationId).toBe(result.conversationId);
+        expect(msg.user).toBeUndefined(); // User should be removed
+      });
+    });
+
+    test('should return null for non-public share', async () => {
+      const shareId = `share_${nanoid()}`;
+
+      await SharedLink.create({
+        shareId,
+        conversationId: 'conv123',
+        user: 'user123',
+        isPublic: false,
+      });
+
+      const result = await shareMethods.getSharedMessages(shareId);
+      expect(result).toBeNull();
+    });
+
+    test('should return null for non-existent share', async () => {
+      const result = await shareMethods.getSharedMessages('non_existent_share');
+      expect(result).toBeNull();
+    });
+
+    test('should handle messages with attachments', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+      const shareId = `share_${nanoid()}`;
+
+      const message = await Message.create({
+        messageId: `msg_${nanoid()}`,
+        conversationId,
+        user: userId,
+        text: 'Message with attachment',
+        isCreatedByUser: true,
+        attachments: [
+          {
+            file_id: 'file123',
+            filename: 'test.pdf',
+            type: 'application/pdf',
+          },
+        ],
+      });
+
+      await SharedLink.create({
+        shareId,
+        conversationId,
+        user: userId,
+        messages: [message._id],
+        isPublic: true,
+      });
+
+      const result = await shareMethods.getSharedMessages(shareId);
+
+      expect(result?.messages[0].attachments).toHaveLength(1);
+      expect(
+        (result?.messages[0].attachments?.[0] as unknown as t.IMessage | undefined)?.messageId,
+      ).toBe(result?.messages[0].messageId);
+      expect(
+        (result?.messages[0].attachments?.[0] as unknown as t.IMessage | undefined)?.conversationId,
+      ).toBe(result?.conversationId);
+    });
+  });
+
+  describe('getSharedLinks', () => {
+    test('should retrieve paginated shared links for a user', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+
+      // Create multiple shared links
+      const sharePromises = Array.from({ length: 15 }, (_, i) =>
+        SharedLink.create({
+          shareId: `share_${i}`,
+          conversationId: `conv_${i}`,
+          user: userId,
+          title: `Share ${i}`,
+          isPublic: true,
+          createdAt: new Date(Date.now() - i * 1000 * 60), // Different timestamps
+        }),
+      );
+
+      await Promise.all(sharePromises);
+
+      const result = await shareMethods.getSharedLinks(userId, undefined, 10);
+
+      expect(result.links).toHaveLength(10);
+      expect(result.hasNextPage).toBe(true);
+      expect(result.nextCursor).toBeDefined();
+
+      // Check ordering (newest first by default)
+      expect(result.links[0].title).toBe('Share 0');
+      expect(result.links[9].title).toBe('Share 9');
+    });
+
+    test('should filter by isPublic parameter', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+
+      await SharedLink.create([
+        {
+          shareId: 'public_share',
+          conversationId: 'conv1',
+          user: userId,
+          title: 'Public Share',
+          isPublic: true,
+        },
+        {
+          shareId: 'private_share',
+          conversationId: 'conv2',
+          user: userId,
+          title: 'Private Share',
+          isPublic: false,
+        },
+      ]);
+
+      const publicResults = await shareMethods.getSharedLinks(userId, undefined, 10, true);
+      const privateResults = await shareMethods.getSharedLinks(userId, undefined, 10, false);
+
+      expect(publicResults.links).toHaveLength(1);
+      expect(publicResults.links[0].title).toBe('Public Share');
+
+      expect(privateResults.links).toHaveLength(1);
+      expect(privateResults.links[0].title).toBe('Private Share');
+    });
+
+    test('should handle search with mocked meiliSearch', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+
+      // Mock meiliSearch method
+      Conversation.meiliSearch = jest.fn().mockResolvedValue({
+        hits: [{ conversationId: 'conv1' }],
+      });
+
+      await SharedLink.create([
+        {
+          shareId: 'share1',
+          conversationId: 'conv1',
+          user: userId,
+          title: 'Matching Share',
+          isPublic: true,
+        },
+        {
+          shareId: 'share2',
+          conversationId: 'conv2',
+          user: userId,
+          title: 'Non-matching Share',
+          isPublic: true,
+        },
+      ]);
+
+      const result = await shareMethods.getSharedLinks(
+        userId,
+        undefined,
+        10,
+        true,
+        'createdAt',
+        'desc',
+        'search term',
+      );
+
+      expect(result.links).toHaveLength(1);
+      expect(result.links[0].title).toBe('Matching Share');
+    });
+
+    test('should handle empty results', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const result = await shareMethods.getSharedLinks(userId);
+
+      expect(result.links).toHaveLength(0);
+      expect(result.hasNextPage).toBe(false);
+      expect(result.nextCursor).toBeUndefined();
+    });
+
+    test('should only return shares for the specified user', async () => {
+      const userId1 = new mongoose.Types.ObjectId().toString();
+      const userId2 = new mongoose.Types.ObjectId().toString();
+
+      // Create shares for different users
+      await SharedLink.create([
+        {
+          shareId: 'share1',
+          conversationId: 'conv1',
+          user: userId1,
+          title: 'User 1 Share',
+          isPublic: true,
+        },
+        {
+          shareId: 'share2',
+          conversationId: 'conv2',
+          user: userId2,
+          title: 'User 2 Share',
+          isPublic: true,
+        },
+        {
+          shareId: 'share3',
+          conversationId: 'conv3',
+          user: userId1,
+          title: 'Another User 1 Share',
+          isPublic: true,
+        },
+      ]);
+
+      const result1 = await shareMethods.getSharedLinks(userId1);
+      const result2 = await shareMethods.getSharedLinks(userId2);
+
+      expect(result1.links).toHaveLength(2);
+      expect(result1.links.every((link) => link.title.includes('User 1'))).toBe(true);
+
+      expect(result2.links).toHaveLength(1);
+      expect(result2.links[0].title).toBe('User 2 Share');
+    });
+  });
+
+  describe('updateSharedLink', () => {
+    test('should update shared link with new messages', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+      const oldShareId = `share_${nanoid()}`;
+
+      // Create initial messages
+      const initialMessages = await Message.create([
+        {
+          messageId: `msg_1`,
+          conversationId,
+          user: userId,
+          text: 'Initial message',
+          isCreatedByUser: true,
+        },
+      ]);
+
+      // Create shared link
+      await SharedLink.create({
+        shareId: oldShareId,
+        conversationId,
+        user: userId,
+        messages: initialMessages.map((m) => m._id),
+        isPublic: true,
+      });
+
+      // Add new message
+      await Message.create({
+        messageId: `msg_2`,
+        conversationId,
+        user: userId,
+        text: 'New message',
+        isCreatedByUser: false,
+      });
+
+      const result = await shareMethods.updateSharedLink(userId, oldShareId);
+
+      expect(result.shareId).not.toBe(oldShareId); // Should generate new shareId
+      expect(result.conversationId).toBe(conversationId);
+
+      // Verify updated share
+      const updatedShare = await SharedLink.findOne({ shareId: result.shareId }).populate(
+        'messages',
+      );
+      expect(updatedShare?.messages).toHaveLength(2);
+    });
+
+    test('should throw error if share not found', async () => {
+      await expect(shareMethods.updateSharedLink('user123', 'non_existent')).rejects.toThrow(
+        'Share not found',
+      );
+    });
+
+    test('should throw error with missing parameters', async () => {
+      await expect(shareMethods.updateSharedLink('', 'share123')).rejects.toThrow(
+        'Missing required parameters',
+      );
+    });
+
+    test('should only update with messages from the same user', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const otherUserId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+      const shareId = `share_${nanoid()}`;
+
+      // Create initial share
+      await SharedLink.create({
+        shareId,
+        conversationId,
+        user: userId,
+        messages: [],
+        isPublic: true,
+      });
+
+      // Add messages from different users
+      await Message.create([
+        {
+          messageId: `msg_1`,
+          conversationId,
+          user: userId,
+          text: 'User message',
+          isCreatedByUser: true,
+        },
+        {
+          messageId: `msg_2`,
+          conversationId,
+          user: otherUserId,
+          text: 'Other user message',
+          isCreatedByUser: true,
+        },
+      ]);
+
+      const result = await shareMethods.updateSharedLink(userId, shareId);
+
+      const updatedShare = await SharedLink.findOne({ shareId: result.shareId }).populate(
+        'messages',
+      );
+      expect(updatedShare?.messages).toHaveLength(1);
+      expect((updatedShare?.messages?.[0] as unknown as t.IMessage | undefined)?.text).toBe(
+        'User message',
+      );
+    });
+
+    test('should not allow user to update shared link they do not own', async () => {
+      const ownerUserId = new mongoose.Types.ObjectId().toString();
+      const otherUserId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+      const shareId = `share_${nanoid()}`;
+
+      // Create shared link owned by ownerUserId
+      await SharedLink.create({
+        shareId,
+        conversationId,
+        user: ownerUserId,
+        messages: [],
+        isPublic: true,
+      });
+
+      // Try to update as a different user
+      await expect(shareMethods.updateSharedLink(otherUserId, shareId)).rejects.toThrow(
+        'Share not found',
+      );
+
+      // Verify the original share still exists and is unchanged
+      const originalShare = await SharedLink.findOne({ shareId });
+      expect(originalShare).toBeDefined();
+      expect(originalShare?.user).toBe(ownerUserId);
+    });
+  });
+
+  describe('deleteSharedLink', () => {
+    test('should delete shared link', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const shareId = `share_${nanoid()}`;
+
+      await SharedLink.create({
+        shareId,
+        conversationId: 'conv123',
+        user: userId,
+        isPublic: true,
+      });
+
+      const result = await shareMethods.deleteSharedLink(userId, shareId);
+
+      expect(result).toBeDefined();
+      expect(result?.success).toBe(true);
+      expect(result?.shareId).toBe(shareId);
+
+      // Verify deletion
+      const deletedShare = await SharedLink.findOne({ shareId });
+      expect(deletedShare).toBeNull();
+    });
+
+    test('should return null if share not found', async () => {
+      const result = await shareMethods.deleteSharedLink('user123', 'non_existent');
+      expect(result).toBeNull();
+    });
+
+    test('should not delete share from different user', async () => {
+      const userId1 = new mongoose.Types.ObjectId().toString();
+      const userId2 = new mongoose.Types.ObjectId().toString();
+      const shareId = `share_${nanoid()}`;
+
+      await SharedLink.create({
+        shareId,
+        conversationId: 'conv123',
+        user: userId1,
+        isPublic: true,
+      });
+
+      const result = await shareMethods.deleteSharedLink(userId2, shareId);
+      expect(result).toBeNull();
+
+      // Verify share still exists
+      const share = await SharedLink.findOne({ shareId });
+      expect(share).toBeDefined();
+    });
+
+    test('should handle missing parameters for deleteSharedLink', async () => {
+      await expect(shareMethods.deleteSharedLink('', 'share123')).rejects.toThrow(
+        'Missing required parameters',
+      );
+
+      await expect(shareMethods.deleteSharedLink('user123', '')).rejects.toThrow(
+        'Missing required parameters',
+      );
+    });
+  });
+
+  describe('getSharedLink', () => {
+    test('should retrieve existing shared link', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+      const shareId = `share_${nanoid()}`;
+
+      await SharedLink.create({
+        shareId,
+        conversationId,
+        user: userId,
+        isPublic: true,
+      });
+
+      const result = await shareMethods.getSharedLink(userId, conversationId);
+
+      expect(result.success).toBe(true);
+      expect(result.shareId).toBe(shareId);
+    });
+
+    test('should return null shareId if not found', async () => {
+      const result = await shareMethods.getSharedLink('user123', 'conv123');
+
+      expect(result.success).toBe(false);
+      expect(result.shareId).toBeNull();
+    });
+
+    test('should not return share from different user', async () => {
+      const userId1 = new mongoose.Types.ObjectId().toString();
+      const userId2 = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+
+      await SharedLink.create({
+        shareId: 'share123',
+        conversationId,
+        user: userId1,
+        isPublic: true,
+      });
+
+      const result = await shareMethods.getSharedLink(userId2, conversationId);
+
+      expect(result.success).toBe(false);
+      expect(result.shareId).toBeNull();
+    });
+
+    test('should handle missing parameters for getSharedLink', async () => {
+      await expect(shareMethods.getSharedLink('', 'conv123')).rejects.toThrow(
+        'Missing required parameters',
+      );
+
+      await expect(shareMethods.getSharedLink('user123', '')).rejects.toThrow(
+        'Missing required parameters',
+      );
+    });
+
+    test('should only return public shares', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+      const shareId = `share_${nanoid()}`;
+
+      // Create a non-public share
+      await SharedLink.create({
+        shareId,
+        conversationId,
+        user: userId,
+        isPublic: false,
+      });
+
+      const result = await shareMethods.getSharedLink(userId, conversationId);
+
+      expect(result.success).toBe(false);
+      expect(result.shareId).toBeNull();
+    });
+  });
+
+  describe('deleteAllSharedLinks', () => {
+    test('should delete all shared links for a user', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const otherUserId = new mongoose.Types.ObjectId().toString();
+
+      // Create shares for different users
+      await SharedLink.create([
+        { shareId: 'share1', conversationId: 'conv1', user: userId },
+        { shareId: 'share2', conversationId: 'conv2', user: userId },
+        { shareId: 'share3', conversationId: 'conv3', user: otherUserId },
+      ]);
+
+      const result = await shareMethods.deleteAllSharedLinks(userId);
+
+      expect(result.deletedCount).toBe(2);
+      expect(result.message).toContain('successfully');
+
+      // Verify only user's shares were deleted
+      const remainingShares = await SharedLink.find({});
+      expect(remainingShares).toHaveLength(1);
+      expect(remainingShares[0].user).toBe(otherUserId);
+    });
+
+    test('should handle when no shares exist', async () => {
+      const result = await shareMethods.deleteAllSharedLinks('user123');
+
+      expect(result.deletedCount).toBe(0);
+      expect(result.message).toContain('successfully');
+    });
+
+    test('should only delete shares belonging to the specified user', async () => {
+      const userId1 = new mongoose.Types.ObjectId().toString();
+      const userId2 = new mongoose.Types.ObjectId().toString();
+      const userId3 = new mongoose.Types.ObjectId().toString();
+
+      // Create multiple shares for different users
+      await SharedLink.create([
+        { shareId: 'share1', conversationId: 'conv1', user: userId1, isPublic: true },
+        { shareId: 'share2', conversationId: 'conv2', user: userId1, isPublic: false },
+        { shareId: 'share3', conversationId: 'conv3', user: userId2, isPublic: true },
+        { shareId: 'share4', conversationId: 'conv4', user: userId2, isPublic: true },
+        { shareId: 'share5', conversationId: 'conv5', user: userId3, isPublic: true },
+      ]);
+
+      // Delete all shares for userId1
+      const result = await shareMethods.deleteAllSharedLinks(userId1);
+      expect(result.deletedCount).toBe(2);
+
+      // Verify shares for other users still exist
+      const remainingShares = await SharedLink.find({});
+      expect(remainingShares).toHaveLength(3);
+      expect(remainingShares.every((share) => share.user !== userId1)).toBe(true);
+
+      // Verify specific users' shares remain
+      const user2Shares = await SharedLink.find({ user: userId2 });
+      expect(user2Shares).toHaveLength(2);
+
+      const user3Shares = await SharedLink.find({ user: userId3 });
+      expect(user3Shares).toHaveLength(1);
+    });
+  });
+
+  describe('Edge Cases and Error Handling', () => {
+    test('should handle conversation with special characters in ID', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationId = 'conv|with|pipes';
+
+      await Conversation.create({
+        conversationId,
+        title: 'Special Conversation',
+        user: userId,
+      });
+
+      // Create a message so we can create a share
+      await Message.create({
+        messageId: `msg_${nanoid()}`,
+        conversationId,
+        user: userId,
+        text: 'Test message',
+        isCreatedByUser: true,
+      });
+
+      const result = await shareMethods.createSharedLink(userId, conversationId);
+
+      expect(result).toBeDefined();
+      expect(result.conversationId).toBe(conversationId);
+    });
+
+    test('should handle messages with assistant_id', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+      const shareId = `share_${nanoid()}`;
+
+      const message = await Message.create({
+        messageId: `msg_${nanoid()}`,
+        conversationId,
+        user: userId,
+        text: 'Assistant message',
+        isCreatedByUser: false,
+        model: 'asst_123456',
+      });
+
+      await SharedLink.create({
+        shareId,
+        conversationId,
+        user: userId,
+        messages: [message._id],
+        isPublic: true,
+      });
+
+      const result = await shareMethods.getSharedMessages(shareId);
+
+      expect(result?.messages[0].model).toMatch(/^a_/); // Should be anonymized
+    });
+
+    test('should handle concurrent operations', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationIds = Array.from({ length: 5 }, () => `conv_${nanoid()}`);
+
+      // Create conversations and messages
+      await Promise.all(
+        conversationIds.map(async (id) => {
+          await Conversation.create({
+            conversationId: id,
+            title: `Conversation ${id}`,
+            user: userId,
+          });
+          // Create a message for each conversation
+          await Message.create({
+            messageId: `msg_${nanoid()}`,
+            conversationId: id,
+            user: userId,
+            text: `Message for ${id}`,
+            isCreatedByUser: true,
+          });
+        }),
+      );
+
+      // Concurrent share creation
+      const createPromises = conversationIds.map((id) => shareMethods.createSharedLink(userId, id));
+
+      const results = await Promise.all(createPromises);
+
+      expect(results).toHaveLength(5);
+      results.forEach((result, index) => {
+        expect(result.shareId).toBeDefined();
+        expect(result.conversationId).toBe(conversationIds[index]);
+      });
+    });
+
+    test('should handle database errors gracefully', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+
+      // Create conversation and message first
+      await Conversation.create({
+        conversationId,
+        title: 'Test Conversation',
+        user: userId,
+      });
+
+      await Message.create({
+        messageId: `msg_${nanoid()}`,
+        conversationId,
+        user: userId,
+        text: 'Test message',
+        isCreatedByUser: true,
+      });
+
+      // Mock a database error
+      const originalCreate = SharedLink.create;
+      SharedLink.create = jest.fn().mockRejectedValue(new Error('Database error'));
+
+      await expect(shareMethods.createSharedLink(userId, conversationId)).rejects.toThrow(
+        'Error creating shared link',
+      );
+
+      SharedLink.create = originalCreate;
+    });
+  });
+
+  describe('Anonymization', () => {
+    beforeEach(() => {
+      // Ensure any mocks are restored before each test
+      jest.restoreAllMocks();
+    });
+
+    test('should consistently anonymize IDs', async () => {
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+      const shareId = `share_${nanoid()}`;
+      const messageId1 = `msg_${nanoid()}`;
+      const messageId2 = `msg_${nanoid()}`;
+
+      const messages = await Message.create([
+        {
+          messageId: messageId1,
+          conversationId,
+          user: userId,
+          text: 'First message',
+          isCreatedByUser: true,
+          parentMessageId: Constants.NO_PARENT,
+        },
+        {
+          messageId: messageId2,
+          conversationId,
+          user: userId,
+          text: 'Second message',
+          isCreatedByUser: false,
+          parentMessageId: messageId1, // Reference to first message
+        },
+      ]);
+
+      await SharedLink.create({
+        shareId,
+        conversationId,
+        user: userId,
+        messages: messages.map((m) => m._id),
+        isPublic: true,
+      });
+
+      const result = await shareMethods.getSharedMessages(shareId);
+
+      // Check that anonymization is consistent within the same result
+      expect(result?.messages).toHaveLength(2);
+
+      // The second message's parentMessageId should match the first message's anonymized ID
+      expect(result?.messages[1].parentMessageId).toBe(result?.messages[0].messageId);
+
+      // Both messages should have the same anonymized conversationId
+      expect(result?.messages[0].conversationId).toBe(result?.conversationId);
+      expect(result?.messages[1].conversationId).toBe(result?.conversationId);
+    });
+
+    test('should handle NO_PARENT constant correctly', async () => {
+      const { Constants } = await import('librechat-data-provider');
+      const userId = new mongoose.Types.ObjectId().toString();
+      const conversationId = `conv_${nanoid()}`;
+      const shareId = `share_${nanoid()}`;
+
+      const message = await Message.create({
+        messageId: `msg_${nanoid()}`,
+        conversationId,
+        user: userId,
+        text: 'Root message',
+        isCreatedByUser: true,
+        parentMessageId: Constants.NO_PARENT,
+      });
+
+      await SharedLink.create({
+        shareId,
+        conversationId,
+        user: userId,
+        messages: [message._id],
+        isPublic: true,
+      });
+
+      const result = await shareMethods.getSharedMessages(shareId);
+
+      expect(result?.messages[0].parentMessageId).toBe(Constants.NO_PARENT);
+    });
+  });
+});
diff --git a/packages/data-schemas/src/methods/share.ts b/packages/data-schemas/src/methods/share.ts
new file mode 100644
index 0000000000..7c16ead209
--- /dev/null
+++ b/packages/data-schemas/src/methods/share.ts
@@ -0,0 +1,442 @@
+import { nanoid } from 'nanoid';
+import { Constants } from 'librechat-data-provider';
+import type { FilterQuery, Model } from 'mongoose';
+import type { SchemaWithMeiliMethods } from '~/models/plugins/mongoMeili';
+import type * as t from '~/types';
+import logger from '~/config/winston';
+
+class ShareServiceError extends Error {
+  code: string;
+  constructor(message: string, code: string) {
+    super(message);
+    this.name = 'ShareServiceError';
+    this.code = code;
+  }
+}
+
+function memoizedAnonymizeId(prefix: string) {
+  const memo = new Map<string, string>();
+  return (id: string) => {
+    if (!memo.has(id)) {
+      memo.set(id, `${prefix}_${nanoid()}`);
+    }
+    return memo.get(id) as string;
+  };
+}
+
+const anonymizeConvoId = memoizedAnonymizeId('convo');
+const anonymizeAssistantId = memoizedAnonymizeId('a');
+const anonymizeMessageId = (id: string) =>
+  id === Constants.NO_PARENT ? id : memoizedAnonymizeId('msg')(id);
+
+function anonymizeConvo(conversation: Partial<t.IConversation> & Partial<t.ISharedLink>) {
+  if (!conversation) {
+    return null;
+  }
+
+  const newConvo = { ...conversation };
+  if (newConvo.assistant_id) {
+    newConvo.assistant_id = anonymizeAssistantId(newConvo.assistant_id);
+  }
+  return newConvo;
+}
+
+function anonymizeMessages(messages: t.IMessage[], newConvoId: string): t.IMessage[] {
+  if (!Array.isArray(messages)) {
+    return [];
+  }
+
+  const idMap = new Map<string, string>();
+  return messages.map((message) => {
+    const newMessageId = anonymizeMessageId(message.messageId);
+    idMap.set(message.messageId, newMessageId);
+
+    type MessageAttachment = {
+      messageId?: string;
+      conversationId?: string;
+      [key: string]: unknown;
+    };
+
+    const anonymizedAttachments = (message.attachments as MessageAttachment[])?.map(
+      (attachment) => {
+        return {
+          ...attachment,
+          messageId: newMessageId,
+          conversationId: newConvoId,
+        };
+      },
+    );
+
+    return {
+      ...message,
+      messageId: newMessageId,
+      parentMessageId:
+        idMap.get(message.parentMessageId || '') ||
+        anonymizeMessageId(message.parentMessageId || ''),
+      conversationId: newConvoId,
+      model: message.model?.startsWith('asst_')
+        ? anonymizeAssistantId(message.model)
+        : message.model,
+      attachments: anonymizedAttachments,
+    } as t.IMessage;
+  });
+}
+
+/** Factory function that takes mongoose instance and returns the methods */
+export function createShareMethods(mongoose: typeof import('mongoose')) {
+  /**
+   * Get shared messages for a public share link
+   */
+  async function getSharedMessages(shareId: string): Promise<t.SharedMessagesResult | null> {
+    try {
+      const SharedLink = mongoose.models.SharedLink as Model<t.ISharedLink>;
+      const share = (await SharedLink.findOne({ shareId, isPublic: true })
+        .populate({
+          path: 'messages',
+          select: '-_id -__v -user',
+        })
+        .select('-_id -__v -user')
+        .lean()) as (t.ISharedLink & { messages: t.IMessage[] }) | null;
+
+      if (!share?.conversationId || !share.isPublic) {
+        return null;
+      }
+
+      const newConvoId = anonymizeConvoId(share.conversationId);
+      const result: t.SharedMessagesResult = {
+        shareId: share.shareId || shareId,
+        title: share.title,
+        isPublic: share.isPublic,
+        createdAt: share.createdAt,
+        updatedAt: share.updatedAt,
+        conversationId: newConvoId,
+        messages: anonymizeMessages(share.messages, newConvoId),
+      };
+
+      return result;
+    } catch (error) {
+      logger.error('[getSharedMessages] Error getting share link', {
+        error: error instanceof Error ? error.message : 'Unknown error',
+        shareId,
+      });
+      throw new ShareServiceError('Error getting share link', 'SHARE_FETCH_ERROR');
+    }
+  }
+
+  /**
+   * Get shared links for a specific user with pagination and search
+   */
+  async function getSharedLinks(
+    user: string,
+    pageParam?: Date,
+    pageSize: number = 10,
+    isPublic: boolean = true,
+    sortBy: string = 'createdAt',
+    sortDirection: string = 'desc',
+    search?: string,
+  ): Promise<t.SharedLinksResult> {
+    try {
+      const SharedLink = mongoose.models.SharedLink as Model<t.ISharedLink>;
+      const Conversation = mongoose.models.Conversation as SchemaWithMeiliMethods;
+      const query: FilterQuery<t.ISharedLink> = { user, isPublic };
+
+      if (pageParam) {
+        if (sortDirection === 'desc') {
+          query[sortBy] = { $lt: pageParam };
+        } else {
+          query[sortBy] = { $gt: pageParam };
+        }
+      }
+
+      if (search && search.trim()) {
+        try {
+          const searchResults = await Conversation.meiliSearch(search);
+
+          if (!searchResults?.hits?.length) {
+            return {
+              links: [],
+              nextCursor: undefined,
+              hasNextPage: false,
+            };
+          }
+
+          const conversationIds = searchResults.hits.map((hit) => hit.conversationId);
+          query['conversationId'] = { $in: conversationIds };
+        } catch (searchError) {
+          logger.error('[getSharedLinks] Meilisearch error', {
+            error: searchError instanceof Error ? searchError.message : 'Unknown error',
+            user,
+          });
+          return {
+            links: [],
+            nextCursor: undefined,
+            hasNextPage: false,
+          };
+        }
+      }
+
+      const sort: Record<string, 1 | -1> = {};
+      sort[sortBy] = sortDirection === 'desc' ? -1 : 1;
+
+      const sharedLinks = await SharedLink.find(query)
+        .sort(sort)
+        .limit(pageSize + 1)
+        .select('-__v -user')
+        .lean();
+
+      const hasNextPage = sharedLinks.length > pageSize;
+      const links = sharedLinks.slice(0, pageSize);
+
+      const nextCursor = hasNextPage
+        ? (links[links.length - 1][sortBy as keyof t.ISharedLink] as Date)
+        : undefined;
+
+      return {
+        links: links.map((link) => ({
+          shareId: link.shareId || '',
+          title: link?.title || 'Untitled',
+          isPublic: link.isPublic,
+          createdAt: link.createdAt || new Date(),
+          conversationId: link.conversationId,
+        })),
+        nextCursor,
+        hasNextPage,
+      };
+    } catch (error) {
+      logger.error('[getSharedLinks] Error getting shares', {
+        error: error instanceof Error ? error.message : 'Unknown error',
+        user,
+      });
+      throw new ShareServiceError('Error getting shares', 'SHARES_FETCH_ERROR');
+    }
+  }
+
+  /**
+   * Delete all shared links for a user
+   */
+  async function deleteAllSharedLinks(user: string): Promise<t.DeleteAllSharesResult> {
+    try {
+      const SharedLink = mongoose.models.SharedLink as Model<t.ISharedLink>;
+      const result = await SharedLink.deleteMany({ user });
+      return {
+        message: 'All shared links deleted successfully',
+        deletedCount: result.deletedCount,
+      };
+    } catch (error) {
+      logger.error('[deleteAllSharedLinks] Error deleting shared links', {
+        error: error instanceof Error ? error.message : 'Unknown error',
+        user,
+      });
+      throw new ShareServiceError('Error deleting shared links', 'BULK_DELETE_ERROR');
+    }
+  }
+
+  /**
+   * Create a new shared link for a conversation
+   */
+  async function createSharedLink(
+    user: string,
+    conversationId: string,
+  ): Promise<t.CreateShareResult> {
+    if (!user || !conversationId) {
+      throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
+    }
+    try {
+      const Message = mongoose.models.Message as SchemaWithMeiliMethods;
+      const SharedLink = mongoose.models.SharedLink as Model<t.ISharedLink>;
+      const Conversation = mongoose.models.Conversation as SchemaWithMeiliMethods;
+
+      const [existingShare, conversationMessages] = await Promise.all([
+        SharedLink.findOne({ conversationId, user, isPublic: true })
+          .select('-_id -__v -user')
+          .lean() as Promise<t.ISharedLink | null>,
+        Message.find({ conversationId, user }).sort({ createdAt: 1 }).lean(),
+      ]);
+
+      if (existingShare && existingShare.isPublic) {
+        logger.error('[createSharedLink] Share already exists', {
+          user,
+          conversationId,
+        });
+        throw new ShareServiceError('Share already exists', 'SHARE_EXISTS');
+      } else if (existingShare) {
+        await SharedLink.deleteOne({ conversationId, user });
+      }
+
+      const conversation = (await Conversation.findOne({ conversationId, user }).lean()) as {
+        title?: string;
+      } | null;
+
+      // Check if user owns the conversation
+      if (!conversation) {
+        throw new ShareServiceError(
+          'Conversation not found or access denied',
+          'CONVERSATION_NOT_FOUND',
+        );
+      }
+
+      // Check if there are any messages to share
+      if (!conversationMessages || conversationMessages.length === 0) {
+        throw new ShareServiceError('No messages to share', 'NO_MESSAGES');
+      }
+
+      const title = conversation.title || 'Untitled';
+
+      const shareId = nanoid();
+      await SharedLink.create({
+        shareId,
+        conversationId,
+        messages: conversationMessages,
+        title,
+        user,
+      });
+
+      return { shareId, conversationId };
+    } catch (error) {
+      if (error instanceof ShareServiceError) {
+        throw error;
+      }
+      logger.error('[createSharedLink] Error creating shared link', {
+        error: error instanceof Error ? error.message : 'Unknown error',
+        user,
+        conversationId,
+      });
+      throw new ShareServiceError('Error creating shared link', 'SHARE_CREATE_ERROR');
+    }
+  }
+
+  /**
+   * Get a shared link for a conversation
+   */
+  async function getSharedLink(
+    user: string,
+    conversationId: string,
+  ): Promise<t.GetShareLinkResult> {
+    if (!user || !conversationId) {
+      throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
+    }
+
+    try {
+      const SharedLink = mongoose.models.SharedLink as Model<t.ISharedLink>;
+      const share = (await SharedLink.findOne({ conversationId, user, isPublic: true })
+        .select('shareId -_id')
+        .lean()) as { shareId?: string } | null;
+
+      if (!share) {
+        return { shareId: null, success: false };
+      }
+
+      return { shareId: share.shareId || null, success: true };
+    } catch (error) {
+      logger.error('[getSharedLink] Error getting shared link', {
+        error: error instanceof Error ? error.message : 'Unknown error',
+        user,
+        conversationId,
+      });
+      throw new ShareServiceError('Error getting shared link', 'SHARE_FETCH_ERROR');
+    }
+  }
+
+  /**
+   * Update a shared link with new messages
+   */
+  async function updateSharedLink(user: string, shareId: string): Promise<t.UpdateShareResult> {
+    if (!user || !shareId) {
+      throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
+    }
+
+    try {
+      const SharedLink = mongoose.models.SharedLink as Model<t.ISharedLink>;
+      const Message = mongoose.models.Message as SchemaWithMeiliMethods;
+      const share = (await SharedLink.findOne({ shareId, user })
+        .select('-_id -__v -user')
+        .lean()) as t.ISharedLink | null;
+
+      if (!share) {
+        throw new ShareServiceError('Share not found', 'SHARE_NOT_FOUND');
+      }
+
+      const updatedMessages = await Message.find({ conversationId: share.conversationId, user })
+        .sort({ createdAt: 1 })
+        .lean();
+
+      const newShareId = nanoid();
+      const update = {
+        messages: updatedMessages,
+        user,
+        shareId: newShareId,
+      };
+
+      const updatedShare = (await SharedLink.findOneAndUpdate({ shareId, user }, update, {
+        new: true,
+        upsert: false,
+        runValidators: true,
+      }).lean()) as t.ISharedLink | null;
+
+      if (!updatedShare) {
+        throw new ShareServiceError('Share update failed', 'SHARE_UPDATE_ERROR');
+      }
+
+      anonymizeConvo(updatedShare);
+
+      return { shareId: newShareId, conversationId: updatedShare.conversationId };
+    } catch (error) {
+      logger.error('[updateSharedLink] Error updating shared link', {
+        error: error instanceof Error ? error.message : 'Unknown error',
+        user,
+        shareId,
+      });
+      throw new ShareServiceError(
+        error instanceof ShareServiceError ? error.message : 'Error updating shared link',
+        error instanceof ShareServiceError ? error.code : 'SHARE_UPDATE_ERROR',
+      );
+    }
+  }
+
+  /**
+   * Delete a shared link
+   */
+  async function deleteSharedLink(
+    user: string,
+    shareId: string,
+  ): Promise<t.DeleteShareResult | null> {
+    if (!user || !shareId) {
+      throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
+    }
+
+    try {
+      const SharedLink = mongoose.models.SharedLink as Model<t.ISharedLink>;
+      const result = await SharedLink.findOneAndDelete({ shareId, user }).lean();
+
+      if (!result) {
+        return null;
+      }
+
+      return {
+        success: true,
+        shareId,
+        message: 'Share deleted successfully',
+      };
+    } catch (error) {
+      logger.error('[deleteSharedLink] Error deleting shared link', {
+        error: error instanceof Error ? error.message : 'Unknown error',
+        user,
+        shareId,
+      });
+      throw new ShareServiceError('Error deleting shared link', 'SHARE_DELETE_ERROR');
+    }
+  }
+
+  // Return all methods
+  return {
+    getSharedLink,
+    getSharedLinks,
+    createSharedLink,
+    updateSharedLink,
+    deleteSharedLink,
+    getSharedMessages,
+    deleteAllSharedLinks,
+  };
+}
+
+export type ShareMethods = ReturnType<typeof createShareMethods>;
diff --git a/packages/data-schemas/src/models/plugins/mongoMeili.ts b/packages/data-schemas/src/models/plugins/mongoMeili.ts
index 77597cdf63..d44dfd806b 100644
--- a/packages/data-schemas/src/models/plugins/mongoMeili.ts
+++ b/packages/data-schemas/src/models/plugins/mongoMeili.ts
@@ -1,5 +1,6 @@
 import _ from 'lodash';
-import { MeiliSearch, Index } from 'meilisearch';
+import { MeiliSearch } from 'meilisearch';
+import type { SearchResponse, Index } from 'meilisearch';
 import type {
   CallbackWithoutResultAndOptionalError,
   FilterQuery,
@@ -9,6 +10,7 @@ import type {
   Types,
   Model,
 } from 'mongoose';
+import type { IConversation, IMessage } from '~/types';
 import logger from '~/config/meiliLogger';
 
 interface MongoMeiliOptions {
@@ -29,7 +31,7 @@ interface ContentItem {
   text?: string;
 }
 
-interface DocumentWithMeiliIndex extends Document {
+interface _DocumentWithMeiliIndex extends Document {
   _meiliIndex?: boolean;
   preprocessObjectForIndex?: () => Record<string, unknown>;
   addObjectToMeili?: (next: CallbackWithoutResultAndOptionalError) => Promise<void>;
@@ -38,19 +40,18 @@ interface DocumentWithMeiliIndex extends Document {
   postSaveHook?: (next: CallbackWithoutResultAndOptionalError) => void;
   postUpdateHook?: (next: CallbackWithoutResultAndOptionalError) => void;
   postRemoveHook?: (next: CallbackWithoutResultAndOptionalError) => void;
-  conversationId?: string;
-  content?: ContentItem[];
-  messageId?: string;
-  unfinished?: boolean;
-  messages?: unknown[];
-  title?: string;
-  toJSON(): Record<string, unknown>;
 }
 
-interface SchemaWithMeiliMethods extends Model<DocumentWithMeiliIndex> {
+export type DocumentWithMeiliIndex = _DocumentWithMeiliIndex & IConversation & Partial<IMessage>;
+
+export interface SchemaWithMeiliMethods extends Model<DocumentWithMeiliIndex> {
   syncWithMeili(): Promise<void>;
   setMeiliIndexSettings(settings: Record<string, unknown>): Promise<unknown>;
-  meiliSearch(q: string, params: Record<string, unknown>, populate: boolean): Promise<unknown>;
+  meiliSearch(
+    q: string,
+    params?: Record<string, unknown>,
+    populate?: boolean,
+  ): Promise<SearchResponse<MeiliIndexable, Record<string, unknown>>>;
 }
 
 // Environment flags
@@ -247,7 +248,7 @@ const createMeiliMongooseModel = ({
       q: string,
       params: Record<string, unknown>,
       populate: boolean,
-    ): Promise<unknown> {
+    ): Promise<SearchResponse<MeiliIndexable, Record<string, unknown>>> {
       const data = await index.search(q, params);
 
       if (populate) {
diff --git a/packages/data-schemas/src/schema/promptGroup.ts b/packages/data-schemas/src/schema/promptGroup.ts
index b13a83724f..ed5f88fe0e 100644
--- a/packages/data-schemas/src/schema/promptGroup.ts
+++ b/packages/data-schemas/src/schema/promptGroup.ts
@@ -63,11 +63,11 @@ const promptGroupSchema = new Schema<IPromptGroupDocument>(
       type: String,
       index: true,
       validate: {
-        validator: function (v: unknown): boolean {
+        validator: function (v: string | undefined | null): boolean {
           return v === undefined || v === null || v === '' || /^[a-z0-9-]+$/.test(v);
         },
-        message: (props: unknown) =>
-          `${props.value} is not a valid command. Only lowercase alphanumeric characters and hyphens are allowed.`,
+        message: (props: { value?: string } | undefined) =>
+          `${props?.value ?? 'Value'} is not a valid command. Only lowercase alphanumeric characters and hyphens are allowed.`,
       },
       maxlength: [
         Constants.COMMANDS_MAX_LENGTH as number,
diff --git a/packages/data-schemas/src/types/index.ts b/packages/data-schemas/src/types/index.ts
index 7b7037c8ed..3dfe1334e5 100644
--- a/packages/data-schemas/src/types/index.ts
+++ b/packages/data-schemas/src/types/index.ts
@@ -13,5 +13,6 @@ export * from './role';
 export * from './action';
 export * from './assistant';
 export * from './file';
+export * from './share';
 /* Memories */
 export * from './memory';
diff --git a/packages/data-schemas/src/types/share.ts b/packages/data-schemas/src/types/share.ts
new file mode 100644
index 0000000000..3db1a360c6
--- /dev/null
+++ b/packages/data-schemas/src/types/share.ts
@@ -0,0 +1,66 @@
+import type { Types } from 'mongoose';
+import type { IMessage } from './message';
+
+export interface ISharedLink {
+  _id?: Types.ObjectId;
+  conversationId: string;
+  title?: string;
+  user?: string;
+  messages?: Types.ObjectId[];
+  shareId?: string;
+  isPublic: boolean;
+  createdAt?: Date;
+  updatedAt?: Date;
+}
+
+export interface ShareServiceError extends Error {
+  code: string;
+}
+
+export interface SharedLinksResult {
+  links: Array<{
+    shareId: string;
+    title: string;
+    isPublic: boolean;
+    createdAt: Date;
+    conversationId: string;
+  }>;
+  nextCursor?: Date;
+  hasNextPage: boolean;
+}
+
+export interface SharedMessagesResult {
+  conversationId: string;
+  messages: Array<IMessage>;
+  shareId: string;
+  title?: string;
+  isPublic: boolean;
+  createdAt?: Date;
+  updatedAt?: Date;
+}
+
+export interface CreateShareResult {
+  shareId: string;
+  conversationId: string;
+}
+
+export interface UpdateShareResult {
+  shareId: string;
+  conversationId: string;
+}
+
+export interface DeleteShareResult {
+  success: boolean;
+  shareId: string;
+  message: string;
+}
+
+export interface GetShareLinkResult {
+  shareId: string | null;
+  success: boolean;
+}
+
+export interface DeleteAllSharesResult {
+  message: string;
+  deletedCount: number;
+}

From b412455e9d8e5c8cb500c1d96d735a6bfc2d2d50 Mon Sep 17 00:00:00 2001
From: Ruben Talstra <RubenTalstra1211@outlook.com>
Date: Sun, 15 Jun 2025 21:08:31 +0200
Subject: [PATCH 34/49] =?UTF-8?q?=F0=9F=9A=AE=20feat:=20Enhance=20"Delete?=
 =?UTF-8?q?=20User"=20Script=20(#7899)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🔧 fix: Enhance user deletion script to allow deep deletion of related data

* 🔧 fix: Update user deletion script to confirm deep deletion of transaction history

* 🔧 fix: Refactor user deletion script to use graceful exit and ensure deep deletion of related data

* Update config/delete-user.js

is a good idea

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 config/delete-user.js | 124 ++++++++++++++++++++++++++++++++----------
 1 file changed, 95 insertions(+), 29 deletions(-)

diff --git a/config/delete-user.js b/config/delete-user.js
index 36f34fb21b..51caa7ce3b 100644
--- a/config/delete-user.js
+++ b/config/delete-user.js
@@ -1,50 +1,116 @@
+#!/usr/bin/env node
 const path = require('path');
 const mongoose = require(path.resolve(__dirname, '..', 'api', 'node_modules', 'mongoose'));
-const { User } = require('@librechat/data-schemas').createModels(mongoose);
+const {
+  User,
+  Agent,
+  Assistant,
+  Balance,
+  Transaction,
+  ConversationTag,
+  Conversation,
+  Message,
+  File,
+  Key,
+  MemoryEntry,
+  PluginAuth,
+  Prompt,
+  PromptGroup,
+  Preset,
+  Session,
+  SharedLink,
+  ToolCall,
+  Token,
+} = require('@librechat/data-schemas').createModels(mongoose);
 require('module-alias')({ base: path.resolve(__dirname, '..', 'api') });
 const { askQuestion, silentExit } = require('./helpers');
 const connect = require('./connect');
 
+async function gracefulExit(code = 0) {
+  try {
+    await mongoose.disconnect();
+  } catch (err) {
+    console.error('Error disconnecting from MongoDB:', err);
+  }
+  silentExit(code);
+}
+
 (async () => {
   await connect();
 
-  /**
-   * Show the welcome / help menu
-   */
   console.purple('---------------');
-  console.purple('Deleting a user');
+  console.purple('Deleting a user and all related data');
   console.purple('---------------');
 
-  let email = '';
-  if (process.argv.length >= 3) {
-    email = process.argv[2];
-  } else {
-    email = await askQuestion('Email:');
-  }
-  let user = await User.findOne({ email: email });
-  if (user !== null) {
-    if ((await askQuestion(`Delete user ${user}?`)) === 'y') {
-      user = await User.findOneAndDelete({ _id: user._id });
-      if (user !== null) {
-        console.yellow(`Deleted user ${user}`);
-      } else {
-        console.yellow(`Couldn't delete user with email ${email}`);
-      }
-    }
-  } else {
-    console.yellow(`Didn't find user with email ${email}`);
+  // 1) Get email
+  let email = process.argv[2]?.trim();
+  if (!email) {
+    email = (await askQuestion('Email:')).trim();
   }
 
-  silentExit(0);
-})();
+  // 2) Find user
+  const user = await User.findOne({ email: email.toLowerCase() });
+  if (!user) {
+    console.yellow(`No user found with email "${email}"`);
+    return gracefulExit(0);
+  }
 
-process.on('uncaughtException', (err) => {
+  // 3) Confirm full deletion
+  const confirmAll = await askQuestion(
+    `Really delete user ${user.email} (${user._id}) and ALL their data? (y/N)`,
+  );
+  if (confirmAll.toLowerCase() !== 'y') {
+    console.yellow('Aborted.');
+    return gracefulExit(0);
+  }
+
+  // 4) Ask specifically about transactions
+  const confirmTx = await askQuestion('Also delete all transaction history for this user? (y/N)');
+  const deleteTx = confirmTx.toLowerCase() === 'y';
+
+  const uid = user._id.toString();
+
+  // 5) Build and run deletion tasks
+  const tasks = [
+    Agent.deleteMany({ author: uid }),
+    Assistant.deleteMany({ user: uid }),
+    Balance.deleteMany({ user: uid }),
+    ConversationTag.deleteMany({ user: uid }),
+    Conversation.deleteMany({ user: uid }),
+    Message.deleteMany({ user: uid }),
+    File.deleteMany({ user: uid }),
+    Key.deleteMany({ userId: uid }),
+    MemoryEntry.deleteMany({ userId: uid }),
+    PluginAuth.deleteMany({ userId: uid }),
+    Prompt.deleteMany({ author: uid }),
+    PromptGroup.deleteMany({ author: uid }),
+    Preset.deleteMany({ user: uid }),
+    Session.deleteMany({ user: uid }),
+    SharedLink.deleteMany({ user: uid }),
+    ToolCall.deleteMany({ user: uid }),
+    Token.deleteMany({ userId: uid }),
+  ];
+
+  if (deleteTx) {
+    tasks.push(Transaction.deleteMany({ user: uid }));
+  }
+
+  await Promise.all(tasks);
+
+  // 6) Finally delete the user document itself
+  await User.deleteOne({ _id: uid });
+
+  console.green(`✔ Successfully deleted user ${email} and all associated data.`);
+  if (!deleteTx) {
+    console.yellow('⚠️ Transaction history was retained.');
+  }
+
+  return gracefulExit(0);
+})().catch(async (err) => {
   if (!err.message.includes('fetch failed')) {
     console.error('There was an uncaught error:');
     console.error(err);
-  }
-
-  if (!err.message.includes('fetch failed')) {
+    await mongoose.disconnect();
     process.exit(1);
   }
 });

From ec7370dfe9a9e6a739f9de36de635e7e2d0433bf Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Tue, 17 Jun 2025 13:50:33 -0400
Subject: [PATCH 35/49] =?UTF-8?q?=F0=9F=AA=90=20feat:=20MCP=20OAuth=202.0?=
 =?UTF-8?q?=20Discovery=20Support=20(#7924)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Update @modelcontextprotocol/sdk to version 1.12.3 in package.json and package-lock.json

- Bump version of @modelcontextprotocol/sdk to 1.12.3 to incorporate recent updates.
- Update dependencies for ajv and cross-spawn to their latest versions.
- Add ajv as a new dependency in the sdk module.
- Include json-schema-traverse as a new dependency in the sdk module.

* feat: @librechat/auth

* feat: Add crypto module exports to auth package

- Introduced a new crypto module by creating index.ts in the crypto directory.
- Updated the main index.ts of the auth package to export from the new crypto module.

* feat: Update package dependencies and build scripts for auth package

- Added @librechat/auth as a dependency in package.json and package-lock.json.
- Updated build scripts to include the auth package in both frontend and bun build processes.
- Removed unused mongoose and openid-client dependencies from package-lock.json for cleaner dependency management.

* refactor: Migrate crypto utility functions to @librechat/auth

- Replaced local crypto utility imports with the new @librechat/auth package across multiple files.
- Removed the obsolete crypto.js file and its exports.
- Updated relevant services and models to utilize the new encryption and decryption methods from @librechat/auth.

* feat: Enhance OAuth token handling and update dependencies in auth package

* chore: Remove Token model and TokenService due to restructuring of OAuth handling

- Deleted the Token.js model and TokenService.js, which were responsible for managing OAuth tokens.
- This change is part of a broader refactor to streamline OAuth token management and improve code organization.

* refactor: imports from '@librechat/auth' to '@librechat/api' and add OAuth token handling functionality

* refactor: Simplify logger usage in MCP and FlowStateManager classes

* chore: fix imports

* feat: Add OAuth configuration schema to MCP with token exchange method support

* feat: FIRST PASS Implement MCP OAuth flow with token management and error handling

- Added a new route for handling OAuth callbacks and token retrieval.
- Integrated OAuth token storage and retrieval mechanisms.
- Enhanced MCP connection to support automatic OAuth flow initiation on 401 errors.
- Implemented dynamic client registration and metadata discovery for OAuth.
- Updated MCPManager to manage OAuth tokens and handle authentication requirements.
- Introduced comprehensive logging for OAuth processes and error handling.

* refactor: Update MCPConnection and MCPManager to utilize new URL handling

- Added a `url` property to MCPConnection for better URL management.
- Refactored MCPManager to use the new `url` property instead of a deprecated method for OAuth handling.
- Changed logging from info to debug level for flow manager and token methods initialization.
- Improved comments for clarity on existing tokens and OAuth event listener setup.

* refactor: Improve connection timeout error messages in MCPConnection and MCPManager and use initTimeout for connection

- Updated the connection timeout error messages to include the duration of the timeout.
- Introduced a configurable `connectTimeout` variable in both MCPConnection and MCPManager for better flexibility.

* chore: cleanup MCP OAuth Token exchange handling; fix: erroneous use of flowsCache and remove verbose logs

* refactor: Update MCPManager and MCPTokenStorage to use TokenMethods for token management

- Removed direct token storage handling in MCPManager and replaced it with TokenMethods for better abstraction.
- Refactored MCPTokenStorage methods to accept parameters for token operations, enhancing flexibility and readability.
- Improved logging messages related to token persistence and retrieval processes.

* refactor: Update MCP OAuth handling to use static methods and improve flow management

- Refactored MCPOAuthHandler to utilize static methods for initiating and completing OAuth flows, enhancing clarity and reducing instance dependencies.
- Updated MCPManager to pass flowManager explicitly to OAuth handling methods, improving flexibility in flow state management.
- Enhanced comments and logging for better understanding of OAuth processes and flow state retrieval.

* refactor: Integrate token methods into createMCPTool for enhanced token management

* refactor: Change logging from info to debug level in MCPOAuthHandler for improved log management

* chore: clean up logging

* feat: first pass, auth URL from MCP OAuth flow

* chore: Improve logging format for OAuth authentication URL display

* chore: cleanup mcp manager comments

* feat: add connection reconnection logic in MCPManager

* refactor: reorganize token storage handling in MCP

- Moved token storage logic from MCPManager to a new MCPTokenStorage class for better separation of concerns.
- Updated imports to reflect the new token storage structure.
- Enhanced methods for storing, retrieving, updating, and deleting OAuth tokens, improving overall token management.

* chore: update comment for SYSTEM_USER_ID in MCPManager for clarity

* feat: implement refresh token functionality in MCP

- Added refresh token handling in MCPManager to support token renewal for both app-level and user-specific connections.
- Introduced a refreshTokens function to facilitate token refresh logic.
- Enhanced MCPTokenStorage to manage client information and refresh token processes.
- Updated logging for better traceability during token operations.

* chore: cleanup @librechat/auth

* feat: implement MCP server initialization in a separate service

- Added a new service to handle the initialization of MCP servers, improving code organization and readability.
- Refactored the server startup logic to utilize the new initializeMCP function.
- Removed redundant MCP initialization code from the main server file.

* fix: don't log auth url for user connections

* feat: enhance OAuth flow with success and error handling components

- Updated OAuth callback routes to redirect to new success and error pages instead of sending status messages.
- Introduced `OAuthSuccess` and `OAuthError` components to provide user feedback during authentication.
- Added localization support for success and error messages in the translation files.
- Implemented countdown functionality in the success component for a better user experience.

* fix: refresh token handling for user connections, add missing URL and methods

- add standard enum for system user id and helper for determining app-lvel vs. user-level connections

* refactor: update token handling in MCPManager and MCPTokenStorage

* fix: improve error logging in OAuth authentication handler

* fix: concurrency issues for both login url emission and concurrency of oauth flows for shared flows (same user, same server, multiple calls for same server)

* fix: properly fail shared flows for concurrent server calls and prevent duplication of tokens

* chore: remove unused auth package directory from update configuration

* ci: fix mocks in samlStrategy tests

* ci: add mcpConfig to AppService test setup

* chore: remove obsolete MCP OAuth implementation documentation

* fix: update build script for API to use correct command

* chore: bump version of @librechat/api to 1.2.4

* fix: update abort signal handling in createMCPTool function

* fix: add optional clientInfo parameter to refreshTokensFunction metadata

* refactor: replace app.locals.availableTools with getCachedTools in multiple services and controllers for improved tool management

* fix: concurrent refresh token handling issue

* refactor: add signal parameter to getUserConnection method for improved abort handling

* chore: JSDoc typing for `loadEphemeralAgent`

* refactor: update isConnectionActive method to use destructured parameters for improved readability

* feat: implement caching for MCP tools to handle app-level disconnects for loading list of tools

* ci: fix agent test
---
 api/app/clients/tools/util/handleTools.js     |   6 +-
 api/cache/getLogStores.js                     |   5 +
 api/config/index.js                           |   3 +-
 api/models/Agent.js                           |   9 +-
 api/models/Agent.spec.js                      |  67 +-
 api/models/Token.js                           |  42 --
 api/models/inviteUser.js                      |   2 +-
 api/server/controllers/PluginController.js    |  57 +-
 api/server/controllers/TwoFactorController.js |   2 +-
 api/server/controllers/agents/v1.js           |  13 +-
 api/server/controllers/assistants/v1.js       |  30 +-
 api/server/controllers/assistants/v2.js       |  20 +-
 api/server/index.js                           |  19 +-
 api/server/routes/actions.js                  | 118 +--
 api/server/routes/index.js                    |   2 +
 api/server/routes/mcp.js                      | 205 ++++++
 api/server/routes/oauth.js                    |   4 +-
 api/server/services/ActionService.js          |  37 +-
 api/server/services/AppService.js             |  14 +-
 api/server/services/AppService.spec.js        |  67 +-
 api/server/services/AuthService.js            |   5 +-
 api/server/services/Config/getCachedTools.js  | 258 +++++++
 api/server/services/Config/index.js           |   2 +
 api/server/services/MCP.js                    | 152 +++-
 api/server/services/PluginService.js          |   4 +-
 api/server/services/TokenService.js           | 195 -----
 api/server/services/ToolService.js            |   9 +-
 api/server/services/UserService.js            |   3 +-
 api/server/services/initializeMCP.js          |  54 ++
 api/server/services/twoFactorService.js       |   2 +-
 api/server/utils/index.js                     |   2 -
 api/strategies/openidStrategy.spec.js         |  11 +-
 api/strategies/samlStrategy.spec.js           |  42 +-
 api/typedefs.js                               |   7 +
 client/src/components/OAuth/OAuthError.tsx    |  72 ++
 client/src/components/OAuth/OAuthSuccess.tsx  |  47 ++
 client/src/components/OAuth/index.ts          |   2 +
 client/src/locales/en/translation.json        |  15 +-
 client/src/routes/index.tsx                   |  21 +-
 package-lock.json                             |  87 +--
 package.json                                  |   1 +
 packages/api/package.json                     |   4 +-
 packages/api/rollup.config.js                 |   3 +-
 .../api/src/crypto/encryption.ts              |  45 +-
 packages/api/src/crypto/index.ts              |   1 +
 packages/api/src/flow/manager.spec.ts         |   4 +-
 packages/api/src/flow/manager.ts              |  43 +-
 packages/api/src/index.ts                     |   5 +
 packages/api/src/mcp/connection.ts            | 222 ++++--
 packages/api/src/mcp/enum.ts                  |   6 +
 packages/api/src/mcp/manager.ts               | 676 +++++++++++++++---
 packages/api/src/mcp/oauth/handler.ts         | 603 ++++++++++++++++
 packages/api/src/mcp/oauth/index.ts           |   3 +
 packages/api/src/mcp/oauth/tokens.ts          | 382 ++++++++++
 packages/api/src/mcp/oauth/types.ts           |  98 +++
 packages/api/src/oauth/index.ts               |   1 +
 packages/api/src/oauth/tokens.ts              | 324 +++++++++
 packages/data-provider/src/config.ts          |   4 +
 packages/data-provider/src/mcp.ts             |  24 +
 packages/data-schemas/src/methods/index.ts    |   2 +-
 60 files changed, 3399 insertions(+), 764 deletions(-)
 delete mode 100644 api/models/Token.js
 create mode 100644 api/server/routes/mcp.js
 create mode 100644 api/server/services/Config/getCachedTools.js
 delete mode 100644 api/server/services/TokenService.js
 create mode 100644 api/server/services/initializeMCP.js
 create mode 100644 client/src/components/OAuth/OAuthError.tsx
 create mode 100644 client/src/components/OAuth/OAuthSuccess.tsx
 create mode 100644 client/src/components/OAuth/index.ts
 rename api/server/utils/crypto.js => packages/api/src/crypto/encryption.ts (81%)
 create mode 100644 packages/api/src/crypto/index.ts
 create mode 100644 packages/api/src/mcp/oauth/handler.ts
 create mode 100644 packages/api/src/mcp/oauth/index.ts
 create mode 100644 packages/api/src/mcp/oauth/tokens.ts
 create mode 100644 packages/api/src/mcp/oauth/types.ts
 create mode 100644 packages/api/src/oauth/index.ts
 create mode 100644 packages/api/src/oauth/tokens.ts

diff --git a/api/app/clients/tools/util/handleTools.js b/api/app/clients/tools/util/handleTools.js
index 51f0c87ef9..b5a40fc4a3 100644
--- a/api/app/clients/tools/util/handleTools.js
+++ b/api/app/clients/tools/util/handleTools.js
@@ -1,3 +1,4 @@
+const { logger } = require('@librechat/data-schemas');
 const { SerpAPI } = require('@langchain/community/tools/serpapi');
 const { Calculator } = require('@langchain/community/tools/calculator');
 const { EnvVar, createCodeExecutionTool, createSearchTool } = require('@librechat/agents');
@@ -29,8 +30,8 @@ const {
 const { primeFiles: primeCodeFiles } = require('~/server/services/Files/Code/process');
 const { createFileSearchTool, primeFiles: primeSearchFiles } = require('./fileSearch');
 const { loadAuthValues } = require('~/server/services/Tools/credentials');
+const { getCachedTools } = require('~/server/services/Config');
 const { createMCPTool } = require('~/server/services/MCP');
-const { logger } = require('~/config');
 
 const mcpToolPattern = new RegExp(`^.+${Constants.mcp_delimiter}.+$`);
 
@@ -236,7 +237,7 @@ const loadTools = async ({
 
   /** @type {Record<string, string>} */
   const toolContextMap = {};
-  const appTools = options.req?.app?.locals?.availableTools ?? {};
+  const appTools = (await getCachedTools({ includeGlobal: true })) ?? {};
 
   for (const tool of tools) {
     if (tool === Tools.execute_code) {
@@ -299,6 +300,7 @@ Current Date & Time: ${replaceSpecialVars({ text: '{{iso_datetime}}' })}
       requestedTools[tool] = async () =>
         createMCPTool({
           req: options.req,
+          res: options.res,
           toolKey: tool,
           model: agent?.model ?? model,
           provider: agent?.provider ?? endpoint,
diff --git a/api/cache/getLogStores.js b/api/cache/getLogStores.js
index 2478bf40d9..06cadf9f64 100644
--- a/api/cache/getLogStores.js
+++ b/api/cache/getLogStores.js
@@ -29,6 +29,10 @@ const roles = isRedisEnabled
   ? new Keyv({ store: keyvRedis })
   : new Keyv({ namespace: CacheKeys.ROLES });
 
+const mcpTools = isRedisEnabled
+  ? new Keyv({ store: keyvRedis })
+  : new Keyv({ namespace: CacheKeys.MCP_TOOLS });
+
 const audioRuns = isRedisEnabled
   ? new Keyv({ store: keyvRedis, ttl: Time.TEN_MINUTES })
   : new Keyv({ namespace: CacheKeys.AUDIO_RUNS, ttl: Time.TEN_MINUTES });
@@ -67,6 +71,7 @@ const openIdExchangedTokensCache = isRedisEnabled
 
 const namespaces = {
   [CacheKeys.ROLES]: roles,
+  [CacheKeys.MCP_TOOLS]: mcpTools,
   [CacheKeys.CONFIG_STORE]: config,
   [CacheKeys.PENDING_REQ]: pending_req,
   [ViolationTypes.BAN]: new Keyv({ store: keyvMongo, namespace: CacheKeys.BANS, ttl: duration }),
diff --git a/api/config/index.js b/api/config/index.js
index a02c75887e..2e69e87118 100644
--- a/api/config/index.js
+++ b/api/config/index.js
@@ -15,7 +15,7 @@ let flowManager = null;
  */
 function getMCPManager(userId) {
   if (!mcpManager) {
-    mcpManager = MCPManager.getInstance(logger);
+    mcpManager = MCPManager.getInstance();
   } else {
     mcpManager.checkIdleConnections(userId);
   }
@@ -30,7 +30,6 @@ function getFlowStateManager(flowsCache) {
   if (!flowManager) {
     flowManager = new FlowStateManager(flowsCache, {
       ttl: Time.ONE_MINUTE * 3,
-      logger,
     });
   }
   return flowManager;
diff --git a/api/models/Agent.js b/api/models/Agent.js
index 297604c444..d33ca8a8bf 100644
--- a/api/models/Agent.js
+++ b/api/models/Agent.js
@@ -11,6 +11,7 @@ const {
   removeAgentIdsFromProject,
   removeAgentFromAllProjects,
 } = require('./Project');
+const { getCachedTools } = require('~/server/services/Config');
 const getLogStores = require('~/cache/getLogStores');
 const { getActions } = require('./Action');
 const { Agent } = require('~/db/models');
@@ -55,12 +56,12 @@ const getAgent = async (searchParameter) => await Agent.findOne(searchParameter)
  * @param {string} params.agent_id
  * @param {string} params.endpoint
  * @param {import('@librechat/agents').ClientOptions} [params.model_parameters]
- * @returns {Agent|null} The agent document as a plain object, or null if not found.
+ * @returns {Promise<Agent|null>} The agent document as a plain object, or null if not found.
  */
-const loadEphemeralAgent = ({ req, agent_id, endpoint, model_parameters: _m }) => {
+const loadEphemeralAgent = async ({ req, agent_id, endpoint, model_parameters: _m }) => {
   const { model, ...model_parameters } = _m;
   /** @type {Record<string, FunctionTool>} */
-  const availableTools = req.app.locals.availableTools;
+  const availableTools = await getCachedTools({ includeGlobal: true });
   /** @type {TEphemeralAgent | null} */
   const ephemeralAgent = req.body.ephemeralAgent;
   const mcpServers = new Set(ephemeralAgent?.mcp);
@@ -111,7 +112,7 @@ const loadAgent = async ({ req, agent_id, endpoint, model_parameters }) => {
     return null;
   }
   if (agent_id === EPHEMERAL_AGENT_ID) {
-    return loadEphemeralAgent({ req, agent_id, endpoint, model_parameters });
+    return await loadEphemeralAgent({ req, agent_id, endpoint, model_parameters });
   }
   const agent = await getAgent({
     id: agent_id,
diff --git a/api/models/Agent.spec.js b/api/models/Agent.spec.js
index 1e18168147..0b0646f524 100644
--- a/api/models/Agent.spec.js
+++ b/api/models/Agent.spec.js
@@ -6,6 +6,10 @@ const originalEnv = {
 process.env.CREDS_KEY = '0123456789abcdef0123456789abcdef';
 process.env.CREDS_IV = '0123456789abcdef';
 
+jest.mock('~/server/services/Config', () => ({
+  getCachedTools: jest.fn(),
+}));
+
 const mongoose = require('mongoose');
 const { v4: uuidv4 } = require('uuid');
 const { agentSchema } = require('@librechat/data-schemas');
@@ -23,6 +27,7 @@ const {
   generateActionMetadataHash,
   revertAgentVersion,
 } = require('./Agent');
+const { getCachedTools } = require('~/server/services/Config');
 
 /**
  * @type {import('mongoose').Model<import('@librechat/data-schemas').IAgent>}
@@ -406,6 +411,7 @@ describe('models/Agent', () => {
     beforeAll(async () => {
       mongoServer = await MongoMemoryServer.create();
       const mongoUri = mongoServer.getUri();
+      Agent = mongoose.models.Agent || mongoose.model('Agent', agentSchema);
       await mongoose.connect(mongoUri);
     });
 
@@ -1546,6 +1552,12 @@ describe('models/Agent', () => {
     test('should test ephemeral agent loading logic', async () => {
       const { EPHEMERAL_AGENT_ID } = require('librechat-data-provider').Constants;
 
+      getCachedTools.mockResolvedValue({
+        tool1_mcp_server1: {},
+        tool2_mcp_server2: {},
+        another_tool: {},
+      });
+
       const mockReq = {
         user: { id: 'user123' },
         body: {
@@ -1556,15 +1568,6 @@ describe('models/Agent', () => {
             mcp: ['server1', 'server2'],
           },
         },
-        app: {
-          locals: {
-            availableTools: {
-              tool1_mcp_server1: {},
-              tool2_mcp_server2: {},
-              another_tool: {},
-            },
-          },
-        },
       };
 
       const result = await loadAgent({
@@ -1657,6 +1660,8 @@ describe('models/Agent', () => {
     test('should handle ephemeral agent with no MCP servers', async () => {
       const { EPHEMERAL_AGENT_ID } = require('librechat-data-provider').Constants;
 
+      getCachedTools.mockResolvedValue({});
+
       const mockReq = {
         user: { id: 'user123' },
         body: {
@@ -1667,11 +1672,6 @@ describe('models/Agent', () => {
             mcp: [],
           },
         },
-        app: {
-          locals: {
-            availableTools: {},
-          },
-        },
       };
 
       const result = await loadAgent({
@@ -1692,16 +1692,13 @@ describe('models/Agent', () => {
     test('should handle ephemeral agent with undefined ephemeralAgent in body', async () => {
       const { EPHEMERAL_AGENT_ID } = require('librechat-data-provider').Constants;
 
+      getCachedTools.mockResolvedValue({});
+
       const mockReq = {
         user: { id: 'user123' },
         body: {
           promptPrefix: 'Basic instructions',
         },
-        app: {
-          locals: {
-            availableTools: {},
-          },
-        },
       };
 
       const result = await loadAgent({
@@ -1734,6 +1731,13 @@ describe('models/Agent', () => {
         const { EPHEMERAL_AGENT_ID } = require('librechat-data-provider').Constants;
 
         const largeToolList = Array.from({ length: 100 }, (_, i) => `tool_${i}_mcp_server1`);
+        const availableTools = largeToolList.reduce((acc, tool) => {
+          acc[tool] = {};
+          return acc;
+        }, {});
+
+        getCachedTools.mockResolvedValue(availableTools);
+
         const mockReq = {
           user: { id: 'user123' },
           body: {
@@ -1744,14 +1748,6 @@ describe('models/Agent', () => {
               mcp: ['server1'],
             },
           },
-          app: {
-            locals: {
-              availableTools: largeToolList.reduce((acc, tool) => {
-                acc[tool] = {};
-                return acc;
-              }, {}),
-            },
-          },
         };
 
         const result = await loadAgent({
@@ -2272,6 +2268,13 @@ describe('models/Agent', () => {
     test('should handle loadEphemeralAgent with malformed MCP tool names', async () => {
       const { EPHEMERAL_AGENT_ID } = require('librechat-data-provider').Constants;
 
+      getCachedTools.mockResolvedValue({
+        malformed_tool_name: {}, // No mcp delimiter
+        tool__server1: {}, // Wrong delimiter
+        tool_mcp_server1: {}, // Correct format
+        tool_mcp_server2: {}, // Different server
+      });
+
       const mockReq = {
         user: { id: 'user123' },
         body: {
@@ -2282,16 +2285,6 @@ describe('models/Agent', () => {
             mcp: ['server1'],
           },
         },
-        app: {
-          locals: {
-            availableTools: {
-              malformed_tool_name: {}, // No mcp delimiter
-              tool__server1: {}, // Wrong delimiter
-              tool_mcp_server1: {}, // Correct format
-              tool_mcp_server2: {}, // Different server
-            },
-          },
-        },
       };
 
       const result = await loadAgent({
diff --git a/api/models/Token.js b/api/models/Token.js
deleted file mode 100644
index 6f130eb2c4..0000000000
--- a/api/models/Token.js
+++ /dev/null
@@ -1,42 +0,0 @@
-const { findToken, updateToken, createToken } = require('~/models');
-const { encryptV2 } = require('~/server/utils/crypto');
-
-/**
- * Handles the OAuth token by creating or updating the token.
- * @param {object} fields
- * @param {string} fields.userId - The user's ID.
- * @param {string} fields.token - The full token to store.
- * @param {string} fields.identifier - Unique, alternative identifier for the token.
- * @param {number} fields.expiresIn - The number of seconds until the token expires.
- * @param {object} fields.metadata - Additional metadata to store with the token.
- * @param {string} [fields.type="oauth"] - The type of token. Default is 'oauth'.
- */
-async function handleOAuthToken({
-  token,
-  userId,
-  identifier,
-  expiresIn,
-  metadata,
-  type = 'oauth',
-}) {
-  const encrypedToken = await encryptV2(token);
-  const tokenData = {
-    type,
-    userId,
-    metadata,
-    identifier,
-    token: encrypedToken,
-    expiresIn: parseInt(expiresIn, 10) || 3600,
-  };
-
-  const existingToken = await findToken({ userId, identifier });
-  if (existingToken) {
-    return await updateToken({ identifier }, tokenData);
-  } else {
-    return await createToken(tokenData);
-  }
-}
-
-module.exports = {
-  handleOAuthToken,
-};
diff --git a/api/models/inviteUser.js b/api/models/inviteUser.js
index 9f35b3f02b..eeb42841bf 100644
--- a/api/models/inviteUser.js
+++ b/api/models/inviteUser.js
@@ -1,6 +1,6 @@
 const mongoose = require('mongoose');
+const { getRandomValues } = require('@librechat/api');
 const { logger, hashToken } = require('@librechat/data-schemas');
-const { getRandomValues } = require('~/server/utils/crypto');
 const { createToken, findToken } = require('~/models');
 
 /**
diff --git a/api/server/controllers/PluginController.js b/api/server/controllers/PluginController.js
index 674e36002a..98e9cbfc45 100644
--- a/api/server/controllers/PluginController.js
+++ b/api/server/controllers/PluginController.js
@@ -1,8 +1,9 @@
+const { logger } = require('@librechat/data-schemas');
 const { CacheKeys, AuthType } = require('librechat-data-provider');
+const { getCustomConfig, getCachedTools } = require('~/server/services/Config');
 const { getToolkitKey } = require('~/server/services/ToolService');
-const { getCustomConfig } = require('~/server/services/Config');
+const { getMCPManager, getFlowStateManager } = require('~/config');
 const { availableTools } = require('~/app/clients/tools');
-const { getMCPManager } = require('~/config');
 const { getLogStores } = require('~/cache');
 
 /**
@@ -84,6 +85,45 @@ const getAvailablePluginsController = async (req, res) => {
   }
 };
 
+function createServerToolsCallback() {
+  /**
+   * @param {string} serverName
+   * @param {TPlugin[] | null} serverTools
+   */
+  return async function (serverName, serverTools) {
+    try {
+      const mcpToolsCache = getLogStores(CacheKeys.MCP_TOOLS);
+      if (!serverName || !mcpToolsCache) {
+        return;
+      }
+      await mcpToolsCache.set(serverName, serverTools);
+      logger.debug(`MCP tools for ${serverName} added to cache.`);
+    } catch (error) {
+      logger.error('Error retrieving MCP tools from cache:', error);
+    }
+  };
+}
+
+function createGetServerTools() {
+  /**
+   * Retrieves cached server tools
+   * @param {string} serverName
+   * @returns {Promise<TPlugin[] | null>}
+   */
+  return async function (serverName) {
+    try {
+      const mcpToolsCache = getLogStores(CacheKeys.MCP_TOOLS);
+      if (!mcpToolsCache) {
+        return null;
+      }
+      return await mcpToolsCache.get(serverName);
+    } catch (error) {
+      logger.error('Error retrieving MCP tools from cache:', error);
+      return null;
+    }
+  };
+}
+
 /**
  * Retrieves and returns a list of available tools, either from a cache or by reading a plugin manifest file.
  *
@@ -109,7 +149,16 @@ const getAvailableTools = async (req, res) => {
     const customConfig = await getCustomConfig();
     if (customConfig?.mcpServers != null) {
       const mcpManager = getMCPManager();
-      pluginManifest = await mcpManager.loadManifestTools(pluginManifest);
+      const flowsCache = getLogStores(CacheKeys.FLOWS);
+      const flowManager = flowsCache ? getFlowStateManager(flowsCache) : null;
+      const serverToolsCallback = createServerToolsCallback();
+      const getServerTools = createGetServerTools();
+      const mcpTools = await mcpManager.loadManifestTools({
+        flowManager,
+        serverToolsCallback,
+        getServerTools,
+      });
+      pluginManifest = [...mcpTools, ...pluginManifest];
     }
 
     /** @type {TPlugin[]} */
@@ -123,7 +172,7 @@ const getAvailableTools = async (req, res) => {
       }
     });
 
-    const toolDefinitions = req.app.locals.availableTools;
+    const toolDefinitions = await getCachedTools({ includeGlobal: true });
     const tools = authenticatedPlugins.filter(
       (plugin) =>
         toolDefinitions[plugin.pluginKey] !== undefined ||
diff --git a/api/server/controllers/TwoFactorController.js b/api/server/controllers/TwoFactorController.js
index 6e22db2e5c..44baf92ee7 100644
--- a/api/server/controllers/TwoFactorController.js
+++ b/api/server/controllers/TwoFactorController.js
@@ -1,3 +1,4 @@
+const { encryptV3 } = require('@librechat/api');
 const { logger } = require('@librechat/data-schemas');
 const {
   verifyTOTP,
@@ -7,7 +8,6 @@ const {
   generateBackupCodes,
 } = require('~/server/services/twoFactorService');
 const { getUserById, updateUser } = require('~/models');
-const { encryptV3 } = require('~/server/utils/crypto');
 
 const safeAppTitle = (process.env.APP_TITLE || 'LibreChat').replace(/\s+/g, '');
 
diff --git a/api/server/controllers/agents/v1.js b/api/server/controllers/agents/v1.js
index 38a058b540..18bd7190f0 100644
--- a/api/server/controllers/agents/v1.js
+++ b/api/server/controllers/agents/v1.js
@@ -1,9 +1,9 @@
 const fs = require('fs').promises;
 const { nanoid } = require('nanoid');
+const { logger } = require('@librechat/data-schemas');
 const {
   Tools,
   Constants,
-  FileContext,
   FileSources,
   SystemRoles,
   EToolResources,
@@ -16,16 +16,16 @@ const {
   deleteAgent,
   getListAgents,
 } = require('~/models/Agent');
-const { uploadImageBuffer, filterFile } = require('~/server/services/Files/process');
 const { getStrategyFunctions } = require('~/server/services/Files/strategies');
 const { resizeAvatar } = require('~/server/services/Files/images/avatar');
 const { refreshS3Url } = require('~/server/services/Files/S3/crud');
+const { filterFile } = require('~/server/services/Files/process');
 const { updateAction, getActions } = require('~/models/Action');
+const { getCachedTools } = require('~/server/services/Config');
 const { updateAgentProjects } = require('~/models/Agent');
 const { getProjectByName } = require('~/models/Project');
-const { deleteFileByFilter } = require('~/models/File');
 const { revertAgentVersion } = require('~/models/Agent');
-const { logger } = require('~/config');
+const { deleteFileByFilter } = require('~/models/File');
 
 const systemTools = {
   [Tools.execute_code]: true,
@@ -47,8 +47,9 @@ const createAgentHandler = async (req, res) => {
 
     agentData.tools = [];
 
+    const availableTools = await getCachedTools({ includeGlobal: true });
     for (const tool of tools) {
-      if (req.app.locals.availableTools[tool]) {
+      if (availableTools[tool]) {
         agentData.tools.push(tool);
       }
 
@@ -445,7 +446,7 @@ const uploadAgentAvatarHandler = async (req, res) => {
     try {
       await fs.unlink(req.file.path);
       logger.debug('[/:agent_id/avatar] Temp. image upload file deleted');
-    } catch (error) {
+    } catch {
       logger.debug('[/:agent_id/avatar] Temp. image upload file already deleted');
     }
   }
diff --git a/api/server/controllers/assistants/v1.js b/api/server/controllers/assistants/v1.js
index 8fb73167c1..e723cda4fc 100644
--- a/api/server/controllers/assistants/v1.js
+++ b/api/server/controllers/assistants/v1.js
@@ -1,4 +1,5 @@
 const fs = require('fs').promises;
+const { logger } = require('@librechat/data-schemas');
 const { FileContext } = require('librechat-data-provider');
 const { uploadImageBuffer, filterFile } = require('~/server/services/Files/process');
 const validateAuthor = require('~/server/middleware/assistants/validateAuthor');
@@ -6,9 +7,9 @@ const { getStrategyFunctions } = require('~/server/services/Files/strategies');
 const { deleteAssistantActions } = require('~/server/services/ActionService');
 const { updateAssistantDoc, getAssistants } = require('~/models/Assistant');
 const { getOpenAIClient, fetchAssistants } = require('./helpers');
+const { getCachedTools } = require('~/server/services/Config');
 const { manifestToolMap } = require('~/app/clients/tools');
 const { deleteFileByFilter } = require('~/models/File');
-const { logger } = require('~/config');
 
 /**
  * Create an assistant.
@@ -30,21 +31,20 @@ const createAssistant = async (req, res) => {
     delete assistantData.conversation_starters;
     delete assistantData.append_current_datetime;
 
+    const toolDefinitions = await getCachedTools({ includeGlobal: true });
+
     assistantData.tools = tools
       .map((tool) => {
         if (typeof tool !== 'string') {
           return tool;
         }
 
-        const toolDefinitions = req.app.locals.availableTools;
         const toolDef = toolDefinitions[tool];
         if (!toolDef && manifestToolMap[tool] && manifestToolMap[tool].toolkit === true) {
-          return (
-            Object.entries(toolDefinitions)
-              .filter(([key]) => key.startsWith(`${tool}_`))
-              // eslint-disable-next-line no-unused-vars
-              .map(([_, val]) => val)
-          );
+          return Object.entries(toolDefinitions)
+            .filter(([key]) => key.startsWith(`${tool}_`))
+
+            .map(([_, val]) => val);
         }
 
         return toolDef;
@@ -135,21 +135,21 @@ const patchAssistant = async (req, res) => {
       append_current_datetime,
       ...updateData
     } = req.body;
+
+    const toolDefinitions = await getCachedTools({ includeGlobal: true });
+
     updateData.tools = (updateData.tools ?? [])
       .map((tool) => {
         if (typeof tool !== 'string') {
           return tool;
         }
 
-        const toolDefinitions = req.app.locals.availableTools;
         const toolDef = toolDefinitions[tool];
         if (!toolDef && manifestToolMap[tool] && manifestToolMap[tool].toolkit === true) {
-          return (
-            Object.entries(toolDefinitions)
-              .filter(([key]) => key.startsWith(`${tool}_`))
-              // eslint-disable-next-line no-unused-vars
-              .map(([_, val]) => val)
-          );
+          return Object.entries(toolDefinitions)
+            .filter(([key]) => key.startsWith(`${tool}_`))
+
+            .map(([_, val]) => val);
         }
 
         return toolDef;
diff --git a/api/server/controllers/assistants/v2.js b/api/server/controllers/assistants/v2.js
index 3bf83a626f..98441ba70a 100644
--- a/api/server/controllers/assistants/v2.js
+++ b/api/server/controllers/assistants/v2.js
@@ -1,10 +1,11 @@
+const { logger } = require('@librechat/data-schemas');
 const { ToolCallTypes } = require('librechat-data-provider');
 const validateAuthor = require('~/server/middleware/assistants/validateAuthor');
 const { validateAndUpdateTool } = require('~/server/services/ActionService');
+const { getCachedTools } = require('~/server/services/Config');
 const { updateAssistantDoc } = require('~/models/Assistant');
 const { manifestToolMap } = require('~/app/clients/tools');
 const { getOpenAIClient } = require('./helpers');
-const { logger } = require('~/config');
 
 /**
  * Create an assistant.
@@ -27,21 +28,20 @@ const createAssistant = async (req, res) => {
     delete assistantData.conversation_starters;
     delete assistantData.append_current_datetime;
 
+    const toolDefinitions = await getCachedTools({ includeGlobal: true });
+
     assistantData.tools = tools
       .map((tool) => {
         if (typeof tool !== 'string') {
           return tool;
         }
 
-        const toolDefinitions = req.app.locals.availableTools;
         const toolDef = toolDefinitions[tool];
         if (!toolDef && manifestToolMap[tool] && manifestToolMap[tool].toolkit === true) {
-          return (
-            Object.entries(toolDefinitions)
-              .filter(([key]) => key.startsWith(`${tool}_`))
-              // eslint-disable-next-line no-unused-vars
-              .map(([_, val]) => val)
-          );
+          return Object.entries(toolDefinitions)
+            .filter(([key]) => key.startsWith(`${tool}_`))
+
+            .map(([_, val]) => val);
         }
 
         return toolDef;
@@ -125,13 +125,13 @@ const updateAssistant = async ({ req, openai, assistant_id, updateData }) => {
 
   let hasFileSearch = false;
   for (const tool of updateData.tools ?? []) {
-    const toolDefinitions = req.app.locals.availableTools;
+    const toolDefinitions = await getCachedTools({ includeGlobal: true });
     let actualTool = typeof tool === 'string' ? toolDefinitions[tool] : tool;
 
     if (!actualTool && manifestToolMap[tool] && manifestToolMap[tool].toolkit === true) {
       actualTool = Object.entries(toolDefinitions)
         .filter(([key]) => key.startsWith(`${tool}_`))
-        // eslint-disable-next-line no-unused-vars
+
         .map(([_, val]) => val);
     } else if (!actualTool) {
       continue;
diff --git a/api/server/index.js b/api/server/index.js
index a04c339b0f..b1132873c7 100644
--- a/api/server/index.js
+++ b/api/server/index.js
@@ -1,22 +1,22 @@
 require('dotenv').config();
+const fs = require('fs');
 const path = require('path');
 require('module-alias')({ base: path.resolve(__dirname, '..') });
 const cors = require('cors');
 const axios = require('axios');
 const express = require('express');
-const compression = require('compression');
 const passport = require('passport');
-const mongoSanitize = require('express-mongo-sanitize');
-const fs = require('fs');
+const compression = require('compression');
 const cookieParser = require('cookie-parser');
+const { isEnabled } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
+const mongoSanitize = require('express-mongo-sanitize');
 const { connectDb, indexSync } = require('~/db');
 
-const { jwtLogin, passportLogin } = require('~/strategies');
-const { isEnabled } = require('~/server/utils');
-const { ldapLogin } = require('~/strategies');
-const { logger } = require('~/config');
 const validateImageRequest = require('./middleware/validateImageRequest');
+const { jwtLogin, ldapLogin, passportLogin } = require('~/strategies');
 const errorController = require('./controllers/ErrorController');
+const initializeMCP = require('./services/initializeMCP');
 const configureSocialLogins = require('./socialLogins');
 const AppService = require('./services/AppService');
 const staticCache = require('./utils/staticCache');
@@ -119,6 +119,7 @@ const startServer = async () => {
   app.use('/api/bedrock', routes.bedrock);
   app.use('/api/memories', routes.memories);
   app.use('/api/tags', routes.tags);
+  app.use('/api/mcp', routes.mcp);
 
   app.use((req, res) => {
     res.set({
@@ -142,6 +143,8 @@ const startServer = async () => {
     } else {
       logger.info(`Server listening at http://${host == '0.0.0.0' ? 'localhost' : host}:${port}`);
     }
+
+    initializeMCP(app);
   });
 };
 
@@ -184,5 +187,5 @@ process.on('uncaughtException', (err) => {
   process.exit(1);
 });
 
-// export app for easier testing purposes
+/** Export app for easier testing purposes */
 module.exports = app;
diff --git a/api/server/routes/actions.js b/api/server/routes/actions.js
index 242e52e4ae..9f94f617ce 100644
--- a/api/server/routes/actions.js
+++ b/api/server/routes/actions.js
@@ -1,8 +1,10 @@
 const express = require('express');
 const jwt = require('jsonwebtoken');
+const { getAccessToken } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const { CacheKeys } = require('librechat-data-provider');
-const { getAccessToken } = require('~/server/services/TokenService');
-const { logger, getFlowStateManager } = require('~/config');
+const { findToken, updateToken, createToken } = require('~/models');
+const { getFlowStateManager } = require('~/config');
 const { getLogStores } = require('~/cache');
 
 const router = express.Router();
@@ -28,18 +30,19 @@ router.get('/:action_id/oauth/callback', async (req, res) => {
     try {
       decodedState = jwt.verify(state, JWT_SECRET);
     } catch (err) {
+      logger.error('Error verifying state parameter:', err);
       await flowManager.failFlow(identifier, 'oauth', 'Invalid or expired state parameter');
-      return res.status(400).send('Invalid or expired state parameter');
+      return res.redirect('/oauth/error?error=invalid_state');
     }
 
     if (decodedState.action_id !== action_id) {
       await flowManager.failFlow(identifier, 'oauth', 'Mismatched action ID in state parameter');
-      return res.status(400).send('Mismatched action ID in state parameter');
+      return res.redirect('/oauth/error?error=invalid_state');
     }
 
     if (!decodedState.user) {
       await flowManager.failFlow(identifier, 'oauth', 'Invalid user ID in state parameter');
-      return res.status(400).send('Invalid user ID in state parameter');
+      return res.redirect('/oauth/error?error=invalid_state');
     }
     identifier = `${decodedState.user}:${action_id}`;
     const flowState = await flowManager.getFlowState(identifier, 'oauth');
@@ -47,91 +50,34 @@ router.get('/:action_id/oauth/callback', async (req, res) => {
       throw new Error('OAuth flow not found');
     }
 
-    const tokenData = await getAccessToken({
-      code,
-      userId: decodedState.user,
-      identifier,
-      client_url: flowState.metadata.client_url,
-      redirect_uri: flowState.metadata.redirect_uri,
-      token_exchange_method: flowState.metadata.token_exchange_method,
-      /** Encrypted values */
-      encrypted_oauth_client_id: flowState.metadata.encrypted_oauth_client_id,
-      encrypted_oauth_client_secret: flowState.metadata.encrypted_oauth_client_secret,
-    });
+    const tokenData = await getAccessToken(
+      {
+        code,
+        userId: decodedState.user,
+        identifier,
+        client_url: flowState.metadata.client_url,
+        redirect_uri: flowState.metadata.redirect_uri,
+        token_exchange_method: flowState.metadata.token_exchange_method,
+        /** Encrypted values */
+        encrypted_oauth_client_id: flowState.metadata.encrypted_oauth_client_id,
+        encrypted_oauth_client_secret: flowState.metadata.encrypted_oauth_client_secret,
+      },
+      {
+        findToken,
+        updateToken,
+        createToken,
+      },
+    );
     await flowManager.completeFlow(identifier, 'oauth', tokenData);
-    res.send(`
-      <!DOCTYPE html>
-      <html>
-        <head>
-          <title>Authentication Successful</title>
-          <meta name="viewport" content="width=device-width, initial-scale=1.0">
-          <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-          <style>
-            body {
-              font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont;
-              background-color: rgb(249, 250, 251);
-              margin: 0;
-              padding: 2rem;
-              display: flex;
-              justify-content: center;
-              align-items: center;
-              min-height: 100vh;
-            }
-            .card {
-              background-color: white;
-              border-radius: 0.5rem;
-              padding: 2rem;
-              max-width: 28rem;
-              width: 100%;
-              box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
-              text-align: center;
-            }
-            .heading {
-              color: rgb(17, 24, 39);
-              font-size: 1.875rem;
-              font-weight: 700;
-              margin: 0 0 1rem;
-            }
-            .description {
-              color: rgb(75, 85, 99);
-              font-size: 0.875rem;
-              margin: 0.5rem 0;
-            }
-            .countdown {
-              color: rgb(99, 102, 241);
-              font-weight: 500;
-            }
-          </style>
-        </head>
-        <body>
-          <div class="card">
-            <h1 class="heading">Authentication Successful</h1>
-            <p class="description">
-              Your authentication was successful. This window will close in 
-              <span class="countdown" id="countdown">3</span> seconds.
-            </p>
-          </div>
-          <script>
-            let secondsLeft = 3;
-            const countdownElement = document.getElementById('countdown');
-            
-            const countdown = setInterval(() => {
-              secondsLeft--;
-              countdownElement.textContent = secondsLeft;
-              
-              if (secondsLeft <= 0) {
-                clearInterval(countdown);
-                window.close();
-              }
-            }, 1000);
-          </script>
-        </body>
-      </html>
-    `);
+
+    /** Redirect to React success page */
+    const serverName = flowState.metadata?.action_name || `Action ${action_id}`;
+    const redirectUrl = `/oauth/success?serverName=${encodeURIComponent(serverName)}`;
+    res.redirect(redirectUrl);
   } catch (error) {
     logger.error('Error in OAuth callback:', error);
     await flowManager.failFlow(identifier, 'oauth', error);
-    res.status(500).send('Authentication failed. Please try again.');
+    res.redirect('/oauth/error?error=callback_failed');
   }
 });
 
diff --git a/api/server/routes/index.js b/api/server/routes/index.js
index 06e39d3671..7c1b5de0fa 100644
--- a/api/server/routes/index.js
+++ b/api/server/routes/index.js
@@ -27,6 +27,7 @@ const edit = require('./edit');
 const keys = require('./keys');
 const user = require('./user');
 const ask = require('./ask');
+const mcp = require('./mcp');
 
 module.exports = {
   ask,
@@ -58,4 +59,5 @@ module.exports = {
   assistants,
   categories,
   staticRoute,
+  mcp,
 };
diff --git a/api/server/routes/mcp.js b/api/server/routes/mcp.js
new file mode 100644
index 0000000000..3dfed4d240
--- /dev/null
+++ b/api/server/routes/mcp.js
@@ -0,0 +1,205 @@
+const { Router } = require('express');
+const { MCPOAuthHandler } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
+const { CacheKeys } = require('librechat-data-provider');
+const { requireJwtAuth } = require('~/server/middleware');
+const { getFlowStateManager } = require('~/config');
+const { getLogStores } = require('~/cache');
+
+const router = Router();
+
+/**
+ * Initiate OAuth flow
+ * This endpoint is called when the user clicks the auth link in the UI
+ */
+router.get('/:serverName/oauth/initiate', requireJwtAuth, async (req, res) => {
+  try {
+    const { serverName } = req.params;
+    const { userId, flowId } = req.query;
+    const user = req.user;
+
+    // Verify the userId matches the authenticated user
+    if (userId !== user.id) {
+      return res.status(403).json({ error: 'User mismatch' });
+    }
+
+    logger.debug('[MCP OAuth] Initiate request', { serverName, userId, flowId });
+
+    const flowsCache = getLogStores(CacheKeys.FLOWS);
+    const flowManager = getFlowStateManager(flowsCache);
+
+    /** Flow state to retrieve OAuth config */
+    const flowState = await flowManager.getFlowState(flowId, 'mcp_oauth');
+    if (!flowState) {
+      logger.error('[MCP OAuth] Flow state not found', { flowId });
+      return res.status(404).json({ error: 'Flow not found' });
+    }
+
+    const { serverUrl, oauth: oauthConfig } = flowState.metadata || {};
+    if (!serverUrl || !oauthConfig) {
+      logger.error('[MCP OAuth] Missing server URL or OAuth config in flow state');
+      return res.status(400).json({ error: 'Invalid flow state' });
+    }
+
+    const { authorizationUrl, flowId: oauthFlowId } = await MCPOAuthHandler.initiateOAuthFlow(
+      serverName,
+      serverUrl,
+      userId,
+      oauthConfig,
+    );
+
+    logger.debug('[MCP OAuth] OAuth flow initiated', { oauthFlowId, authorizationUrl });
+
+    // Redirect user to the authorization URL
+    res.redirect(authorizationUrl);
+  } catch (error) {
+    logger.error('[MCP OAuth] Failed to initiate OAuth', error);
+    res.status(500).json({ error: 'Failed to initiate OAuth' });
+  }
+});
+
+/**
+ * OAuth callback handler
+ * This handles the OAuth callback after the user has authorized the application
+ */
+router.get('/:serverName/oauth/callback', async (req, res) => {
+  try {
+    const { serverName } = req.params;
+    const { code, state, error: oauthError } = req.query;
+
+    logger.debug('[MCP OAuth] Callback received', {
+      serverName,
+      code: code ? 'present' : 'missing',
+      state,
+      error: oauthError,
+    });
+
+    if (oauthError) {
+      logger.error('[MCP OAuth] OAuth error received', { error: oauthError });
+      return res.redirect(`/oauth/error?error=${encodeURIComponent(String(oauthError))}`);
+    }
+
+    if (!code || typeof code !== 'string') {
+      logger.error('[MCP OAuth] Missing or invalid code');
+      return res.redirect('/oauth/error?error=missing_code');
+    }
+
+    if (!state || typeof state !== 'string') {
+      logger.error('[MCP OAuth] Missing or invalid state');
+      return res.redirect('/oauth/error?error=missing_state');
+    }
+
+    // Extract flow ID from state
+    const flowId = state;
+    logger.debug('[MCP OAuth] Using flow ID from state', { flowId });
+
+    const flowsCache = getLogStores(CacheKeys.FLOWS);
+    const flowManager = getFlowStateManager(flowsCache);
+
+    logger.debug('[MCP OAuth] Getting flow state for flowId: ' + flowId);
+    const flowState = await MCPOAuthHandler.getFlowState(flowId, flowManager);
+
+    if (!flowState) {
+      logger.error('[MCP OAuth] Flow state not found for flowId:', flowId);
+      return res.redirect('/oauth/error?error=invalid_state');
+    }
+
+    logger.debug('[MCP OAuth] Flow state details', {
+      serverName: flowState.serverName,
+      userId: flowState.userId,
+      hasMetadata: !!flowState.metadata,
+      hasClientInfo: !!flowState.clientInfo,
+      hasCodeVerifier: !!flowState.codeVerifier,
+    });
+
+    // Complete the OAuth flow
+    logger.debug('[MCP OAuth] Completing OAuth flow');
+    const tokens = await MCPOAuthHandler.completeOAuthFlow(flowId, code, flowManager);
+    logger.info('[MCP OAuth] OAuth flow completed, tokens received in callback route');
+
+    // For system-level OAuth, we need to store the tokens and retry the connection
+    if (flowState.userId === 'system') {
+      logger.debug(`[MCP OAuth] System-level OAuth completed for ${serverName}`);
+    }
+
+    /** ID of the flow that the tool/connection is waiting for */
+    const toolFlowId = flowState.metadata?.toolFlowId;
+    if (toolFlowId) {
+      logger.debug('[MCP OAuth] Completing tool flow', { toolFlowId });
+      await flowManager.completeFlow(toolFlowId, 'mcp_oauth', tokens);
+    }
+
+    /** Redirect to success page with flowId and serverName */
+    const redirectUrl = `/oauth/success?serverName=${encodeURIComponent(serverName)}`;
+    res.redirect(redirectUrl);
+  } catch (error) {
+    logger.error('[MCP OAuth] OAuth callback error', error);
+    res.redirect('/oauth/error?error=callback_failed');
+  }
+});
+
+/**
+ * Get OAuth tokens for a completed flow
+ * This is primarily for user-level OAuth flows
+ */
+router.get('/oauth/tokens/:flowId', requireJwtAuth, async (req, res) => {
+  try {
+    const { flowId } = req.params;
+    const user = req.user;
+
+    if (!user?.id) {
+      return res.status(401).json({ error: 'User not authenticated' });
+    }
+
+    // Allow system flows or user-owned flows
+    if (!flowId.startsWith(`${user.id}:`) && !flowId.startsWith('system:')) {
+      return res.status(403).json({ error: 'Access denied' });
+    }
+
+    const flowsCache = getLogStores(CacheKeys.FLOWS);
+    const flowManager = getFlowStateManager(flowsCache);
+
+    const flowState = await flowManager.getFlowState(flowId, 'mcp_oauth');
+    if (!flowState) {
+      return res.status(404).json({ error: 'Flow not found' });
+    }
+
+    if (flowState.status !== 'COMPLETED') {
+      return res.status(400).json({ error: 'Flow not completed' });
+    }
+
+    res.json({ tokens: flowState.result });
+  } catch (error) {
+    logger.error('[MCP OAuth] Failed to get tokens', error);
+    res.status(500).json({ error: 'Failed to get tokens' });
+  }
+});
+
+/**
+ * Check OAuth flow status
+ * This endpoint can be used to poll the status of an OAuth flow
+ */
+router.get('/oauth/status/:flowId', async (req, res) => {
+  try {
+    const { flowId } = req.params;
+    const flowsCache = getLogStores(CacheKeys.FLOWS);
+    const flowManager = getFlowStateManager(flowsCache);
+
+    const flowState = await flowManager.getFlowState(flowId, 'mcp_oauth');
+    if (!flowState) {
+      return res.status(404).json({ error: 'Flow not found' });
+    }
+
+    res.json({
+      status: flowState.status,
+      completed: flowState.status === 'COMPLETED',
+      failed: flowState.status === 'FAILED',
+      error: flowState.error,
+    });
+  } catch (error) {
+    logger.error('[MCP OAuth] Failed to get flow status', error);
+    res.status(500).json({ error: 'Failed to get flow status' });
+  }
+});
+
+module.exports = router;
diff --git a/api/server/routes/oauth.js b/api/server/routes/oauth.js
index bc8d120ef5..afc4a05b75 100644
--- a/api/server/routes/oauth.js
+++ b/api/server/routes/oauth.js
@@ -47,7 +47,9 @@ const oauthHandler = async (req, res) => {
 
 router.get('/error', (req, res) => {
   // A single error message is pushed by passport when authentication fails.
-  logger.error('Error in OAuth authentication:', { message: req.session.messages.pop() });
+  logger.error('Error in OAuth authentication:', {
+    message: req.session?.messages?.pop() || 'Unknown error',
+  });
 
   // Redirect to login page with auth_failed parameter to prevent infinite redirect loops
   res.redirect(`${domains.client}/login?redirect=false`);
diff --git a/api/server/services/ActionService.js b/api/server/services/ActionService.js
index 9bf7491543..b9555a752c 100644
--- a/api/server/services/ActionService.js
+++ b/api/server/services/ActionService.js
@@ -3,7 +3,13 @@ const { nanoid } = require('nanoid');
 const { tool } = require('@langchain/core/tools');
 const { logger } = require('@librechat/data-schemas');
 const { GraphEvents, sleep } = require('@librechat/agents');
-const { sendEvent, logAxiosError } = require('@librechat/api');
+const {
+  sendEvent,
+  encryptV2,
+  decryptV2,
+  logAxiosError,
+  refreshAccessToken,
+} = require('@librechat/api');
 const {
   Time,
   CacheKeys,
@@ -14,13 +20,11 @@ const {
   isImageVisionTool,
   actionDomainSeparator,
 } = require('librechat-data-provider');
-const { refreshAccessToken } = require('~/server/services/TokenService');
-const { encryptV2, decryptV2 } = require('~/server/utils/crypto');
+const { findToken, updateToken, createToken } = require('~/models');
 const { getActions, deleteActions } = require('~/models/Action');
 const { deleteAssistant } = require('~/models/Assistant');
 const { getFlowStateManager } = require('~/config');
 const { getLogStores } = require('~/cache');
-const { findToken } = require('~/models');
 
 const JWT_SECRET = process.env.JWT_SECRET;
 const toolNameRegex = /^[a-zA-Z0-9_-]+$/;
@@ -258,15 +262,22 @@ async function createActionTool({
               try {
                 const refresh_token = await decryptV2(refreshTokenData.token);
                 const refreshTokens = async () =>
-                  await refreshAccessToken({
-                    userId,
-                    identifier,
-                    refresh_token,
-                    client_url: metadata.auth.client_url,
-                    encrypted_oauth_client_id: encrypted.oauth_client_id,
-                    token_exchange_method: metadata.auth.token_exchange_method,
-                    encrypted_oauth_client_secret: encrypted.oauth_client_secret,
-                  });
+                  await refreshAccessToken(
+                    {
+                      userId,
+                      identifier,
+                      refresh_token,
+                      client_url: metadata.auth.client_url,
+                      encrypted_oauth_client_id: encrypted.oauth_client_id,
+                      token_exchange_method: metadata.auth.token_exchange_method,
+                      encrypted_oauth_client_secret: encrypted.oauth_client_secret,
+                    },
+                    {
+                      findToken,
+                      updateToken,
+                      createToken,
+                    },
+                  );
                 const flowsCache = getLogStores(CacheKeys.FLOWS);
                 const flowManager = getFlowStateManager(flowsCache);
                 const refreshData = await flowManager.createFlowWithHandler(
diff --git a/api/server/services/AppService.js b/api/server/services/AppService.js
index 2e5a0e586b..6b7ff7417f 100644
--- a/api/server/services/AppService.js
+++ b/api/server/services/AppService.js
@@ -1,7 +1,6 @@
 const {
   FileSources,
   loadOCRConfig,
-  processMCPEnv,
   EModelEndpoint,
   loadMemoryConfig,
   getConfigDefaults,
@@ -28,7 +27,7 @@ const { initializeS3 } = require('./Files/S3/initialize');
 const { loadAndFormatTools } = require('./ToolService');
 const { isEnabled } = require('~/server/utils');
 const { initializeRoles } = require('~/models');
-const { getMCPManager } = require('~/config');
+const { setCachedTools } = require('./Config');
 const paths = require('~/config/paths');
 
 /**
@@ -76,11 +75,10 @@ const AppService = async (app) => {
     directory: paths.structuredTools,
   });
 
-  if (config.mcpServers != null) {
-    const mcpManager = getMCPManager();
-    await mcpManager.initializeMCP(config.mcpServers, processMCPEnv);
-    await mcpManager.mapAvailableTools(availableTools);
-  }
+  await setCachedTools(availableTools, { isGlobal: true });
+
+  // Store MCP config for later initialization
+  const mcpConfig = config.mcpServers || null;
 
   const socialLogins =
     config?.registration?.socialLogins ?? configDefaults?.registration?.socialLogins;
@@ -96,11 +94,11 @@ const AppService = async (app) => {
     socialLogins,
     filteredTools,
     includedTools,
-    availableTools,
     imageOutputType,
     interfaceConfig,
     turnstileConfig,
     balance,
+    mcpConfig,
   };
 
   const agentsDefaults = agentsConfigSetup(config);
diff --git a/api/server/services/AppService.spec.js b/api/server/services/AppService.spec.js
index 70a405ccdb..7edccc2c0d 100644
--- a/api/server/services/AppService.spec.js
+++ b/api/server/services/AppService.spec.js
@@ -32,6 +32,25 @@ jest.mock('~/models', () => ({
 jest.mock('~/models/Role', () => ({
   updateAccessPermissions: jest.fn(),
 }));
+jest.mock('./Config', () => ({
+  setCachedTools: jest.fn(),
+  getCachedTools: jest.fn().mockResolvedValue({
+    ExampleTool: {
+      type: 'function',
+      function: {
+        description: 'Example tool function',
+        name: 'exampleFunction',
+        parameters: {
+          type: 'object',
+          properties: {
+            param1: { type: 'string', description: 'An example parameter' },
+          },
+          required: ['param1'],
+        },
+      },
+    },
+  }),
+}));
 jest.mock('./ToolService', () => ({
   loadAndFormatTools: jest.fn().mockReturnValue({
     ExampleTool: {
@@ -121,22 +140,9 @@ describe('AppService', () => {
         sidePanel: true,
         presets: true,
       }),
+      mcpConfig: null,
       turnstileConfig: mockedTurnstileConfig,
       modelSpecs: undefined,
-      availableTools: {
-        ExampleTool: {
-          type: 'function',
-          function: expect.objectContaining({
-            description: 'Example tool function',
-            name: 'exampleFunction',
-            parameters: expect.objectContaining({
-              type: 'object',
-              properties: expect.any(Object),
-              required: expect.arrayContaining(['param1']),
-            }),
-          }),
-        },
-      },
       paths: expect.anything(),
       ocr: expect.anything(),
       imageOutputType: expect.any(String),
@@ -223,14 +229,41 @@ describe('AppService', () => {
 
   it('should load and format tools accurately with defined structure', async () => {
     const { loadAndFormatTools } = require('./ToolService');
+    const { setCachedTools, getCachedTools } = require('./Config');
+
     await AppService(app);
 
     expect(loadAndFormatTools).toHaveBeenCalledWith({
+      adminFilter: undefined,
+      adminIncluded: undefined,
       directory: expect.anything(),
     });
 
-    expect(app.locals.availableTools.ExampleTool).toBeDefined();
-    expect(app.locals.availableTools.ExampleTool).toEqual({
+    // Verify setCachedTools was called with the tools
+    expect(setCachedTools).toHaveBeenCalledWith(
+      {
+        ExampleTool: {
+          type: 'function',
+          function: {
+            description: 'Example tool function',
+            name: 'exampleFunction',
+            parameters: {
+              type: 'object',
+              properties: {
+                param1: { type: 'string', description: 'An example parameter' },
+              },
+              required: ['param1'],
+            },
+          },
+        },
+      },
+      { isGlobal: true },
+    );
+
+    // Verify we can retrieve the tools from cache
+    const cachedTools = await getCachedTools({ includeGlobal: true });
+    expect(cachedTools.ExampleTool).toBeDefined();
+    expect(cachedTools.ExampleTool).toEqual({
       type: 'function',
       function: {
         description: 'Example tool function',
@@ -535,7 +568,6 @@ describe('AppService updating app.locals and issuing warnings', () => {
 
     expect(app.locals).toBeDefined();
     expect(app.locals.paths).toBeDefined();
-    expect(app.locals.availableTools).toBeDefined();
     expect(app.locals.fileStrategy).toEqual(FileSources.local);
     expect(app.locals.socialLogins).toEqual(defaultSocialLogins);
     expect(app.locals.balance).toEqual(
@@ -568,7 +600,6 @@ describe('AppService updating app.locals and issuing warnings', () => {
 
     expect(app.locals).toBeDefined();
     expect(app.locals.paths).toBeDefined();
-    expect(app.locals.availableTools).toBeDefined();
     expect(app.locals.fileStrategy).toEqual(customConfig.fileStrategy);
     expect(app.locals.socialLogins).toEqual(customConfig.registration.socialLogins);
     expect(app.locals.balance).toEqual(customConfig.balance);
diff --git a/api/server/services/AuthService.js b/api/server/services/AuthService.js
index 2c285512ee..6061277437 100644
--- a/api/server/services/AuthService.js
+++ b/api/server/services/AuthService.js
@@ -1,5 +1,7 @@
 const bcrypt = require('bcryptjs');
 const { webcrypto } = require('node:crypto');
+const { isEnabled } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const { SystemRoles, errorsToString } = require('librechat-data-provider');
 const {
   findUser,
@@ -17,11 +19,10 @@ const {
   deleteUserById,
   generateRefreshToken,
 } = require('~/models');
-const { isEnabled, checkEmailConfig, sendEmail } = require('~/server/utils');
 const { isEmailDomainAllowed } = require('~/server/services/domains');
+const { checkEmailConfig, sendEmail } = require('~/server/utils');
 const { getBalanceConfig } = require('~/server/services/Config');
 const { registerSchema } = require('~/strategies/validators');
-const { logger } = require('~/config');
 
 const domains = {
   client: process.env.DOMAIN_CLIENT,
diff --git a/api/server/services/Config/getCachedTools.js b/api/server/services/Config/getCachedTools.js
new file mode 100644
index 0000000000..b3a4f0c869
--- /dev/null
+++ b/api/server/services/Config/getCachedTools.js
@@ -0,0 +1,258 @@
+const { CacheKeys } = require('librechat-data-provider');
+const getLogStores = require('~/cache/getLogStores');
+
+/**
+ * Cache key generators for different tool access patterns
+ * These will support future permission-based caching
+ */
+const ToolCacheKeys = {
+  /** Global tools available to all users */
+  GLOBAL: 'tools:global',
+  /** Tools available to a specific user */
+  USER: (userId) => `tools:user:${userId}`,
+  /** Tools available to a specific role */
+  ROLE: (roleId) => `tools:role:${roleId}`,
+  /** Tools available to a specific group */
+  GROUP: (groupId) => `tools:group:${groupId}`,
+  /** Combined effective tools for a user (computed from all sources) */
+  EFFECTIVE: (userId) => `tools:effective:${userId}`,
+};
+
+/**
+ * Retrieves available tools from cache
+ * @function getCachedTools
+ * @param {Object} options - Options for retrieving tools
+ * @param {string} [options.userId] - User ID for user-specific tools
+ * @param {string[]} [options.roleIds] - Role IDs for role-based tools
+ * @param {string[]} [options.groupIds] - Group IDs for group-based tools
+ * @param {boolean} [options.includeGlobal=true] - Whether to include global tools
+ * @returns {Promise<Object|null>} The available tools object or null if not cached
+ */
+async function getCachedTools(options = {}) {
+  const cache = getLogStores(CacheKeys.CONFIG_STORE);
+  const { userId, roleIds = [], groupIds = [], includeGlobal = true } = options;
+
+  // For now, return global tools (current behavior)
+  // This will be expanded to merge tools from different sources
+  if (!userId && includeGlobal) {
+    return await cache.get(ToolCacheKeys.GLOBAL);
+  }
+
+  // Future implementation will merge tools from multiple sources
+  // based on user permissions, roles, and groups
+  if (userId) {
+    // Check if we have pre-computed effective tools for this user
+    const effectiveTools = await cache.get(ToolCacheKeys.EFFECTIVE(userId));
+    if (effectiveTools) {
+      return effectiveTools;
+    }
+
+    // Otherwise, compute from individual sources
+    const toolSources = [];
+
+    if (includeGlobal) {
+      const globalTools = await cache.get(ToolCacheKeys.GLOBAL);
+      if (globalTools) {
+        toolSources.push(globalTools);
+      }
+    }
+
+    // User-specific tools
+    const userTools = await cache.get(ToolCacheKeys.USER(userId));
+    if (userTools) {
+      toolSources.push(userTools);
+    }
+
+    // Role-based tools
+    for (const roleId of roleIds) {
+      const roleTools = await cache.get(ToolCacheKeys.ROLE(roleId));
+      if (roleTools) {
+        toolSources.push(roleTools);
+      }
+    }
+
+    // Group-based tools
+    for (const groupId of groupIds) {
+      const groupTools = await cache.get(ToolCacheKeys.GROUP(groupId));
+      if (groupTools) {
+        toolSources.push(groupTools);
+      }
+    }
+
+    // Merge all tool sources (for now, simple merge - future will handle conflicts)
+    if (toolSources.length > 0) {
+      return mergeToolSources(toolSources);
+    }
+  }
+
+  return null;
+}
+
+/**
+ * Sets available tools in cache
+ * @function setCachedTools
+ * @param {Object} tools - The tools object to cache
+ * @param {Object} options - Options for caching tools
+ * @param {string} [options.userId] - User ID for user-specific tools
+ * @param {string} [options.roleId] - Role ID for role-based tools
+ * @param {string} [options.groupId] - Group ID for group-based tools
+ * @param {boolean} [options.isGlobal=false] - Whether these are global tools
+ * @param {number} [options.ttl] - Time to live in milliseconds
+ * @returns {Promise<boolean>} Whether the operation was successful
+ */
+async function setCachedTools(tools, options = {}) {
+  const cache = getLogStores(CacheKeys.CONFIG_STORE);
+  const { userId, roleId, groupId, isGlobal = false, ttl } = options;
+
+  let cacheKey;
+  if (isGlobal || (!userId && !roleId && !groupId)) {
+    cacheKey = ToolCacheKeys.GLOBAL;
+  } else if (userId) {
+    cacheKey = ToolCacheKeys.USER(userId);
+  } else if (roleId) {
+    cacheKey = ToolCacheKeys.ROLE(roleId);
+  } else if (groupId) {
+    cacheKey = ToolCacheKeys.GROUP(groupId);
+  }
+
+  if (!cacheKey) {
+    throw new Error('Invalid cache key options provided');
+  }
+
+  return await cache.set(cacheKey, tools, ttl);
+}
+
+/**
+ * Invalidates cached tools
+ * @function invalidateCachedTools
+ * @param {Object} options - Options for invalidating tools
+ * @param {string} [options.userId] - User ID to invalidate
+ * @param {string} [options.roleId] - Role ID to invalidate
+ * @param {string} [options.groupId] - Group ID to invalidate
+ * @param {boolean} [options.invalidateGlobal=false] - Whether to invalidate global tools
+ * @param {boolean} [options.invalidateEffective=true] - Whether to invalidate effective tools
+ * @returns {Promise<void>}
+ */
+async function invalidateCachedTools(options = {}) {
+  const cache = getLogStores(CacheKeys.CONFIG_STORE);
+  const { userId, roleId, groupId, invalidateGlobal = false, invalidateEffective = true } = options;
+
+  const keysToDelete = [];
+
+  if (invalidateGlobal) {
+    keysToDelete.push(ToolCacheKeys.GLOBAL);
+  }
+
+  if (userId) {
+    keysToDelete.push(ToolCacheKeys.USER(userId));
+    if (invalidateEffective) {
+      keysToDelete.push(ToolCacheKeys.EFFECTIVE(userId));
+    }
+  }
+
+  if (roleId) {
+    keysToDelete.push(ToolCacheKeys.ROLE(roleId));
+    // TODO: In future, invalidate all users with this role
+  }
+
+  if (groupId) {
+    keysToDelete.push(ToolCacheKeys.GROUP(groupId));
+    // TODO: In future, invalidate all users in this group
+  }
+
+  await Promise.all(keysToDelete.map((key) => cache.delete(key)));
+}
+
+/**
+ * Computes and caches effective tools for a user
+ * @function computeEffectiveTools
+ * @param {string} userId - The user ID
+ * @param {Object} context - Context containing user's roles and groups
+ * @param {string[]} [context.roleIds=[]] - User's role IDs
+ * @param {string[]} [context.groupIds=[]] - User's group IDs
+ * @param {number} [ttl] - Time to live for the computed result
+ * @returns {Promise<Object>} The computed effective tools
+ */
+async function computeEffectiveTools(userId, context = {}, ttl) {
+  const { roleIds = [], groupIds = [] } = context;
+
+  // Get all tool sources
+  const tools = await getCachedTools({
+    userId,
+    roleIds,
+    groupIds,
+    includeGlobal: true,
+  });
+
+  if (tools) {
+    // Cache the computed result
+    const cache = getLogStores(CacheKeys.CONFIG_STORE);
+    await cache.set(ToolCacheKeys.EFFECTIVE(userId), tools, ttl);
+  }
+
+  return tools;
+}
+
+/**
+ * Merges multiple tool sources into a single tools object
+ * @function mergeToolSources
+ * @param {Object[]} sources - Array of tool objects to merge
+ * @returns {Object} Merged tools object
+ */
+function mergeToolSources(sources) {
+  // For now, simple merge that combines all tools
+  // Future implementation will handle:
+  // - Permission precedence (deny > allow)
+  // - Tool property conflicts
+  // - Metadata merging
+  const merged = {};
+
+  for (const source of sources) {
+    if (!source || typeof source !== 'object') {
+      continue;
+    }
+
+    for (const [toolId, toolConfig] of Object.entries(source)) {
+      // Simple last-write-wins for now
+      // Future: merge based on permission levels
+      merged[toolId] = toolConfig;
+    }
+  }
+
+  return merged;
+}
+
+/**
+ * Middleware-friendly function to get tools for a request
+ * @function getToolsForRequest
+ * @param {Object} req - Express request object
+ * @returns {Promise<Object|null>} Available tools for the request
+ */
+async function getToolsForRequest(req) {
+  const userId = req.user?.id;
+
+  // For now, return global tools if no user
+  if (!userId) {
+    return getCachedTools({ includeGlobal: true });
+  }
+
+  // Future: Extract roles and groups from req.user
+  const roleIds = req.user?.roles || [];
+  const groupIds = req.user?.groups || [];
+
+  return getCachedTools({
+    userId,
+    roleIds,
+    groupIds,
+    includeGlobal: true,
+  });
+}
+
+module.exports = {
+  ToolCacheKeys,
+  getCachedTools,
+  setCachedTools,
+  getToolsForRequest,
+  invalidateCachedTools,
+  computeEffectiveTools,
+};
diff --git a/api/server/services/Config/index.js b/api/server/services/Config/index.js
index 9d668da958..ad25e57998 100644
--- a/api/server/services/Config/index.js
+++ b/api/server/services/Config/index.js
@@ -1,4 +1,5 @@
 const { config } = require('./EndpointService');
+const getCachedTools = require('./getCachedTools');
 const getCustomConfig = require('./getCustomConfig');
 const loadCustomConfig = require('./loadCustomConfig');
 const loadConfigModels = require('./loadConfigModels');
@@ -14,6 +15,7 @@ module.exports = {
   loadDefaultModels,
   loadOverrideConfig,
   loadAsyncEndpoints,
+  ...getCachedTools,
   ...getCustomConfig,
   ...getEndpointsConfig,
 };
diff --git a/api/server/services/MCP.js b/api/server/services/MCP.js
index 357913e519..9720305668 100644
--- a/api/server/services/MCP.js
+++ b/api/server/services/MCP.js
@@ -1,27 +1,111 @@
 const { z } = require('zod');
 const { tool } = require('@langchain/core/tools');
-const { normalizeServerName } = require('@librechat/api');
-const { Constants: AgentConstants, Providers } = require('@librechat/agents');
+const { logger } = require('@librechat/data-schemas');
+const { Time, CacheKeys, StepTypes } = require('librechat-data-provider');
+const { sendEvent, normalizeServerName, MCPOAuthHandler } = require('@librechat/api');
+const { Constants: AgentConstants, Providers, GraphEvents } = require('@librechat/agents');
 const {
   Constants,
   ContentTypes,
   isAssistantsEndpoint,
   convertJsonSchemaToZod,
 } = require('librechat-data-provider');
-const { logger, getMCPManager } = require('~/config');
+const { getMCPManager, getFlowStateManager } = require('~/config');
+const { findToken, createToken, updateToken } = require('~/models');
+const { getCachedTools } = require('./Config');
+const { getLogStores } = require('~/cache');
+
+/**
+ * @param {object} params
+ * @param {ServerResponse} params.res - The Express response object for sending events.
+ * @param {string} params.stepId - The ID of the step in the flow.
+ * @param {ToolCallChunk} params.toolCall - The tool call object containing tool information.
+ * @param {string} params.loginFlowId - The ID of the login flow.
+ * @param {FlowStateManager<any>} params.flowManager - The flow manager instance.
+ */
+function createOAuthStart({ res, stepId, toolCall, loginFlowId, flowManager, signal }) {
+  /**
+   * Creates a function to handle OAuth login requests.
+   * @param {string} authURL - The URL to redirect the user for OAuth authentication.
+   * @returns {Promise<boolean>} Returns true to indicate the event was sent successfully.
+   */
+  return async function (authURL) {
+    /** @type {{ id: string; delta: AgentToolCallDelta }} */
+    const data = {
+      id: stepId,
+      delta: {
+        type: StepTypes.TOOL_CALLS,
+        tool_calls: [{ ...toolCall, args: '' }],
+        auth: authURL,
+        expires_at: Date.now() + Time.TWO_MINUTES,
+      },
+    };
+    /** Used to ensure the handler (use of `sendEvent`) is only invoked once */
+    await flowManager.createFlowWithHandler(
+      loginFlowId,
+      'oauth_login',
+      async () => {
+        sendEvent(res, { event: GraphEvents.ON_RUN_STEP_DELTA, data });
+        logger.debug('Sent OAuth login request to client');
+        return true;
+      },
+      signal,
+    );
+  };
+}
+
+/**
+ * @param {object} params
+ * @param {ServerResponse} params.res - The Express response object for sending events.
+ * @param {string} params.stepId - The ID of the step in the flow.
+ * @param {ToolCallChunk} params.toolCall - The tool call object containing tool information.
+ * @param {string} params.loginFlowId - The ID of the login flow.
+ * @param {FlowStateManager<any>} params.flowManager - The flow manager instance.
+ */
+function createOAuthEnd({ res, stepId, toolCall }) {
+  return async function () {
+    /** @type {{ id: string; delta: AgentToolCallDelta }} */
+    const data = {
+      id: stepId,
+      delta: {
+        type: StepTypes.TOOL_CALLS,
+        tool_calls: [{ ...toolCall }],
+      },
+    };
+    sendEvent(res, { event: GraphEvents.ON_RUN_STEP_DELTA, data });
+    logger.debug('Sent OAuth login success to client');
+  };
+}
+
+/**
+ * @param {object} params
+ * @param {string} params.userId - The ID of the user.
+ * @param {string} params.serverName - The name of the server.
+ * @param {string} params.toolName - The name of the tool.
+ * @param {FlowStateManager<any>} params.flowManager - The flow manager instance.
+ */
+function createAbortHandler({ userId, serverName, toolName, flowManager }) {
+  return function () {
+    logger.info(`[MCP][User: ${userId}][${serverName}][${toolName}] Tool call aborted`);
+    const flowId = MCPOAuthHandler.generateFlowId(userId, serverName);
+    flowManager.failFlow(flowId, 'mcp_oauth', new Error('Tool call aborted'));
+  };
+}
 
 /**
  * Creates a general tool for an entire action set.
  *
  * @param {Object} params - The parameters for loading action sets.
  * @param {ServerRequest} params.req - The Express request object, containing user/request info.
+ * @param {ServerResponse} params.res - The Express response object for sending events.
  * @param {string} params.toolKey - The toolKey for the tool.
  * @param {import('@librechat/agents').Providers | EModelEndpoint} params.provider - The provider for the tool.
  * @param {string} params.model - The model for the tool.
  * @returns { Promise<typeof tool | { _call: (toolInput: Object | string) => unknown}> } An object with `_call` method to execute the tool input.
  */
-async function createMCPTool({ req, toolKey, provider: _provider }) {
-  const toolDefinition = req.app.locals.availableTools[toolKey]?.function;
+async function createMCPTool({ req, res, toolKey, provider: _provider }) {
+  const availableTools = await getCachedTools({ includeGlobal: true });
+  const toolDefinition = availableTools?.[toolKey]?.function;
   if (!toolDefinition) {
     logger.error(`Tool ${toolKey} not found in available tools`);
     return null;
@@ -51,10 +135,39 @@ async function createMCPTool({ req, toolKey, provider: _provider }) {
   /** @type {(toolArguments: Object | string, config?: GraphRunnableConfig) => Promise<unknown>} */
   const _call = async (toolArguments, config) => {
     const userId = config?.configurable?.user?.id || config?.configurable?.user_id;
+    /** @type {ReturnType<typeof createAbortHandler>} */
+    let abortHandler = null;
+    /** @type {AbortSignal} */
+    let derivedSignal = null;
+
     try {
-      const derivedSignal = config?.signal ? AbortSignal.any([config.signal]) : undefined;
+      const flowsCache = getLogStores(CacheKeys.FLOWS);
+      const flowManager = getFlowStateManager(flowsCache);
+      derivedSignal = config?.signal ? AbortSignal.any([config.signal]) : undefined;
       const mcpManager = getMCPManager(userId);
       const provider = (config?.metadata?.provider || _provider)?.toLowerCase();
+
+      const { args: _args, stepId, ...toolCall } = config.toolCall ?? {};
+      const loginFlowId = `${serverName}:oauth_login:${config.metadata.thread_id}:${config.metadata.run_id}`;
+      const oauthStart = createOAuthStart({
+        res,
+        stepId,
+        toolCall,
+        loginFlowId,
+        flowManager,
+        signal: derivedSignal,
+      });
+      const oauthEnd = createOAuthEnd({
+        res,
+        stepId,
+        toolCall,
+      });
+
+      if (derivedSignal) {
+        abortHandler = createAbortHandler({ userId, serverName, toolName, flowManager });
+        derivedSignal.addEventListener('abort', abortHandler, { once: true });
+      }
+
       const result = await mcpManager.callTool({
         serverName,
         toolName,
@@ -64,6 +177,14 @@ async function createMCPTool({ req, toolKey, provider: _provider }) {
           signal: derivedSignal,
           user: config?.configurable?.user,
         },
+        flowManager,
+        tokenMethods: {
+          findToken,
+          createToken,
+          updateToken,
+        },
+        oauthStart,
+        oauthEnd,
       });
 
       if (isAssistantsEndpoint(provider) && Array.isArray(result)) {
@@ -78,9 +199,28 @@ async function createMCPTool({ req, toolKey, provider: _provider }) {
         `[MCP][User: ${userId}][${serverName}] Error calling "${toolName}" MCP tool:`,
         error,
       );
+
+      /** OAuth error, provide a helpful message */
+      const isOAuthError =
+        error.message?.includes('401') ||
+        error.message?.includes('OAuth') ||
+        error.message?.includes('authentication') ||
+        error.message?.includes('Non-200 status code (401)');
+
+      if (isOAuthError) {
+        throw new Error(
+          `OAuth authentication required for ${serverName}. Please check the server logs for the authentication URL.`,
+        );
+      }
+
       throw new Error(
         `"${toolKey}" tool call failed${error?.message ? `: ${error?.message}` : '.'}`,
       );
+    } finally {
+      // Clean up abort handler to prevent memory leaks
+      if (abortHandler && derivedSignal) {
+        derivedSignal.removeEventListener('abort', abortHandler);
+      }
     }
   };
 
diff --git a/api/server/services/PluginService.js b/api/server/services/PluginService.js
index 7463e0814e..04c5abb32b 100644
--- a/api/server/services/PluginService.js
+++ b/api/server/services/PluginService.js
@@ -1,6 +1,6 @@
-const { encrypt, decrypt } = require('~/server/utils/crypto');
+const { logger } = require('@librechat/data-schemas');
+const { encrypt, decrypt } = require('@librechat/api');
 const { PluginAuth } = require('~/db/models');
-const { logger } = require('~/config');
 
 /**
  * Asynchronously retrieves and decrypts the authentication value for a user's plugin, based on a specified authentication field.
diff --git a/api/server/services/TokenService.js b/api/server/services/TokenService.js
deleted file mode 100644
index ec74844197..0000000000
--- a/api/server/services/TokenService.js
+++ /dev/null
@@ -1,195 +0,0 @@
-const axios = require('axios');
-const { logAxiosError } = require('@librechat/api');
-const { logger } = require('@librechat/data-schemas');
-const { TokenExchangeMethodEnum } = require('librechat-data-provider');
-const { handleOAuthToken } = require('~/models/Token');
-const { decryptV2 } = require('~/server/utils/crypto');
-
-/**
- * Processes the access tokens and stores them in the database.
- * @param {object} tokenData
- * @param {string} tokenData.access_token
- * @param {number} tokenData.expires_in
- * @param {string} [tokenData.refresh_token]
- * @param {number} [tokenData.refresh_token_expires_in]
- * @param {object} metadata
- * @param {string} metadata.userId
- * @param {string} metadata.identifier
- * @returns {Promise<void>}
- */
-async function processAccessTokens(tokenData, { userId, identifier }) {
-  const { access_token, expires_in = 3600, refresh_token, refresh_token_expires_in } = tokenData;
-  if (!access_token) {
-    logger.error('Access token not found: ', tokenData);
-    throw new Error('Access token not found');
-  }
-  await handleOAuthToken({
-    identifier,
-    token: access_token,
-    expiresIn: expires_in,
-    userId,
-  });
-
-  if (refresh_token != null) {
-    logger.debug('Processing refresh token');
-    await handleOAuthToken({
-      token: refresh_token,
-      type: 'oauth_refresh',
-      userId,
-      identifier: `${identifier}:refresh`,
-      expiresIn: refresh_token_expires_in ?? null,
-    });
-  }
-  logger.debug('Access tokens processed');
-}
-
-/**
- * Refreshes the access token using the refresh token.
- * @param {object} fields
- * @param {string} fields.userId - The ID of the user.
- * @param {string} fields.client_url - The URL of the OAuth provider.
- * @param {string} fields.identifier - The identifier for the token.
- * @param {string} fields.refresh_token - The refresh token to use.
- * @param {string} fields.token_exchange_method - The token exchange method ('default_post' or 'basic_auth_header').
- * @param {string} fields.encrypted_oauth_client_id - The client ID for the OAuth provider.
- * @param {string} fields.encrypted_oauth_client_secret - The client secret for the OAuth provider.
- * @returns {Promise<{
- *  access_token: string,
- *  expires_in: number,
- *  refresh_token?: string,
- *  refresh_token_expires_in?: number,
- * }>}
- */
-const refreshAccessToken = async ({
-  userId,
-  client_url,
-  identifier,
-  refresh_token,
-  token_exchange_method,
-  encrypted_oauth_client_id,
-  encrypted_oauth_client_secret,
-}) => {
-  try {
-    const oauth_client_id = await decryptV2(encrypted_oauth_client_id);
-    const oauth_client_secret = await decryptV2(encrypted_oauth_client_secret);
-
-    const headers = {
-      'Content-Type': 'application/x-www-form-urlencoded',
-      Accept: 'application/json',
-    };
-
-    const params = new URLSearchParams({
-      grant_type: 'refresh_token',
-      refresh_token,
-    });
-
-    if (token_exchange_method === TokenExchangeMethodEnum.BasicAuthHeader) {
-      const basicAuth = Buffer.from(`${oauth_client_id}:${oauth_client_secret}`).toString('base64');
-      headers['Authorization'] = `Basic ${basicAuth}`;
-    } else {
-      params.append('client_id', oauth_client_id);
-      params.append('client_secret', oauth_client_secret);
-    }
-
-    const response = await axios({
-      method: 'POST',
-      url: client_url,
-      headers,
-      data: params.toString(),
-    });
-    await processAccessTokens(response.data, {
-      userId,
-      identifier,
-    });
-    logger.debug(`Access token refreshed successfully for ${identifier}`);
-    return response.data;
-  } catch (error) {
-    const message = 'Error refreshing OAuth tokens';
-    throw new Error(
-      logAxiosError({
-        message,
-        error,
-      }),
-    );
-  }
-};
-
-/**
- * Handles the OAuth callback and exchanges the authorization code for tokens.
- * @param {object} fields
- * @param {string} fields.code - The authorization code returned by the provider.
- * @param {string} fields.userId - The ID of the user.
- * @param {string} fields.identifier - The identifier for the token.
- * @param {string} fields.client_url - The URL of the OAuth provider.
- * @param {string} fields.redirect_uri - The redirect URI for the OAuth provider.
- * @param {string} fields.token_exchange_method - The token exchange method ('default_post' or 'basic_auth_header').
- * @param {string} fields.encrypted_oauth_client_id - The client ID for the OAuth provider.
- * @param {string} fields.encrypted_oauth_client_secret - The client secret for the OAuth provider.
- * @returns {Promise<{
- *  access_token: string,
- *  expires_in: number,
- *  refresh_token?: string,
- *  refresh_token_expires_in?: number,
- * }>}
- */
-const getAccessToken = async ({
-  code,
-  userId,
-  identifier,
-  client_url,
-  redirect_uri,
-  token_exchange_method,
-  encrypted_oauth_client_id,
-  encrypted_oauth_client_secret,
-}) => {
-  const oauth_client_id = await decryptV2(encrypted_oauth_client_id);
-  const oauth_client_secret = await decryptV2(encrypted_oauth_client_secret);
-
-  const headers = {
-    'Content-Type': 'application/x-www-form-urlencoded',
-    Accept: 'application/json',
-  };
-
-  const params = new URLSearchParams({
-    code,
-    grant_type: 'authorization_code',
-    redirect_uri,
-  });
-
-  if (token_exchange_method === TokenExchangeMethodEnum.BasicAuthHeader) {
-    const basicAuth = Buffer.from(`${oauth_client_id}:${oauth_client_secret}`).toString('base64');
-    headers['Authorization'] = `Basic ${basicAuth}`;
-  } else {
-    params.append('client_id', oauth_client_id);
-    params.append('client_secret', oauth_client_secret);
-  }
-
-  try {
-    const response = await axios({
-      method: 'POST',
-      url: client_url,
-      headers,
-      data: params.toString(),
-    });
-
-    await processAccessTokens(response.data, {
-      userId,
-      identifier,
-    });
-    logger.debug(`Access tokens successfully created for ${identifier}`);
-    return response.data;
-  } catch (error) {
-    const message = 'Error exchanging OAuth code';
-    throw new Error(
-      logAxiosError({
-        message,
-        error,
-      }),
-    );
-  }
-};
-
-module.exports = {
-  getAccessToken,
-  refreshAccessToken,
-};
diff --git a/api/server/services/ToolService.js b/api/server/services/ToolService.js
index 9172c25e96..f1567a3783 100644
--- a/api/server/services/ToolService.js
+++ b/api/server/services/ToolService.js
@@ -1,5 +1,7 @@
 const fs = require('fs');
 const path = require('path');
+const { sleep } = require('@librechat/agents');
+const { logger } = require('@librechat/data-schemas');
 const { zodToJsonSchema } = require('zod-to-json-schema');
 const { Calculator } = require('@langchain/community/tools/calculator');
 const { tool: toolFn, Tool, DynamicStructuredTool } = require('@langchain/core/tools');
@@ -31,14 +33,12 @@ const {
   toolkits,
 } = require('~/app/clients/tools');
 const { processFileURL, uploadImageBuffer } = require('~/server/services/Files/process');
+const { getEndpointsConfig, getCachedTools } = require('~/server/services/Config');
 const { createOnSearchResults } = require('~/server/services/Tools/search');
 const { isActionDomainAllowed } = require('~/server/services/domains');
-const { getEndpointsConfig } = require('~/server/services/Config');
 const { recordUsage } = require('~/server/services/Threads');
 const { loadTools } = require('~/app/clients/tools/util');
 const { redactMessage } = require('~/config/parsers');
-const { sleep } = require('~/server/utils');
-const { logger } = require('~/config');
 
 /**
  * @param {string} toolName
@@ -226,7 +226,7 @@ async function processRequiredActions(client, requiredActions) {
     `[required actions] user: ${client.req.user.id} | thread_id: ${requiredActions[0].thread_id} | run_id: ${requiredActions[0].run_id}`,
     requiredActions,
   );
-  const toolDefinitions = client.req.app.locals.availableTools;
+  const toolDefinitions = await getCachedTools({ includeGlobal: true });
   const seenToolkits = new Set();
   const tools = requiredActions
     .map((action) => {
@@ -553,6 +553,7 @@ async function loadAgentTools({ req, res, agent, tool_resources, openAIApiKey })
     tools: _agentTools,
     options: {
       req,
+      res,
       openAIApiKey,
       tool_resources,
       processFileURL,
diff --git a/api/server/services/UserService.js b/api/server/services/UserService.js
index b729607f69..7cf2f832a3 100644
--- a/api/server/services/UserService.js
+++ b/api/server/services/UserService.js
@@ -1,6 +1,6 @@
 const { logger } = require('@librechat/data-schemas');
+const { encrypt, decrypt } = require('@librechat/api');
 const { ErrorTypes } = require('librechat-data-provider');
-const { encrypt, decrypt } = require('~/server/utils/crypto');
 const { updateUser } = require('~/models');
 const { Key } = require('~/db/models');
 
@@ -70,6 +70,7 @@ const getUserKeyValues = async ({ userId, name }) => {
   try {
     userValues = JSON.parse(userValues);
   } catch (e) {
+    logger.error('[getUserKeyValues]', e);
     throw new Error(
       JSON.stringify({
         type: ErrorTypes.INVALID_USER_KEY,
diff --git a/api/server/services/initializeMCP.js b/api/server/services/initializeMCP.js
new file mode 100644
index 0000000000..d7c5ab7d8a
--- /dev/null
+++ b/api/server/services/initializeMCP.js
@@ -0,0 +1,54 @@
+const { logger } = require('@librechat/data-schemas');
+const { CacheKeys, processMCPEnv } = require('librechat-data-provider');
+const { getMCPManager, getFlowStateManager } = require('~/config');
+const { getCachedTools, setCachedTools } = require('./Config');
+const { getLogStores } = require('~/cache');
+const { findToken, updateToken, createToken, deleteTokens } = require('~/models');
+
+/**
+ * Initialize MCP servers
+ * @param {import('express').Application} app - Express app instance
+ */
+async function initializeMCP(app) {
+  const mcpServers = app.locals.mcpConfig;
+  if (!mcpServers) {
+    return;
+  }
+
+  logger.info('Initializing MCP servers...');
+  const mcpManager = getMCPManager();
+  const flowsCache = getLogStores(CacheKeys.FLOWS);
+  const flowManager = flowsCache ? getFlowStateManager(flowsCache) : null;
+
+  try {
+    await mcpManager.initializeMCP({
+      mcpServers,
+      flowManager,
+      tokenMethods: {
+        findToken,
+        updateToken,
+        createToken,
+        deleteTokens,
+      },
+      processMCPEnv,
+    });
+
+    delete app.locals.mcpConfig;
+    const availableTools = await getCachedTools();
+
+    if (!availableTools) {
+      logger.warn('No available tools found in cache during MCP initialization');
+      return;
+    }
+
+    const toolsCopy = { ...availableTools };
+    await mcpManager.mapAvailableTools(toolsCopy, flowManager);
+    await setCachedTools(toolsCopy, { isGlobal: true });
+
+    logger.info('MCP servers initialized successfully');
+  } catch (error) {
+    logger.error('Failed to initialize MCP servers:', error);
+  }
+}
+
+module.exports = initializeMCP;
diff --git a/api/server/services/twoFactorService.js b/api/server/services/twoFactorService.js
index 0274842367..4ac86a5549 100644
--- a/api/server/services/twoFactorService.js
+++ b/api/server/services/twoFactorService.js
@@ -1,5 +1,5 @@
 const { webcrypto } = require('node:crypto');
-const { hashBackupCode, decryptV3, decryptV2 } = require('~/server/utils/crypto');
+const { hashBackupCode, decryptV3, decryptV2 } = require('@librechat/api');
 const { updateUser } = require('~/models');
 
 // Base32 alphabet for TOTP secret encoding.
diff --git a/api/server/utils/index.js b/api/server/utils/index.js
index aa432ec379..2661ff75e1 100644
--- a/api/server/utils/index.js
+++ b/api/server/utils/index.js
@@ -3,7 +3,6 @@ const removePorts = require('./removePorts');
 const countTokens = require('./countTokens');
 const handleText = require('./handleText');
 const sendEmail = require('./sendEmail');
-const cryptoUtils = require('./crypto');
 const queue = require('./queue');
 const files = require('./files');
 const math = require('./math');
@@ -31,7 +30,6 @@ function checkEmailConfig() {
 module.exports = {
   ...streamResponse,
   checkEmailConfig,
-  ...cryptoUtils,
   ...handleText,
   countTokens,
   removePorts,
diff --git a/api/strategies/openidStrategy.spec.js b/api/strategies/openidStrategy.spec.js
index 3e52ad01f1..1e6750384e 100644
--- a/api/strategies/openidStrategy.spec.js
+++ b/api/strategies/openidStrategy.spec.js
@@ -21,19 +21,18 @@ jest.mock('~/models', () => ({
   createUser: jest.fn(),
   updateUser: jest.fn(),
 }));
-jest.mock('~/server/utils/crypto', () => ({
-  hashToken: jest.fn().mockResolvedValue('hashed-token'),
-}));
-jest.mock('~/server/utils', () => ({
+jest.mock('@librechat/api', () => ({
+  ...jest.requireActual('@librechat/api'),
   isEnabled: jest.fn(() => false),
 }));
-jest.mock('~/config', () => ({
+jest.mock('@librechat/data-schemas', () => ({
+  ...jest.requireActual('@librechat/api'),
   logger: {
     info: jest.fn(),
     debug: jest.fn(),
     error: jest.fn(),
-    warn: jest.fn(),
   },
+  hashToken: jest.fn().mockResolvedValue('hashed-token'),
 }));
 jest.mock('~/cache/getLogStores', () =>
   jest.fn(() => ({
diff --git a/api/strategies/samlStrategy.spec.js b/api/strategies/samlStrategy.spec.js
index 675bdc998b..fc8329a31a 100644
--- a/api/strategies/samlStrategy.spec.js
+++ b/api/strategies/samlStrategy.spec.js
@@ -1,15 +1,17 @@
-const fs = require('fs');
-const path = require('path');
-const fetch = require('node-fetch');
-const { Strategy: SamlStrategy } = require('@node-saml/passport-saml');
-const { findUser, createUser, updateUser } = require('~/models');
-const { setupSaml, getCertificateContent } = require('./samlStrategy');
-
 // --- Mocks ---
+jest.mock('tiktoken');
 jest.mock('fs');
 jest.mock('path');
 jest.mock('node-fetch');
 jest.mock('@node-saml/passport-saml');
+jest.mock('@librechat/data-schemas', () => ({
+  logger: {
+    info: jest.fn(),
+    debug: jest.fn(),
+    error: jest.fn(),
+  },
+  hashToken: jest.fn().mockResolvedValue('hashed-token'),
+}));
 jest.mock('~/models', () => ({
   findUser: jest.fn(),
   createUser: jest.fn(),
@@ -29,26 +31,26 @@ jest.mock('~/server/services/Config', () => ({
 jest.mock('~/server/services/Config/EndpointService', () => ({
   config: {},
 }));
-jest.mock('~/server/utils', () => ({
-  isEnabled: jest.fn(() => false),
-  isUserProvided: jest.fn(() => false),
-}));
 jest.mock('~/server/services/Files/strategies', () => ({
   getStrategyFunctions: jest.fn(() => ({
     saveBuffer: jest.fn().mockResolvedValue('/fake/path/to/avatar.png'),
   })),
 }));
-jest.mock('~/server/utils/crypto', () => ({
-  hashToken: jest.fn().mockResolvedValue('hashed-token'),
-}));
-jest.mock('~/config', () => ({
-  logger: {
-    info: jest.fn(),
-    debug: jest.fn(),
-    error: jest.fn(),
-  },
+jest.mock('~/config/paths', () => ({
+  root: '/fake/root/path',
 }));
 
+const fs = require('fs');
+const path = require('path');
+const fetch = require('node-fetch');
+const { Strategy: SamlStrategy } = require('@node-saml/passport-saml');
+const { setupSaml, getCertificateContent } = require('./samlStrategy');
+
+// Configure fs mock
+jest.mocked(fs).existsSync = jest.fn();
+jest.mocked(fs).statSync = jest.fn();
+jest.mocked(fs).readFileSync = jest.fn();
+
 // To capture the verify callback from the strategy, we grab it from the mock constructor
 let verifyCallback;
 SamlStrategy.mockImplementation((options, verify) => {
diff --git a/api/typedefs.js b/api/typedefs.js
index 5bc7ebf664..58cd802425 100644
--- a/api/typedefs.js
+++ b/api/typedefs.js
@@ -476,11 +476,18 @@
  * @memberof typedefs
  */
 
+/**
+ * @exports ToolCallChunk
+ * @typedef {import('librechat-data-provider').Agents.ToolCallChunk} ToolCallChunk
+ * @memberof typedefs
+ */
+
 /**
  * @exports MessageContentImageUrl
  * @typedef {import('librechat-data-provider').Agents.MessageContentImageUrl} MessageContentImageUrl
  * @memberof typedefs
  */
+
 /** Web Search */
 
 /**
diff --git a/client/src/components/OAuth/OAuthError.tsx b/client/src/components/OAuth/OAuthError.tsx
new file mode 100644
index 0000000000..ac5532c241
--- /dev/null
+++ b/client/src/components/OAuth/OAuthError.tsx
@@ -0,0 +1,72 @@
+import React from 'react';
+import { useSearchParams } from 'react-router-dom';
+import { useLocalize } from '~/hooks';
+
+export default function OAuthError() {
+  const localize = useLocalize();
+  const [searchParams] = useSearchParams();
+  const error = searchParams.get('error') || 'unknown_error';
+
+  const getErrorMessage = (error: string): string => {
+    switch (error) {
+      case 'missing_code':
+        return (
+          localize('com_ui_oauth_error_missing_code') ||
+          'Authorization code is missing. Please try again.'
+        );
+      case 'missing_state':
+        return (
+          localize('com_ui_oauth_error_missing_state') ||
+          'State parameter is missing. Please try again.'
+        );
+      case 'invalid_state':
+        return (
+          localize('com_ui_oauth_error_invalid_state') ||
+          'Invalid state parameter. Please try again.'
+        );
+      case 'callback_failed':
+        return (
+          localize('com_ui_oauth_error_callback_failed') ||
+          'Authentication callback failed. Please try again.'
+        );
+      default:
+        return localize('com_ui_oauth_error_generic') || error.replace(/_/g, ' ');
+    }
+  };
+
+  return (
+    <div className="flex min-h-screen items-center justify-center bg-gray-50 p-8">
+      <div className="w-full max-w-md rounded-lg bg-white p-8 text-center shadow-lg">
+        <div className="mb-4 flex justify-center">
+          <div className="flex h-12 w-12 items-center justify-center rounded-full bg-red-100">
+            <svg
+              className="h-6 w-6 text-red-600"
+              fill="none"
+              viewBox="0 0 24 24"
+              stroke="currentColor"
+              aria-hidden="true"
+            >
+              <path
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                strokeWidth={2}
+                d="M6 18L18 6M6 6l12 12"
+              />
+            </svg>
+          </div>
+        </div>
+        <h1 className="mb-4 text-3xl font-bold text-gray-900">
+          {localize('com_ui_oauth_error_title') || 'Authentication Failed'}
+        </h1>
+        <p className="mb-6 text-sm text-gray-600">{getErrorMessage(error)}</p>
+        <button
+          onClick={() => window.close()}
+          className="rounded-md bg-gray-900 px-4 py-2 text-sm font-medium text-white hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-gray-500 focus:ring-offset-2"
+          aria-label={localize('com_ui_close_window') || 'Close Window'}
+        >
+          {localize('com_ui_close_window') || 'Close Window'}
+        </button>
+      </div>
+    </div>
+  );
+}
diff --git a/client/src/components/OAuth/OAuthSuccess.tsx b/client/src/components/OAuth/OAuthSuccess.tsx
new file mode 100644
index 0000000000..fd8051a6f5
--- /dev/null
+++ b/client/src/components/OAuth/OAuthSuccess.tsx
@@ -0,0 +1,47 @@
+import React, { useEffect, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
+import { useLocalize } from '~/hooks';
+
+export default function OAuthSuccess() {
+  const localize = useLocalize();
+  const [searchParams] = useSearchParams();
+  const [secondsLeft, setSecondsLeft] = useState(3);
+  const serverName = searchParams.get('serverName');
+
+  useEffect(() => {
+    const countdown = setInterval(() => {
+      setSecondsLeft((prev) => {
+        if (prev <= 1) {
+          clearInterval(countdown);
+          window.close();
+          return 0;
+        }
+        return prev - 1;
+      });
+    }, 1000);
+
+    return () => clearInterval(countdown);
+  }, []);
+
+  return (
+    <div className="flex min-h-screen items-center justify-center bg-gray-50 p-8">
+      <div className="w-full max-w-md rounded-lg bg-white p-8 text-center shadow-lg">
+        <h1 className="mb-4 text-3xl font-bold text-gray-900">
+          {localize('com_ui_oauth_success_title') || 'Authentication Successful'}
+        </h1>
+        <p className="mb-2 text-sm text-gray-600">
+          {localize('com_ui_oauth_success_description') ||
+            'Your authentication was successful. This window will close in'}{' '}
+          <span className="font-medium text-indigo-500">{secondsLeft}</span>{' '}
+          {localize('com_ui_seconds') || 'seconds'}.
+        </p>
+        {serverName && (
+          <p className="mt-4 text-xs text-gray-500">
+            {localize('com_ui_oauth_connected_to') || 'Connected to'}:{' '}
+            <span className="font-medium">{serverName}</span>
+          </p>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/client/src/components/OAuth/index.ts b/client/src/components/OAuth/index.ts
new file mode 100644
index 0000000000..788b92c3a9
--- /dev/null
+++ b/client/src/components/OAuth/index.ts
@@ -0,0 +1,2 @@
+export { default as OAuthSuccess } from './OAuthSuccess';
+export { default as OAuthError } from './OAuthError';
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index 5791ff7713..d7171a032f 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -833,6 +833,17 @@
   "com_ui_not_used": "Not Used",
   "com_ui_nothing_found": "Nothing found",
   "com_ui_oauth": "OAuth",
+  "com_ui_oauth_success_title": "Authentication Successful",
+  "com_ui_oauth_success_description": "Your authentication was successful. This window will close in",
+  "com_ui_oauth_connected_to": "Connected to",
+  "com_ui_oauth_error_title": "Authentication Failed",
+  "com_ui_oauth_error_missing_code": "Authorization code is missing. Please try again.",
+  "com_ui_oauth_error_missing_state": "State parameter is missing. Please try again.",
+  "com_ui_oauth_error_invalid_state": "Invalid state parameter. Please try again.",
+  "com_ui_oauth_error_callback_failed": "Authentication callback failed. Please try again.",
+  "com_ui_oauth_error_generic": "Authentication failed. Please try again.",
+  "com_ui_close_window": "Close Window",
+  "com_ui_seconds": "seconds",
   "com_ui_of": "of",
   "com_ui_off": "Off",
   "com_ui_on": "On",
@@ -1006,7 +1017,7 @@
   "com_ui_zoom": "Zoom",
   "com_user_message": "You",
   "com_warning_resubmit_unsupported": "Resubmitting the AI message is not supported for this endpoint.",
-    "com_ui_add_mcp": "Add MCP",
+  "com_ui_add_mcp": "Add MCP",
   "com_ui_add_mcp_server": "Add MCP Server",
   "com_ui_edit_mcp_server": "Edit MCP Server",
   "com_agents_mcps_disabled": "You need to create an agent before adding MCPs.",
@@ -1028,4 +1039,4 @@
   "com_agents_mcp_trust_subtext": "Custom connectors are not verified by LibreChat",
   "com_ui_icon": "Icon",
   "com_agents_mcp_icon_size": "Minimum size 128 x 128 px"
-}
\ No newline at end of file
+}
diff --git a/client/src/routes/index.tsx b/client/src/routes/index.tsx
index c8bc382a42..607464ecbb 100644
--- a/client/src/routes/index.tsx
+++ b/client/src/routes/index.tsx
@@ -1,13 +1,14 @@
 import { createBrowserRouter, Navigate, Outlet } from 'react-router-dom';
 import {
   Login,
-  Registration,
-  RequestPasswordReset,
-  ResetPassword,
   VerifyEmail,
+  Registration,
+  ResetPassword,
   ApiErrorWatcher,
   TwoFactorScreen,
+  RequestPasswordReset,
 } from '~/components/Auth';
+import { OAuthSuccess, OAuthError } from '~/components/OAuth';
 import { AuthContextProvider } from '~/hooks/AuthContext';
 import RouteErrorBoundary from './RouteErrorBoundary';
 import StartupLayout from './Layouts/Startup';
@@ -31,6 +32,20 @@ export const router = createBrowserRouter([
     element: <ShareRoute />,
     errorElement: <RouteErrorBoundary />,
   },
+  {
+    path: 'oauth',
+    errorElement: <RouteErrorBoundary />,
+    children: [
+      {
+        path: 'success',
+        element: <OAuthSuccess />,
+      },
+      {
+        path: 'error',
+        element: <OAuthError />,
+      },
+    ],
+  },
   {
     path: '/',
     element: <StartupLayout />,
diff --git a/package-lock.json b/package-lock.json
index 50dacbb5c0..ed1ef74865 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20056,15 +20056,16 @@
       }
     },
     "node_modules/@modelcontextprotocol/sdk": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.2.tgz",
-      "integrity": "sha512-H9vwztj5OAqHg9GockCQC06k1natgcxWQSRpQcPJf6i5+MWBzfKkRtxGbjQf0X2ihii0ffLZCRGbYV2f2bjNCQ==",
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.12.3.tgz",
+      "integrity": "sha512-DyVYSOafBvk3/j1Oka4z5BWT8o4AFmoNyZY9pALOm7Lh3GZglR71Co4r4dEUoqDWdDazIZQHBe7J2Nwkg6gHgQ==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
+        "ajv": "^6.12.6",
         "content-type": "^1.0.5",
         "cors": "^2.8.5",
-        "cross-spawn": "^7.0.3",
+        "cross-spawn": "^7.0.5",
         "eventsource": "^3.0.2",
         "express": "^5.0.1",
         "express-rate-limit": "^7.5.0",
@@ -20091,6 +20092,23 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/@modelcontextprotocol/sdk/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
     "node_modules/@modelcontextprotocol/sdk/node_modules/body-parser": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
@@ -20219,6 +20237,13 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/@modelcontextprotocol/sdk/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/@modelcontextprotocol/sdk/node_modules/media-typer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
@@ -30602,8 +30627,7 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
@@ -37599,9 +37623,9 @@
       "integrity": "sha512-1orQ9MT1vHFGQxhuy7E/0gECD3fd2fCC+PIX+/jgmU/gI3EpRocXtmtvxCO5x3WZ443FLTLFWNDjl5MPJf9u+Q=="
     },
     "node_modules/oauth4webapi": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/oauth4webapi/-/oauth4webapi-3.5.1.tgz",
-      "integrity": "sha512-txg/jZQwcbaF7PMJgY7aoxc9QuCxHVFMiEkDIJ60DwDz3PbtXPQnrzo+3X4IRYGChIwWLabRBRpf1k9hO9+xrQ==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/oauth4webapi/-/oauth4webapi-3.5.2.tgz",
+      "integrity": "sha512-VYz5BaP3izIrUc1GAVzIoz4JnljiW0YAUFObMBwsqDnfHxz2sjLu3W7/8vE8Ms9IbMewN9+1kcvhY3tMscAeGQ==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/panva"
@@ -44419,7 +44443,6 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
@@ -46150,7 +46173,7 @@
     },
     "packages/api": {
       "name": "@librechat/api",
-      "version": "1.2.3",
+      "version": "1.2.4",
       "license": "ISC",
       "devDependencies": {
         "@babel/preset-env": "^7.21.5",
@@ -46184,7 +46207,7 @@
       "peerDependencies": {
         "@librechat/agents": "^2.4.37",
         "@librechat/data-schemas": "*",
-        "@modelcontextprotocol/sdk": "^1.11.2",
+        "@modelcontextprotocol/sdk": "^1.12.3",
         "axios": "^1.8.2",
         "diff": "^7.0.0",
         "eventsource": "^3.0.2",
@@ -46270,46 +46293,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "packages/auth": {
-      "name": "@librechat/auth",
-      "version": "0.0.1",
-      "extraneous": true,
-      "license": "MIT",
-      "dependencies": {
-        "https-proxy-agent": "^7.0.6",
-        "jsonwebtoken": "^9.0.2",
-        "mongoose": "^8.12.1",
-        "openid-client": "^6.5.0",
-        "passport": "^0.7.0",
-        "passport-facebook": "^3.0.0"
-      },
-      "devDependencies": {
-        "@librechat/data-schemas": "^0.0.9",
-        "@rollup/plugin-alias": "^5.1.0",
-        "@rollup/plugin-commonjs": "^25.0.2",
-        "@rollup/plugin-json": "^6.1.0",
-        "@rollup/plugin-node-resolve": "^15.1.0",
-        "@rollup/plugin-replace": "^5.0.5",
-        "@rollup/plugin-terser": "^0.4.4",
-        "@rollup/plugin-typescript": "^12.1.2",
-        "@types/diff": "^6.0.0",
-        "@types/express": "^5.0.0",
-        "@types/jest": "^29.5.2",
-        "@types/node": "^20.3.0",
-        "jest": "^29.5.0",
-        "jest-junit": "^16.0.0",
-        "rimraf": "^5.0.1",
-        "rollup": "^4.22.4",
-        "rollup-plugin-generate-package-json": "^3.2.0",
-        "rollup-plugin-peer-deps-external": "^2.2.4",
-        "rollup-plugin-typescript2": "^0.35.0",
-        "ts-node": "^10.9.2",
-        "typescript": "^5.0.4"
-      },
-      "peerDependencies": {
-        "keyv": "^5.3.2"
-      }
-    },
     "packages/data-provider": {
       "name": "librechat-data-provider",
       "version": "0.7.87",
diff --git a/package.json b/package.json
index cb33ac9164..251247f4b9 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "b:data": "cd packages/data-provider && bun run b:build",
     "b:mcp": "cd packages/api && bun run b:build",
     "b:data-schemas": "cd packages/data-schemas && bun run b:build",
+    "b:build:api": "cd packages/api && bun run b:build",
     "b:client": "bun --bun run b:data && bun --bun run b:mcp && bun --bun run b:data-schemas && cd client && bun --bun run b:build",
     "b:client:dev": "cd client && bun run b:dev",
     "b:test:client": "cd client && bun run b:test",
diff --git a/packages/api/package.json b/packages/api/package.json
index 61f4cda757..1c2ab534e3 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@librechat/api",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "type": "commonjs",
   "description": "MCP services for LibreChat",
   "main": "dist/index.js",
@@ -71,7 +71,7 @@
   "peerDependencies": {
     "@librechat/agents": "^2.4.37",
     "@librechat/data-schemas": "*",
-    "@modelcontextprotocol/sdk": "^1.11.2",
+    "@modelcontextprotocol/sdk": "^1.12.3",
     "axios": "^1.8.2",
     "diff": "^7.0.0",
     "eventsource": "^3.0.2",
diff --git a/packages/api/rollup.config.js b/packages/api/rollup.config.js
index 0a56ea3d91..13d805874e 100644
--- a/packages/api/rollup.config.js
+++ b/packages/api/rollup.config.js
@@ -36,10 +36,11 @@ const plugins = [
 const cjsBuild = {
   input: 'src/index.ts',
   output: {
-    file: pkg.main,
+    dir: 'dist',
     format: 'cjs',
     sourcemap: true,
     exports: 'named',
+    entryFileNames: '[name].js',
   },
   external: [...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.devDependencies || {})],
   preserveSymlinks: true,
diff --git a/api/server/utils/crypto.js b/packages/api/src/crypto/encryption.ts
similarity index 81%
rename from api/server/utils/crypto.js
rename to packages/api/src/crypto/encryption.ts
index 2f176fedee..aedf3c9c92 100644
--- a/api/server/utils/crypto.js
+++ b/packages/api/src/crypto/encryption.ts
@@ -1,15 +1,15 @@
-require('dotenv').config();
-const crypto = require('node:crypto');
+import 'dotenv/config';
+import crypto from 'node:crypto';
 const { webcrypto } = crypto;
 
 // Use hex decoding for both key and IV for legacy methods.
-const key = Buffer.from(process.env.CREDS_KEY, 'hex');
-const iv = Buffer.from(process.env.CREDS_IV, 'hex');
+const key = Buffer.from(process.env.CREDS_KEY ?? '', 'hex');
+const iv = Buffer.from(process.env.CREDS_IV ?? '', 'hex');
 const algorithm = 'AES-CBC';
 
 // --- Legacy v1/v2 Setup: AES-CBC with fixed key and IV ---
 
-async function encrypt(value) {
+export async function encrypt(value: string) {
   const cryptoKey = await webcrypto.subtle.importKey('raw', key, { name: algorithm }, false, [
     'encrypt',
   ]);
@@ -23,7 +23,7 @@ async function encrypt(value) {
   return Buffer.from(encryptedBuffer).toString('hex');
 }
 
-async function decrypt(encryptedValue) {
+export async function decrypt(encryptedValue: string) {
   const cryptoKey = await webcrypto.subtle.importKey('raw', key, { name: algorithm }, false, [
     'decrypt',
   ]);
@@ -39,7 +39,7 @@ async function decrypt(encryptedValue) {
 
 // --- v2: AES-CBC with a random IV per encryption ---
 
-async function encryptV2(value) {
+export async function encryptV2(value: string) {
   const gen_iv = webcrypto.getRandomValues(new Uint8Array(16));
   const cryptoKey = await webcrypto.subtle.importKey('raw', key, { name: algorithm }, false, [
     'encrypt',
@@ -54,12 +54,12 @@ async function encryptV2(value) {
   return Buffer.from(gen_iv).toString('hex') + ':' + Buffer.from(encryptedBuffer).toString('hex');
 }
 
-async function decryptV2(encryptedValue) {
+export async function decryptV2(encryptedValue: string) {
   const parts = encryptedValue.split(':');
   if (parts.length === 1) {
     return parts[0];
   }
-  const gen_iv = Buffer.from(parts.shift(), 'hex');
+  const gen_iv = Buffer.from(parts.shift() ?? '', 'hex');
   const encrypted = parts.join(':');
   const cryptoKey = await webcrypto.subtle.importKey('raw', key, { name: algorithm }, false, [
     'decrypt',
@@ -81,10 +81,10 @@ const algorithm_v3 = 'aes-256-ctr';
  * Encrypts a value using AES-256-CTR.
  * Note: AES-256 requires a 32-byte key. Ensure that process.env.CREDS_KEY is a 64-character hex string.
  *
- * @param {string} value - The plaintext to encrypt.
- * @returns {string} The encrypted string with a "v3:" prefix.
+ * @param value - The plaintext to encrypt.
+ * @returns The encrypted string with a "v3:" prefix.
  */
-function encryptV3(value) {
+export function encryptV3(value: string) {
   if (key.length !== 32) {
     throw new Error(`Invalid key length: expected 32 bytes, got ${key.length} bytes`);
   }
@@ -94,7 +94,7 @@ function encryptV3(value) {
   return `v3:${iv_v3.toString('hex')}:${encrypted.toString('hex')}`;
 }
 
-function decryptV3(encryptedValue) {
+export function decryptV3(encryptedValue: string) {
   const parts = encryptedValue.split(':');
   if (parts[0] !== 'v3') {
     throw new Error('Not a v3 encrypted value');
@@ -106,7 +106,7 @@ function decryptV3(encryptedValue) {
   return decrypted.toString('utf8');
 }
 
-async function getRandomValues(length) {
+export async function getRandomValues(length: number) {
   if (!Number.isInteger(length) || length <= 0) {
     throw new Error('Length must be a positive integer');
   }
@@ -117,24 +117,13 @@ async function getRandomValues(length) {
 
 /**
  * Computes SHA-256 hash for the given input.
- * @param {string} input
- * @returns {Promise<string>}
+ * @param input - The input to hash.
+ * @returns The SHA-256 hash of the input.
  */
-async function hashBackupCode(input) {
+export async function hashBackupCode(input: string) {
   const encoder = new TextEncoder();
   const data = encoder.encode(input);
   const hashBuffer = await webcrypto.subtle.digest('SHA-256', data);
   const hashArray = Array.from(new Uint8Array(hashBuffer));
   return hashArray.map((b) => b.toString(16).padStart(2, '0')).join('');
 }
-
-module.exports = {
-  encrypt,
-  decrypt,
-  encryptV2,
-  decryptV2,
-  encryptV3,
-  decryptV3,
-  hashBackupCode,
-  getRandomValues,
-};
diff --git a/packages/api/src/crypto/index.ts b/packages/api/src/crypto/index.ts
new file mode 100644
index 0000000000..73ebae8b16
--- /dev/null
+++ b/packages/api/src/crypto/index.ts
@@ -0,0 +1 @@
+export * from './encryption';
diff --git a/packages/api/src/flow/manager.spec.ts b/packages/api/src/flow/manager.spec.ts
index 1f1714509b..af6420ffc4 100644
--- a/packages/api/src/flow/manager.spec.ts
+++ b/packages/api/src/flow/manager.spec.ts
@@ -1,8 +1,8 @@
-import { FlowStateManager } from './manager';
 import { Keyv } from 'keyv';
+import { FlowStateManager } from './manager';
 import type { FlowState } from './types';
 
-// Create a mock class without extending Keyv
+/** Mock class without extending Keyv */
 class MockKeyv {
   private store: Map<string, FlowState<string>>;
 
diff --git a/packages/api/src/flow/manager.ts b/packages/api/src/flow/manager.ts
index 6a421b8d18..f27dfbb64b 100644
--- a/packages/api/src/flow/manager.ts
+++ b/packages/api/src/flow/manager.ts
@@ -1,28 +1,18 @@
 import { Keyv } from 'keyv';
+import { logger } from '@librechat/data-schemas';
 import type { StoredDataNoRaw } from 'keyv';
-import type { Logger } from 'winston';
 import type { FlowState, FlowMetadata, FlowManagerOptions } from './types';
 
 export class FlowStateManager<T = unknown> {
   private keyv: Keyv;
   private ttl: number;
-  private logger: Logger;
   private intervals: Set<NodeJS.Timeout>;
 
-  private static getDefaultLogger(): Logger {
-    return {
-      error: console.error,
-      warn: console.warn,
-      info: console.info,
-      debug: console.debug,
-    } as Logger;
-  }
-
   constructor(store: Keyv, options?: FlowManagerOptions) {
     if (!options) {
       options = { ttl: 60000 * 3 };
     }
-    const { ci = false, ttl, logger } = options;
+    const { ci = false, ttl } = options;
 
     if (!ci && !(store instanceof Keyv)) {
       throw new Error('Invalid store provided to FlowStateManager');
@@ -30,14 +20,13 @@ export class FlowStateManager<T = unknown> {
 
     this.ttl = ttl;
     this.keyv = store;
-    this.logger = logger || FlowStateManager.getDefaultLogger();
     this.intervals = new Set();
     this.setupCleanupHandlers();
   }
 
   private setupCleanupHandlers() {
     const cleanup = () => {
-      this.logger.info('Cleaning up FlowStateManager intervals...');
+      logger.info('Cleaning up FlowStateManager intervals...');
       this.intervals.forEach((interval) => clearInterval(interval));
       this.intervals.clear();
       process.exit(0);
@@ -66,7 +55,7 @@ export class FlowStateManager<T = unknown> {
 
     let existingState = (await this.keyv.get(flowKey)) as FlowState<T> | undefined;
     if (existingState) {
-      this.logger.debug(`[${flowKey}] Flow already exists`);
+      logger.debug(`[${flowKey}] Flow already exists`);
       return this.monitorFlow(flowKey, type, signal);
     }
 
@@ -74,7 +63,7 @@ export class FlowStateManager<T = unknown> {
 
     existingState = (await this.keyv.get(flowKey)) as FlowState<T> | undefined;
     if (existingState) {
-      this.logger.debug(`[${flowKey}] Flow exists on 2nd check`);
+      logger.debug(`[${flowKey}] Flow exists on 2nd check`);
       return this.monitorFlow(flowKey, type, signal);
     }
 
@@ -85,7 +74,7 @@ export class FlowStateManager<T = unknown> {
       createdAt: Date.now(),
     };
 
-    this.logger.debug('Creating initial flow state:', flowKey);
+    logger.debug('Creating initial flow state:', flowKey);
     await this.keyv.set(flowKey, initialState, this.ttl);
     return this.monitorFlow(flowKey, type, signal);
   }
@@ -102,7 +91,7 @@ export class FlowStateManager<T = unknown> {
           if (!flowState) {
             clearInterval(intervalId);
             this.intervals.delete(intervalId);
-            this.logger.error(`[${flowKey}] Flow state not found`);
+            logger.error(`[${flowKey}] Flow state not found`);
             reject(new Error(`${type} Flow state not found`));
             return;
           }
@@ -110,7 +99,7 @@ export class FlowStateManager<T = unknown> {
           if (signal?.aborted) {
             clearInterval(intervalId);
             this.intervals.delete(intervalId);
-            this.logger.warn(`[${flowKey}] Flow aborted`);
+            logger.warn(`[${flowKey}] Flow aborted`);
             const message = `${type} flow aborted`;
             await this.keyv.delete(flowKey);
             reject(new Error(message));
@@ -120,7 +109,7 @@ export class FlowStateManager<T = unknown> {
           if (flowState.status !== 'PENDING') {
             clearInterval(intervalId);
             this.intervals.delete(intervalId);
-            this.logger.debug(`[${flowKey}] Flow completed`);
+            logger.debug(`[${flowKey}] Flow completed`);
 
             if (flowState.status === 'COMPLETED' && flowState.result !== undefined) {
               resolve(flowState.result);
@@ -135,17 +124,15 @@ export class FlowStateManager<T = unknown> {
           if (elapsedTime >= this.ttl) {
             clearInterval(intervalId);
             this.intervals.delete(intervalId);
-            this.logger.error(
+            logger.error(
               `[${flowKey}] Flow timed out | Elapsed time: ${elapsedTime} | TTL: ${this.ttl}`,
             );
             await this.keyv.delete(flowKey);
             reject(new Error(`${type} flow timed out`));
           }
-          this.logger.debug(
-            `[${flowKey}] Flow state elapsed time: ${elapsedTime}, checking again...`,
-          );
+          logger.debug(`[${flowKey}] Flow state elapsed time: ${elapsedTime}, checking again...`);
         } catch (error) {
-          this.logger.error(`[${flowKey}] Error checking flow state:`, error);
+          logger.error(`[${flowKey}] Error checking flow state:`, error);
           clearInterval(intervalId);
           this.intervals.delete(intervalId);
           reject(error);
@@ -224,7 +211,7 @@ export class FlowStateManager<T = unknown> {
     const flowKey = this.getFlowKey(flowId, type);
     let existingState = (await this.keyv.get(flowKey)) as FlowState<T> | undefined;
     if (existingState) {
-      this.logger.debug(`[${flowKey}] Flow already exists`);
+      logger.debug(`[${flowKey}] Flow already exists`);
       return this.monitorFlow(flowKey, type, signal);
     }
 
@@ -232,7 +219,7 @@ export class FlowStateManager<T = unknown> {
 
     existingState = (await this.keyv.get(flowKey)) as FlowState<T> | undefined;
     if (existingState) {
-      this.logger.debug(`[${flowKey}] Flow exists on 2nd check`);
+      logger.debug(`[${flowKey}] Flow exists on 2nd check`);
       return this.monitorFlow(flowKey, type, signal);
     }
 
@@ -242,7 +229,7 @@ export class FlowStateManager<T = unknown> {
       metadata: {},
       createdAt: Date.now(),
     };
-    this.logger.debug(`[${flowKey}] Creating initial flow state`);
+    logger.debug(`[${flowKey}] Creating initial flow state`);
     await this.keyv.set(flowKey, initialState, this.ttl);
 
     try {
diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
index 9e3db4ef6b..b7859e7ca4 100644
--- a/packages/api/src/index.ts
+++ b/packages/api/src/index.ts
@@ -1,8 +1,13 @@
 /* MCP */
 export * from './mcp/manager';
+export * from './mcp/oauth';
 /* Utilities */
 export * from './mcp/utils';
 export * from './utils';
+/* OAuth */
+export * from './oauth';
+/* Crypto */
+export * from './crypto';
 /* Flow */
 export * from './flow/manager';
 /* Agents */
diff --git a/packages/api/src/mcp/connection.ts b/packages/api/src/mcp/connection.ts
index 81a6831a70..38ca2b23d6 100644
--- a/packages/api/src/mcp/connection.ts
+++ b/packages/api/src/mcp/connection.ts
@@ -1,4 +1,5 @@
 import { EventEmitter } from 'events';
+import { logger } from '@librechat/data-schemas';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import {
@@ -10,7 +11,7 @@ import { ResourceListChangedNotificationSchema } from '@modelcontextprotocol/sdk
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
 import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
-import type { Logger } from 'winston';
+import type { MCPOAuthTokens } from './oauth/types';
 import type * as t from './types';
 
 function isStdioOptions(options: t.MCPOptions): options is t.StdioOptions {
@@ -67,24 +68,29 @@ export class MCPConnection extends EventEmitter {
   private isReconnecting = false;
   private isInitializing = false;
   private reconnectAttempts = 0;
-  iconPath?: string;
-  timeout?: number;
   private readonly userId?: string;
   private lastPingTime: number;
+  private oauthTokens?: MCPOAuthTokens | null;
+  private oauthRequired = false;
+  iconPath?: string;
+  timeout?: number;
+  url?: string;
 
   constructor(
     serverName: string,
     private readonly options: t.MCPOptions,
-    private logger?: Logger,
     userId?: string,
+    oauthTokens?: MCPOAuthTokens | null,
   ) {
     super();
     this.serverName = serverName;
-    this.logger = logger;
     this.userId = userId;
     this.iconPath = options.iconPath;
     this.timeout = options.timeout;
     this.lastPingTime = Date.now();
+    if (oauthTokens) {
+      this.oauthTokens = oauthTokens;
+    }
     this.client = new Client(
       {
         name: '@librechat/api-client',
@@ -107,11 +113,10 @@ export class MCPConnection extends EventEmitter {
   public static getInstance(
     serverName: string,
     options: t.MCPOptions,
-    logger?: Logger,
     userId?: string,
   ): MCPConnection {
     if (!MCPConnection.instance) {
-      MCPConnection.instance = new MCPConnection(serverName, options, logger, userId);
+      MCPConnection.instance = new MCPConnection(serverName, options, userId);
     }
     return MCPConnection.instance;
   }
@@ -129,7 +134,7 @@ export class MCPConnection extends EventEmitter {
 
   private emitError(error: unknown, errorContext: string): void {
     const errorMessage = error instanceof Error ? error.message : String(error);
-    this.logger?.error(`${this.getLogPrefix()} ${errorContext}: ${errorMessage}`);
+    logger.error(`${this.getLogPrefix()} ${errorContext}: ${errorMessage}`);
     this.emit('error', new Error(`${errorContext}: ${errorMessage}`));
   }
 
@@ -167,45 +172,52 @@ export class MCPConnection extends EventEmitter {
           if (!isWebSocketOptions(options)) {
             throw new Error('Invalid options for websocket transport.');
           }
+          this.url = options.url;
           return new WebSocketClientTransport(new URL(options.url));
 
         case 'sse': {
           if (!isSSEOptions(options)) {
             throw new Error('Invalid options for sse transport.');
           }
+          this.url = options.url;
           const url = new URL(options.url);
-          this.logger?.info(`${this.getLogPrefix()} Creating SSE transport: ${url.toString()}`);
+          logger.info(`${this.getLogPrefix()} Creating SSE transport: ${url.toString()}`);
           const abortController = new AbortController();
+
+          /** Add OAuth token to headers if available */
+          const headers = { ...options.headers };
+          if (this.oauthTokens?.access_token) {
+            headers['Authorization'] = `Bearer ${this.oauthTokens.access_token}`;
+          }
+
           const transport = new SSEClientTransport(url, {
             requestInit: {
-              headers: options.headers,
+              headers,
               signal: abortController.signal,
             },
             eventSourceInit: {
               fetch: (url, init) => {
-                const headers = new Headers(Object.assign({}, init?.headers, options.headers));
+                const fetchHeaders = new Headers(Object.assign({}, init?.headers, headers));
                 return fetch(url, {
                   ...init,
-                  headers,
+                  headers: fetchHeaders,
                 });
               },
             },
           });
 
           transport.onclose = () => {
-            this.logger?.info(`${this.getLogPrefix()} SSE transport closed`);
+            logger.info(`${this.getLogPrefix()} SSE transport closed`);
             this.emit('connectionChange', 'disconnected');
           };
 
           transport.onerror = (error) => {
-            this.logger?.error(`${this.getLogPrefix()} SSE transport error:`, error);
+            logger.error(`${this.getLogPrefix()} SSE transport error:`, error);
             this.emitError(error, 'SSE transport error:');
           };
 
           transport.onmessage = (message) => {
-            this.logger?.info(
-              `${this.getLogPrefix()} Message received: ${JSON.stringify(message)}`,
-            );
+            logger.info(`${this.getLogPrefix()} Message received: ${JSON.stringify(message)}`);
           };
 
           this.setupTransportErrorHandlers(transport);
@@ -216,33 +228,38 @@ export class MCPConnection extends EventEmitter {
           if (!isStreamableHTTPOptions(options)) {
             throw new Error('Invalid options for streamable-http transport.');
           }
+          this.url = options.url;
           const url = new URL(options.url);
-          this.logger?.info(
+          logger.info(
             `${this.getLogPrefix()} Creating streamable-http transport: ${url.toString()}`,
           );
           const abortController = new AbortController();
 
+          // Add OAuth token to headers if available
+          const headers = { ...options.headers };
+          if (this.oauthTokens?.access_token) {
+            headers['Authorization'] = `Bearer ${this.oauthTokens.access_token}`;
+          }
+
           const transport = new StreamableHTTPClientTransport(url, {
             requestInit: {
-              headers: options.headers,
+              headers,
               signal: abortController.signal,
             },
           });
 
           transport.onclose = () => {
-            this.logger?.info(`${this.getLogPrefix()} Streamable-http transport closed`);
+            logger.info(`${this.getLogPrefix()} Streamable-http transport closed`);
             this.emit('connectionChange', 'disconnected');
           };
 
           transport.onerror = (error: Error | unknown) => {
-            this.logger?.error(`${this.getLogPrefix()} Streamable-http transport error:`, error);
+            logger.error(`${this.getLogPrefix()} Streamable-http transport error:`, error);
             this.emitError(error, 'Streamable-http transport error:');
           };
 
           transport.onmessage = (message: JSONRPCMessage) => {
-            this.logger?.info(
-              `${this.getLogPrefix()} Message received: ${JSON.stringify(message)}`,
-            );
+            logger.info(`${this.getLogPrefix()} Message received: ${JSON.stringify(message)}`);
           };
 
           this.setupTransportErrorHandlers(transport);
@@ -271,17 +288,17 @@ export class MCPConnection extends EventEmitter {
         /**
          * // FOR DEBUGGING
          * // this.client.setRequestHandler(PingRequestSchema, async (request, extra) => {
-         * //    this.logger?.info(`[MCP][${this.serverName}] PingRequest: ${JSON.stringify(request)}`);
+         * //    logger.info(`[MCP][${this.serverName}] PingRequest: ${JSON.stringify(request)}`);
          * //    if (getEventListeners && extra.signal) {
          * //      const listenerCount = getEventListeners(extra.signal, 'abort').length;
-         * //      this.logger?.debug(`Signal has ${listenerCount} abort listeners`);
+         * //      logger.debug(`Signal has ${listenerCount} abort listeners`);
          * //    }
          * //    return {};
          * //  });
          */
       } else if (state === 'error' && !this.isReconnecting && !this.isInitializing) {
         this.handleReconnection().catch((error) => {
-          this.logger?.error(`${this.getLogPrefix()} Reconnection handler failed:`, error);
+          logger.error(`${this.getLogPrefix()} Reconnection handler failed:`, error);
         });
       }
     });
@@ -290,7 +307,15 @@ export class MCPConnection extends EventEmitter {
   }
 
   private async handleReconnection(): Promise<void> {
-    if (this.isReconnecting || this.shouldStopReconnecting || this.isInitializing) {
+    if (
+      this.isReconnecting ||
+      this.shouldStopReconnecting ||
+      this.isInitializing ||
+      this.oauthRequired
+    ) {
+      if (this.oauthRequired) {
+        logger.info(`${this.getLogPrefix()} OAuth required, skipping reconnection attempts`);
+      }
       return;
     }
 
@@ -305,7 +330,7 @@ export class MCPConnection extends EventEmitter {
         this.reconnectAttempts++;
         const delay = backoffDelay(this.reconnectAttempts);
 
-        this.logger?.info(
+        logger.info(
           `${this.getLogPrefix()} Reconnecting ${this.reconnectAttempts}/${this.MAX_RECONNECT_ATTEMPTS} (delay: ${delay}ms)`,
         );
 
@@ -316,13 +341,13 @@ export class MCPConnection extends EventEmitter {
           this.reconnectAttempts = 0;
           return;
         } catch (error) {
-          this.logger?.error(`${this.getLogPrefix()} Reconnection attempt failed:`, error);
+          logger.error(`${this.getLogPrefix()} Reconnection attempt failed:`, error);
 
           if (
             this.reconnectAttempts === this.MAX_RECONNECT_ATTEMPTS ||
             (this.shouldStopReconnecting as boolean)
           ) {
-            this.logger?.error(`${this.getLogPrefix()} Stopping reconnection attempts`);
+            logger.error(`${this.getLogPrefix()} Stopping reconnection attempts`);
             return;
           }
         }
@@ -366,18 +391,21 @@ export class MCPConnection extends EventEmitter {
             await this.client.close();
             this.transport = null;
           } catch (error) {
-            this.logger?.warn(`${this.getLogPrefix()} Error closing connection:`, error);
+            logger.warn(`${this.getLogPrefix()} Error closing connection:`, error);
           }
         }
 
         this.transport = this.constructTransport(this.options);
         this.setupTransportDebugHandlers();
 
-        const connectTimeout = this.options.initTimeout ?? 10000;
+        const connectTimeout = this.options.initTimeout ?? 120000;
         await Promise.race([
           this.client.connect(this.transport),
           new Promise((_resolve, reject) =>
-            setTimeout(() => reject(new Error('Connection timeout')), connectTimeout),
+            setTimeout(
+              () => reject(new Error(`Connection timeout after ${connectTimeout}ms`)),
+              connectTimeout,
+            ),
           ),
         ]);
 
@@ -385,9 +413,85 @@ export class MCPConnection extends EventEmitter {
         this.emit('connectionChange', 'connected');
         this.reconnectAttempts = 0;
       } catch (error) {
+        // Check if it's an OAuth authentication error
+        if (this.isOAuthError(error)) {
+          logger.warn(`${this.getLogPrefix()} OAuth authentication required`);
+          this.oauthRequired = true;
+          const serverUrl = this.url;
+          logger.debug(`${this.getLogPrefix()} Server URL for OAuth: ${serverUrl}`);
+
+          const oauthTimeout = this.options.initTimeout ?? 60000;
+          /** Promise that will resolve when OAuth is handled */
+          const oauthHandledPromise = new Promise<void>((resolve, reject) => {
+            let timeoutId: NodeJS.Timeout | null = null;
+            let oauthHandledListener: (() => void) | null = null;
+            let oauthFailedListener: ((error: Error) => void) | null = null;
+
+            /** Cleanup function to remove listeners and clear timeout */
+            const cleanup = () => {
+              if (timeoutId) {
+                clearTimeout(timeoutId);
+              }
+              if (oauthHandledListener) {
+                this.off('oauthHandled', oauthHandledListener);
+              }
+              if (oauthFailedListener) {
+                this.off('oauthFailed', oauthFailedListener);
+              }
+            };
+
+            // Success handler
+            oauthHandledListener = () => {
+              cleanup();
+              resolve();
+            };
+
+            // Failure handler
+            oauthFailedListener = (error: Error) => {
+              cleanup();
+              reject(error);
+            };
+
+            // Timeout handler
+            timeoutId = setTimeout(() => {
+              cleanup();
+              reject(new Error(`OAuth handling timeout after ${oauthTimeout}ms`));
+            }, oauthTimeout);
+
+            // Listen for both success and failure events
+            this.once('oauthHandled', oauthHandledListener);
+            this.once('oauthFailed', oauthFailedListener);
+          });
+
+          // Emit the event
+          this.emit('oauthRequired', {
+            serverName: this.serverName,
+            error,
+            serverUrl,
+            userId: this.userId,
+          });
+
+          try {
+            // Wait for OAuth to be handled
+            await oauthHandledPromise;
+            // Reset the oauthRequired flag
+            this.oauthRequired = false;
+            // Don't throw the error - just return so connection can be retried
+            logger.info(
+              `${this.getLogPrefix()} OAuth handled successfully, connection will be retried`,
+            );
+            return;
+          } catch (oauthError) {
+            // OAuth failed or timed out
+            this.oauthRequired = false;
+            logger.error(`${this.getLogPrefix()} OAuth handling failed:`, oauthError);
+            // Re-throw the original authentication error
+            throw error;
+          }
+        }
+
         this.connectionState = 'error';
         this.emit('connectionChange', 'error');
-        this.lastError = error instanceof Error ? error : new Error(String(error));
         throw error;
       } finally {
         this.connectPromise = null;
@@ -403,7 +507,7 @@ export class MCPConnection extends EventEmitter {
     }
 
     this.transport.onmessage = (msg) => {
-      this.logger?.debug(`${this.getLogPrefix()} Transport received: ${JSON.stringify(msg)}`);
+      logger.debug(`${this.getLogPrefix()} Transport received: ${JSON.stringify(msg)}`);
     };
 
     const originalSend = this.transport.send.bind(this.transport);
@@ -414,7 +518,7 @@ export class MCPConnection extends EventEmitter {
         }
         this.lastPingTime = Date.now();
       }
-      this.logger?.debug(`${this.getLogPrefix()} Transport sending: ${JSON.stringify(msg)}`);
+      logger.debug(`${this.getLogPrefix()} Transport sending: ${JSON.stringify(msg)}`);
       return originalSend(msg);
     };
   }
@@ -427,14 +531,24 @@ export class MCPConnection extends EventEmitter {
         throw new Error('Connection not established');
       }
     } catch (error) {
-      this.logger?.error(`${this.getLogPrefix()} Connection failed:`, error);
+      logger.error(`${this.getLogPrefix()} Connection failed:`, error);
       throw error;
     }
   }
 
   private setupTransportErrorHandlers(transport: Transport): void {
     transport.onerror = (error) => {
-      this.logger?.error(`${this.getLogPrefix()} Transport error:`, error);
+      logger.error(`${this.getLogPrefix()} Transport error:`, error);
+
+      // Check if it's an OAuth authentication error
+      if (error && typeof error === 'object' && 'code' in error) {
+        const errorCode = (error as unknown as { code?: number }).code;
+        if (errorCode === 401 || errorCode === 403) {
+          logger.warn(`${this.getLogPrefix()} OAuth authentication error detected`);
+          this.emit('oauthError', error);
+        }
+      }
+
       this.emit('connectionChange', 'error');
     };
   }
@@ -562,22 +676,36 @@ export class MCPConnection extends EventEmitter {
   //   }
   // }
 
-  // Public getters for state information
-  public getConnectionState(): t.ConnectionState {
-    return this.connectionState;
-  }
-
   public async isConnected(): Promise<boolean> {
     try {
       await this.client.ping();
       return this.connectionState === 'connected';
     } catch (error) {
-      this.logger?.error(`${this.getLogPrefix()} Ping failed:`, error);
+      logger.error(`${this.getLogPrefix()} Ping failed:`, error);
       return false;
     }
   }
 
-  public getLastError(): Error | null {
-    return this.lastError;
+  public setOAuthTokens(tokens: MCPOAuthTokens): void {
+    this.oauthTokens = tokens;
+  }
+
+  private isOAuthError(error: unknown): boolean {
+    if (!error || typeof error !== 'object') {
+      return false;
+    }
+
+    // Check for SSE error with 401 status
+    if ('message' in error && typeof error.message === 'string') {
+      return error.message.includes('401') || error.message.includes('Non-200 status code (401)');
+    }
+
+    // Check for error code
+    if ('code' in error) {
+      const code = (error as { code?: number }).code;
+      return code === 401 || code === 403;
+    }
+
+    return false;
   }
 }
diff --git a/packages/api/src/mcp/enum.ts b/packages/api/src/mcp/enum.ts
index 995ddfb523..806e5c0054 100644
--- a/packages/api/src/mcp/enum.ts
+++ b/packages/api/src/mcp/enum.ts
@@ -1,3 +1,9 @@
 export enum CONSTANTS {
   mcp_delimiter = '_mcp_',
+  /** System user ID for app-level OAuth tokens (all zeros ObjectId) */
+  SYSTEM_USER_ID = '000000000000000000000000',
+}
+
+export function isSystemUserId(userId?: string): boolean {
+  return userId === CONSTANTS.SYSTEM_USER_ID;
 }
diff --git a/packages/api/src/mcp/manager.ts b/packages/api/src/mcp/manager.ts
index af8f1632a7..0a60784457 100644
--- a/packages/api/src/mcp/manager.ts
+++ b/packages/api/src/mcp/manager.ts
@@ -1,11 +1,18 @@
+import { logger } from '@librechat/data-schemas';
 import { CallToolResultSchema, ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
 import type { RequestOptions } from '@modelcontextprotocol/sdk/shared/protocol.js';
+import type { OAuthClientInformation } from '@modelcontextprotocol/sdk/shared/auth.js';
 import type { JsonSchemaType, MCPOptions, TUser } from 'librechat-data-provider';
-import type { Logger } from 'winston';
+import type { TokenMethods } from '@librechat/data-schemas';
+import type { FlowStateManager } from '~/flow/manager';
+import type { MCPOAuthTokens, MCPOAuthFlowMetadata } from './oauth/types';
+import type { FlowMetadata } from '~/flow/types';
 import type * as t from './types';
+import { CONSTANTS, isSystemUserId } from './enum';
+import { MCPOAuthHandler } from './oauth/handler';
+import { MCPTokenStorage } from './oauth/tokens';
 import { formatToolContent } from './parsers';
 import { MCPConnection } from './connection';
-import { CONSTANTS } from './enum';
 
 export interface CallToolOptions extends RequestOptions {
   user?: TUser;
@@ -24,24 +31,10 @@ export class MCPManager {
   private processMCPEnv?: (obj: MCPOptions, user?: TUser) => MCPOptions; // Store the processing function
   /** Store MCP server instructions */
   private serverInstructions: Map<string, string> = new Map();
-  private logger: Logger;
 
-  private static getDefaultLogger(): Logger {
-    return {
-      error: console.error,
-      warn: console.warn,
-      info: console.info,
-      debug: console.debug,
-    } as Logger;
-  }
-
-  private constructor(logger?: Logger) {
-    this.logger = logger || MCPManager.getDefaultLogger();
-  }
-
-  public static getInstance(logger?: Logger): MCPManager {
+  public static getInstance(): MCPManager {
     if (!MCPManager.instance) {
-      MCPManager.instance = new MCPManager(logger);
+      MCPManager.instance = new MCPManager();
     }
     // Check for idle connections when getInstance is called
     MCPManager.instance.checkIdleConnections();
@@ -49,79 +42,188 @@ export class MCPManager {
   }
 
   /** Stores configs and initializes app-level connections */
-  public async initializeMCP(
-    mcpServers: t.MCPServers,
-    processMCPEnv?: (obj: MCPOptions) => MCPOptions,
-  ): Promise<void> {
-    this.logger.info('[MCP] Initializing app-level servers');
+  public async initializeMCP({
+    mcpServers,
+    flowManager,
+    tokenMethods,
+    processMCPEnv,
+  }: {
+    mcpServers: t.MCPServers;
+    flowManager: FlowStateManager<MCPOAuthTokens | null>;
+    tokenMethods?: TokenMethods;
+    processMCPEnv?: (obj: MCPOptions) => MCPOptions;
+  }): Promise<void> {
     this.processMCPEnv = processMCPEnv; // Store the function
     this.mcpConfigs = mcpServers;
 
+    if (!flowManager) {
+      logger.info('[MCP] No flow manager provided, OAuth will not be available');
+    }
+
+    if (!tokenMethods) {
+      logger.info('[MCP] No token methods provided, token persistence will not be available');
+    }
+
     const entries = Object.entries(mcpServers);
     const initializedServers = new Set();
     const connectionResults = await Promise.allSettled(
       entries.map(async ([serverName, _config], i) => {
         /** Process env for app-level connections */
         const config = this.processMCPEnv ? this.processMCPEnv(_config) : _config;
-        const connection = new MCPConnection(serverName, config, this.logger);
+
+        /** Existing tokens for system-level connections */
+        let tokens: MCPOAuthTokens | null = null;
+        if (tokenMethods?.findToken) {
+          try {
+            /** Refresh function for app-level connections */
+            const refreshTokensFunction = async (
+              refreshToken: string,
+              metadata: {
+                userId: string;
+                serverName: string;
+                identifier: string;
+                clientInfo?: OAuthClientInformation;
+              },
+            ) => {
+              /** URL from config if available */
+              const serverUrl = (config as t.SSEOptions | t.StreamableHTTPOptions).url;
+              return await MCPOAuthHandler.refreshOAuthTokens(
+                refreshToken,
+                {
+                  serverName: metadata.serverName,
+                  serverUrl,
+                  clientInfo: metadata.clientInfo,
+                },
+                config.oauth,
+              );
+            };
+
+            /** Flow state to prevent concurrent token operations */
+            const tokenFlowId = `tokens:${CONSTANTS.SYSTEM_USER_ID}:${serverName}`;
+            tokens = await flowManager.createFlowWithHandler(
+              tokenFlowId,
+              'mcp_get_tokens',
+              async () => {
+                return await MCPTokenStorage.getTokens({
+                  userId: CONSTANTS.SYSTEM_USER_ID,
+                  serverName,
+                  findToken: tokenMethods.findToken,
+                  refreshTokens: refreshTokensFunction,
+                  createToken: tokenMethods.createToken,
+                  updateToken: tokenMethods.updateToken,
+                });
+              },
+            );
+          } catch {
+            logger.debug(`[MCP][${serverName}] No existing tokens found`);
+          }
+        }
+
+        if (tokens) {
+          logger.info(`[MCP][${serverName}] Loaded OAuth tokens`);
+        }
+
+        const connection = new MCPConnection(serverName, config, undefined, tokens);
+
+        /** Listen for OAuth requirements */
+        logger.info(`[MCP][${serverName}] Setting up OAuth event listener`);
+        connection.on('oauthRequired', async (data) => {
+          logger.debug(`[MCP][${serverName}] oauthRequired event received`);
+          const result = await this.handleOAuthRequired({
+            ...data,
+            flowManager,
+          });
+
+          if (result?.tokens && tokenMethods?.createToken) {
+            try {
+              connection.setOAuthTokens(result.tokens);
+              await MCPTokenStorage.storeTokens({
+                userId: CONSTANTS.SYSTEM_USER_ID,
+                serverName,
+                tokens: result.tokens,
+                createToken: tokenMethods.createToken,
+                updateToken: tokenMethods.updateToken,
+                findToken: tokenMethods.findToken,
+                clientInfo: result.clientInfo,
+              });
+              logger.info(`[MCP][${serverName}] OAuth tokens saved to storage`);
+            } catch (error) {
+              logger.error(`[MCP][${serverName}] Failed to save OAuth tokens to storage`, error);
+            }
+          }
+
+          // Only emit oauthHandled if we actually got tokens (OAuth succeeded)
+          if (result?.tokens) {
+            connection.emit('oauthHandled');
+          } else {
+            // OAuth failed, emit oauthFailed to properly reject the promise
+            logger.warn(`[MCP][${serverName}] OAuth failed, emitting oauthFailed event`);
+            connection.emit('oauthFailed', new Error('OAuth authentication failed'));
+          }
+        });
 
         try {
+          const connectTimeout = config.initTimeout ?? 30000;
           const connectionTimeout = new Promise<void>((_, reject) =>
-            setTimeout(() => reject(new Error('Connection timeout')), 30000),
+            setTimeout(
+              () => reject(new Error(`Connection timeout after ${connectTimeout}ms`)),
+              connectTimeout,
+            ),
           );
 
-          const connectionAttempt = this.initializeServer(connection, `[MCP][${serverName}]`);
+          const connectionAttempt = this.initializeServer({
+            connection,
+            logPrefix: `[MCP][${serverName}]`,
+            flowManager,
+            handleOAuth: false,
+          });
           await Promise.race([connectionAttempt, connectionTimeout]);
 
           if (await connection.isConnected()) {
             initializedServers.add(i);
-            this.connections.set(serverName, connection); // Store in app-level map
+            this.connections.set(serverName, connection);
 
-            // Handle unified serverInstructions configuration
+            /** Unified `serverInstructions` configuration */
             const configInstructions = config.serverInstructions;
 
             if (configInstructions !== undefined) {
               if (typeof configInstructions === 'string') {
-                // Custom instructions provided
                 this.serverInstructions.set(serverName, configInstructions);
-                this.logger.info(
+                logger.info(
                   `[MCP][${serverName}] Custom instructions stored for context inclusion: ${configInstructions}`,
                 );
               } else if (configInstructions === true) {
-                // Use server-provided instructions
+                /** Server-provided instructions */
                 const serverInstructions = connection.client.getInstructions();
 
                 if (serverInstructions) {
                   this.serverInstructions.set(serverName, serverInstructions);
-                  this.logger.info(
+                  logger.info(
                     `[MCP][${serverName}] Server instructions stored for context inclusion: ${serverInstructions}`,
                   );
                 } else {
-                  this.logger.info(
+                  logger.info(
                     `[MCP][${serverName}] serverInstructions=true but no server instructions available`,
                   );
                 }
               } else {
-                // configInstructions is false - explicitly disabled
-                this.logger.info(
+                logger.info(
                   `[MCP][${serverName}] Instructions explicitly disabled (serverInstructions=false)`,
                 );
               }
             } else {
-              this.logger.info(
+              logger.info(
                 `[MCP][${serverName}] Instructions not included (serverInstructions not configured)`,
               );
             }
 
             const serverCapabilities = connection.client.getServerCapabilities();
-            this.logger.info(
-              `[MCP][${serverName}] Capabilities: ${JSON.stringify(serverCapabilities)}`,
-            );
+            logger.info(`[MCP][${serverName}] Capabilities: ${JSON.stringify(serverCapabilities)}`);
 
             if (serverCapabilities?.tools) {
               const tools = await connection.client.listTools();
               if (tools.tools.length) {
-                this.logger.info(
+                logger.info(
                   `[MCP][${serverName}] Available tools: ${tools.tools
                     .map((tool) => tool.name)
                     .join(', ')}`,
@@ -130,7 +232,7 @@ export class MCPManager {
             }
           }
         } catch (error) {
-          this.logger.error(`[MCP][${serverName}] Initialization failed`, error);
+          logger.error(`[MCP][${serverName}] Initialization failed`, error);
           throw error;
         }
       }),
@@ -140,35 +242,47 @@ export class MCPManager {
       (result): result is PromiseRejectedResult => result.status === 'rejected',
     );
 
-    this.logger.info(
+    logger.info(
       `[MCP] Initialized ${initializedServers.size}/${entries.length} app-level server(s)`,
     );
 
     if (failedConnections.length > 0) {
-      this.logger.warn(
+      logger.warn(
         `[MCP] ${failedConnections.length}/${entries.length} app-level server(s) failed to initialize`,
       );
     }
 
     entries.forEach(([serverName], index) => {
       if (initializedServers.has(index)) {
-        this.logger.info(`[MCP][${serverName}] ✓ Initialized`);
+        logger.info(`[MCP][${serverName}] ✓ Initialized`);
       } else {
-        this.logger.info(`[MCP][${serverName}] ✗ Failed`);
+        logger.info(`[MCP][${serverName}] ✗ Failed`);
       }
     });
 
     if (initializedServers.size === entries.length) {
-      this.logger.info('[MCP] All app-level servers initialized successfully');
+      logger.info('[MCP] All app-level servers initialized successfully');
     } else if (initializedServers.size === 0) {
-      this.logger.warn('[MCP] No app-level servers initialized');
+      logger.warn('[MCP] No app-level servers initialized');
     }
   }
 
   /** Generic server initialization logic */
-  private async initializeServer(connection: MCPConnection, logPrefix: string): Promise<void> {
+  private async initializeServer({
+    connection,
+    logPrefix,
+    flowManager,
+    handleOAuth = true,
+  }: {
+    connection: MCPConnection;
+    logPrefix: string;
+    flowManager: FlowStateManager<MCPOAuthTokens | null>;
+    handleOAuth?: boolean;
+  }): Promise<void> {
     const maxAttempts = 3;
     let attempts = 0;
+    /** Whether OAuth has been handled by the connection */
+    let oauthHandled = false;
 
     while (attempts < maxAttempts) {
       try {
@@ -179,8 +293,34 @@ export class MCPManager {
         throw new Error('Connection attempt succeeded but status is not connected');
       } catch (error) {
         attempts++;
+
+        if (this.isOAuthError(error)) {
+          // Only handle OAuth if requested (not already handled by event listener)
+          if (handleOAuth) {
+            /** Check if OAuth was already handled by the connection */
+            const errorWithFlag = error as (Error & { isOAuthError?: boolean }) | undefined;
+            if (!oauthHandled && errorWithFlag?.isOAuthError) {
+              oauthHandled = true;
+              logger.info(`${logPrefix} Handling OAuth`);
+              const serverUrl = connection.url;
+              if (serverUrl) {
+                await this.handleOAuthRequired({
+                  serverName: connection.serverName,
+                  serverUrl,
+                  flowManager,
+                });
+              }
+            } else {
+              logger.info(`${logPrefix} OAuth already handled by connection`);
+            }
+          }
+          // Don't retry on OAuth errors - just throw
+          logger.info(`${logPrefix} OAuth required, stopping connection attempts`);
+          throw error;
+        }
+
         if (attempts === maxAttempts) {
-          this.logger.error(`${logPrefix} Failed to connect after ${maxAttempts} attempts`, error);
+          logger.error(`${logPrefix} Failed to connect after ${maxAttempts} attempts`, error);
           throw error; // Re-throw the last error
         }
         await new Promise((resolve) => setTimeout(resolve, 2000 * attempts));
@@ -188,6 +328,25 @@ export class MCPManager {
     }
   }
 
+  private isOAuthError(error: unknown): boolean {
+    if (!error || typeof error !== 'object') {
+      return false;
+    }
+
+    // Check for SSE error with 401 status
+    if ('message' in error && typeof error.message === 'string') {
+      return error.message.includes('401') || error.message.includes('Non-200 status code (401)');
+    }
+
+    // Check for error code
+    if ('code' in error) {
+      const code = (error as { code?: number }).code;
+      return code === 401 || code === 403;
+    }
+
+    return false;
+  }
+
   /** Check for and disconnect idle connections */
   private checkIdleConnections(currentUserId?: string): void {
     const now = Date.now();
@@ -198,12 +357,12 @@ export class MCPManager {
         continue;
       }
       if (now - lastActivity > this.USER_CONNECTION_IDLE_TIMEOUT) {
-        this.logger.info(
+        logger.info(
           `[MCP][User: ${userId}] User idle for too long. Disconnecting all connections...`,
         );
         // Disconnect all user connections asynchronously (fire and forget)
         this.disconnectUserConnections(userId).catch((err) =>
-          this.logger.error(`[MCP][User: ${userId}] Error disconnecting idle connections:`, err),
+          logger.error(`[MCP][User: ${userId}] Error disconnecting idle connections:`, err),
         );
       }
     }
@@ -213,13 +372,29 @@ export class MCPManager {
   private updateUserLastActivity(userId: string): void {
     const now = Date.now();
     this.userLastActivity.set(userId, now);
-    this.logger.debug(
+    logger.debug(
       `[MCP][User: ${userId}] Updated last activity timestamp: ${new Date(now).toISOString()}`,
     );
   }
 
   /** Gets or creates a connection for a specific user */
-  public async getUserConnection(serverName: string, user: TUser): Promise<MCPConnection> {
+  public async getUserConnection({
+    user,
+    serverName,
+    flowManager,
+    tokenMethods,
+    oauthStart,
+    oauthEnd,
+    signal,
+  }: {
+    user: TUser;
+    serverName: string;
+    flowManager: FlowStateManager<MCPOAuthTokens | null>;
+    tokenMethods?: TokenMethods;
+    oauthStart?: (authURL: string) => Promise<void>;
+    oauthEnd?: () => Promise<void>;
+    signal?: AbortSignal;
+  }): Promise<MCPConnection> {
     const userId = user.id;
     if (!userId) {
       throw new McpError(ErrorCode.InvalidRequest, `[MCP] User object missing id property`);
@@ -232,25 +407,22 @@ export class MCPManager {
     // Check if user is idle
     const lastActivity = this.userLastActivity.get(userId);
     if (lastActivity && now - lastActivity > this.USER_CONNECTION_IDLE_TIMEOUT) {
-      this.logger.info(
-        `[MCP][User: ${userId}] User idle for too long. Disconnecting all connections.`,
-      );
+      logger.info(`[MCP][User: ${userId}] User idle for too long. Disconnecting all connections.`);
       // Disconnect all user connections
       try {
         await this.disconnectUserConnections(userId);
       } catch (err) {
-        this.logger.error(`[MCP][User: ${userId}] Error disconnecting idle connections:`, err);
+        logger.error(`[MCP][User: ${userId}] Error disconnecting idle connections:`, err);
       }
       connection = undefined; // Force creation of a new connection
     } else if (connection) {
       if (await connection.isConnected()) {
-        this.logger.debug(`[MCP][User: ${userId}][${serverName}] Reusing active connection`);
-        // Update timestamp on reuse
+        logger.debug(`[MCP][User: ${userId}][${serverName}] Reusing active connection`);
         this.updateUserLastActivity(userId);
         return connection;
       } else {
         // Connection exists but is not connected, attempt to remove potentially stale entry
-        this.logger.warn(
+        logger.warn(
           `[MCP][User: ${userId}][${serverName}] Found existing but disconnected connection object. Cleaning up.`,
         );
         this.removeUserConnection(userId, serverName); // Clean up maps
@@ -260,7 +432,7 @@ export class MCPManager {
 
     // If no valid connection exists, create a new one
     if (!connection) {
-      this.logger.info(`[MCP][User: ${userId}][${serverName}] Establishing new connection`);
+      logger.info(`[MCP][User: ${userId}][${serverName}] Establishing new connection`);
     }
 
     let config = this.mcpConfigs[serverName];
@@ -275,19 +447,122 @@ export class MCPManager {
       config = { ...(this.processMCPEnv(config, user) ?? {}) };
     }
 
-    connection = new MCPConnection(serverName, config, this.logger, userId);
+    /** If no in-memory tokens, tokens from persistent storage */
+    let tokens: MCPOAuthTokens | null = null;
+    if (tokenMethods?.findToken) {
+      try {
+        /** Refresh function for user-specific connections */
+        const refreshTokensFunction = async (
+          refreshToken: string,
+          metadata: {
+            userId: string;
+            serverName: string;
+            identifier: string;
+            clientInfo?: OAuthClientInformation;
+          },
+        ) => {
+          /** URL from config since connection doesn't exist yet */
+          const serverUrl = (config as t.SSEOptions | t.StreamableHTTPOptions).url;
+          return await MCPOAuthHandler.refreshOAuthTokens(
+            refreshToken,
+            {
+              serverName: metadata.serverName,
+              serverUrl,
+              clientInfo: metadata.clientInfo,
+            },
+            config.oauth,
+          );
+        };
+
+        /** Flow state to prevent concurrent token operations */
+        const tokenFlowId = `tokens:${userId}:${serverName}`;
+        tokens = await flowManager.createFlowWithHandler(
+          tokenFlowId,
+          'mcp_get_tokens',
+          async () => {
+            return await MCPTokenStorage.getTokens({
+              userId,
+              serverName,
+              findToken: tokenMethods.findToken,
+              refreshTokens: refreshTokensFunction,
+              createToken: tokenMethods.createToken,
+              updateToken: tokenMethods.updateToken,
+            });
+          },
+          signal,
+        );
+      } catch (error) {
+        logger.error(
+          `[MCP][User: ${userId}][${serverName}] Error loading OAuth tokens from storage`,
+          error,
+        );
+      }
+    }
+
+    if (tokens) {
+      logger.info(`[MCP][User: ${userId}][${serverName}] Loaded OAuth tokens`);
+    }
+
+    connection = new MCPConnection(serverName, config, userId, tokens);
+
+    connection.on('oauthRequired', async (data) => {
+      logger.info(`[MCP][User: ${userId}][${serverName}] oauthRequired event received`);
+      const result = await this.handleOAuthRequired({
+        ...data,
+        flowManager,
+        oauthStart,
+        oauthEnd,
+      });
+
+      if (result?.tokens && tokenMethods?.createToken) {
+        try {
+          connection?.setOAuthTokens(result.tokens);
+          await MCPTokenStorage.storeTokens({
+            userId,
+            serverName,
+            tokens: result.tokens,
+            createToken: tokenMethods.createToken,
+            updateToken: tokenMethods.updateToken,
+            findToken: tokenMethods.findToken,
+            clientInfo: result.clientInfo,
+          });
+          logger.info(`[MCP][User: ${userId}][${serverName}] OAuth tokens saved to storage`);
+        } catch (error) {
+          logger.error(
+            `[MCP][User: ${userId}][${serverName}] Failed to save OAuth tokens to storage`,
+            error,
+          );
+        }
+      }
+
+      // Only emit oauthHandled if we actually got tokens (OAuth succeeded)
+      if (result?.tokens) {
+        connection?.emit('oauthHandled');
+      } else {
+        // OAuth failed, emit oauthFailed to properly reject the promise
+        logger.warn(
+          `[MCP][User: ${userId}][${serverName}] OAuth failed, emitting oauthFailed event`,
+        );
+        connection?.emit('oauthFailed', new Error('OAuth authentication failed'));
+      }
+    });
 
     try {
+      const connectTimeout = config.initTimeout ?? 30000;
       const connectionTimeout = new Promise<void>((_, reject) =>
-        setTimeout(() => reject(new Error('Connection timeout')), 30000),
+        setTimeout(
+          () => reject(new Error(`Connection timeout after ${connectTimeout}ms`)),
+          connectTimeout,
+        ),
       );
-      const connectionAttempt = this.initializeServer(
+      const connectionAttempt = this.initializeServer({
         connection,
-        `[MCP][User: ${userId}][${serverName}]`,
-      );
+        logPrefix: `[MCP][User: ${userId}][${serverName}]`,
+        flowManager,
+      });
       await Promise.race([connectionAttempt, connectionTimeout]);
 
-      if (!(await connection.isConnected())) {
+      if (!(await connection?.isConnected())) {
         throw new Error('Failed to establish connection after initialization attempt.');
       }
 
@@ -295,18 +570,16 @@ export class MCPManager {
         this.userConnections.set(userId, new Map());
       }
       this.userConnections.get(userId)?.set(serverName, connection);
-      this.logger.info(`[MCP][User: ${userId}][${serverName}] Connection successfully established`);
+
+      logger.info(`[MCP][User: ${userId}][${serverName}] Connection successfully established`);
       // Update timestamp on creation
       this.updateUserLastActivity(userId);
       return connection;
     } catch (error) {
-      this.logger.error(
-        `[MCP][User: ${userId}][${serverName}] Failed to establish connection`,
-        error,
-      );
+      logger.error(`[MCP][User: ${userId}][${serverName}] Failed to establish connection`, error);
       // Ensure partial connection state is cleaned up if initialization fails
-      await connection.disconnect().catch((disconnectError) => {
-        this.logger.error(
+      await connection?.disconnect().catch((disconnectError) => {
+        logger.error(
           `[MCP][User: ${userId}][${serverName}] Error during cleanup after failed connection`,
           disconnectError,
         );
@@ -330,7 +603,7 @@ export class MCPManager {
       }
     }
 
-    this.logger.debug(`[MCP][User: ${userId}][${serverName}] Removed connection entry.`);
+    logger.debug(`[MCP][User: ${userId}][${serverName}] Removed connection entry.`);
   }
 
   /** Disconnects and removes a specific user connection */
@@ -338,7 +611,7 @@ export class MCPManager {
     const userMap = this.userConnections.get(userId);
     const connection = userMap?.get(serverName);
     if (connection) {
-      this.logger.info(`[MCP][User: ${userId}][${serverName}] Disconnecting...`);
+      logger.info(`[MCP][User: ${userId}][${serverName}] Disconnecting...`);
       await connection.disconnect();
       this.removeUserConnection(userId, serverName);
     }
@@ -349,12 +622,12 @@ export class MCPManager {
     const userMap = this.userConnections.get(userId);
     const disconnectPromises: Promise<void>[] = [];
     if (userMap) {
-      this.logger.info(`[MCP][User: ${userId}] Disconnecting all servers...`);
+      logger.info(`[MCP][User: ${userId}] Disconnecting all servers...`);
       const userServers = Array.from(userMap.keys());
       for (const serverName of userServers) {
         disconnectPromises.push(
           this.disconnectUserConnection(userId, serverName).catch((error) => {
-            this.logger.error(
+            logger.error(
               `[MCP][User: ${userId}][${serverName}] Error during disconnection:`,
               error,
             );
@@ -364,7 +637,7 @@ export class MCPManager {
       await Promise.allSettled(disconnectPromises);
       // Ensure user activity timestamp is removed
       this.userLastActivity.delete(userId);
-      this.logger.info(`[MCP][User: ${userId}] All connections processed for disconnection.`);
+      logger.info(`[MCP][User: ${userId}] All connections processed for disconnection.`);
     }
   }
 
@@ -378,17 +651,73 @@ export class MCPManager {
     return this.connections;
   }
 
+  /** Attempts to reconnect an app-level connection if it's disconnected */
+  private async isConnectionActive({
+    serverName,
+    connection,
+    flowManager,
+    skipReconnect = false,
+  }: {
+    serverName: string;
+    connection: MCPConnection;
+    flowManager: FlowStateManager<MCPOAuthTokens | null>;
+    skipReconnect?: boolean;
+  }): Promise<boolean> {
+    if (await connection.isConnected()) {
+      return true;
+    }
+
+    if (skipReconnect) {
+      logger.warn(
+        `[MCP][${serverName}] App-level connection is disconnected, skipping reconnection attempt`,
+      );
+      return false;
+    }
+
+    logger.warn(
+      `[MCP][${serverName}] App-level connection disconnected, attempting to reconnect...`,
+    );
+
+    try {
+      const config = this.mcpConfigs[serverName];
+      if (!config) {
+        logger.error(`[MCP][${serverName}] Configuration not found for reconnection`);
+        return false;
+      }
+
+      await this.initializeServer({
+        connection,
+        logPrefix: `[MCP][${serverName}]`,
+        flowManager,
+      });
+
+      if (await connection.isConnected()) {
+        logger.info(`[MCP][${serverName}] App-level connection successfully reconnected`);
+        return true;
+      } else {
+        logger.warn(`[MCP][${serverName}] App-level connection reconnection failed`);
+        return false;
+      }
+    } catch (error) {
+      logger.error(`[MCP][${serverName}] Error during app-level connection reconnection:`, error);
+      return false;
+    }
+  }
+
   /**
    * Maps available tools from all app-level connections into the provided object.
    * The object is modified in place.
    */
-  public async mapAvailableTools(availableTools: t.LCAvailableTools): Promise<void> {
+  public async mapAvailableTools(
+    availableTools: t.LCAvailableTools,
+    flowManager: FlowStateManager<MCPOAuthTokens | null>,
+  ): Promise<void> {
     for (const [serverName, connection] of this.connections.entries()) {
       try {
-        if ((await connection.isConnected()) !== true) {
-          this.logger.warn(
-            `[MCP][${serverName}] Connection not established. Skipping tool mapping.`,
-          );
+        /** Attempt to ensure connection is active, with reconnection if needed */
+        const isActive = await this.isConnectionActive({ serverName, connection, flowManager });
+        if (!isActive) {
+          logger.warn(`[MCP][${serverName}] Connection not available. Skipping tool mapping.`);
           continue;
         }
 
@@ -405,7 +734,7 @@ export class MCPManager {
           };
         }
       } catch (error) {
-        this.logger.warn(`[MCP][${serverName}] Error fetching tools for mapping:`, error);
+        logger.warn(`[MCP][${serverName}] Error fetching tools`, error);
       }
     }
   }
@@ -413,19 +742,46 @@ export class MCPManager {
   /**
    * Loads tools from all app-level connections into the manifest.
    */
-  public async loadManifestTools(manifestTools: t.LCToolManifest): Promise<t.LCToolManifest> {
+  public async loadManifestTools({
+    flowManager,
+    serverToolsCallback,
+    getServerTools,
+  }: {
+    flowManager: FlowStateManager<MCPOAuthTokens | null>;
+    serverToolsCallback?: (serverName: string, tools: t.LCManifestTool[]) => Promise<void>;
+    getServerTools?: (serverName: string) => Promise<t.LCManifestTool[] | undefined>;
+  }): Promise<t.LCToolManifest> {
     const mcpTools: t.LCManifestTool[] = [];
 
     for (const [serverName, connection] of this.connections.entries()) {
       try {
-        if ((await connection.isConnected()) !== true) {
-          this.logger.warn(
-            `[MCP][${serverName}] Connection not established. Skipping manifest loading.`,
+        /** Attempt to ensure connection is active, with reconnection if needed */
+        const isActive = await this.isConnectionActive({
+          serverName,
+          connection,
+          flowManager,
+          skipReconnect: true,
+        });
+        if (!isActive) {
+          logger.warn(
+            `[MCP][${serverName}] Connection not available for ${serverName} manifest tools.`,
           );
+          if (typeof getServerTools !== 'function') {
+            logger.warn(
+              `[MCP][${serverName}] No \`getServerTools\` function provided, skipping tool loading.`,
+            );
+            continue;
+          }
+          const serverTools = await getServerTools(serverName);
+          if (serverTools && serverTools.length > 0) {
+            logger.info(`[MCP][${serverName}] Loaded tools from cache for manifest`);
+            mcpTools.push(...serverTools);
+          }
           continue;
         }
 
         const tools = await connection.fetchTools();
+        const serverTools: t.LCManifestTool[] = [];
         for (const tool of tools) {
           const pluginKey = `${tool.name}${CONSTANTS.mcp_delimiter}${serverName}`;
           const manifestTool: t.LCManifestTool = {
@@ -439,13 +795,17 @@ export class MCPManager {
             manifestTool.chatMenu = false;
           }
           mcpTools.push(manifestTool);
+          serverTools.push(manifestTool);
+        }
+        if (typeof serverToolsCallback === 'function') {
+          await serverToolsCallback(serverName, serverTools);
         }
       } catch (error) {
-        this.logger.error(`[MCP][${serverName}] Error fetching tools for manifest:`, error);
+        logger.error(`[MCP][${serverName}] Error fetching tools for manifest:`, error);
       }
     }
 
-    return [...mcpTools, ...manifestTools];
+    return mcpTools;
   }
 
   /**
@@ -459,13 +819,22 @@ export class MCPManager {
     provider,
     toolArguments,
     options,
+    tokenMethods,
+    flowManager,
+    oauthStart,
+    oauthEnd,
   }: {
     serverName: string;
     toolName: string;
     provider: t.Provider;
     toolArguments?: Record<string, unknown>;
     options?: CallToolOptions;
+    tokenMethods?: TokenMethods;
+    flowManager: FlowStateManager<MCPOAuthTokens | null>;
+    oauthStart?: (authURL: string) => Promise<void>;
+    oauthEnd?: () => Promise<void>;
   }): Promise<t.FormattedToolResponse> {
+    /** User-specific connection */
     let connection: MCPConnection | undefined;
     const { user, ...callOptions } = options ?? {};
     const userId = user?.id;
@@ -474,10 +843,18 @@ export class MCPManager {
     try {
       if (userId && user) {
         this.updateUserLastActivity(userId);
-        // Get or create user-specific connection
-        connection = await this.getUserConnection(serverName, user);
+        /** Get or create user-specific connection */
+        connection = await this.getUserConnection({
+          user,
+          serverName,
+          flowManager,
+          tokenMethods,
+          oauthStart,
+          oauthEnd,
+          signal: options?.signal,
+        });
       } else {
-        // Use app-level connection
+        /** App-level connection */
         connection = this.connections.get(serverName);
         if (!connection) {
           throw new McpError(
@@ -488,7 +865,7 @@ export class MCPManager {
       }
 
       if (!(await connection.isConnected())) {
-        // This might happen if getUserConnection failed silently or app connection dropped
+        /** May happen if getUserConnection failed silently or app connection dropped */
         throw new McpError(
           ErrorCode.InternalError, // Use InternalError for connection issues
           `${logPrefix} Connection is not active. Cannot execute tool ${toolName}.`,
@@ -516,7 +893,7 @@ export class MCPManager {
       return formatToolContent(result, provider);
     } catch (error) {
       // Log with context and re-throw or handle as needed
-      this.logger.error(`${logPrefix}[${toolName}] Tool call failed`, error);
+      logger.error(`${logPrefix}[${toolName}] Tool call failed`, error);
       // Rethrowing allows the caller (createMCPTool) to handle the final user message
       throw error;
     }
@@ -526,7 +903,7 @@ export class MCPManager {
   public async disconnectServer(serverName: string): Promise<void> {
     const connection = this.connections.get(serverName);
     if (connection) {
-      this.logger.info(`[MCP][${serverName}] Disconnecting...`);
+      logger.info(`[MCP][${serverName}] Disconnecting...`);
       await connection.disconnect();
       this.connections.delete(serverName);
     }
@@ -534,7 +911,7 @@ export class MCPManager {
 
   /** Disconnects all app-level and user-level connections */
   public async disconnectAll(): Promise<void> {
-    this.logger.info('[MCP] Disconnecting all app-level and user-level connections...');
+    logger.info('[MCP] Disconnecting all app-level and user-level connections...');
 
     const userDisconnectPromises = Array.from(this.userConnections.keys()).map((userId) =>
       this.disconnectUserConnections(userId),
@@ -545,13 +922,13 @@ export class MCPManager {
     // Disconnect all app-level connections
     const appDisconnectPromises = Array.from(this.connections.values()).map((connection) =>
       connection.disconnect().catch((error) => {
-        this.logger.error(`[MCP][${connection.serverName}] Error during disconnectAll:`, error);
+        logger.error(`[MCP][${connection.serverName}] Error during disconnectAll:`, error);
       }),
     );
     await Promise.allSettled(appDisconnectPromises);
     this.connections.clear();
 
-    this.logger.info('[MCP] All connections processed for disconnection.');
+    logger.info('[MCP] All connections processed for disconnection.');
   }
 
   /** Destroys the singleton instance and disconnects all connections */
@@ -559,7 +936,6 @@ export class MCPManager {
     if (MCPManager.instance) {
       await MCPManager.instance.disconnectAll();
       MCPManager.instance = null;
-      const logger = MCPManager.getDefaultLogger();
       logger.info('[MCP] Manager instance destroyed.');
     }
   }
@@ -620,4 +996,102 @@ ${formattedInstructions}
 
 Please follow these instructions when using tools from the respective MCP servers.`;
   }
+
+  /** Handles OAuth authentication requirements */
+  private async handleOAuthRequired({
+    serverName,
+    serverUrl,
+    flowManager,
+    userId = CONSTANTS.SYSTEM_USER_ID,
+    oauthStart,
+    oauthEnd,
+  }: {
+    serverName: string;
+    flowManager: FlowStateManager<MCPOAuthTokens | null>;
+    userId?: string;
+    serverUrl?: string;
+    oauthStart?: (authURL: string) => Promise<void>;
+    oauthEnd?: () => Promise<void>;
+  }): Promise<{ tokens: MCPOAuthTokens | null; clientInfo?: OAuthClientInformation } | null> {
+    const userPart = isSystemUserId(userId) ? '' : `[User: ${userId}]`;
+    const logPrefix = `[MCP]${userPart}[${serverName}]`;
+    logger.debug(`${logPrefix} \`handleOAuthRequired\` called with serverUrl: ${serverUrl}`);
+
+    if (!flowManager || !serverUrl) {
+      logger.error(
+        `${logPrefix} OAuth required but flow manager not available or server URL missing for ${serverName}`,
+      );
+      logger.warn(`${logPrefix} Please configure OAuth credentials for ${serverName}`);
+      return null;
+    }
+
+    try {
+      const config = this.mcpConfigs[serverName];
+      logger.debug(`${logPrefix} Checking for existing OAuth flow for ${serverName}...`);
+
+      /** Flow ID to check if a flow already exists */
+      const flowId = MCPOAuthHandler.generateFlowId(userId, serverName);
+
+      /** Check if there's already an ongoing OAuth flow for this flowId */
+      const existingFlow = await flowManager.getFlowState(flowId, 'mcp_oauth');
+      if (existingFlow && existingFlow.status === 'PENDING') {
+        logger.debug(
+          `${logPrefix} OAuth flow already exists for ${flowId}, waiting for completion`,
+        );
+        /** Tokens from existing flow to complete */
+        const tokens = await flowManager.createFlow(flowId, 'mcp_oauth');
+        if (typeof oauthEnd === 'function') {
+          await oauthEnd();
+        }
+        logger.info(`${logPrefix} OAuth flow completed, tokens received for ${serverName}`);
+
+        /** Client information from the existing flow metadata */
+        const existingMetadata = existingFlow.metadata as unknown as MCPOAuthFlowMetadata;
+        const clientInfo = existingMetadata?.clientInfo;
+
+        return { tokens, clientInfo };
+      }
+
+      logger.debug(`${logPrefix} Initiating new OAuth flow for ${serverName}...`);
+      const {
+        authorizationUrl,
+        flowId: newFlowId,
+        flowMetadata,
+      } = await MCPOAuthHandler.initiateOAuthFlow(serverName, serverUrl, userId, config?.oauth);
+
+      if (typeof oauthStart === 'function') {
+        logger.info(`${logPrefix} OAuth flow started, issued authorization URL to user`);
+        await oauthStart(authorizationUrl);
+      } else {
+        logger.info(`
+═══════════════════════════════════════════════════════════════════════
+Please visit the following URL to authenticate:
+
+${authorizationUrl}
+
+${logPrefix} Flow ID: ${newFlowId}
+═══════════════════════════════════════════════════════════════════════
+`);
+      }
+
+      /** Tokens from the new flow */
+      const tokens = await flowManager.createFlow(
+        newFlowId,
+        'mcp_oauth',
+        flowMetadata as FlowMetadata,
+      );
+      if (typeof oauthEnd === 'function') {
+        await oauthEnd();
+      }
+      logger.info(`${logPrefix} OAuth flow completed, tokens received for ${serverName}`);
+
+      /** Client information from the flow metadata */
+      const clientInfo = flowMetadata?.clientInfo;
+
+      return { tokens, clientInfo };
+    } catch (error) {
+      logger.error(`${logPrefix} Failed to complete OAuth flow for ${serverName}`, error);
+      return null;
+    }
+  }
 }
diff --git a/packages/api/src/mcp/oauth/handler.ts b/packages/api/src/mcp/oauth/handler.ts
new file mode 100644
index 0000000000..ab9bbe46c1
--- /dev/null
+++ b/packages/api/src/mcp/oauth/handler.ts
@@ -0,0 +1,603 @@
+import { randomBytes } from 'crypto';
+import { logger } from '@librechat/data-schemas';
+import {
+  discoverOAuthMetadata,
+  registerClient,
+  startAuthorization,
+  exchangeAuthorization,
+  discoverOAuthProtectedResourceMetadata,
+} from '@modelcontextprotocol/sdk/client/auth.js';
+import { OAuthMetadataSchema } from '@modelcontextprotocol/sdk/shared/auth.js';
+import type { MCPOptions } from 'librechat-data-provider';
+import type { FlowStateManager } from '~/flow/manager';
+import type {
+  OAuthClientInformation,
+  OAuthProtectedResourceMetadata,
+  MCPOAuthFlowMetadata,
+  MCPOAuthTokens,
+  OAuthMetadata,
+} from './types';
+
+/** Type for the OAuth metadata from the SDK */
+type SDKOAuthMetadata = Parameters<typeof registerClient>[1]['metadata'];
+
+export class MCPOAuthHandler {
+  private static readonly FLOW_TYPE = 'mcp_oauth';
+  private static readonly FLOW_TTL = 10 * 60 * 1000; // 10 minutes
+
+  /**
+   * Discovers OAuth metadata from the server
+   */
+  private static async discoverMetadata(serverUrl: string): Promise<{
+    metadata: OAuthMetadata;
+    resourceMetadata?: OAuthProtectedResourceMetadata;
+    authServerUrl: URL;
+  }> {
+    logger.debug(`[MCPOAuth] discoverMetadata called with serverUrl: ${serverUrl}`);
+
+    let authServerUrl = new URL(serverUrl);
+    let resourceMetadata: OAuthProtectedResourceMetadata | undefined;
+
+    try {
+      // Try to discover resource metadata first
+      logger.debug(
+        `[MCPOAuth] Attempting to discover protected resource metadata from ${serverUrl}`,
+      );
+      resourceMetadata = await discoverOAuthProtectedResourceMetadata(serverUrl);
+
+      if (resourceMetadata?.authorization_servers?.length) {
+        authServerUrl = new URL(resourceMetadata.authorization_servers[0]);
+        logger.debug(
+          `[MCPOAuth] Found authorization server from resource metadata: ${authServerUrl}`,
+        );
+      } else {
+        logger.debug(`[MCPOAuth] No authorization servers found in resource metadata`);
+      }
+    } catch (error) {
+      logger.debug('[MCPOAuth] Resource metadata discovery failed, continuing with server URL', {
+        error,
+      });
+    }
+
+    // Discover OAuth metadata
+    logger.debug(`[MCPOAuth] Discovering OAuth metadata from ${authServerUrl}`);
+    const rawMetadata = await discoverOAuthMetadata(authServerUrl);
+
+    if (!rawMetadata) {
+      logger.error(`[MCPOAuth] Failed to discover OAuth metadata from ${authServerUrl}`);
+      throw new Error('Failed to discover OAuth metadata');
+    }
+
+    logger.debug(`[MCPOAuth] OAuth metadata discovered successfully`);
+    const metadata = await OAuthMetadataSchema.parseAsync(rawMetadata);
+
+    logger.debug(`[MCPOAuth] OAuth metadata parsed successfully`);
+    return {
+      metadata: metadata as unknown as OAuthMetadata,
+      resourceMetadata,
+      authServerUrl,
+    };
+  }
+
+  /**
+   * Registers an OAuth client dynamically
+   */
+  private static async registerOAuthClient(
+    serverUrl: string,
+    metadata: OAuthMetadata,
+    resourceMetadata?: OAuthProtectedResourceMetadata,
+    redirectUri?: string,
+  ): Promise<OAuthClientInformation> {
+    logger.debug(`[MCPOAuth] Starting client registration for ${serverUrl}, server metadata:`, {
+      grant_types_supported: metadata.grant_types_supported,
+      response_types_supported: metadata.response_types_supported,
+      token_endpoint_auth_methods_supported: metadata.token_endpoint_auth_methods_supported,
+      scopes_supported: metadata.scopes_supported,
+    });
+
+    /** Client metadata based on what the server supports */
+    const clientMetadata = {
+      client_name: 'LibreChat MCP Client',
+      redirect_uris: [redirectUri || this.getDefaultRedirectUri()],
+      grant_types: ['authorization_code'] as string[],
+      response_types: ['code'] as string[],
+      token_endpoint_auth_method: 'client_secret_basic',
+      scope: undefined as string | undefined,
+    };
+
+    const supportedGrantTypes = metadata.grant_types_supported || ['authorization_code'];
+    const requestedGrantTypes = ['authorization_code'];
+
+    if (supportedGrantTypes.includes('refresh_token')) {
+      requestedGrantTypes.push('refresh_token');
+      logger.debug(
+        `[MCPOAuth] Server ${serverUrl} supports \`refresh_token\` grant type, adding to request`,
+      );
+    } else {
+      logger.debug(`[MCPOAuth] Server ${serverUrl} does not support \`refresh_token\` grant type`);
+    }
+    clientMetadata.grant_types = requestedGrantTypes;
+
+    clientMetadata.response_types = metadata.response_types_supported || ['code'];
+
+    if (metadata.token_endpoint_auth_methods_supported) {
+      // Prefer client_secret_basic if supported, otherwise use the first supported method
+      if (metadata.token_endpoint_auth_methods_supported.includes('client_secret_basic')) {
+        clientMetadata.token_endpoint_auth_method = 'client_secret_basic';
+      } else if (metadata.token_endpoint_auth_methods_supported.includes('client_secret_post')) {
+        clientMetadata.token_endpoint_auth_method = 'client_secret_post';
+      } else if (metadata.token_endpoint_auth_methods_supported.includes('none')) {
+        clientMetadata.token_endpoint_auth_method = 'none';
+      } else {
+        clientMetadata.token_endpoint_auth_method =
+          metadata.token_endpoint_auth_methods_supported[0];
+      }
+    }
+
+    const availableScopes = resourceMetadata?.scopes_supported || metadata.scopes_supported;
+    if (availableScopes) {
+      clientMetadata.scope = availableScopes.join(' ');
+    }
+
+    logger.debug(`[MCPOAuth] Registering client for ${serverUrl} with metadata:`, clientMetadata);
+
+    const clientInfo = await registerClient(serverUrl, {
+      metadata: metadata as unknown as SDKOAuthMetadata,
+      clientMetadata,
+    });
+
+    logger.debug(`[MCPOAuth] Client registered successfully for ${serverUrl}:`, {
+      client_id: clientInfo.client_id,
+      has_client_secret: !!clientInfo.client_secret,
+      grant_types: clientInfo.grant_types,
+      scope: clientInfo.scope,
+    });
+
+    return clientInfo;
+  }
+
+  /**
+   * Initiates the OAuth flow for an MCP server
+   */
+  static async initiateOAuthFlow(
+    serverName: string,
+    serverUrl: string,
+    userId: string,
+    config: MCPOptions['oauth'] | undefined,
+  ): Promise<{ authorizationUrl: string; flowId: string; flowMetadata: MCPOAuthFlowMetadata }> {
+    logger.debug(`[MCPOAuth] initiateOAuthFlow called for ${serverName} with URL: ${serverUrl}`);
+
+    const flowId = this.generateFlowId(userId, serverName);
+    const state = this.generateState();
+
+    logger.debug(`[MCPOAuth] Generated flowId: ${flowId}, state: ${state}`);
+
+    try {
+      // Check if we have pre-configured OAuth settings
+      if (config?.authorization_url && config?.token_url && config?.client_id) {
+        logger.debug(`[MCPOAuth] Using pre-configured OAuth settings for ${serverName}`);
+        /** Metadata based on pre-configured settings */
+        const metadata: OAuthMetadata = {
+          authorization_endpoint: config.authorization_url,
+          token_endpoint: config.token_url,
+          issuer: serverUrl,
+          scopes_supported: config.scope?.split(' '),
+        };
+
+        const clientInfo: OAuthClientInformation = {
+          client_id: config.client_id,
+          client_secret: config.client_secret,
+          redirect_uris: [config.redirect_uri || this.getDefaultRedirectUri(serverName)],
+          scope: config.scope,
+        };
+
+        logger.debug(`[MCPOAuth] Starting authorization with pre-configured settings`);
+        const { authorizationUrl, codeVerifier } = await startAuthorization(serverUrl, {
+          metadata: metadata as unknown as SDKOAuthMetadata,
+          clientInformation: clientInfo,
+          redirectUrl: clientInfo.redirect_uris?.[0] || this.getDefaultRedirectUri(serverName),
+          scope: config.scope,
+        });
+
+        /** Add state parameter with flowId to the authorization URL */
+        authorizationUrl.searchParams.set('state', flowId);
+        logger.debug(`[MCPOAuth] Added state parameter to authorization URL`);
+
+        const flowMetadata: MCPOAuthFlowMetadata = {
+          serverName,
+          userId,
+          serverUrl,
+          state,
+          codeVerifier,
+          clientInfo,
+          metadata,
+        };
+
+        logger.debug(`[MCPOAuth] Authorization URL generated: ${authorizationUrl.toString()}`);
+        return {
+          authorizationUrl: authorizationUrl.toString(),
+          flowId,
+          flowMetadata,
+        };
+      }
+
+      logger.debug(`[MCPOAuth] Starting auto-discovery of OAuth metadata from ${serverUrl}`);
+      const { metadata, resourceMetadata, authServerUrl } = await this.discoverMetadata(serverUrl);
+
+      logger.debug(`[MCPOAuth] OAuth metadata discovered, auth server URL: ${authServerUrl}`);
+
+      /** Dynamic client registration based on the discovered metadata */
+      const redirectUri = config?.redirect_uri || this.getDefaultRedirectUri(serverName);
+      logger.debug(`[MCPOAuth] Registering OAuth client with redirect URI: ${redirectUri}`);
+
+      const clientInfo = await this.registerOAuthClient(
+        authServerUrl.toString(),
+        metadata,
+        resourceMetadata,
+        redirectUri,
+      );
+
+      logger.debug(`[MCPOAuth] Client registered with ID: ${clientInfo.client_id}`);
+
+      /** Authorization Scope */
+      const scope =
+        config?.scope ||
+        resourceMetadata?.scopes_supported?.join(' ') ||
+        metadata.scopes_supported?.join(' ');
+
+      logger.debug(`[MCPOAuth] Starting authorization with scope: ${scope}`);
+
+      let authorizationUrl: URL;
+      let codeVerifier: string;
+
+      try {
+        logger.debug(`[MCPOAuth] Calling startAuthorization...`);
+        const authResult = await startAuthorization(serverUrl, {
+          metadata: metadata as unknown as SDKOAuthMetadata,
+          clientInformation: clientInfo,
+          redirectUrl: redirectUri,
+          scope,
+        });
+
+        authorizationUrl = authResult.authorizationUrl;
+        codeVerifier = authResult.codeVerifier;
+
+        logger.debug(`[MCPOAuth] startAuthorization completed successfully`);
+        logger.debug(`[MCPOAuth] Authorization URL: ${authorizationUrl.toString()}`);
+
+        /** Add state parameter with flowId to the authorization URL */
+        authorizationUrl.searchParams.set('state', flowId);
+        logger.debug(`[MCPOAuth] Added state parameter to authorization URL`);
+      } catch (error) {
+        logger.error(`[MCPOAuth] startAuthorization failed:`, error);
+        throw error;
+      }
+
+      const flowMetadata: MCPOAuthFlowMetadata = {
+        serverName,
+        userId,
+        serverUrl,
+        state,
+        codeVerifier,
+        clientInfo,
+        metadata,
+        resourceMetadata,
+      };
+
+      logger.debug(
+        `[MCPOAuth] Authorization URL generated for ${serverName}: ${authorizationUrl.toString()}`,
+      );
+
+      const result = {
+        authorizationUrl: authorizationUrl.toString(),
+        flowId,
+        flowMetadata,
+      };
+
+      logger.debug(
+        `[MCPOAuth] Returning from initiateOAuthFlow with result ${flowId} for ${serverName}`,
+        result,
+      );
+      return result;
+    } catch (error) {
+      logger.error('[MCPOAuth] Failed to initiate OAuth flow', { error, serverName, userId });
+      throw error;
+    }
+  }
+
+  /**
+   * Completes the OAuth flow by exchanging the authorization code for tokens
+   */
+  static async completeOAuthFlow(
+    flowId: string,
+    authorizationCode: string,
+    flowManager: FlowStateManager<MCPOAuthTokens>,
+  ): Promise<MCPOAuthTokens> {
+    try {
+      /** Flow state which contains our metadata */
+      const flowState = await flowManager.getFlowState(flowId, this.FLOW_TYPE);
+      if (!flowState) {
+        throw new Error('OAuth flow not found');
+      }
+
+      const flowMetadata = flowState.metadata as MCPOAuthFlowMetadata;
+      if (!flowMetadata) {
+        throw new Error('OAuth flow metadata not found');
+      }
+
+      const metadata = flowMetadata;
+      if (!metadata.metadata || !metadata.clientInfo || !metadata.codeVerifier) {
+        throw new Error('Invalid flow metadata');
+      }
+
+      const tokens = await exchangeAuthorization(metadata.serverUrl, {
+        metadata: metadata.metadata as unknown as SDKOAuthMetadata,
+        clientInformation: metadata.clientInfo,
+        authorizationCode,
+        codeVerifier: metadata.codeVerifier,
+        redirectUri: metadata.clientInfo.redirect_uris?.[0] || this.getDefaultRedirectUri(),
+      });
+
+      logger.debug('[MCPOAuth] Raw tokens from exchange:', {
+        access_token: tokens.access_token ? '[REDACTED]' : undefined,
+        refresh_token: tokens.refresh_token ? '[REDACTED]' : undefined,
+        expires_in: tokens.expires_in,
+        token_type: tokens.token_type,
+        scope: tokens.scope,
+      });
+
+      const mcpTokens: MCPOAuthTokens = {
+        ...tokens,
+        obtained_at: Date.now(),
+        expires_at: tokens.expires_in ? Date.now() + tokens.expires_in * 1000 : undefined,
+      };
+
+      /** Now complete the flow with the tokens */
+      await flowManager.completeFlow(flowId, this.FLOW_TYPE, mcpTokens);
+
+      return mcpTokens;
+    } catch (error) {
+      logger.error('[MCPOAuth] Failed to complete OAuth flow', { error, flowId });
+      await flowManager.failFlow(flowId, this.FLOW_TYPE, error as Error);
+      throw error;
+    }
+  }
+
+  /**
+   * Gets the OAuth flow metadata
+   */
+  static async getFlowState(
+    flowId: string,
+    flowManager: FlowStateManager<MCPOAuthTokens>,
+  ): Promise<MCPOAuthFlowMetadata | null> {
+    const flowState = await flowManager.getFlowState(flowId, this.FLOW_TYPE);
+    if (!flowState) {
+      return null;
+    }
+    return flowState.metadata as MCPOAuthFlowMetadata;
+  }
+
+  /**
+   * Generates a flow ID for the OAuth flow
+   * @returns Consistent ID so concurrent requests share the same flow
+   */
+  public static generateFlowId(userId: string, serverName: string): string {
+    return `${userId}:${serverName}`;
+  }
+
+  /**
+   * Generates a secure state parameter
+   */
+  private static generateState(): string {
+    return randomBytes(32).toString('base64url');
+  }
+
+  /**
+   * Gets the default redirect URI for a server
+   */
+  private static getDefaultRedirectUri(serverName?: string): string {
+    const baseUrl = process.env.DOMAIN_SERVER || 'http://localhost:3080';
+    return serverName
+      ? `${baseUrl}/api/mcp/${serverName}/oauth/callback`
+      : `${baseUrl}/api/mcp/oauth/callback`;
+  }
+
+  /**
+   * Refreshes OAuth tokens using a refresh token
+   */
+  static async refreshOAuthTokens(
+    refreshToken: string,
+    metadata: { serverName: string; serverUrl?: string; clientInfo?: OAuthClientInformation },
+    config?: MCPOptions['oauth'],
+  ): Promise<MCPOAuthTokens> {
+    logger.debug(`[MCPOAuth] Refreshing tokens for ${metadata.serverName}`);
+
+    try {
+      /** If we have stored client information from the original flow, use that first */
+      if (metadata.clientInfo?.client_id) {
+        logger.debug(
+          `[MCPOAuth] Using stored client information for token refresh for ${metadata.serverName}`,
+        );
+        logger.debug(
+          `[MCPOAuth] Client ID: ${metadata.clientInfo.client_id} for ${metadata.serverName}`,
+        );
+        logger.debug(
+          `[MCPOAuth] Has client secret: ${!!metadata.clientInfo.client_secret} for ${metadata.serverName}`,
+        );
+        logger.debug(`[MCPOAuth] Stored client info for ${metadata.serverName}:`, {
+          client_id: metadata.clientInfo.client_id,
+          has_client_secret: !!metadata.clientInfo.client_secret,
+          grant_types: metadata.clientInfo.grant_types,
+          scope: metadata.clientInfo.scope,
+        });
+
+        /** Use the stored client information and metadata to determine the token URL */
+        let tokenUrl: string;
+        if (config?.token_url) {
+          tokenUrl = config.token_url;
+        } else if (!metadata.serverUrl) {
+          throw new Error('No token URL available for refresh');
+        } else {
+          /** Auto-discover OAuth configuration for refresh */
+          const { metadata: oauthMetadata } = await this.discoverMetadata(metadata.serverUrl);
+          if (!oauthMetadata.token_endpoint) {
+            throw new Error('No token endpoint found in OAuth metadata');
+          }
+          tokenUrl = oauthMetadata.token_endpoint;
+        }
+
+        const body = new URLSearchParams({
+          grant_type: 'refresh_token',
+          refresh_token: refreshToken,
+        });
+
+        /** Add scope if available */
+        if (metadata.clientInfo.scope) {
+          body.append('scope', metadata.clientInfo.scope);
+        }
+
+        const headers: HeadersInit = {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          Accept: 'application/json',
+        };
+
+        /** Use client_secret for authentication if available */
+        if (metadata.clientInfo.client_secret) {
+          const clientAuth = Buffer.from(
+            `${metadata.clientInfo.client_id}:${metadata.clientInfo.client_secret}`,
+          ).toString('base64');
+          headers['Authorization'] = `Basic ${clientAuth}`;
+        } else {
+          /** For public clients, client_id must be in the body */
+          body.append('client_id', metadata.clientInfo.client_id);
+        }
+
+        logger.debug(`[MCPOAuth] Refresh request to: ${tokenUrl}`, {
+          body: body.toString(),
+          headers,
+        });
+
+        const response = await fetch(tokenUrl, {
+          method: 'POST',
+          headers,
+          body,
+        });
+
+        if (!response.ok) {
+          const errorText = await response.text();
+          throw new Error(
+            `Token refresh failed: ${response.status} ${response.statusText} - ${errorText}`,
+          );
+        }
+
+        const tokens = await response.json();
+
+        return {
+          ...tokens,
+          obtained_at: Date.now(),
+          expires_at: tokens.expires_in ? Date.now() + tokens.expires_in * 1000 : undefined,
+        };
+      }
+
+      // Fallback: If we have pre-configured OAuth settings, use them
+      if (config?.token_url && config?.client_id) {
+        logger.debug(`[MCPOAuth] Using pre-configured OAuth settings for token refresh`);
+
+        const tokenUrl = new URL(config.token_url);
+        const clientAuth = config.client_secret
+          ? Buffer.from(`${config.client_id}:${config.client_secret}`).toString('base64')
+          : null;
+
+        const body = new URLSearchParams({
+          grant_type: 'refresh_token',
+          refresh_token: refreshToken,
+        });
+
+        if (config.scope) {
+          body.append('scope', config.scope);
+        }
+
+        const headers: HeadersInit = {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          Accept: 'application/json',
+        };
+
+        if (clientAuth) {
+          headers['Authorization'] = `Basic ${clientAuth}`;
+        } else {
+          // Use client_id in body for public clients
+          body.append('client_id', config.client_id);
+        }
+
+        const response = await fetch(tokenUrl, {
+          method: 'POST',
+          headers,
+          body,
+        });
+
+        if (!response.ok) {
+          const errorText = await response.text();
+          throw new Error(
+            `Token refresh failed: ${response.status} ${response.statusText} - ${errorText}`,
+          );
+        }
+
+        const tokens = await response.json();
+
+        return {
+          ...tokens,
+          obtained_at: Date.now(),
+          expires_at: tokens.expires_in ? Date.now() + tokens.expires_in * 1000 : undefined,
+        };
+      }
+
+      /** For auto-discovered OAuth, we need the server URL */
+      if (!metadata.serverUrl) {
+        throw new Error('Server URL required for auto-discovered OAuth token refresh');
+      }
+
+      /** Auto-discover OAuth configuration for refresh */
+      const { metadata: oauthMetadata } = await this.discoverMetadata(metadata.serverUrl);
+
+      if (!oauthMetadata.token_endpoint) {
+        throw new Error('No token endpoint found in OAuth metadata');
+      }
+
+      const tokenUrl = new URL(oauthMetadata.token_endpoint);
+
+      const body = new URLSearchParams({
+        grant_type: 'refresh_token',
+        refresh_token: refreshToken,
+      });
+
+      const headers: HeadersInit = {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        Accept: 'application/json',
+      };
+
+      const response = await fetch(tokenUrl, {
+        method: 'POST',
+        headers,
+        body,
+      });
+
+      if (!response.ok) {
+        const errorText = await response.text();
+        throw new Error(
+          `Token refresh failed: ${response.status} ${response.statusText} - ${errorText}`,
+        );
+      }
+
+      const tokens = await response.json();
+
+      return {
+        ...tokens,
+        obtained_at: Date.now(),
+        expires_at: tokens.expires_in ? Date.now() + tokens.expires_in * 1000 : undefined,
+      };
+    } catch (error) {
+      logger.error(`[MCPOAuth] Failed to refresh tokens for ${metadata.serverName}`, error);
+      throw error;
+    }
+  }
+}
diff --git a/packages/api/src/mcp/oauth/index.ts b/packages/api/src/mcp/oauth/index.ts
new file mode 100644
index 0000000000..ff82bd92f7
--- /dev/null
+++ b/packages/api/src/mcp/oauth/index.ts
@@ -0,0 +1,3 @@
+export * from './types';
+export * from './handler';
+export * from './tokens';
diff --git a/packages/api/src/mcp/oauth/tokens.ts b/packages/api/src/mcp/oauth/tokens.ts
new file mode 100644
index 0000000000..4aeb11482a
--- /dev/null
+++ b/packages/api/src/mcp/oauth/tokens.ts
@@ -0,0 +1,382 @@
+import { logger } from '@librechat/data-schemas';
+import type { OAuthTokens, OAuthClientInformation } from '@modelcontextprotocol/sdk/shared/auth.js';
+import type { TokenMethods, IToken } from '@librechat/data-schemas';
+import type { MCPOAuthTokens, ExtendedOAuthTokens } from './types';
+import { encryptV2, decryptV2 } from '~/crypto';
+import { isSystemUserId } from '~/mcp/enum';
+
+interface StoreTokensParams {
+  userId: string;
+  serverName: string;
+  tokens: OAuthTokens | ExtendedOAuthTokens | MCPOAuthTokens;
+  createToken: TokenMethods['createToken'];
+  updateToken?: TokenMethods['updateToken'];
+  findToken?: TokenMethods['findToken'];
+  clientInfo?: OAuthClientInformation;
+  /** Optional: Pass existing token state to avoid duplicate DB calls */
+  existingTokens?: {
+    accessToken?: IToken | null;
+    refreshToken?: IToken | null;
+    clientInfoToken?: IToken | null;
+  };
+}
+
+interface GetTokensParams {
+  userId: string;
+  serverName: string;
+  findToken: TokenMethods['findToken'];
+  refreshTokens?: (
+    refreshToken: string,
+    metadata: { userId: string; serverName: string; identifier: string },
+  ) => Promise<MCPOAuthTokens>;
+  createToken?: TokenMethods['createToken'];
+  updateToken?: TokenMethods['updateToken'];
+}
+
+export class MCPTokenStorage {
+  static getLogPrefix(userId: string, serverName: string): string {
+    return isSystemUserId(userId)
+      ? `[MCP][${serverName}]`
+      : `[MCP][User: ${userId}][${serverName}]`;
+  }
+
+  /**
+   * Stores OAuth tokens for an MCP server
+   *
+   * @param params.existingTokens - Optional: Pass existing token state to avoid duplicate DB calls.
+   * This is useful when refreshing tokens, as getTokens() already has the token state.
+   */
+  static async storeTokens({
+    userId,
+    serverName,
+    tokens,
+    createToken,
+    updateToken,
+    findToken,
+    clientInfo,
+    existingTokens,
+  }: StoreTokensParams): Promise<void> {
+    const logPrefix = this.getLogPrefix(userId, serverName);
+
+    try {
+      const identifier = `mcp:${serverName}`;
+
+      // Encrypt and store access token
+      const encryptedAccessToken = await encryptV2(tokens.access_token);
+
+      logger.debug(
+        `${logPrefix} Token expires_in: ${'expires_in' in tokens ? tokens.expires_in : 'N/A'}, expires_at: ${'expires_at' in tokens ? tokens.expires_at : 'N/A'}`,
+      );
+
+      // Handle both expires_in and expires_at formats
+      let accessTokenExpiry: Date;
+      if ('expires_at' in tokens && tokens.expires_at) {
+        /** MCPOAuthTokens format - already has calculated expiry */
+        logger.debug(`${logPrefix} Using expires_at: ${tokens.expires_at}`);
+        accessTokenExpiry = new Date(tokens.expires_at);
+      } else if (tokens.expires_in) {
+        /** Standard OAuthTokens format - calculate expiry */
+        logger.debug(`${logPrefix} Using expires_in: ${tokens.expires_in}`);
+        accessTokenExpiry = new Date(Date.now() + tokens.expires_in * 1000);
+      } else {
+        /** No expiry provided - default to 1 year */
+        logger.debug(`${logPrefix} No expiry provided, using default`);
+        accessTokenExpiry = new Date(Date.now() + 365 * 24 * 60 * 60 * 1000);
+      }
+
+      logger.debug(`${logPrefix} Calculated expiry date: ${accessTokenExpiry.toISOString()}`);
+      logger.debug(
+        `${logPrefix} Date object: ${JSON.stringify({
+          time: accessTokenExpiry.getTime(),
+          valid: !isNaN(accessTokenExpiry.getTime()),
+          iso: accessTokenExpiry.toISOString(),
+        })}`,
+      );
+
+      // Ensure the date is valid before passing to createToken
+      if (isNaN(accessTokenExpiry.getTime())) {
+        logger.error(`${logPrefix} Invalid expiry date calculated, using default`);
+        accessTokenExpiry = new Date(Date.now() + 365 * 24 * 60 * 60 * 1000);
+      }
+
+      // Calculate expiresIn (seconds from now)
+      const expiresIn = Math.floor((accessTokenExpiry.getTime() - Date.now()) / 1000);
+
+      const accessTokenData = {
+        userId,
+        type: 'mcp_oauth',
+        identifier,
+        token: encryptedAccessToken,
+        expiresIn: expiresIn > 0 ? expiresIn : 365 * 24 * 60 * 60, // Default to 1 year if negative
+      };
+
+      // Check if token already exists and update if it does
+      if (findToken && updateToken) {
+        // Use provided existing token state if available, otherwise look it up
+        const existingToken =
+          existingTokens?.accessToken !== undefined
+            ? existingTokens.accessToken
+            : await findToken({ userId, identifier });
+
+        if (existingToken) {
+          await updateToken({ userId, identifier }, accessTokenData);
+          logger.debug(`${logPrefix} Updated existing access token`);
+        } else {
+          await createToken(accessTokenData);
+          logger.debug(`${logPrefix} Created new access token`);
+        }
+      } else {
+        // Create new token if it's initial store or update methods not provided
+        await createToken(accessTokenData);
+        logger.debug(`${logPrefix} Created access token (no update methods available)`);
+      }
+
+      // Store refresh token if available
+      if (tokens.refresh_token) {
+        const encryptedRefreshToken = await encryptV2(tokens.refresh_token);
+        const extendedTokens = tokens as ExtendedOAuthTokens;
+        const refreshTokenExpiry = extendedTokens.refresh_token_expires_in
+          ? new Date(Date.now() + extendedTokens.refresh_token_expires_in * 1000)
+          : new Date(Date.now() + 365 * 24 * 60 * 60 * 1000); // Default to 1 year
+
+        /** Calculated expiresIn for refresh token */
+        const refreshExpiresIn = Math.floor((refreshTokenExpiry.getTime() - Date.now()) / 1000);
+
+        const refreshTokenData = {
+          userId,
+          type: 'mcp_oauth_refresh',
+          identifier: `${identifier}:refresh`,
+          token: encryptedRefreshToken,
+          expiresIn: refreshExpiresIn > 0 ? refreshExpiresIn : 365 * 24 * 60 * 60,
+        };
+
+        // Check if refresh token already exists and update if it does
+        if (findToken && updateToken) {
+          // Use provided existing token state if available, otherwise look it up
+          const existingRefreshToken =
+            existingTokens?.refreshToken !== undefined
+              ? existingTokens.refreshToken
+              : await findToken({
+                  userId,
+                  identifier: `${identifier}:refresh`,
+                });
+
+          if (existingRefreshToken) {
+            await updateToken({ userId, identifier: `${identifier}:refresh` }, refreshTokenData);
+            logger.debug(`${logPrefix} Updated existing refresh token`);
+          } else {
+            await createToken(refreshTokenData);
+            logger.debug(`${logPrefix} Created new refresh token`);
+          }
+        } else {
+          await createToken(refreshTokenData);
+          logger.debug(`${logPrefix} Created refresh token (no update methods available)`);
+        }
+      }
+
+      /** Store client information if provided */
+      if (clientInfo) {
+        logger.debug(`${logPrefix} Storing client info:`, {
+          client_id: clientInfo.client_id,
+          has_client_secret: !!clientInfo.client_secret,
+        });
+        const encryptedClientInfo = await encryptV2(JSON.stringify(clientInfo));
+
+        const clientInfoData = {
+          userId,
+          type: 'mcp_oauth_client',
+          identifier: `${identifier}:client`,
+          token: encryptedClientInfo,
+          expiresIn: 365 * 24 * 60 * 60,
+        };
+
+        // Check if client info already exists and update if it does
+        if (findToken && updateToken) {
+          // Use provided existing token state if available, otherwise look it up
+          const existingClientInfo =
+            existingTokens?.clientInfoToken !== undefined
+              ? existingTokens.clientInfoToken
+              : await findToken({
+                  userId,
+                  identifier: `${identifier}:client`,
+                });
+
+          if (existingClientInfo) {
+            await updateToken({ userId, identifier: `${identifier}:client` }, clientInfoData);
+            logger.debug(`${logPrefix} Updated existing client info`);
+          } else {
+            await createToken(clientInfoData);
+            logger.debug(`${logPrefix} Created new client info`);
+          }
+        } else {
+          await createToken(clientInfoData);
+          logger.debug(`${logPrefix} Created client info (no update methods available)`);
+        }
+      }
+
+      logger.debug(`${logPrefix} Stored OAuth tokens`);
+    } catch (error) {
+      const logPrefix = this.getLogPrefix(userId, serverName);
+      logger.error(`${logPrefix} Failed to store tokens`, error);
+      throw error;
+    }
+  }
+
+  /**
+   * Retrieves OAuth tokens for an MCP server
+   */
+  static async getTokens({
+    userId,
+    serverName,
+    findToken,
+    createToken,
+    updateToken,
+    refreshTokens,
+  }: GetTokensParams): Promise<MCPOAuthTokens | null> {
+    const logPrefix = this.getLogPrefix(userId, serverName);
+
+    try {
+      const identifier = `mcp:${serverName}`;
+
+      // Get access token
+      const accessTokenData = await findToken({
+        userId,
+        type: 'mcp_oauth',
+        identifier,
+      });
+
+      /** Check if access token is missing or expired */
+      const isMissing = !accessTokenData;
+      const isExpired = accessTokenData?.expiresAt && new Date() >= accessTokenData.expiresAt;
+
+      if (isMissing || isExpired) {
+        logger.info(`${logPrefix} Access token ${isMissing ? 'missing' : 'expired'}`);
+
+        /** Refresh data if we have a refresh token and refresh function */
+        const refreshTokenData = await findToken({
+          userId,
+          type: 'mcp_oauth_refresh',
+          identifier: `${identifier}:refresh`,
+        });
+
+        if (!refreshTokenData) {
+          logger.info(
+            `${logPrefix} Access token ${isMissing ? 'missing' : 'expired'} and no refresh token available`,
+          );
+          return null;
+        }
+
+        if (!refreshTokens) {
+          logger.warn(
+            `${logPrefix} Access token ${isMissing ? 'missing' : 'expired'}, refresh token available but no \`refreshTokens\` provided`,
+          );
+          return null;
+        }
+
+        if (!createToken) {
+          logger.warn(
+            `${logPrefix} Access token ${isMissing ? 'missing' : 'expired'}, refresh token available but no \`createToken\` function provided`,
+          );
+          return null;
+        }
+
+        try {
+          logger.info(`${logPrefix} Attempting to refresh token`);
+          const decryptedRefreshToken = await decryptV2(refreshTokenData.token);
+
+          /** Client information if available */
+          let clientInfo;
+          let clientInfoData;
+          try {
+            clientInfoData = await findToken({
+              userId,
+              type: 'mcp_oauth_client',
+              identifier: `${identifier}:client`,
+            });
+            if (clientInfoData) {
+              const decryptedClientInfo = await decryptV2(clientInfoData.token);
+              clientInfo = JSON.parse(decryptedClientInfo);
+              logger.debug(`${logPrefix} Retrieved client info:`, {
+                client_id: clientInfo.client_id,
+                has_client_secret: !!clientInfo.client_secret,
+              });
+            }
+          } catch {
+            logger.debug(`${logPrefix} No client info found`);
+          }
+
+          const metadata = {
+            userId,
+            serverName,
+            identifier,
+            clientInfo,
+          };
+
+          const newTokens = await refreshTokens(decryptedRefreshToken, metadata);
+
+          // Store the refreshed tokens (handles both create and update)
+          // Pass existing token state to avoid duplicate DB calls
+          await this.storeTokens({
+            userId,
+            serverName,
+            tokens: newTokens,
+            createToken,
+            updateToken,
+            findToken,
+            clientInfo,
+            existingTokens: {
+              accessToken: accessTokenData, // We know this is expired/missing
+              refreshToken: refreshTokenData, // We already have this
+              clientInfoToken: clientInfoData, // We already looked this up
+            },
+          });
+
+          logger.info(`${logPrefix} Successfully refreshed and stored OAuth tokens`);
+          return newTokens;
+        } catch (refreshError) {
+          logger.error(`${logPrefix} Failed to refresh tokens`, refreshError);
+          // Check if it's an unauthorized_client error (refresh not supported)
+          const errorMessage =
+            refreshError instanceof Error ? refreshError.message : String(refreshError);
+          if (errorMessage.includes('unauthorized_client')) {
+            logger.info(
+              `${logPrefix} Server does not support refresh tokens for this client. New authentication required.`,
+            );
+          }
+          return null;
+        }
+      }
+
+      // If we reach here, access token should exist and be valid
+      if (!accessTokenData) {
+        return null;
+      }
+
+      const decryptedAccessToken = await decryptV2(accessTokenData.token);
+
+      /** Get refresh token if available */
+      const refreshTokenData = await findToken({
+        userId,
+        type: 'mcp_oauth_refresh',
+        identifier: `${identifier}:refresh`,
+      });
+
+      const tokens: MCPOAuthTokens = {
+        access_token: decryptedAccessToken,
+        token_type: 'Bearer',
+        obtained_at: accessTokenData.createdAt.getTime(),
+        expires_at: accessTokenData.expiresAt?.getTime(),
+      };
+
+      if (refreshTokenData) {
+        tokens.refresh_token = await decryptV2(refreshTokenData.token);
+      }
+
+      logger.debug(`${logPrefix} Loaded existing OAuth tokens from storage`);
+      return tokens;
+    } catch (error) {
+      logger.error(`${logPrefix} Failed to retrieve tokens`, error);
+      return null;
+    }
+  }
+}
diff --git a/packages/api/src/mcp/oauth/types.ts b/packages/api/src/mcp/oauth/types.ts
new file mode 100644
index 0000000000..7fa9d69921
--- /dev/null
+++ b/packages/api/src/mcp/oauth/types.ts
@@ -0,0 +1,98 @@
+import type { OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
+import type { FlowMetadata } from '~/flow/types';
+
+export interface OAuthMetadata {
+  /** OAuth authorization endpoint */
+  authorization_endpoint: string;
+  /** OAuth token endpoint */
+  token_endpoint: string;
+  /** OAuth issuer */
+  issuer?: string;
+  /** Supported scopes */
+  scopes_supported?: string[];
+  /** Response types supported */
+  response_types_supported?: string[];
+  /** Grant types supported */
+  grant_types_supported?: string[];
+  /** Token endpoint auth methods supported */
+  token_endpoint_auth_methods_supported?: string[];
+  /** Code challenge methods supported */
+  code_challenge_methods_supported?: string[];
+}
+
+export interface OAuthProtectedResourceMetadata {
+  /** Resource identifier */
+  resource: string;
+  /** Authorization servers */
+  authorization_servers?: string[];
+  /** Scopes supported by the resource */
+  scopes_supported?: string[];
+}
+
+export interface OAuthClientInformation {
+  /** Client ID */
+  client_id: string;
+  /** Client secret (optional for public clients) */
+  client_secret?: string;
+  /** Client name */
+  client_name?: string;
+  /** Redirect URIs */
+  redirect_uris?: string[];
+  /** Grant types */
+  grant_types?: string[];
+  /** Response types */
+  response_types?: string[];
+  /** Scope */
+  scope?: string;
+  /** Token endpoint auth method */
+  token_endpoint_auth_method?: string;
+}
+
+export interface MCPOAuthState {
+  /** Current step in the OAuth flow */
+  step: 'discovery' | 'registration' | 'authorization' | 'token_exchange' | 'complete' | 'error';
+  /** Server name */
+  serverName: string;
+  /** User ID */
+  userId: string;
+  /** OAuth metadata from discovery */
+  metadata?: OAuthMetadata;
+  /** Resource metadata */
+  resourceMetadata?: OAuthProtectedResourceMetadata;
+  /** Client information */
+  clientInfo?: OAuthClientInformation;
+  /** Authorization URL */
+  authorizationUrl?: string;
+  /** Code verifier for PKCE */
+  codeVerifier?: string;
+  /** State parameter for OAuth flow */
+  state?: string;
+  /** Error information */
+  error?: string;
+  /** Timestamp */
+  timestamp: number;
+}
+
+export interface MCPOAuthFlowMetadata extends FlowMetadata {
+  serverName: string;
+  userId: string;
+  serverUrl: string;
+  state: string;
+  codeVerifier?: string;
+  clientInfo?: OAuthClientInformation;
+  metadata?: OAuthMetadata;
+  resourceMetadata?: OAuthProtectedResourceMetadata;
+}
+
+export interface MCPOAuthTokens extends OAuthTokens {
+  /** When the tokens were obtained */
+  obtained_at: number;
+  /** Calculated expiry time */
+  expires_at?: number;
+}
+
+/** Extended OAuth tokens that may include refresh token expiry */
+export interface ExtendedOAuthTokens extends OAuthTokens {
+  /** Refresh token expiry in seconds (non-standard, some providers include this) */
+  refresh_token_expires_in?: number;
+}
diff --git a/packages/api/src/oauth/index.ts b/packages/api/src/oauth/index.ts
new file mode 100644
index 0000000000..e56053c166
--- /dev/null
+++ b/packages/api/src/oauth/index.ts
@@ -0,0 +1 @@
+export * from './tokens';
diff --git a/packages/api/src/oauth/tokens.ts b/packages/api/src/oauth/tokens.ts
new file mode 100644
index 0000000000..8489bdcb97
--- /dev/null
+++ b/packages/api/src/oauth/tokens.ts
@@ -0,0 +1,324 @@
+import axios from 'axios';
+import { logger } from '@librechat/data-schemas';
+import { TokenExchangeMethodEnum } from 'librechat-data-provider';
+import type { TokenMethods } from '@librechat/data-schemas';
+import type { AxiosError } from 'axios';
+import { encryptV2, decryptV2 } from '~/crypto';
+import { logAxiosError } from '~/utils';
+
+export function createHandleOAuthToken({
+  findToken,
+  updateToken,
+  createToken,
+}: {
+  findToken: TokenMethods['findToken'];
+  updateToken: TokenMethods['updateToken'];
+  createToken: TokenMethods['createToken'];
+}) {
+  /**
+   * Handles the OAuth token by creating or updating the token.
+   * @param fields
+   * @param fields.userId - The user's ID.
+   * @param fields.token - The full token to store.
+   * @param fields.identifier - Unique, alternative identifier for the token.
+   * @param fields.expiresIn - The number of seconds until the token expires.
+   * @param fields.metadata - Additional metadata to store with the token.
+   * @param [fields.type="oauth"] - The type of token. Default is 'oauth'.
+   */
+  return async function handleOAuthToken({
+    token,
+    userId,
+    identifier,
+    expiresIn,
+    metadata,
+    type = 'oauth',
+  }: {
+    token: string;
+    userId: string;
+    identifier: string;
+    expiresIn?: number | string | null;
+    metadata?: Record<string, unknown>;
+    type?: string;
+  }) {
+    const encrypedToken = await encryptV2(token);
+    let expiresInNumber = 3600;
+    if (typeof expiresIn === 'number') {
+      expiresInNumber = expiresIn;
+    } else if (expiresIn != null) {
+      expiresInNumber = parseInt(expiresIn, 10) || 3600;
+    }
+    const tokenData = {
+      type,
+      userId,
+      metadata,
+      identifier,
+      token: encrypedToken,
+      expiresIn: expiresInNumber,
+    };
+
+    const existingToken = await findToken({ userId, identifier });
+    if (existingToken) {
+      return await updateToken({ identifier }, tokenData);
+    } else {
+      return await createToken(tokenData);
+    }
+  };
+}
+
+/**
+ * Processes the access tokens and stores them in the database.
+ * @param tokenData
+ * @param tokenData.access_token
+ * @param tokenData.expires_in
+ * @param [tokenData.refresh_token]
+ * @param [tokenData.refresh_token_expires_in]
+ * @param metadata
+ * @param metadata.userId
+ * @param metadata.identifier
+ */
+async function processAccessTokens(
+  tokenData: {
+    access_token: string;
+    expires_in: number;
+    refresh_token?: string;
+    refresh_token_expires_in?: number;
+  },
+  { userId, identifier }: { userId: string; identifier: string },
+  {
+    findToken,
+    updateToken,
+    createToken,
+  }: {
+    findToken: TokenMethods['findToken'];
+    updateToken: TokenMethods['updateToken'];
+    createToken: TokenMethods['createToken'];
+  },
+) {
+  const { access_token, expires_in = 3600, refresh_token, refresh_token_expires_in } = tokenData;
+  if (!access_token) {
+    logger.error('Access token not found: ', tokenData);
+    throw new Error('Access token not found');
+  }
+  const handleOAuthToken = createHandleOAuthToken({
+    findToken,
+    updateToken,
+    createToken,
+  });
+  await handleOAuthToken({
+    identifier,
+    token: access_token,
+    expiresIn: expires_in,
+    userId,
+  });
+
+  if (refresh_token != null) {
+    logger.debug('Processing refresh token');
+    await handleOAuthToken({
+      token: refresh_token,
+      type: 'oauth_refresh',
+      userId,
+      identifier: `${identifier}:refresh`,
+      expiresIn: refresh_token_expires_in ?? null,
+    });
+  }
+  logger.debug('Access tokens processed');
+}
+
+/**
+ * Refreshes the access token using the refresh token.
+ * @param fields
+ * @param fields.userId - The ID of the user.
+ * @param fields.client_url - The URL of the OAuth provider.
+ * @param fields.identifier - The identifier for the token.
+ * @param fields.refresh_token - The refresh token to use.
+ * @param fields.token_exchange_method - The token exchange method ('default_post' or 'basic_auth_header').
+ * @param fields.encrypted_oauth_client_id - The client ID for the OAuth provider.
+ * @param fields.encrypted_oauth_client_secret - The client secret for the OAuth provider.
+ */
+export async function refreshAccessToken(
+  {
+    userId,
+    client_url,
+    identifier,
+    refresh_token,
+    token_exchange_method,
+    encrypted_oauth_client_id,
+    encrypted_oauth_client_secret,
+  }: {
+    userId: string;
+    client_url: string;
+    identifier: string;
+    refresh_token: string;
+    token_exchange_method: TokenExchangeMethodEnum;
+    encrypted_oauth_client_id: string;
+    encrypted_oauth_client_secret: string;
+  },
+  {
+    findToken,
+    updateToken,
+    createToken,
+  }: {
+    findToken: TokenMethods['findToken'];
+    updateToken: TokenMethods['updateToken'];
+    createToken: TokenMethods['createToken'];
+  },
+): Promise<{
+  access_token: string;
+  expires_in: number;
+  refresh_token?: string;
+  refresh_token_expires_in?: number;
+}> {
+  try {
+    const oauth_client_id = await decryptV2(encrypted_oauth_client_id);
+    const oauth_client_secret = await decryptV2(encrypted_oauth_client_secret);
+
+    const headers: Record<string, string> = {
+      'Content-Type': 'application/x-www-form-urlencoded',
+      Accept: 'application/json',
+    };
+
+    const params = new URLSearchParams({
+      grant_type: 'refresh_token',
+      refresh_token,
+    });
+
+    if (token_exchange_method === TokenExchangeMethodEnum.BasicAuthHeader) {
+      const basicAuth = Buffer.from(`${oauth_client_id}:${oauth_client_secret}`).toString('base64');
+      headers['Authorization'] = `Basic ${basicAuth}`;
+    } else {
+      params.append('client_id', oauth_client_id);
+      params.append('client_secret', oauth_client_secret);
+    }
+
+    const response = await axios({
+      method: 'POST',
+      url: client_url,
+      headers,
+      data: params.toString(),
+    });
+    await processAccessTokens(
+      response.data,
+      {
+        userId,
+        identifier,
+      },
+      {
+        findToken,
+        updateToken,
+        createToken,
+      },
+    );
+    logger.debug(`Access token refreshed successfully for ${identifier}`);
+    return response.data;
+  } catch (error) {
+    const message = 'Error refreshing OAuth tokens';
+    throw new Error(
+      logAxiosError({
+        message,
+        error: error as AxiosError,
+      }),
+    );
+  }
+}
+
+/**
+ * Handles the OAuth callback and exchanges the authorization code for tokens.
+ * @param {object} fields
+ * @param {string} fields.code - The authorization code returned by the provider.
+ * @param {string} fields.userId - The ID of the user.
+ * @param {string} fields.identifier - The identifier for the token.
+ * @param {string} fields.client_url - The URL of the OAuth provider.
+ * @param {string} fields.redirect_uri - The redirect URI for the OAuth provider.
+ * @param {string} fields.token_exchange_method - The token exchange method ('default_post' or 'basic_auth_header').
+ * @param {string} fields.encrypted_oauth_client_id - The client ID for the OAuth provider.
+ * @param {string} fields.encrypted_oauth_client_secret - The client secret for the OAuth provider.
+ */
+export async function getAccessToken(
+  {
+    code,
+    userId,
+    identifier,
+    client_url,
+    redirect_uri,
+    token_exchange_method,
+    encrypted_oauth_client_id,
+    encrypted_oauth_client_secret,
+  }: {
+    code: string;
+    userId: string;
+    identifier: string;
+    client_url: string;
+    redirect_uri: string;
+    token_exchange_method: TokenExchangeMethodEnum;
+    encrypted_oauth_client_id: string;
+    encrypted_oauth_client_secret: string;
+  },
+  {
+    findToken,
+    updateToken,
+    createToken,
+  }: {
+    findToken: TokenMethods['findToken'];
+    updateToken: TokenMethods['updateToken'];
+    createToken: TokenMethods['createToken'];
+  },
+): Promise<{
+  access_token: string;
+  expires_in: number;
+  refresh_token?: string;
+  refresh_token_expires_in?: number;
+}> {
+  const oauth_client_id = await decryptV2(encrypted_oauth_client_id);
+  const oauth_client_secret = await decryptV2(encrypted_oauth_client_secret);
+
+  const headers: Record<string, string> = {
+    'Content-Type': 'application/x-www-form-urlencoded',
+    Accept: 'application/json',
+  };
+
+  const params = new URLSearchParams({
+    code,
+    grant_type: 'authorization_code',
+    redirect_uri,
+  });
+
+  if (token_exchange_method === TokenExchangeMethodEnum.BasicAuthHeader) {
+    const basicAuth = Buffer.from(`${oauth_client_id}:${oauth_client_secret}`).toString('base64');
+    headers['Authorization'] = `Basic ${basicAuth}`;
+  } else {
+    params.append('client_id', oauth_client_id);
+    params.append('client_secret', oauth_client_secret);
+  }
+
+  try {
+    const response = await axios({
+      method: 'POST',
+      url: client_url,
+      headers,
+      data: params.toString(),
+    });
+
+    await processAccessTokens(
+      response.data,
+      {
+        userId,
+        identifier,
+      },
+      {
+        findToken,
+        updateToken,
+        createToken,
+      },
+    );
+    logger.debug(`Access tokens successfully created for ${identifier}`);
+    return response.data;
+  } catch (error) {
+    const message = 'Error exchanging OAuth code';
+    throw new Error(
+      logAxiosError({
+        message,
+        error: error as AxiosError,
+      }),
+    );
+  }
+}
diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.ts
index d851891ac4..145487d7ef 100644
--- a/packages/data-provider/src/config.ts
+++ b/packages/data-provider/src/config.ts
@@ -1136,6 +1136,10 @@ export enum CacheKeys {
    * Key for in-progress flow states.
    */
   FLOWS = 'flows',
+  /**
+   * Key for individual MCP Tool Manifests.
+   */
+  MCP_TOOLS = 'mcp_tools',
   /**
    * Key for pending chat requests (concurrency check)
    */
diff --git a/packages/data-provider/src/mcp.ts b/packages/data-provider/src/mcp.ts
index 2d7be8458f..ffcb65cda1 100644
--- a/packages/data-provider/src/mcp.ts
+++ b/packages/data-provider/src/mcp.ts
@@ -1,6 +1,7 @@
 import { z } from 'zod';
 import type { TUser } from './types';
 import { extractEnvVariable } from './utils';
+import { TokenExchangeMethodEnum } from './types/assistants';
 
 const BaseOptionsSchema = z.object({
   iconPath: z.string().optional(),
@@ -15,6 +16,29 @@ const BaseOptionsSchema = z.object({
    * - string: Use custom instructions (overrides server-provided)
    */
   serverInstructions: z.union([z.boolean(), z.string()]).optional(),
+  /**
+   * OAuth configuration for SSE and Streamable HTTP transports
+   * - Optional: OAuth can be auto-discovered on 401 responses
+   * - Pre-configured values will skip discovery steps
+   */
+  oauth: z
+    .object({
+      /** OAuth authorization endpoint (optional - can be auto-discovered) */
+      authorization_url: z.string().url().optional(),
+      /** OAuth token endpoint (optional - can be auto-discovered) */
+      token_url: z.string().url().optional(),
+      /** OAuth client ID (optional - can use dynamic registration) */
+      client_id: z.string().optional(),
+      /** OAuth client secret (optional - can use dynamic registration) */
+      client_secret: z.string().optional(),
+      /** OAuth scopes to request */
+      scope: z.string().optional(),
+      /** OAuth redirect URI (defaults to /api/mcp/{serverName}/oauth/callback) */
+      redirect_uri: z.string().url().optional(),
+      /** Token exchange method */
+      token_exchange_method: z.nativeEnum(TokenExchangeMethodEnum).optional(),
+    })
+    .optional(),
 });
 
 export const StdioOptionsSchema = BaseOptionsSchema.extend({
diff --git a/packages/data-schemas/src/methods/index.ts b/packages/data-schemas/src/methods/index.ts
index 67f8255c8d..be4308ecd9 100644
--- a/packages/data-schemas/src/methods/index.ts
+++ b/packages/data-schemas/src/methods/index.ts
@@ -20,7 +20,7 @@ export function createMethods(mongoose: typeof import('mongoose')) {
   };
 }
 
-export type { MemoryMethods, ShareMethods };
+export type { MemoryMethods, ShareMethods, TokenMethods };
 export type AllMethods = UserMethods &
   SessionMethods &
   TokenMethods &

From 10c0d7d47408be372310cdc94010f76fc2074909 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Tue, 17 Jun 2025 21:11:39 -0400
Subject: [PATCH 36/49] =?UTF-8?q?=E2=AC=87=EF=B8=8F=20fix:=20Image=20Downl?=
 =?UTF-8?q?oad=20Browser=20Compatibility=20(#7950)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: Add null check for SelectedTTS in MessageAudio component to prevent rendering issues

* fix: image download browser compatibility with error handling and fallback mechanism

- Updated the downloadImage function to use fetch for improved reliability and added error handling.
- Implemented a fallback to the original download method in case of fetch failure.
- Ensured the download link uses a blob URL for better compatibility with various image types.
---
 .../Chat/Messages/Content/Image.tsx           | 34 +++++++++++++++----
 .../components/Chat/Messages/MessageAudio.tsx |  3 ++
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/client/src/components/Chat/Messages/Content/Image.tsx b/client/src/components/Chat/Messages/Content/Image.tsx
index 85c3fdb3f2..ba4f65671a 100644
--- a/client/src/components/Chat/Messages/Content/Image.tsx
+++ b/client/src/components/Chat/Messages/Content/Image.tsx
@@ -46,13 +46,33 @@ const Image = ({
     [placeholderDimensions, height, width],
   );
 
-  const downloadImage = () => {
-    const link = document.createElement('a');
-    link.href = imagePath;
-    link.download = altText;
-    document.body.appendChild(link);
-    link.click();
-    document.body.removeChild(link);
+  const downloadImage = async () => {
+    try {
+      const response = await fetch(imagePath);
+      if (!response.ok) {
+        throw new Error(`Failed to fetch image: ${response.status}`);
+      }
+
+      const blob = await response.blob();
+      const url = window.URL.createObjectURL(blob);
+
+      const link = document.createElement('a');
+      link.href = url;
+      link.download = altText || 'image.png';
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+
+      window.URL.revokeObjectURL(url);
+    } catch (error) {
+      console.error('Download failed:', error);
+      const link = document.createElement('a');
+      link.href = imagePath;
+      link.download = altText || 'image.png';
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+    }
   };
 
   return (
diff --git a/client/src/components/Chat/Messages/MessageAudio.tsx b/client/src/components/Chat/Messages/MessageAudio.tsx
index 29805e7afb..eb4c52a407 100644
--- a/client/src/components/Chat/Messages/MessageAudio.tsx
+++ b/client/src/components/Chat/Messages/MessageAudio.tsx
@@ -14,6 +14,9 @@ function MessageAudio(props: TMessageAudio) {
   };
 
   const SelectedTTS = TTSComponents[engineTTS];
+  if (!SelectedTTS) {
+    return null;
+  }
   return <SelectedTTS {...props} />;
 }
 

From 3c9357580ef800eb0018c4504d1ef155d9785bde Mon Sep 17 00:00:00 2001
From: Rakshit Tiwari <rak1729e@gmail.com>
Date: Wed, 18 Jun 2025 06:42:15 +0530
Subject: [PATCH 37/49] =?UTF-8?q?=F0=9F=96=BC=EF=B8=8F=20feat:=20Add=20sup?=
 =?UTF-8?q?port=20for=20HEIC=20image=20format=20(#7914)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: Add HEIC image format support with client-side conversion - Add HEIC/HEIF mime types to supported image formats - Install heic-to library for client-side HEIC to JPEG conversion - Create heicConverter utility with detection and conversion functions - Integrate HEIC processing into file upload flow - Add error handling and localization for HEIC conversion failures - Maintain backward compatibility with existing image formats - Resolves #5570

* feat: Add UI feedback during HEIC conversion - Show file thumbnail

* Addressing eslint errors

* Addressing the vite bundler issue
---
 client/package.json                       |   1 +
 client/src/hooks/Files/useFileHandling.ts | 132 +++++++++++++++++-----
 client/src/locales/en/translation.json    |   2 +
 client/src/utils/heicConverter.ts         |  79 +++++++++++++
 client/vite.config.ts                     |  11 +-
 package-lock.json                         |   7 ++
 packages/data-provider/src/file-config.ts |  10 +-
 7 files changed, 204 insertions(+), 38 deletions(-)
 create mode 100644 client/src/utils/heicConverter.ts

diff --git a/client/package.json b/client/package.json
index 7cb983d218..5218ebdc6b 100644
--- a/client/package.json
+++ b/client/package.json
@@ -65,6 +65,7 @@
     "export-from-json": "^1.7.2",
     "filenamify": "^6.0.0",
     "framer-motion": "^11.5.4",
+    "heic-to": "^1.1.14",
     "html-to-image": "^1.11.11",
     "i18next": "^24.2.2",
     "i18next-browser-languagedetector": "^8.0.3",
diff --git a/client/src/hooks/Files/useFileHandling.ts b/client/src/hooks/Files/useFileHandling.ts
index 69a99fef33..9e03f29334 100644
--- a/client/src/hooks/Files/useFileHandling.ts
+++ b/client/src/hooks/Files/useFileHandling.ts
@@ -1,24 +1,25 @@
-import { v4 } from 'uuid';
-import debounce from 'lodash/debounce';
 import { useQueryClient } from '@tanstack/react-query';
-import React, { useState, useEffect, useCallback, useRef, useMemo } from 'react';
+import type { TEndpointsConfig, TError } from 'librechat-data-provider';
 import {
-  QueryKeys,
-  EModelEndpoint,
-  mergeFileConfig,
-  isAgentsEndpoint,
-  isAssistantsEndpoint,
   defaultAssistantsVersion,
   fileConfig as defaultFileConfig,
+  EModelEndpoint,
+  isAgentsEndpoint,
+  isAssistantsEndpoint,
+  mergeFileConfig,
+  QueryKeys,
 } from 'librechat-data-provider';
-import type { TEndpointsConfig, TError } from 'librechat-data-provider';
+import debounce from 'lodash/debounce';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { v4 } from 'uuid';
 import type { ExtendedFile, FileSetter } from '~/common';
-import { useUploadFileMutation, useGetFileConfig } from '~/data-provider';
+import { useGetFileConfig, useUploadFileMutation } from '~/data-provider';
 import useLocalize, { TranslationKeys } from '~/hooks/useLocalize';
-import { useDelayedUploadToast } from './useDelayedUploadToast';
-import { useToastContext } from '~/Providers/ToastContext';
 import { useChatContext } from '~/Providers/ChatContext';
+import { useToastContext } from '~/Providers/ToastContext';
 import { logger, validateFiles } from '~/utils';
+import { processFileForUpload } from '~/utils/heicConverter';
+import { useDelayedUploadToast } from './useDelayedUploadToast';
 import useUpdateFiles from './useUpdateFiles';
 
 type UseFileHandling = {
@@ -262,41 +263,110 @@ const useFileHandling = (params?: UseFileHandling) => {
     for (const originalFile of fileList) {
       const file_id = v4();
       try {
-        const preview = URL.createObjectURL(originalFile);
-        const extendedFile: ExtendedFile = {
+        // Create initial preview with original file
+        const initialPreview = URL.createObjectURL(originalFile);
+
+        // Create initial ExtendedFile to show immediately
+        const initialExtendedFile: ExtendedFile = {
           file_id,
           file: originalFile,
           type: originalFile.type,
-          preview,
-          progress: 0.2,
+          preview: initialPreview,
+          progress: 0.1, // Show as processing
           size: originalFile.size,
         };
 
         if (_toolResource != null && _toolResource !== '') {
-          extendedFile.tool_resource = _toolResource;
+          initialExtendedFile.tool_resource = _toolResource;
         }
 
-        const isImage = originalFile.type.split('/')[0] === 'image';
-        const tool_resource =
-          extendedFile.tool_resource ?? params?.additionalMetadata?.tool_resource;
-        if (isAgentsEndpoint(endpoint) && !isImage && tool_resource == null) {
-          /** Note: this needs to be removed when we can support files to providers */
-          setError('com_error_files_unsupported_capability');
-          continue;
+        // Add file immediately to show in UI
+        addFile(initialExtendedFile);
+
+        // Check if HEIC conversion is needed and show toast
+        const isHEIC =
+          originalFile.type === 'image/heic' ||
+          originalFile.type === 'image/heif' ||
+          originalFile.name.toLowerCase().match(/\.(heic|heif)$/);
+
+        if (isHEIC) {
+          showToast({
+            message: localize('com_info_heic_converting'),
+            status: 'info',
+            duration: 3000,
+          });
         }
 
-        addFile(extendedFile);
+        // Process file for HEIC conversion if needed
+        const processedFile = await processFileForUpload(
+          originalFile,
+          0.9,
+          (conversionProgress) => {
+            // Update progress during HEIC conversion (0.1 to 0.5 range for conversion)
+            const adjustedProgress = 0.1 + conversionProgress * 0.4;
+            replaceFile({
+              ...initialExtendedFile,
+              progress: adjustedProgress,
+            });
+          },
+        );
 
-        if (isImage) {
-          loadImage(extendedFile, preview);
-          continue;
+        // If file was converted, update with new file and preview
+        if (processedFile !== originalFile) {
+          URL.revokeObjectURL(initialPreview); // Clean up original preview
+          const newPreview = URL.createObjectURL(processedFile);
+
+          const updatedExtendedFile: ExtendedFile = {
+            ...initialExtendedFile,
+            file: processedFile,
+            type: processedFile.type,
+            preview: newPreview,
+            progress: 0.5, // Conversion complete, ready for upload
+            size: processedFile.size,
+          };
+
+          replaceFile(updatedExtendedFile);
+
+          const isImage = processedFile.type.split('/')[0] === 'image';
+          if (isImage) {
+            loadImage(updatedExtendedFile, newPreview);
+            continue;
+          }
+
+          await startUpload(updatedExtendedFile);
+        } else {
+          // File wasn't converted, proceed with original
+          const isImage = originalFile.type.split('/')[0] === 'image';
+          const tool_resource =
+            initialExtendedFile.tool_resource ?? params?.additionalMetadata?.tool_resource;
+          if (isAgentsEndpoint(endpoint) && !isImage && tool_resource == null) {
+            /** Note: this needs to be removed when we can support files to providers */
+            setError('com_error_files_unsupported_capability');
+            continue;
+          }
+
+          // Update progress to show ready for upload
+          const readyExtendedFile = {
+            ...initialExtendedFile,
+            progress: 0.2,
+          };
+          replaceFile(readyExtendedFile);
+
+          if (isImage) {
+            loadImage(readyExtendedFile, initialPreview);
+            continue;
+          }
+
+          await startUpload(readyExtendedFile);
         }
-
-        await startUpload(extendedFile);
       } catch (error) {
         deleteFileById(file_id);
         console.log('file handling error', error);
-        setError('com_error_files_process');
+        if (error instanceof Error && error.message.includes('HEIC')) {
+          setError('com_error_heic_conversion');
+        } else {
+          setError('com_error_files_process');
+        }
       }
     }
   };
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index d7171a032f..c314329edf 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -276,6 +276,8 @@
   "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_heic_conversion": "Failed to convert HEIC image to JPEG. Please try converting the image manually or use a different format.",
+  "com_info_heic_converting": "Converting HEIC image to JPEG...",
   "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.",
   "com_error_invalid_user_key": "Invalid key provided. Please provide a valid key and try again.",
diff --git a/client/src/utils/heicConverter.ts b/client/src/utils/heicConverter.ts
new file mode 100644
index 0000000000..a14e09a050
--- /dev/null
+++ b/client/src/utils/heicConverter.ts
@@ -0,0 +1,79 @@
+import { heicTo, isHeic } from 'heic-to';
+
+/**
+ * Check if a file is in HEIC format
+ * @param file - The file to check
+ * @returns Promise<boolean> - True if the file is HEIC
+ */
+export const isHEICFile = async (file: File): Promise<boolean> => {
+  try {
+    return await isHeic(file);
+  } catch (error) {
+    console.warn('Error checking if file is HEIC:', error);
+    // Fallback to mime type check
+    return file.type === 'image/heic' || file.type === 'image/heif';
+  }
+};
+
+/**
+ * Convert HEIC file to JPEG
+ * @param file - The HEIC file to convert
+ * @param quality - JPEG quality (0-1), default is 0.9
+ * @param onProgress - Optional callback to track conversion progress
+ * @returns Promise<File> - The converted JPEG file
+ */
+export const convertHEICToJPEG = async (
+  file: File,
+  quality: number = 0.9,
+  onProgress?: (progress: number) => void,
+): Promise<File> => {
+  try {
+    // Report conversion start
+    onProgress?.(0.3);
+
+    const convertedBlob = await heicTo({
+      blob: file,
+      type: 'image/jpeg',
+      quality,
+    });
+
+    // Report conversion completion
+    onProgress?.(0.8);
+
+    // Create a new File object with the converted blob
+    const convertedFile = new File([convertedBlob], file.name.replace(/\.(heic|heif)$/i, '.jpg'), {
+      type: 'image/jpeg',
+      lastModified: file.lastModified,
+    });
+
+    // Report file creation completion
+    onProgress?.(1.0);
+
+    return convertedFile;
+  } catch (error) {
+    console.error('Error converting HEIC to JPEG:', error);
+    throw new Error('Failed to convert HEIC image to JPEG');
+  }
+};
+
+/**
+ * Process a file, converting it from HEIC to JPEG if necessary
+ * @param file - The file to process
+ * @param quality - JPEG quality for conversion (0-1), default is 0.9
+ * @param onProgress - Optional callback to track conversion progress
+ * @returns Promise<File> - The processed file (converted if it was HEIC, original otherwise)
+ */
+export const processFileForUpload = async (
+  file: File,
+  quality: number = 0.9,
+  onProgress?: (progress: number) => void,
+): Promise<File> => {
+  const isHEIC = await isHEICFile(file);
+
+  if (isHEIC) {
+    console.log('HEIC file detected, converting to JPEG...');
+    return convertHEICToJPEG(file, quality, onProgress);
+  }
+
+  return file;
+};
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 98451b6c06..4ce4fc3b86 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -1,10 +1,10 @@
-import path from 'path';
-import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
-import { VitePWA } from 'vite-plugin-pwa';
+import path from 'path';
+import type { Plugin } from 'vite';
+import { defineConfig } from 'vite';
 import { compression } from 'vite-plugin-compression2';
 import { nodePolyfills } from 'vite-plugin-node-polyfills';
-import type { Plugin } from 'vite';
+import { VitePWA } from 'vite-plugin-pwa';
 
 // https://vitejs.dev/config/
 export default defineConfig(({ command }) => ({
@@ -169,6 +169,9 @@ export default defineConfig(({ command }) => ({
             if (id.includes('react-select') || id.includes('downshift')) {
               return 'advanced-inputs';
             }
+            if (id.includes('heic-to')) {
+              return 'heic-converter';
+            }
 
             // Existing chunks
             if (id.includes('@radix-ui')) {
diff --git a/package-lock.json b/package-lock.json
index ed1ef74865..d9dc4cc2ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2464,6 +2464,7 @@
         "export-from-json": "^1.7.2",
         "filenamify": "^6.0.0",
         "framer-motion": "^11.5.4",
+        "heic-to": "^1.1.14",
         "html-to-image": "^1.11.11",
         "i18next": "^24.2.2",
         "i18next-browser-languagedetector": "^8.0.3",
@@ -32074,6 +32075,12 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/heic-to": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/heic-to/-/heic-to-1.1.14.tgz",
+      "integrity": "sha512-CxJE27BF6JcQvrL1giK478iSZr7EJNTnAN2Th1rAJiN1BSMYZxDLm4PL/p/ha3aSqVHvCo+YNk++5tIj0JVxLQ==",
+      "license": "LGPL-3.0"
+    },
     "node_modules/highlight.js": {
       "version": "11.8.0",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.8.0.tgz",
diff --git a/packages/data-provider/src/file-config.ts b/packages/data-provider/src/file-config.ts
index 050fb2541d..80521b4c47 100644
--- a/packages/data-provider/src/file-config.ts
+++ b/packages/data-provider/src/file-config.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { EModelEndpoint } from './schemas';
-import type { FileConfig, EndpointFileConfig } from './types/files';
+import type { EndpointFileConfig, FileConfig } from './types/files';
 
 export const supportsFiles = {
   [EModelEndpoint.openAI]: true,
@@ -49,6 +49,8 @@ export const fullMimeTypesList = [
   'text/javascript',
   'image/gif',
   'image/png',
+  'image/heic',
+  'image/heif',
   'application/x-tar',
   'application/typescript',
   'application/xml',
@@ -80,6 +82,8 @@ export const codeInterpreterMimeTypesList = [
   'text/javascript',
   'image/gif',
   'image/png',
+  'image/heic',
+  'image/heif',
   'application/x-tar',
   'application/typescript',
   'application/xml',
@@ -105,7 +109,7 @@ export const retrievalMimeTypesList = [
   'text/plain',
 ];
 
-export const imageExtRegex = /\.(jpg|jpeg|png|gif|webp)$/i;
+export const imageExtRegex = /\.(jpg|jpeg|png|gif|webp|heic|heif)$/i;
 
 export const excelMimeTypes =
   /^application\/(vnd\.ms-excel|msexcel|x-msexcel|x-ms-excel|x-excel|x-dos_ms_excel|xls|x-xls|vnd\.openxmlformats-officedocument\.spreadsheetml\.sheet)$/;
@@ -116,7 +120,7 @@ export const textMimeTypes =
 export const applicationMimeTypes =
   /^(application\/(epub\+zip|csv|json|pdf|x-tar|typescript|vnd\.openxmlformats-officedocument\.(wordprocessingml\.document|presentationml\.presentation|spreadsheetml\.sheet)|xml|zip))$/;
 
-export const imageMimeTypes = /^image\/(jpeg|gif|png|webp)$/;
+export const imageMimeTypes = /^image\/(jpeg|gif|png|webp|heic|heif)$/;
 
 export const supportedMimeTypes = [
   textMimeTypes,

From dba0ec4320fcf7e5c8c5ec69abc914fb5d5ffadb Mon Sep 17 00:00:00 2001
From: Robin Anderson <robin.b.anderson@gmail.com>
Date: Wed, 18 Jun 2025 02:27:31 +0100
Subject: [PATCH 38/49] =?UTF-8?q?=F0=9F=94=A7=20chore:=20update=20pricing?=
 =?UTF-8?q?=20for=20OpenAI=20o3=20(#7948)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`o3` is now 80% cheaper, at $2/Mt input and $8/Mt output.
https://openai.com/api/pricing/
---
 api/models/tx.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/models/tx.js b/api/models/tx.js
index ddd098b80f..f3ba38652d 100644
--- a/api/models/tx.js
+++ b/api/models/tx.js
@@ -78,7 +78,7 @@ const tokenValues = Object.assign(
     'gpt-3.5-turbo-1106': { prompt: 1, completion: 2 },
     'o4-mini': { prompt: 1.1, completion: 4.4 },
     'o3-mini': { prompt: 1.1, completion: 4.4 },
-    o3: { prompt: 10, completion: 40 },
+    o3: { prompt: 2, completion: 8 },
     'o1-mini': { prompt: 1.1, completion: 4.4 },
     'o1-preview': { prompt: 15, completion: 60 },
     o1: { prompt: 15, completion: 60 },

From c7e4523d7c725c0a7fa0d364954241263eea73cb Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Wed, 18 Jun 2025 00:58:51 -0400
Subject: [PATCH 39/49] =?UTF-8?q?=F0=9F=8E=AF=20refactor:=20LaTeX=20and=20?=
 =?UTF-8?q?Math=20Rendering=20(#7952)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: Markdown LaTeX processing

- Added micromark-extension-llm-math as a dependency in package.json and package-lock.json.
- Updated Vite configuration to alias micromark-extension-math.
- Modified Markdown components to use singleDollarTextMath: false for improved LaTeX rendering.
- Refactored latex utility functions to enhance LaTeX processing and escaping mechanisms.

* chore: linting of `EditTextPart`

* fix: handle key up to initiate edit of latest user message by adding id prop to Edit Message HoverButton

* chore: linting in Artifact component

* refactor: enhance LaTeX preprocessing functionality

- Updated `preprocessLaTeX` to improve handling of currency and LaTeX expressions.
- Introduced optimized regex patterns for better performance.
- Added support for escaping mhchem commands and handling code blocks.
- Enhanced tests for various LaTeX scenarios, including currency and special characters.
- Refactored existing tests to align with new preprocessing logic.

* chore: filter out false positives in unused packages workflow

- Added a grep command to exclude the micromark-extension-llm-math package from the list of unused dependencies in the GitHub Actions workflow.
---
 .github/workflows/unused-packages.yml         |   2 +
 client/package.json                           |   1 +
 client/src/components/Artifacts/Artifact.tsx  |   4 +-
 .../Chat/Messages/Content/Markdown.tsx        |   2 +-
 .../Chat/Messages/Content/MarkdownLite.tsx    |   2 +-
 .../Messages/Content/Parts/EditTextPart.tsx   |   6 +-
 .../components/Chat/Messages/HoverButtons.tsx |   4 +
 .../Prompts/Groups/VariableForm.tsx           |   2 +-
 .../src/components/Prompts/PromptDetails.tsx  |   2 +-
 .../src/components/Prompts/PromptEditor.tsx   |   2 +-
 client/src/utils/latex.spec.ts                | 313 +++++++++---------
 client/src/utils/latex.ts                     | 231 ++++++++-----
 client/vite.config.ts                         |   1 +
 package-lock.json                             |  20 ++
 14 files changed, 341 insertions(+), 251 deletions(-)

diff --git a/.github/workflows/unused-packages.yml b/.github/workflows/unused-packages.yml
index 442e70e52c..dc6ce3ba56 100644
--- a/.github/workflows/unused-packages.yml
+++ b/.github/workflows/unused-packages.yml
@@ -98,6 +98,8 @@ jobs:
             cd client
             UNUSED=$(depcheck --json | jq -r '.dependencies | join("\n")' || echo "")
             UNUSED=$(comm -23 <(echo "$UNUSED" | sort) <(cat ../client_used_deps.txt ../client_used_code.txt | sort) || echo "")
+            # Filter out false positives
+            UNUSED=$(echo "$UNUSED" | grep -v "^micromark-extension-llm-math$" || echo "")
             echo "CLIENT_UNUSED<<EOF" >> $GITHUB_ENV
             echo "$UNUSED" >> $GITHUB_ENV
             echo "EOF" >> $GITHUB_ENV
diff --git a/client/package.json b/client/package.json
index 5218ebdc6b..67cbec2820 100644
--- a/client/package.json
+++ b/client/package.json
@@ -75,6 +75,7 @@
     "lodash": "^4.17.21",
     "lucide-react": "^0.394.0",
     "match-sorter": "^6.3.4",
+    "micromark-extension-llm-math": "^3.1.0",
     "qrcode.react": "^4.2.0",
     "rc-input-number": "^7.4.2",
     "react": "^18.2.0",
diff --git a/client/src/components/Artifacts/Artifact.tsx b/client/src/components/Artifacts/Artifact.tsx
index 2b06a2ccc0..902ac9191a 100644
--- a/client/src/components/Artifacts/Artifact.tsx
+++ b/client/src/components/Artifacts/Artifact.tsx
@@ -40,7 +40,7 @@ const defaultType = 'unknown';
 const defaultIdentifier = 'lc-no-identifier';
 
 export function Artifact({
-  node,
+  node: _node,
   ...props
 }: Artifact & {
   children: React.ReactNode | { props: { children: React.ReactNode } };
@@ -95,7 +95,7 @@ export function Artifact({
       setArtifacts((prevArtifacts) => {
         if (
           prevArtifacts?.[artifactKey] != null &&
-          prevArtifacts[artifactKey].content === content
+          prevArtifacts[artifactKey]?.content === content
         ) {
           return prevArtifacts;
         }
diff --git a/client/src/components/Chat/Messages/Content/Markdown.tsx b/client/src/components/Chat/Messages/Content/Markdown.tsx
index 740bf66670..7bd6511cfa 100644
--- a/client/src/components/Chat/Messages/Content/Markdown.tsx
+++ b/client/src/components/Chat/Messages/Content/Markdown.tsx
@@ -204,7 +204,7 @@ const Markdown = memo(({ content = '', isLatestMessage }: TContentProps) => {
     remarkGfm,
     remarkDirective,
     artifactPlugin,
-    [remarkMath, { singleDollarTextMath: true }],
+    [remarkMath, { singleDollarTextMath: false }],
     unicodeCitation,
   ];
 
diff --git a/client/src/components/Chat/Messages/Content/MarkdownLite.tsx b/client/src/components/Chat/Messages/Content/MarkdownLite.tsx
index 972395c425..019783607c 100644
--- a/client/src/components/Chat/Messages/Content/MarkdownLite.tsx
+++ b/client/src/components/Chat/Messages/Content/MarkdownLite.tsx
@@ -32,7 +32,7 @@ const MarkdownLite = memo(
               /** @ts-ignore */
               supersub,
               remarkGfm,
-              [remarkMath, { singleDollarTextMath: true }],
+              [remarkMath, { singleDollarTextMath: false }],
             ]}
             /** @ts-ignore */
             rehypePlugins={rehypePlugins}
diff --git a/client/src/components/Chat/Messages/Content/Parts/EditTextPart.tsx b/client/src/components/Chat/Messages/Content/Parts/EditTextPart.tsx
index e6736b192e..1ce207fe1c 100644
--- a/client/src/components/Chat/Messages/Content/Parts/EditTextPart.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/EditTextPart.tsx
@@ -117,9 +117,9 @@ const EditTextPart = ({
       messages.map((msg) =>
         msg.messageId === messageId
           ? {
-            ...msg,
-            content: updatedContent,
-          }
+              ...msg,
+              content: updatedContent,
+            }
           : msg,
       ),
     );
diff --git a/client/src/components/Chat/Messages/HoverButtons.tsx b/client/src/components/Chat/Messages/HoverButtons.tsx
index 644852c0b4..a13266f04c 100644
--- a/client/src/components/Chat/Messages/HoverButtons.tsx
+++ b/client/src/components/Chat/Messages/HoverButtons.tsx
@@ -25,6 +25,7 @@ type THoverButtons = {
 };
 
 type HoverButtonProps = {
+  id?: string;
   onClick: (e?: React.MouseEvent<HTMLButtonElement>) => void;
   title: string;
   icon: React.ReactNode;
@@ -67,6 +68,7 @@ const extractMessageContent = (message: TMessage): string => {
 
 const HoverButton = memo(
   ({
+    id,
     onClick,
     title,
     icon,
@@ -89,6 +91,7 @@ const HoverButton = memo(
 
     return (
       <button
+        id={id}
         className={buttonStyle}
         onClick={onClick}
         type="button"
@@ -213,6 +216,7 @@ const HoverButtons = ({
       {/* Edit Button */}
       {isEditableEndpoint && (
         <HoverButton
+          id={`edit-${message.messageId}`}
           onClick={onEdit}
           title={localize('com_ui_edit')}
           icon={<EditIcon size="19" />}
diff --git a/client/src/components/Prompts/Groups/VariableForm.tsx b/client/src/components/Prompts/Groups/VariableForm.tsx
index 57458fb444..09bdcd40da 100644
--- a/client/src/components/Prompts/Groups/VariableForm.tsx
+++ b/client/src/components/Prompts/Groups/VariableForm.tsx
@@ -143,7 +143,7 @@ export default function VariableForm({
         <div className="mb-6 max-h-screen max-w-[90vw] overflow-auto rounded-md bg-surface-tertiary p-4 text-text-secondary dark:bg-surface-primary sm:max-w-full md:max-h-96">
           <ReactMarkdown
             /** @ts-ignore */
-            remarkPlugins={[supersub, remarkGfm, [remarkMath, { singleDollarTextMath: true }]]}
+            remarkPlugins={[supersub, remarkGfm, [remarkMath, { singleDollarTextMath: false }]]}
             rehypePlugins={[
               /** @ts-ignore */
               [rehypeKatex],
diff --git a/client/src/components/Prompts/PromptDetails.tsx b/client/src/components/Prompts/PromptDetails.tsx
index e686386417..0bfd8e9931 100644
--- a/client/src/components/Prompts/PromptDetails.tsx
+++ b/client/src/components/Prompts/PromptDetails.tsx
@@ -55,7 +55,7 @@ const PromptDetails = ({ group }: { group?: TPromptGroup }) => {
                   /** @ts-ignore */
                   supersub,
                   remarkGfm,
-                  [remarkMath, { singleDollarTextMath: true }],
+                  [remarkMath, { singleDollarTextMath: false }],
                 ]}
                 rehypePlugins={[
                   /** @ts-ignore */
diff --git a/client/src/components/Prompts/PromptEditor.tsx b/client/src/components/Prompts/PromptEditor.tsx
index 7db89c7078..f10a94c11e 100644
--- a/client/src/components/Prompts/PromptEditor.tsx
+++ b/client/src/components/Prompts/PromptEditor.tsx
@@ -130,7 +130,7 @@ const PromptEditor: React.FC<Props> = ({ name, isEditing, setIsEditing }) => {
                     /** @ts-ignore */
                     supersub,
                     remarkGfm,
-                    [remarkMath, { singleDollarTextMath: true }],
+                    [remarkMath, { singleDollarTextMath: false }],
                   ]}
                   /** @ts-ignore */
                   rehypePlugins={rehypePlugins}
diff --git a/client/src/utils/latex.spec.ts b/client/src/utils/latex.spec.ts
index e5a81fe723..6b1e685dfe 100644
--- a/client/src/utils/latex.spec.ts
+++ b/client/src/utils/latex.spec.ts
@@ -1,163 +1,92 @@
-
-import { processLaTeX, preprocessLaTeX } from './latex';
-
-describe('processLaTeX', () => {
-  test('returns the same string if no LaTeX patterns are found', () => {
-    const content = 'This is a test string without LaTeX';
-    expect(processLaTeX(content)).toBe(content);
-  });
-
-  test('converts inline LaTeX expressions correctly', () => {
-    const content = 'This is an inline LaTeX expression: \\(x^2 + y^2 = z^2\\)';
-    const expected = 'This is an inline LaTeX expression: $x^2 + y^2 = z^2$';
-    expect(processLaTeX(content)).toBe(expected);
-  });
-
-  test('converts block LaTeX expressions correctly', () => {
-    const content = 'This is a block LaTeX expression: \\[E = mc^2\\]';
-    const expected = 'This is a block LaTeX expression: $$E = mc^2$$';
-    expect(processLaTeX(content)).toBe(expected);
-  });
-
-  test('converts mixed LaTeX expressions correctly', () => {
-    const content = 'Inline \\(a + b = c\\) and block \\[x^2 + y^2 = z^2\\]';
-    const expected = 'Inline $a + b = c$ and block $$x^2 + y^2 = z^2$$';
-    expect(processLaTeX(content)).toBe(expected);
-  });
-
-  test('escapes dollar signs followed by a digit or space and digit', () => {
-    const content = 'Price is $50 and $ 100';
-    const expected = 'Price is \\$50 and \\$ 100';
-    expect(processLaTeX(content)).toBe(expected);
-  });
-
-  test('handles strings with no content', () => {
-    const content = '';
-    expect(processLaTeX(content)).toBe('');
-  });
-
-  test('does not alter already valid inline Markdown LaTeX', () => {
-    const content = 'This is a valid inline LaTeX: $x^2 + y^2 = z^2$';
-    expect(processLaTeX(content)).toBe(content);
-  });
-
-  test('does not alter already valid block Markdown LaTeX', () => {
-    const content = 'This is a valid block LaTeX: $$E = mc^2$$';
-    expect(processLaTeX(content)).toBe(content);
-  });
-
-  test('correctly processes a mix of valid Markdown LaTeX and LaTeX patterns', () => {
-    const content = 'Valid $a + b = c$ and LaTeX to convert \\(x^2 + y^2 = z^2\\)';
-    const expected = 'Valid $a + b = c$ and LaTeX to convert $x^2 + y^2 = z^2$';
-    expect(processLaTeX(content)).toBe(expected);
-  });
-
-  test('correctly handles strings with LaTeX and non-LaTeX dollar signs', () => {
-    const content = 'Price $100 and LaTeX \\(x^2 + y^2 = z^2\\)';
-    const expected = 'Price \\$100 and LaTeX $x^2 + y^2 = z^2$';
-    expect(processLaTeX(content)).toBe(expected);
-  });
-
-  test('ignores non-LaTeX content enclosed in dollar signs', () => {
-    const content = 'This is not LaTeX: $This is just text$';
-    expect(processLaTeX(content)).toBe(content);
-  });
-
-  test('correctly processes complex block LaTeX with line breaks', () => {
-    const complexBlockLatex = `Certainly! Here's an example of a mathematical formula written in LaTeX:
-
-    \\[
-    \\sum_{i=1}^{n} \\left( \\frac{x_i}{y_i} \\right)^2
-    \\]
-    
-    This formula represents the sum of the squares of the ratios of \\(x\\) to \\(y\\) for \\(n\\) terms, where \\(x_i\\) and \\(y_i\\) represent the values of \\(x\\) and \\(y\\) for each term.
-    
-    LaTeX is a typesetting system commonly used for mathematical and scientific documents. It provides a wide range of formatting options and symbols for expressing mathematical expressions.`;
-    const expectedOutput = `Certainly! Here's an example of a mathematical formula written in LaTeX:
-
-    $$
-    \\sum_{i=1}^{n} \\left( \\frac{x_i}{y_i} \\right)^2
-    $$
-    
-    This formula represents the sum of the squares of the ratios of $x$ to $y$ for $n$ terms, where $x_i$ and $y_i$ represent the values of $x$ and $y$ for each term.
-    
-    LaTeX is a typesetting system commonly used for mathematical and scientific documents. It provides a wide range of formatting options and symbols for expressing mathematical expressions.`;
-    expect(processLaTeX(complexBlockLatex)).toBe(expectedOutput);
-  });
-
-  describe('processLaTeX with code block exception', () => {
-    test('ignores dollar signs inside inline code', () => {
-      const content = 'This is inline code: `$100`';
-      expect(processLaTeX(content)).toBe(content);
-    });
-
-    test('ignores dollar signs inside multi-line code blocks', () => {
-      const content = '```\n$100\n# $1000\n```';
-      expect(processLaTeX(content)).toBe(content);
-    });
-
-    test('processes LaTeX outside of code blocks', () => {
-      const content =
-        'Outside \\(x^2 + y^2 = z^2\\) and inside code block: ```\n$100\n# $1000\n```';
-      const expected = 'Outside $x^2 + y^2 = z^2$ and inside code block: ```\n$100\n# $1000\n```';
-      expect(processLaTeX(content)).toBe(expected);
-    });
-  });
-});
+import { preprocessLaTeX } from './latex';
 
 describe('preprocessLaTeX', () => {
   test('returns the same string if no LaTeX patterns are found', () => {
-    const content = 'This is a test string without LaTeX';
+    const content = 'This is a test string without LaTeX or dollar signs';
     expect(preprocessLaTeX(content)).toBe(content);
   });
 
-  test('escapes dollar signs followed by digits', () => {
+  test('returns the same string if no dollar signs are present', () => {
+    const content = 'This has LaTeX \\(x^2\\) and \\[y^2\\] but no dollars';
+    expect(preprocessLaTeX(content)).toBe(content);
+  });
+
+  test('preserves valid inline LaTeX delimiters \\(...\\)', () => {
+    const content = 'This is inline LaTeX: \\(x^2 + y^2 = z^2\\)';
+    expect(preprocessLaTeX(content)).toBe(content);
+  });
+
+  test('preserves valid block LaTeX delimiters \\[...\\]', () => {
+    const content = 'This is block LaTeX: \\[E = mc^2\\]';
+    expect(preprocessLaTeX(content)).toBe(content);
+  });
+
+  test('preserves valid double dollar delimiters', () => {
+    const content = 'This is valid: $$x^2 + y^2 = z^2$$';
+    expect(preprocessLaTeX(content)).toBe(content);
+  });
+
+  test('converts single dollar delimiters to double dollars', () => {
+    const content = 'Inline math: $x^2 + y^2 = z^2$';
+    const expected = 'Inline math: $$x^2 + y^2 = z^2$$';
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('converts multiple single dollar expressions', () => {
+    const content = 'First $a + b = c$ and second $x^2 + y^2 = z^2$';
+    const expected = 'First $$a + b = c$$ and second $$x^2 + y^2 = z^2$$';
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('escapes currency dollar signs', () => {
     const content = 'Price is $50 and $100';
     const expected = 'Price is \\$50 and \\$100';
     expect(preprocessLaTeX(content)).toBe(expected);
   });
 
-  test('does not escape dollar signs not followed by digits', () => {
-    const content = 'This $variable is not escaped';
-    expect(preprocessLaTeX(content)).toBe(content);
+  test('escapes currency with spaces', () => {
+    const content = '$50 is $20 + $30';
+    const expected = '\\$50 is \\$20 + \\$30';
+    expect(preprocessLaTeX(content)).toBe(expected);
   });
 
-  test('preserves existing LaTeX expressions', () => {
-    const content = 'Inline $x^2 + y^2 = z^2$ and block $$E = mc^2$$';
-    expect(preprocessLaTeX(content)).toBe(content);
+  test('escapes currency with commas', () => {
+    const content = 'The price is $1,000,000 for this item.';
+    const expected = 'The price is \\$1,000,000 for this item.';
+    expect(preprocessLaTeX(content)).toBe(expected);
   });
 
-  test('handles mixed LaTeX and currency', () => {
+  test('escapes currency with decimals', () => {
+    const content = 'Total: $29.50 plus tax';
+    const expected = 'Total: \\$29.50 plus tax';
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('converts LaTeX expressions while escaping currency', () => {
     const content = 'LaTeX $x^2$ and price $50';
-    const expected = 'LaTeX $x^2$ and price \\$50';
+    const expected = 'LaTeX $$x^2$$ and price \\$50';
     expect(preprocessLaTeX(content)).toBe(expected);
   });
 
-  test('converts LaTeX delimiters', () => {
-    const content = 'Brackets \\[x^2\\] and parentheses \\(y^2\\)';
-    const expected = 'Brackets $$x^2$$ and parentheses $y^2$';
+  test('handles Goldbach Conjecture example', () => {
+    const content = '- **Goldbach Conjecture**: $2n = p + q$ (every even integer > 2)';
+    const expected = '- **Goldbach Conjecture**: $$2n = p + q$$ (every even integer > 2)';
     expect(preprocessLaTeX(content)).toBe(expected);
   });
 
+  test('does not escape already escaped dollar signs', () => {
+    const content = 'Already escaped \\$50 and \\$100';
+    expect(preprocessLaTeX(content)).toBe(content);
+  });
+
+  test('does not convert already escaped single dollars', () => {
+    const content = 'Escaped \\$x^2\\$ should not change';
+    expect(preprocessLaTeX(content)).toBe(content);
+  });
+
   test('escapes mhchem commands', () => {
     const content = '$\\ce{H2O}$ and $\\pu{123 J}$';
-    const expected = '$\\\\ce{H2O}$ and $\\\\pu{123 J}$';
-    expect(preprocessLaTeX(content)).toBe(expected);
-  });
-
-  test('handles complex mixed content', () => {
-    const content = `
-      LaTeX inline $x^2$ and block $$y^2$$
-      Currency $100 and $200
-      Chemical $\\ce{H2O}$
-      Brackets \\[z^2\\]
-    `;
-    const expected = `
-      LaTeX inline $x^2$ and block $$y^2$$
-      Currency \\$100 and \\$200
-      Chemical $\\\\ce{H2O}$
-      Brackets $$z^2$$
-    `;
+    const expected = '$$\\\\ce{H2O}$$ and $$\\\\pu{123 J}$$';
     expect(preprocessLaTeX(content)).toBe(expected);
   });
 
@@ -165,31 +94,117 @@ describe('preprocessLaTeX', () => {
     expect(preprocessLaTeX('')).toBe('');
   });
 
-  test('preserves code blocks', () => {
-    const content = '```\n$100\n```\nOutside $200';
-    const expected = '```\n$100\n```\nOutside \\$200';
+  test('handles complex mixed content', () => {
+    const content = `Valid double $$y^2$$
+Currency $100 and $200
+Single dollar math $x^2 + y^2$
+Chemical $\\ce{H2O}$
+Valid brackets \\[z^2\\]`;
+    const expected = `Valid double $$y^2$$
+Currency \\$100 and \\$200
+Single dollar math $$x^2 + y^2$$
+Chemical $$\\\\ce{H2O}$$
+Valid brackets \\[z^2\\]`;
     expect(preprocessLaTeX(content)).toBe(expected);
   });
 
-  test('handles multiple currency values in a sentence', () => {
-    const content = 'I have $50 in my wallet and $100 in the bank.';
-    const expected = 'I have \\$50 in my wallet and \\$100 in the bank.';
+  test('handles multiple equations with currency', () => {
+    const content = `- **Euler's Totient Function**: $\\phi(n) = n \\prod_{p|n} \\left(1 - \\frac{1}{p}\\right)$
+- **Total Savings**: $500 + $200 + $150 = $850`;
+    const expected = `- **Euler's Totient Function**: $$\\phi(n) = n \\prod_{p|n} \\left(1 - \\frac{1}{p}\\right)$$
+- **Total Savings**: \\$500 + \\$200 + \\$150 = \\$850`;
     expect(preprocessLaTeX(content)).toBe(expected);
   });
 
-  test('preserves LaTeX expressions with numbers', () => {
-    const content = 'The equation is $f(x) = 2x + 3$ where x is a variable.';
-    expect(preprocessLaTeX(content)).toBe(content);
+  test('handles inline code blocks', () => {
+    const content = 'Outside $x^2$ and inside code: `$100`';
+    const expected = 'Outside $$x^2$$ and inside code: `$100`';
+    expect(preprocessLaTeX(content)).toBe(expected);
   });
 
-  test('handles currency values with commas', () => {
-    const content = 'The price is $1,000,000 for this item.';
-    const expected = 'The price is \\$1,000,000 for this item.';
+  test('handles multiline code blocks', () => {
+    const content = '```\n$100\n$variable\n```\nOutside $x^2$';
+    const expected = '```\n$100\n$variable\n```\nOutside $$x^2$$';
     expect(preprocessLaTeX(content)).toBe(expected);
   });
 
   test('preserves LaTeX expressions with special characters', () => {
     const content = 'The set is defined as $\\{x | x > 0\\}$.';
-    expect(preprocessLaTeX(content)).toBe(content);
+    const expected = 'The set is defined as $$\\{x | x > 0\\}$$.';
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('handles complex physics equations', () => {
+    const content = `- **Schrödinger Equation**: $i\\hbar\\frac{\\partial}{\\partial t}|\\psi\\rangle = \\hat{H}|\\psi\\rangle$
+- **Einstein Field Equations**: $G_{\\mu\\nu} = \\frac{8\\pi G}{c^4} T_{\\mu\\nu}$`;
+    const expected = `- **Schrödinger Equation**: $$i\\hbar\\frac{\\partial}{\\partial t}|\\psi\\rangle = \\hat{H}|\\psi\\rangle$$
+- **Einstein Field Equations**: $$G_{\\mu\\nu} = \\frac{8\\pi G}{c^4} T_{\\mu\\nu}$$`;
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('handles financial calculations with currency', () => {
+    const content = `- **Simple Interest**: $A = P + Prt = $1,000 + ($1,000)(0.05)(2) = $1,100$
+- **ROI**: $\\text{ROI} = \\frac{$1,200 - $1,000}{$1,000} \\times 100\\% = 20\\%$`;
+    const expected = `- **Simple Interest**: $$A = P + Prt = \\$1,000 + (\\$1,000)(0.05)(2) = \\$1,100$$
+- **ROI**: $$\\text{ROI} = \\frac{\\$1,200 - \\$1,000}{\\$1,000} \\times 100\\% = 20\\%$$`;
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('does not convert partial or malformed expressions', () => {
+    const content = 'A single $ sign should not be converted';
+    const expected = 'A single $ sign should not be converted';
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('handles nested parentheses in LaTeX', () => {
+    const content =
+      'Matrix determinant: $\\det(A) = \\sum_{\\sigma \\in S_n} \\text{sgn}(\\sigma) \\prod_{i=1}^n a_{i,\\sigma(i)}$';
+    const expected =
+      'Matrix determinant: $$\\det(A) = \\sum_{\\sigma \\in S_n} \\text{sgn}(\\sigma) \\prod_{i=1}^n a_{i,\\sigma(i)}$$';
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('preserves spacing in equations', () => {
+    const content = 'Equation: $f(x) = 2x + 3$ where x is a variable.';
+    const expected = 'Equation: $$f(x) = 2x + 3$$ where x is a variable.';
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('handles LaTeX with newlines inside should not be converted', () => {
+    const content = `This has $x
+y$ which spans lines`;
+    const expected = `This has $x
+y$ which spans lines`;
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('handles multiple dollar signs in text', () => {
+    const content = 'Price $100 then equation $x + y = z$ then another price $50';
+    const expected = 'Price \\$100 then equation $$x + y = z$$ then another price \\$50';
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('handles complex LaTeX with currency in same expression', () => {
+    const content = 'Calculate $\\text{Total} = \\$500 + \\$200$';
+    const expected = 'Calculate $$\\text{Total} = \\$500 + \\$200$$';
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('preserves already escaped dollars in LaTeX', () => {
+    const content = 'The formula $f(x) = \\$2x$ represents cost';
+    const expected = 'The formula $$f(x) = \\$2x$$ represents cost';
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('handles adjacent LaTeX and currency', () => {
+    const content = 'Formula $x^2$ costs $25';
+    const expected = 'Formula $$x^2$$ costs \\$25';
+    expect(preprocessLaTeX(content)).toBe(expected);
+  });
+
+  test('handles LaTeX with special characters and currency', () => {
+    const content = 'Set $\\{x | x > \\$0\\}$ for positive prices';
+    const expected = 'Set $$\\{x | x > \\$0\\}$$ for positive prices';
+    expect(preprocessLaTeX(content)).toBe(expected);
   });
 });
diff --git a/client/src/utils/latex.ts b/client/src/utils/latex.ts
index 97fbc46670..b004d798fb 100644
--- a/client/src/utils/latex.ts
+++ b/client/src/utils/latex.ts
@@ -1,105 +1,152 @@
-// Regex to check if the processed content contains any potential LaTeX patterns
-const containsLatexRegex =
-  /\\\(.*?\\\)|\\\[.*?\\\]|\$.*?\$|\\begin\{equation\}.*?\\end\{equation\}/;
-
-// Regex for inline and block LaTeX expressions
-const inlineLatex = new RegExp(/\\\((.+?)\\\)/, 'g');
-const blockLatex = new RegExp(/\\\[(.*?[^\\])\\\]/, 'gs');
-
-// Function to restore code blocks
-const restoreCodeBlocks = (content: string, codeBlocks: string[]) => {
-  return content.replace(/<<CODE_BLOCK_(\d+)>>/g, (match, index) => codeBlocks[index]);
-};
-
-// Regex to identify code blocks and inline code
-const codeBlockRegex = /(```[\s\S]*?```|`.*?`)/g;
-
-export const processLaTeX = (_content: string) => {
-  let content = _content;
-  // Temporarily replace code blocks and inline code with placeholders
-  const codeBlocks: string[] = [];
-  let index = 0;
-  content = content.replace(codeBlockRegex, (match) => {
-    codeBlocks[index] = match;
-    return `<<CODE_BLOCK_${index++}>>`;
-  });
-
-  // Escape dollar signs followed by a digit or space and digit
-  let processedContent = content.replace(/(\$)(?=\s?\d)/g, '\\$');
-
-  // If no LaTeX patterns are found, restore code blocks and return the processed content
-  if (!containsLatexRegex.test(processedContent)) {
-    return restoreCodeBlocks(processedContent, codeBlocks);
-  }
-
-  // Convert LaTeX expressions to a markdown compatible format
-  processedContent = processedContent
-    .replace(inlineLatex, (match: string, equation: string) => `$${equation}$`) // Convert inline LaTeX
-    .replace(blockLatex, (match: string, equation: string) => `$$${equation}$$`); // Convert block LaTeX
-
-  // Restore code blocks
-  return restoreCodeBlocks(processedContent, codeBlocks);
-};
+// Pre-compile all regular expressions for better performance
+const MHCHEM_CE_REGEX = /\$\\ce\{/g;
+const MHCHEM_PU_REGEX = /\$\\pu\{/g;
+const MHCHEM_CE_ESCAPED_REGEX = /\$\\\\ce\{[^}]*\}\$/g;
+const MHCHEM_PU_ESCAPED_REGEX = /\$\\\\pu\{[^}]*\}\$/g;
+const CURRENCY_REGEX =
+  /(?<![\\$])\$(?!\$)(?=\d{1,3}(?:,\d{3})*(?:\.\d{1,2})?(?:\s|$|[^a-zA-Z\d]))/g;
+const SINGLE_DOLLAR_REGEX = /(?<!\\)\$(?!\$)((?:[^$\n]|\\[$])+?)(?<!\\)\$(?!\$)/g;
 
 /**
- * Preprocesses LaTeX content by replacing delimiters and escaping certain characters.
+ * Escapes mhchem package notation in LaTeX by converting single dollar delimiters to double dollars
+ * and escaping backslashes in mhchem commands.
  *
+ * @param text - The input text containing potential mhchem notation
+ * @returns The processed text with properly escaped mhchem notation
+ */
+function escapeMhchem(text: string): string {
+  // First escape the backslashes in mhchem commands
+  let result = text.replace(MHCHEM_CE_REGEX, '$\\\\ce{');
+  result = result.replace(MHCHEM_PU_REGEX, '$\\\\pu{');
+
+  // Then convert single dollar mhchem to double dollar
+  result = result.replace(MHCHEM_CE_ESCAPED_REGEX, (match) => `$${match}$`);
+  result = result.replace(MHCHEM_PU_ESCAPED_REGEX, (match) => `$${match}$`);
+
+  return result;
+}
+
+/**
+ * Efficiently finds all code block regions in the content
+ * @param content The content to analyze
+ * @returns Array of code block regions [start, end]
+ */
+function findCodeBlockRegions(content: string): Array<[number, number]> {
+  const regions: Array<[number, number]> = [];
+  let inlineStart = -1;
+  let multilineStart = -1;
+
+  for (let i = 0; i < content.length; i++) {
+    const char = content[i];
+
+    // Check for multiline code blocks
+    if (
+      char === '`' &&
+      i + 2 < content.length &&
+      content[i + 1] === '`' &&
+      content[i + 2] === '`'
+    ) {
+      if (multilineStart === -1) {
+        multilineStart = i;
+        i += 2; // Skip the next two backticks
+      } else {
+        regions.push([multilineStart, i + 2]);
+        multilineStart = -1;
+        i += 2;
+      }
+    }
+    // Check for inline code blocks (only if not in multiline)
+    else if (char === '`' && multilineStart === -1) {
+      if (inlineStart === -1) {
+        inlineStart = i;
+      } else {
+        regions.push([inlineStart, i]);
+        inlineStart = -1;
+      }
+    }
+  }
+
+  return regions;
+}
+
+/**
+ * Checks if a position is inside any code block region using binary search
+ * @param position The position to check
+ * @param codeRegions Array of code block regions
+ * @returns True if position is inside a code block
+ */
+function isInCodeBlock(position: number, codeRegions: Array<[number, number]>): boolean {
+  let left = 0;
+  let right = codeRegions.length - 1;
+
+  while (left <= right) {
+    const mid = Math.floor((left + right) / 2);
+    const [start, end] = codeRegions[mid];
+
+    if (position >= start && position <= end) {
+      return true;
+    } else if (position < start) {
+      right = mid - 1;
+    } else {
+      left = mid + 1;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * Preprocesses LaTeX content by escaping currency indicators and converting single dollar math delimiters.
+ * Optimized for high-frequency execution.
  * @param content The input string containing LaTeX expressions.
- * @returns The processed string with replaced delimiters and escaped characters.
+ * @returns The processed string with escaped currency indicators and converted math delimiters.
  */
 export function preprocessLaTeX(content: string): string {
-  // Step 1: Protect code blocks
-  const codeBlocks: string[] = [];
-  content = content.replace(/(```[\s\S]*?```|`[^`\n]+`)/g, (match, code) => {
-    codeBlocks.push(code);
-    return `<<CODE_BLOCK_${codeBlocks.length - 1}>>`;
-  });
+  // Early return for most common case
+  if (!content.includes('$')) return content;
 
-  // Step 2: Protect existing LaTeX expressions
-  const latexExpressions: string[] = [];
-  content = content.replace(/(\$\$[\s\S]*?\$\$|\\\[[\s\S]*?\\\]|\\\(.*?\\\))/g, (match) => {
-    latexExpressions.push(match);
-    return `<<LATEX_${latexExpressions.length - 1}>>`;
-  });
+  // Process mhchem first (usually rare, so check if needed)
+  let processed = content;
+  if (content.includes('\\ce{') || content.includes('\\pu{')) {
+    processed = escapeMhchem(content);
+  }
 
-  // Step 3: Escape dollar signs that are likely currency indicators
-  content = content.replace(/\$(?=\d)/g, '\\$');
+  // Find all code block regions once
+  const codeRegions = findCodeBlockRegions(processed);
 
-  // Step 4: Restore LaTeX expressions
-  content = content.replace(/<<LATEX_(\d+)>>/g, (_, index) => latexExpressions[parseInt(index)]);
+  // First pass: escape currency dollar signs
+  const parts: string[] = [];
+  let lastIndex = 0;
 
-  // Step 5: Restore code blocks
-  content = content.replace(/<<CODE_BLOCK_(\d+)>>/g, (_, index) => codeBlocks[parseInt(index)]);
+  // Reset regex for reuse
+  CURRENCY_REGEX.lastIndex = 0;
 
-  // Step 6: Apply additional escaping functions
-  content = escapeBrackets(content);
-  content = escapeMhchem(content);
+  let match: RegExpExecArray | null;
+  while ((match = CURRENCY_REGEX.exec(processed)) !== null) {
+    if (!isInCodeBlock(match.index, codeRegions)) {
+      parts.push(processed.substring(lastIndex, match.index));
+      parts.push('\\$');
+      lastIndex = match.index + 1;
+    }
+  }
+  parts.push(processed.substring(lastIndex));
+  processed = parts.join('');
 
-  return content;
-}
-
-export function escapeBrackets(text: string): string {
-  const pattern = /(```[\S\s]*?```|`.*?`)|\\\[([\S\s]*?[^\\])\\]|\\\((.*?)\\\)/g;
-  return text.replace(
-    pattern,
-    (
-      match: string,
-      codeBlock: string | undefined,
-      squareBracket: string | undefined,
-      roundBracket: string | undefined,
-    ): string => {
-      if (codeBlock != null) {
-        return codeBlock;
-      } else if (squareBracket != null) {
-        return `$$${squareBracket}$$`;
-      } else if (roundBracket != null) {
-        return `$${roundBracket}$`;
-      }
-      return match;
-    },
-  );
-}
-
-export function escapeMhchem(text: string) {
-  return text.replaceAll('$\\ce{', '$\\\\ce{').replaceAll('$\\pu{', '$\\\\pu{');
+  // Second pass: convert single dollar delimiters to double dollars
+  const result: string[] = [];
+  lastIndex = 0;
+
+  // Reset regex for reuse
+  SINGLE_DOLLAR_REGEX.lastIndex = 0;
+
+  while ((match = SINGLE_DOLLAR_REGEX.exec(processed)) !== null) {
+    if (!isInCodeBlock(match.index, codeRegions)) {
+      result.push(processed.substring(lastIndex, match.index));
+      result.push(`$$${match[1]}$$`);
+      lastIndex = match.index + match[0].length;
+    }
+  }
+  result.push(processed.substring(lastIndex));
+
+  return result.join('');
 }
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 4ce4fc3b86..9a091d9f53 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -232,6 +232,7 @@ export default defineConfig(({ command }) => ({
     alias: {
       '~': path.join(__dirname, 'src/'),
       $fonts: path.resolve(__dirname, 'public/fonts'),
+      'micromark-extension-math': 'micromark-extension-llm-math',
     },
   },
 }));
diff --git a/package-lock.json b/package-lock.json
index d9dc4cc2ed..75ce0ea9fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2474,6 +2474,7 @@
         "lodash": "^4.17.21",
         "lucide-react": "^0.394.0",
         "match-sorter": "^6.3.4",
+        "micromark-extension-llm-math": "^3.1.0",
         "qrcode.react": "^4.2.0",
         "rc-input-number": "^7.4.2",
         "react": "^18.2.0",
@@ -36460,6 +36461,25 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/micromark-extension-llm-math": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-llm-math/-/micromark-extension-llm-math-3.1.0.tgz",
+      "integrity": "sha512-VIYHuIEk0gpHrojEtNGaxGwdpSLtdWYlLL2vu9PM4M1ilEtak10S8F9zzbNAPBNRoWFs/bjs+J7R3yUBoIQUEA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/katex": "^0.16.0",
+        "devlop": "^1.0.0",
+        "katex": "^0.16.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/micromark-extension-math": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/micromark-extension-math/-/micromark-extension-math-3.1.0.tgz",

From 8b15bb2ed63fc3d0c5934859a754956af1641c79 Mon Sep 17 00:00:00 2001
From: Dustin Healy <54083382+dustinhealy@users.noreply.github.com>
Date: Thu, 19 Jun 2025 07:01:50 -0700
Subject: [PATCH 40/49] =?UTF-8?q?=E2=9C=A8=20feat:=20Enhance=20Agent=20Pan?=
 =?UTF-8?q?el=20with=20Tool=20Grouping=20(#7951)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✨ feat: Enhance Agent Panel with Tool Grouping

* 🧰 feat: Added support for grouping tools in the Agent Panel, allowing for better organization and management of related tools.
* 💡 feat: Added hovercards for tools belonging to a group which display their tool descriptions when their help icon is hovered over.
* 🧹 chore: Updated the AgentPanelContext to include grouped tools and their metadata.
* 🔨 refactor: Refactored AgentConfig and AgentTool components to utilize the new tool structure and enhance rendering logic.
* 🔍 feat: Improved the ToolSelectDialog to filter and display tools based on user input, including searching for tools within a group, and limits viewport height to prevent overflowing vertically on smaller screens.

This update enhances the overall functionality and usability of the Agent Panel, making it easier for users to interact with tools.

* Potential fix for code scanning alert no. 6217: Disallow unused variables

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

* fix: Agent tool type mismatches

* fix: accessibility issues and mcp tool overflow issue

* fix: enhance keyboard accessibility and prevent event propagation in AgentTool

* chore: WIP types

* chore: address comments and fix accordian collapse bug

---------

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: Danny Avila <danny@librechat.ai>
---
 client/src/Providers/AgentPanelContext.tsx    |  58 ++-
 client/src/common/types.ts                    |   2 +
 .../SidePanel/Agents/AgentConfig.tsx          |  80 ++--
 .../components/SidePanel/Agents/AgentTool.tsx | 378 ++++++++++++++++--
 client/src/components/Tools/ToolItem.tsx      |  22 +-
 .../src/components/Tools/ToolSelectDialog.tsx |  81 ++--
 client/src/locales/en/translation.json        |   5 +-
 packages/data-provider/src/actions.ts         |  12 +-
 packages/data-provider/src/data-service.ts    |   5 +-
 packages/data-provider/src/mcp.ts             |   2 +-
 packages/data-provider/src/types/agents.ts    |  78 +++-
 .../data-provider/src/types/assistants.ts     |  71 ----
 packages/data-provider/src/types/mutations.ts |   3 +-
 13 files changed, 602 insertions(+), 195 deletions(-)

diff --git a/client/src/Providers/AgentPanelContext.tsx b/client/src/Providers/AgentPanelContext.tsx
index 628eda00f2..2cc64ba3ed 100644
--- a/client/src/Providers/AgentPanelContext.tsx
+++ b/client/src/Providers/AgentPanelContext.tsx
@@ -1,7 +1,9 @@
 import React, { createContext, useContext, useState } from 'react';
-import { Action, MCP, EModelEndpoint } from 'librechat-data-provider';
+import { Constants, EModelEndpoint } from 'librechat-data-provider';
+import type { TPlugin, AgentToolType, Action, MCP } from 'librechat-data-provider';
 import type { AgentPanelContextType } from '~/common';
-import { useGetActionsQuery } from '~/data-provider';
+import { useAvailableToolsQuery, useGetActionsQuery } from '~/data-provider';
+import { useLocalize } from '~/hooks';
 import { Panel } from '~/common';
 
 const AgentPanelContext = createContext<AgentPanelContextType | undefined>(undefined);
@@ -16,6 +18,7 @@ export function useAgentPanelContext() {
 
 /** Houses relevant state for the Agent Form Panels (formerly 'commonProps') */
 export function AgentPanelProvider({ children }: { children: React.ReactNode }) {
+  const localize = useLocalize();
   const [mcp, setMcp] = useState<MCP | undefined>(undefined);
   const [mcps, setMcps] = useState<MCP[] | undefined>(undefined);
   const [action, setAction] = useState<Action | undefined>(undefined);
@@ -26,6 +29,53 @@ export function AgentPanelProvider({ children }: { children: React.ReactNode })
     enabled: !!agent_id,
   });
 
+  const { data: pluginTools } = useAvailableToolsQuery(EModelEndpoint.agents, {
+    enabled: !!agent_id,
+  });
+
+  const tools =
+    pluginTools?.map((tool) => ({
+      tool_id: tool.pluginKey,
+      metadata: tool as TPlugin,
+      agent_id: agent_id || '',
+    })) || [];
+
+  const groupedTools =
+    tools?.reduce(
+      (acc, tool) => {
+        if (tool.tool_id.includes(Constants.mcp_delimiter)) {
+          const [_toolName, serverName] = tool.tool_id.split(Constants.mcp_delimiter);
+          const groupKey = `${serverName.toLowerCase()}`;
+          if (!acc[groupKey]) {
+            acc[groupKey] = {
+              tool_id: groupKey,
+              metadata: {
+                name: `${serverName}`,
+                pluginKey: groupKey,
+                description: `${localize('com_ui_tool_collection_prefix')} ${serverName}`,
+                icon: tool.metadata.icon || '',
+              } as TPlugin,
+              agent_id: agent_id || '',
+              tools: [],
+            };
+          }
+          acc[groupKey].tools?.push({
+            tool_id: tool.tool_id,
+            metadata: tool.metadata,
+            agent_id: agent_id || '',
+          });
+        } else {
+          acc[tool.tool_id] = {
+            tool_id: tool.tool_id,
+            metadata: tool.metadata,
+            agent_id: agent_id || '',
+          };
+        }
+        return acc;
+      },
+      {} as Record<string, AgentToolType & { tools?: AgentToolType[] }>,
+    ) || {};
+
   const value = {
     action,
     setAction,
@@ -37,8 +87,10 @@ export function AgentPanelProvider({ children }: { children: React.ReactNode })
     setActivePanel,
     setCurrentAgentId,
     agent_id,
-    /** Query data for actions */
+    groupedTools,
+    /** Query data for actions and tools */
     actions,
+    tools,
   };
 
   return <AgentPanelContext.Provider value={value}>{children}</AgentPanelContext.Provider>;
diff --git a/client/src/common/types.ts b/client/src/common/types.ts
index 6fe4784fbc..214dc349b5 100644
--- a/client/src/common/types.ts
+++ b/client/src/common/types.ts
@@ -219,6 +219,8 @@ export type AgentPanelContextType = {
   mcps?: t.MCP[];
   setMcp: React.Dispatch<React.SetStateAction<t.MCP | undefined>>;
   setMcps: React.Dispatch<React.SetStateAction<t.MCP[] | undefined>>;
+  groupedTools: Record<string, t.AgentToolType & { tools?: t.AgentToolType[] }>;
+  tools: t.AgentToolType[];
   activePanel?: string;
   setActivePanel: React.Dispatch<React.SetStateAction<Panel>>;
   setCurrentAgentId: React.Dispatch<React.SetStateAction<string | undefined>>;
diff --git a/client/src/components/SidePanel/Agents/AgentConfig.tsx b/client/src/components/SidePanel/Agents/AgentConfig.tsx
index 2b056a5181..2afa56601c 100644
--- a/client/src/components/SidePanel/Agents/AgentConfig.tsx
+++ b/client/src/components/SidePanel/Agents/AgentConfig.tsx
@@ -1,11 +1,9 @@
-import { useQueryClient } from '@tanstack/react-query';
 import React, { useState, useMemo, useCallback } from 'react';
 import { Controller, useWatch, useFormContext } from 'react-hook-form';
-import { QueryKeys, EModelEndpoint, AgentCapabilities } from 'librechat-data-provider';
-import type { TPlugin } from 'librechat-data-provider';
+import { EModelEndpoint, AgentCapabilities } from 'librechat-data-provider';
+import type { AgentForm, AgentPanelProps, IconComponentTypes } from '~/common';
 import { cn, defaultTextProps, removeFocusOutlines, getEndpointField, getIconKey } from '~/utils';
 import { useToastContext, useFileMapContext, useAgentPanelContext } from '~/Providers';
-import type { AgentForm, AgentPanelProps, IconComponentTypes } from '~/common';
 import Action from '~/components/SidePanel/Builder/Action';
 import { ToolSelectDialog } from '~/components/Tools';
 import { icons } from '~/hooks/Endpoint/Icons';
@@ -15,7 +13,6 @@ import AgentAvatar from './AgentAvatar';
 import FileContext from './FileContext';
 import SearchForm from './Search/Form';
 import { useLocalize } from '~/hooks';
-import MCPSection from './MCPSection';
 import FileSearch from './FileSearch';
 import Artifacts from './Artifacts';
 import AgentTool from './AgentTool';
@@ -36,13 +33,10 @@ export default function AgentConfig({
 }: Pick<AgentPanelProps, 'agentsConfig' | 'createMutation' | 'endpointsConfig'>) {
   const localize = useLocalize();
   const fileMap = useFileMapContext();
-  const queryClient = useQueryClient();
   const { showToast } = useToastContext();
   const methods = useFormContext<AgentForm>();
   const [showToolDialog, setShowToolDialog] = useState(false);
-  const { actions, setAction, setActivePanel } = useAgentPanelContext();
-
-  const allTools = queryClient.getQueryData<TPlugin[]>([QueryKeys.tools]) ?? [];
+  const { actions, setAction, groupedTools: allTools, setActivePanel } = useAgentPanelContext();
 
   const { control } = methods;
   const provider = useWatch({ control, name: 'provider' });
@@ -169,6 +163,20 @@ export default function AgentConfig({
     Icon = icons[iconKey];
   }
 
+  // Determine what to show
+  const selectedToolIds = tools ?? [];
+  const visibleToolIds = new Set(selectedToolIds);
+
+  // Check what group parent tools should be shown if any subtool is present
+  Object.entries(allTools).forEach(([toolId, toolObj]) => {
+    if (toolObj.tools?.length) {
+      // if any subtool of this group is selected, ensure group parent tool rendered
+      if (toolObj.tools.some((st) => selectedToolIds.includes(st.tool_id))) {
+        visibleToolIds.add(toolId);
+      }
+    }
+  });
+
   return (
     <>
       <div className="h-auto bg-white px-4 pt-3 dark:bg-transparent">
@@ -287,28 +295,37 @@ export default function AgentConfig({
               ${toolsEnabled === true && actionsEnabled === true ? ' + ' : ''}
               ${actionsEnabled === true ? localize('com_assistants_actions') : ''}`}
           </label>
-          <div className="space-y-2">
-            {tools?.map((func, i) => (
-              <AgentTool
-                key={`${func}-${i}-${agent_id}`}
-                tool={func}
-                allTools={allTools}
-                agent_id={agent_id}
-              />
-            ))}
-            {(actions ?? [])
-              .filter((action) => action.agent_id === agent_id)
-              .map((action, i) => (
-                <Action
-                  key={i}
-                  action={action}
-                  onClick={() => {
-                    setAction(action);
-                    setActivePanel(Panel.actions);
-                  }}
-                />
-              ))}
-            <div className="flex space-x-2">
+          <div>
+            <div className="mb-1">
+              {/* // Render all visible IDs (including groups with subtools selected) */}
+              {[...visibleToolIds].map((toolId, i) => {
+                const tool = allTools[toolId];
+                if (!tool) return null;
+                return (
+                  <AgentTool
+                    key={`${toolId}-${i}-${agent_id}`}
+                    tool={toolId}
+                    allTools={allTools}
+                    agent_id={agent_id}
+                  />
+                );
+              })}
+            </div>
+            <div className="flex flex-col gap-1">
+              {(actions ?? [])
+                .filter((action) => action.agent_id === agent_id)
+                .map((action, i) => (
+                  <Action
+                    key={i}
+                    action={action}
+                    onClick={() => {
+                      setAction(action);
+                      setActivePanel(Panel.actions);
+                    }}
+                  />
+                ))}
+            </div>
+            <div className="mt-2 flex space-x-2">
               {(toolsEnabled ?? false) && (
                 <button
                   type="button"
@@ -343,7 +360,6 @@ export default function AgentConfig({
       <ToolSelectDialog
         isOpen={showToolDialog}
         setIsOpen={setShowToolDialog}
-        toolsFormKey="tools"
         endpoint={EModelEndpoint.agents}
       />
     </>
diff --git a/client/src/components/SidePanel/Agents/AgentTool.tsx b/client/src/components/SidePanel/Agents/AgentTool.tsx
index 59c2e267f1..4876f447fb 100644
--- a/client/src/components/SidePanel/Agents/AgentTool.tsx
+++ b/client/src/components/SidePanel/Agents/AgentTool.tsx
@@ -1,41 +1,69 @@
 import React, { useState } from 'react';
+import * as Ariakit from '@ariakit/react';
+import { ChevronDown } from 'lucide-react';
 import { useFormContext } from 'react-hook-form';
-import type { TPlugin } from 'librechat-data-provider';
+import * as AccordionPrimitive from '@radix-ui/react-accordion';
 import { useUpdateUserPluginsMutation } from 'librechat-data-provider/react-query';
-import { OGDialog, OGDialogTrigger, Label } from '~/components/ui';
+import type { AgentToolType } from 'librechat-data-provider';
+import type { AgentForm } from '~/common';
+import { Accordion, AccordionItem, AccordionContent } from '~/components/ui/Accordion';
+import { OGDialog, OGDialogTrigger, Label, Checkbox } from '~/components/ui';
+import { TrashIcon, CircleHelpIcon } from '~/components/svg';
 import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
 import { useToastContext } from '~/Providers';
-import { TrashIcon } from '~/components/svg';
 import { useLocalize } from '~/hooks';
 import { cn } from '~/utils';
 
 export default function AgentTool({
   tool,
   allTools,
-  agent_id = '',
 }: {
   tool: string;
-  allTools: TPlugin[];
+  allTools: Record<string, AgentToolType & { tools?: AgentToolType[] }>;
   agent_id?: string;
 }) {
   const [isHovering, setIsHovering] = useState(false);
+  const [isFocused, setIsFocused] = useState(false);
+  const [hoveredToolId, setHoveredToolId] = useState<string | null>(null);
+  const [accordionValue, setAccordionValue] = useState<string>('');
   const localize = useLocalize();
   const { showToast } = useToastContext();
   const updateUserPlugins = useUpdateUserPluginsMutation();
-  const { getValues, setValue } = useFormContext();
-  const currentTool = allTools.find((t) => t.pluginKey === tool);
+  const { getValues, setValue } = useFormContext<AgentForm>();
+  const currentTool = allTools[tool];
+
+  const getSelectedTools = () => {
+    if (!currentTool?.tools) return [];
+    const formTools = getValues('tools') || [];
+    return currentTool.tools.filter((t) => formTools.includes(t.tool_id)).map((t) => t.tool_id);
+  };
+
+  const updateFormTools = (newSelectedTools: string[]) => {
+    const currentTools = getValues('tools') || [];
+    const otherTools = currentTools.filter(
+      (t: string) => !currentTool?.tools?.some((st) => st.tool_id === t),
+    );
+    setValue('tools', [...otherTools, ...newSelectedTools]);
+  };
+
+  const removeTool = (toolId: string) => {
+    if (toolId) {
+      const toolIdsToRemove =
+        isGroup && currentTool.tools
+          ? [toolId, ...currentTool.tools.map((t) => t.tool_id)]
+          : [toolId];
 
-  const removeTool = (tool: string) => {
-    if (tool) {
       updateUserPlugins.mutate(
-        { pluginKey: tool, action: 'uninstall', auth: null, isEntityTool: true },
+        { pluginKey: toolId, action: 'uninstall', auth: {}, isEntityTool: true },
         {
           onError: (error: unknown) => {
             showToast({ message: `Error while deleting the tool: ${error}`, status: 'error' });
           },
           onSuccess: () => {
-            const tools = getValues('tools').filter((fn: string) => fn !== tool);
-            setValue('tools', tools);
+            const remainingToolIds = getValues('tools')?.filter(
+              (toolId: string) => !toolIdsToRemove.includes(toolId),
+            );
+            setValue('tools', remainingToolIds);
             showToast({ message: 'Tool deleted successfully', status: 'success' });
           },
         },
@@ -47,41 +75,309 @@ export default function AgentTool({
     return null;
   }
 
-  return (
-    <OGDialog>
-      <div
-        className={cn('flex w-full items-center rounded-lg text-sm', !agent_id ? 'opacity-40' : '')}
-        onMouseEnter={() => setIsHovering(true)}
-        onMouseLeave={() => setIsHovering(false)}
-      >
-        <div className="flex grow items-center">
-          {currentTool.icon && (
-            <div className="flex h-9 w-9 items-center justify-center overflow-hidden rounded-full">
-              <div
-                className="flex h-6 w-6 items-center justify-center overflow-hidden rounded-full bg-center bg-no-repeat dark:bg-white/20"
-                style={{ backgroundImage: `url(${currentTool.icon})`, backgroundSize: 'cover' }}
-              />
-            </div>
-          )}
-          <div
-            className="h-9 grow px-3 py-2"
-            style={{ textOverflow: 'ellipsis', wordBreak: 'break-all', overflow: 'hidden' }}
-          >
-            {currentTool.name}
-          </div>
-        </div>
+  const isGroup = currentTool.tools && currentTool.tools.length > 0;
+  const selectedTools = getSelectedTools();
+  const isExpanded = accordionValue === currentTool.tool_id;
+
+  if (!isGroup) {
+    return (
+      <OGDialog>
+        <div
+          className="group relative flex w-full items-center gap-1 rounded-lg p-1 text-sm hover:bg-gray-50 dark:hover:bg-gray-800/50"
+          onMouseEnter={() => setIsHovering(true)}
+          onMouseLeave={() => setIsHovering(false)}
+          onFocus={() => setIsFocused(true)}
+          onBlur={(e) => {
+            // Check if focus is moving to a child element
+            if (!e.currentTarget.contains(e.relatedTarget)) {
+              setIsFocused(false);
+            }
+          }}
+        >
+          <div className="flex grow items-center">
+            {currentTool.metadata.icon && (
+              <div className="flex h-8 w-8 items-center justify-center overflow-hidden rounded-full">
+                <div
+                  className="flex h-6 w-6 items-center justify-center overflow-hidden rounded-full bg-center bg-no-repeat dark:bg-white/20"
+                  style={{
+                    backgroundImage: `url(${currentTool.metadata.icon})`,
+                    backgroundSize: 'cover',
+                  }}
+                />
+              </div>
+            )}
+            <div
+              className="grow px-2 py-1.5"
+              style={{ textOverflow: 'ellipsis', wordBreak: 'break-all', overflow: 'hidden' }}
+            >
+              {currentTool.metadata.name}
+            </div>
+          </div>
 
-        {isHovering && (
           <OGDialogTrigger asChild>
             <button
               type="button"
-              className="transition-color flex h-9 w-9 min-w-9 items-center justify-center rounded-lg duration-200 hover:bg-gray-200 dark:hover:bg-gray-700"
+              className={cn(
+                'flex h-7 w-7 items-center justify-center rounded transition-all duration-200',
+                'hover:bg-gray-200 dark:hover:bg-gray-700',
+                'focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-1',
+                'focus:opacity-100',
+                isHovering || isFocused ? 'opacity-100' : 'pointer-events-none opacity-0',
+              )}
+              aria-label={`Delete ${currentTool.metadata.name}`}
+              tabIndex={0}
+              onFocus={() => setIsFocused(true)}
             >
-              <TrashIcon />
+              <TrashIcon className="h-4 w-4" />
             </button>
           </OGDialogTrigger>
-        )}
-      </div>
+        </div>
+        <OGDialogTemplate
+          showCloseButton={false}
+          title={localize('com_ui_delete_tool')}
+          mainClassName="px-0"
+          className="max-w-[450px]"
+          main={
+            <Label className="text-left text-sm font-medium">
+              {localize('com_ui_delete_tool_confirm')}
+            </Label>
+          }
+          selection={{
+            selectHandler: () => removeTool(currentTool.tool_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>
+    );
+  }
+
+  // Group tool with accordion
+  return (
+    <OGDialog>
+      <Accordion type="single" value={accordionValue} onValueChange={setAccordionValue} collapsible>
+        <AccordionItem value={currentTool.tool_id} className="group relative w-full border-none">
+          <div
+            className="relative flex w-full items-center gap-1 rounded-lg p-1 hover:bg-gray-50 dark:hover:bg-gray-800/50"
+            onMouseEnter={() => setIsHovering(true)}
+            onMouseLeave={() => setIsHovering(false)}
+            onFocus={() => setIsFocused(true)}
+            onBlur={(e) => {
+              // Check if focus is moving to a child element
+              if (!e.currentTarget.contains(e.relatedTarget)) {
+                setIsFocused(false);
+              }
+            }}
+          >
+            <AccordionPrimitive.Header asChild>
+              <AccordionPrimitive.Trigger asChild>
+                <button
+                  type="button"
+                  className={cn(
+                    'flex grow items-center gap-1 rounded bg-transparent p-0 text-left transition-colors',
+                    'focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-1',
+                  )}
+                >
+                  {currentTool.metadata.icon && (
+                    <div className="flex h-8 w-8 items-center justify-center overflow-hidden rounded-full">
+                      <div
+                        className="flex h-6 w-6 items-center justify-center overflow-hidden rounded-full bg-center bg-no-repeat dark:bg-white/20"
+                        style={{
+                          backgroundImage: `url(${currentTool.metadata.icon})`,
+                          backgroundSize: 'cover',
+                        }}
+                      />
+                    </div>
+                  )}
+                  <div
+                    className="grow px-2 py-1.5"
+                    style={{ textOverflow: 'ellipsis', wordBreak: 'break-all', overflow: 'hidden' }}
+                  >
+                    {currentTool.metadata.name}
+                  </div>
+                  <div className="flex items-center">
+                    {/* Container for grouped checkbox and chevron */}
+                    <div className="relative flex items-center">
+                      {/* Grouped checkbox and chevron that slide together */}
+                      <div
+                        className={cn(
+                          'flex items-center gap-2 transition-all duration-300',
+                          isHovering || isFocused ? '-translate-x-8' : 'translate-x-0',
+                        )}
+                      >
+                        <div
+                          data-checkbox-container
+                          onClick={(e) => e.stopPropagation()}
+                          className="mt-1"
+                        >
+                          <Checkbox
+                            id={`select-all-${currentTool.tool_id}`}
+                            checked={selectedTools.length === currentTool.tools?.length}
+                            onCheckedChange={(checked) => {
+                              if (currentTool.tools) {
+                                const newSelectedTools = checked
+                                  ? currentTool.tools.map((t) => t.tool_id)
+                                  : [];
+                                updateFormTools(newSelectedTools);
+                              }
+                            }}
+                            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',
+                            )}
+                            onClick={(e) => e.stopPropagation()}
+                            onKeyDown={(e) => {
+                              if (e.key === 'Enter' || e.key === ' ') {
+                                e.preventDefault();
+                                e.stopPropagation();
+                                const checkbox = e.currentTarget as HTMLButtonElement;
+                                checkbox.click();
+                              }
+                            }}
+                            tabIndex={isExpanded ? 0 : -1}
+                          />
+                        </div>
+
+                        <div
+                          className={cn(
+                            'pointer-events-none flex h-4 w-4 items-center justify-center transition-transform duration-300',
+                            isExpanded ? 'rotate-180' : '',
+                          )}
+                          aria-hidden="true"
+                        >
+                          <ChevronDown className="h-4 w-4" />
+                        </div>
+                      </div>
+
+                      {/* Delete button slides in from behind */}
+                      <div
+                        className={cn(
+                          'absolute right-0 transition-all duration-300',
+                          isHovering || isFocused
+                            ? 'translate-x-0 opacity-100'
+                            : 'translate-x-8 opacity-0',
+                        )}
+                      >
+                        <OGDialogTrigger asChild>
+                          <button
+                            type="button"
+                            className={cn(
+                              'flex h-7 w-7 items-center justify-center rounded transition-colors duration-200',
+                              'hover:bg-gray-200 dark:hover:bg-gray-700',
+                              'focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-1',
+                              'focus:translate-x-0 focus:opacity-100',
+                            )}
+                            onClick={(e) => e.stopPropagation()}
+                            aria-label={`Delete ${currentTool.metadata.name}`}
+                            tabIndex={0}
+                            onFocus={() => setIsFocused(true)}
+                          >
+                            <TrashIcon className="h-4 w-4" />
+                          </button>
+                        </OGDialogTrigger>
+                      </div>
+                    </div>
+                  </div>
+                </button>
+              </AccordionPrimitive.Trigger>
+            </AccordionPrimitive.Header>
+          </div>
+
+          <AccordionContent className="relative ml-1 pt-1 before:absolute before:bottom-2 before:left-0 before:top-0 before:w-0.5 before:bg-border-medium">
+            <div className="space-y-1">
+              {currentTool.tools?.map((subTool) => (
+                <label
+                  key={subTool.tool_id}
+                  htmlFor={subTool.tool_id}
+                  className={cn(
+                    'border-token-border-light hover:bg-token-surface-secondary flex cursor-pointer items-center rounded-lg border p-2',
+                    'ml-2 mr-1 focus-within:ring-2 focus-within:ring-ring focus-within:ring-offset-2 focus-within:ring-offset-background',
+                  )}
+                  onClick={(e) => e.stopPropagation()}
+                  onKeyDown={(e) => {
+                    e.stopPropagation();
+                  }}
+                  onMouseEnter={() => setHoveredToolId(subTool.tool_id)}
+                  onMouseLeave={() => setHoveredToolId(null)}
+                >
+                  <Checkbox
+                    id={subTool.tool_id}
+                    checked={selectedTools.includes(subTool.tool_id)}
+                    onCheckedChange={(_checked) => {
+                      const newSelectedTools = selectedTools.includes(subTool.tool_id)
+                        ? selectedTools.filter((t) => t !== subTool.tool_id)
+                        : [...selectedTools, subTool.tool_id];
+                      updateFormTools(newSelectedTools);
+                    }}
+                    onKeyDown={(e) => {
+                      e.stopPropagation();
+                      if (e.key === 'Enter' || e.key === ' ') {
+                        e.preventDefault();
+                        const checkbox = e.currentTarget as HTMLButtonElement;
+                        checkbox.click();
+                      }
+                    }}
+                    onClick={(e) => e.stopPropagation()}
+                    className="relative float-left mr-2 inline-flex h-4 w-4 cursor-pointer rounded border border-gray-300 transition-[border-color] duration-200 hover:border-gray-400 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 focus:ring-offset-background dark:border-gray-600 dark:hover:border-gray-500"
+                  />
+                  <span className="text-token-text-primary">{subTool.metadata.name}</span>
+                  {subTool.metadata.description && (
+                    <Ariakit.HovercardProvider placement="left-start">
+                      <div className="ml-auto flex h-6 w-6 items-center justify-center">
+                        <Ariakit.HovercardAnchor
+                          render={
+                            <Ariakit.Button
+                              className={cn(
+                                'flex h-5 w-5 cursor-help items-center rounded-full text-text-secondary transition-opacity duration-200',
+                                hoveredToolId === subTool.tool_id ? 'opacity-100' : 'opacity-0',
+                              )}
+                              aria-label={localize('com_ui_tool_info')}
+                            >
+                              <CircleHelpIcon className="h-4 w-4" />
+                              <Ariakit.VisuallyHidden>
+                                {localize('com_ui_tool_info')}
+                              </Ariakit.VisuallyHidden>
+                            </Ariakit.Button>
+                          }
+                        />
+                        <Ariakit.HovercardDisclosure
+                          className="rounded-full text-text-secondary focus:outline-none focus:ring-2 focus:ring-ring"
+                          aria-label={localize('com_ui_tool_more_info')}
+                          aria-expanded={hoveredToolId === subTool.tool_id}
+                          aria-controls={`tool-description-${subTool.tool_id}`}
+                        >
+                          <Ariakit.VisuallyHidden>
+                            {localize('com_ui_tool_more_info')}
+                          </Ariakit.VisuallyHidden>
+                          <ChevronDown className="h-4 w-4" />
+                        </Ariakit.HovercardDisclosure>
+                      </div>
+                      <Ariakit.Hovercard
+                        id={`tool-description-${subTool.tool_id}`}
+                        gutter={14}
+                        shift={40}
+                        flip={false}
+                        className="z-[999] w-80 scale-95 rounded-2xl border border-border-medium bg-surface-secondary p-4 text-text-primary opacity-0 shadow-md transition-all duration-200 data-[enter]:scale-100 data-[leave]:scale-95 data-[enter]:opacity-100 data-[leave]:opacity-0"
+                        portal={true}
+                        unmountOnHide={true}
+                        role="tooltip"
+                        aria-label={subTool.metadata.description}
+                      >
+                        <div className="space-y-2">
+                          <p className="text-sm text-text-secondary">
+                            {subTool.metadata.description}
+                          </p>
+                        </div>
+                      </Ariakit.Hovercard>
+                    </Ariakit.HovercardProvider>
+                  )}
+                </label>
+              ))}
+            </div>
+          </AccordionContent>
+        </AccordionItem>
+      </Accordion>
       <OGDialogTemplate
         showCloseButton={false}
         title={localize('com_ui_delete_tool')}
@@ -93,7 +389,7 @@ export default function AgentTool({
           </Label>
         }
         selection={{
-          selectHandler: () => removeTool(currentTool.pluginKey),
+          selectHandler: () => removeTool(currentTool.tool_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'),
diff --git a/client/src/components/Tools/ToolItem.tsx b/client/src/components/Tools/ToolItem.tsx
index cfb318a898..0b16b0ba42 100644
--- a/client/src/components/Tools/ToolItem.tsx
+++ b/client/src/components/Tools/ToolItem.tsx
@@ -1,9 +1,9 @@
-import { TPlugin } from 'librechat-data-provider';
 import { XCircle, PlusCircleIcon, Wrench } from 'lucide-react';
+import { AgentToolType } from 'librechat-data-provider';
 import { useLocalize } from '~/hooks';
 
 type ToolItemProps = {
-  tool: TPlugin;
+  tool: AgentToolType;
   onAddTool: () => void;
   onRemoveTool: () => void;
   isInstalled?: boolean;
@@ -19,15 +19,19 @@ function ToolItem({ tool, onAddTool, onRemoveTool, isInstalled = false }: ToolIt
     }
   };
 
+  const name = tool.metadata?.name || tool.tool_id;
+  const description = tool.metadata?.description || '';
+  const icon = tool.metadata?.icon;
+
   return (
     <div className="flex flex-col gap-4 rounded border border-border-medium bg-transparent p-6">
       <div className="flex gap-4">
         <div className="h-[70px] w-[70px] shrink-0">
           <div className="relative h-full w-full">
-            {tool.icon != null && tool.icon ? (
+            {icon ? (
               <img
-                src={tool.icon}
-                alt={localize('com_ui_logo', { 0: tool.name })}
+                src={icon}
+                alt={localize('com_ui_logo', { 0: name })}
                 className="h-full w-full rounded-[5px] bg-white"
               />
             ) : (
@@ -40,12 +44,12 @@ function ToolItem({ tool, onAddTool, onRemoveTool, isInstalled = false }: ToolIt
         </div>
         <div className="flex min-w-0 flex-col items-start justify-between">
           <div className="mb-2 line-clamp-1 max-w-full text-lg leading-5 text-text-primary">
-            {tool.name}
+            {name}
           </div>
           {!isInstalled ? (
             <button
               className="btn btn-primary relative"
-              aria-label={`${localize('com_ui_add')} ${tool.name}`}
+              aria-label={`${localize('com_ui_add')} ${name}`}
               onClick={handleClick}
             >
               <div className="flex w-full items-center justify-center gap-2">
@@ -57,7 +61,7 @@ function ToolItem({ tool, onAddTool, onRemoveTool, isInstalled = false }: ToolIt
             <button
               className="btn relative bg-gray-300 hover:bg-gray-400 dark:bg-gray-50 dark:hover:bg-gray-200"
               onClick={handleClick}
-              aria-label={`${localize('com_nav_tool_remove')} ${tool.name}`}
+              aria-label={`${localize('com_nav_tool_remove')} ${name}`}
             >
               <div className="flex w-full items-center justify-center gap-2">
                 {localize('com_nav_tool_remove')}
@@ -67,7 +71,7 @@ function ToolItem({ tool, onAddTool, onRemoveTool, isInstalled = false }: ToolIt
           )}
         </div>
       </div>
-      <div className="line-clamp-3 h-[60px] text-sm text-text-secondary">{tool.description}</div>
+      <div className="line-clamp-3 h-[60px] text-sm text-text-secondary">{description}</div>
     </div>
   );
 }
diff --git a/client/src/components/Tools/ToolSelectDialog.tsx b/client/src/components/Tools/ToolSelectDialog.tsx
index e5c18eda47..b3bc558405 100644
--- a/client/src/components/Tools/ToolSelectDialog.tsx
+++ b/client/src/components/Tools/ToolSelectDialog.tsx
@@ -1,17 +1,19 @@
 import { useEffect } from 'react';
 import { Search, X } from 'lucide-react';
-import { Dialog, DialogPanel, DialogTitle, Description } from '@headlessui/react';
 import { useFormContext } from 'react-hook-form';
 import { isAgentsEndpoint } from 'librechat-data-provider';
+import { Dialog, DialogPanel, DialogTitle, Description } from '@headlessui/react';
 import { useUpdateUserPluginsMutation } from 'librechat-data-provider/react-query';
 import type {
   AssistantsEndpoint,
   EModelEndpoint,
   TPluginAction,
+  AgentToolType,
   TError,
 } from 'librechat-data-provider';
-import type { TPluginStoreDialogProps } from '~/common/types';
+import type { AgentForm, TPluginStoreDialogProps } from '~/common';
 import { PluginPagination, PluginAuthForm } from '~/components/Plugins/Store';
+import { useAgentPanelContext } from '~/Providers/AgentPanelContext';
 import { useLocalize, usePluginDialogHelpers } from '~/hooks';
 import { useAvailableToolsQuery } from '~/data-provider';
 import ToolItem from './ToolItem';
@@ -20,14 +22,13 @@ function ToolSelectDialog({
   isOpen,
   endpoint,
   setIsOpen,
-  toolsFormKey,
 }: TPluginStoreDialogProps & {
-  toolsFormKey: string;
   endpoint: AssistantsEndpoint | EModelEndpoint.agents;
 }) {
   const localize = useLocalize();
-  const { getValues, setValue } = useFormContext();
+  const { getValues, setValue } = useFormContext<AgentForm>();
   const { data: tools } = useAvailableToolsQuery(endpoint);
+  const { groupedTools } = useAgentPanelContext();
   const isAgentTools = isAgentsEndpoint(endpoint);
 
   const {
@@ -66,11 +67,23 @@ function ToolSelectDialog({
     }, 5000);
   };
 
+  const toolsFormKey = 'tools';
   const handleInstall = (pluginAction: TPluginAction) => {
     const addFunction = () => {
-      const fns = getValues(toolsFormKey).slice();
-      fns.push(pluginAction.pluginKey);
-      setValue(toolsFormKey, fns);
+      const installedToolIds: string[] = getValues(toolsFormKey) || [];
+      // Add the parent
+      installedToolIds.push(pluginAction.pluginKey);
+
+      // If this tool is a group, add subtools too
+      const groupObj = groupedTools[pluginAction.pluginKey];
+      if (groupObj?.tools && groupObj.tools.length > 0) {
+        for (const sub of groupObj.tools) {
+          if (!installedToolIds.includes(sub.tool_id)) {
+            installedToolIds.push(sub.tool_id);
+          }
+        }
+      }
+      setValue(toolsFormKey, Array.from(new Set(installedToolIds))); // no duplicates just in case
     };
 
     if (!pluginAction.auth) {
@@ -87,17 +100,21 @@ function ToolSelectDialog({
     setShowPluginAuthForm(false);
   };
 
-  const onRemoveTool = (tool: string) => {
-    setShowPluginAuthForm(false);
+  const onRemoveTool = (toolId: string) => {
+    const groupObj = groupedTools[toolId];
+    const toolIdsToRemove = [toolId];
+    if (groupObj?.tools && groupObj.tools.length > 0) {
+      toolIdsToRemove.push(...groupObj.tools.map((sub) => sub.tool_id));
+    }
+    // Remove these from the formTools
     updateUserPlugins.mutate(
-      { pluginKey: tool, action: 'uninstall', auth: null, isEntityTool: true },
+      { pluginKey: toolId, action: 'uninstall', auth: {}, isEntityTool: true },
       {
-        onError: (error: unknown) => {
-          handleInstallError(error as TError);
-        },
+        onError: (error: unknown) => handleInstallError(error as TError),
         onSuccess: () => {
-          const fns = getValues(toolsFormKey).filter((fn: string) => fn !== tool);
-          setValue(toolsFormKey, fns);
+          const remainingToolIds =
+            getValues(toolsFormKey)?.filter((toolId) => !toolIdsToRemove.includes(toolId)) || [];
+          setValue(toolsFormKey, remainingToolIds);
         },
       },
     );
@@ -113,17 +130,33 @@ function ToolSelectDialog({
     if (authConfig && authConfig.length > 0 && !authenticated) {
       setShowPluginAuthForm(true);
     } else {
-      handleInstall({ pluginKey, action: 'install', auth: null });
+      handleInstall({
+        pluginKey,
+        action: 'install',
+        auth: {},
+      });
     }
   };
 
-  const filteredTools = tools?.filter((tool) =>
-    tool.name.toLowerCase().includes(searchValue.toLowerCase()),
+  const filteredTools = Object.values(groupedTools || {}).filter(
+    (tool: AgentToolType & { tools?: AgentToolType[] }) => {
+      // Check if the parent tool matches
+      if (tool.metadata?.name?.toLowerCase().includes(searchValue.toLowerCase())) {
+        return true;
+      }
+      // Check if any child tools match
+      if (tool.tools) {
+        return tool.tools.some((childTool) =>
+          childTool.metadata?.name?.toLowerCase().includes(searchValue.toLowerCase()),
+        );
+      }
+      return false;
+    },
   );
 
   useEffect(() => {
     if (filteredTools) {
-      setMaxPage(Math.ceil(filteredTools.length / itemsPerPage));
+      setMaxPage(Math.ceil(Object.keys(filteredTools || {}).length / itemsPerPage));
       if (searchChanged) {
         setCurrentPage(1);
         setSearchChanged(false);
@@ -155,7 +188,7 @@ function ToolSelectDialog({
       {/* Full-screen container to center the panel */}
       <div className="fixed inset-0 flex items-center justify-center p-4">
         <DialogPanel
-          className="relative w-full transform overflow-hidden overflow-y-auto rounded-lg bg-surface-secondary text-left shadow-xl transition-all max-sm:h-full sm:mx-7 sm:my-8 sm:max-w-2xl lg:max-w-5xl xl:max-w-7xl"
+          className="relative max-h-[90vh] w-full transform overflow-hidden overflow-y-auto rounded-lg bg-surface-secondary text-left shadow-xl transition-all max-sm:h-full sm:mx-7 sm:my-8 sm:max-w-2xl lg:max-w-5xl xl:max-w-7xl"
           style={{ minHeight: '610px' }}
         >
           <div className="flex items-center justify-between border-b-[1px] border-border-medium px-4 pb-4 pt-5 sm:p-6">
@@ -228,9 +261,9 @@ function ToolSelectDialog({
                       <ToolItem
                         key={index}
                         tool={tool}
-                        isInstalled={getValues(toolsFormKey).includes(tool.pluginKey)}
-                        onAddTool={() => onAddTool(tool.pluginKey)}
-                        onRemoveTool={() => onRemoveTool(tool.pluginKey)}
+                        isInstalled={getValues(toolsFormKey)?.includes(tool.tool_id) || false}
+                        onAddTool={() => onAddTool(tool.tool_id)}
+                        onRemoveTool={() => onRemoveTool(tool.tool_id)}
                       />
                     ))}
               </div>
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index c314329edf..0d6d40f398 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -1040,5 +1040,8 @@
   "com_ui_trust_app": "I trust this application",
   "com_agents_mcp_trust_subtext": "Custom connectors are not verified by LibreChat",
   "com_ui_icon": "Icon",
-  "com_agents_mcp_icon_size": "Minimum size 128 x 128 px"
+  "com_agents_mcp_icon_size": "Minimum size 128 x 128 px",
+  "com_ui_tool_collection_prefix": "A collection of tools from",
+  "com_ui_tool_info": "Tool Information",
+  "com_ui_tool_more_info": "More information about this tool"
 }
diff --git a/packages/data-provider/src/actions.ts b/packages/data-provider/src/actions.ts
index e0e9b10d7b..cc768154e5 100644
--- a/packages/data-provider/src/actions.ts
+++ b/packages/data-provider/src/actions.ts
@@ -3,15 +3,11 @@ import _axios from 'axios';
 import { URL } from 'url';
 import crypto from 'crypto';
 import { load } from 'js-yaml';
-import type {
-  FunctionTool,
-  Schema,
-  Reference,
-  ActionMetadata,
-  ActionMetadataRuntime,
-} from './types/assistants';
+import type { ActionMetadata, ActionMetadataRuntime } from './types/agents';
+import type { FunctionTool, Schema, Reference } from './types/assistants';
+import { AuthTypeEnum, AuthorizationTypeEnum } from './types/agents';
 import type { OpenAPIV3 } from 'openapi-types';
-import { Tools, AuthTypeEnum, AuthorizationTypeEnum } from './types/assistants';
+import { Tools } from './types/assistants';
 
 export type ParametersSchema = {
   type: string;
diff --git a/packages/data-provider/src/data-service.ts b/packages/data-provider/src/data-service.ts
index c78553f3a3..b956364835 100644
--- a/packages/data-provider/src/data-service.ts
+++ b/packages/data-provider/src/data-service.ts
@@ -2,6 +2,7 @@ import type { AxiosResponse } from 'axios';
 import type * as t from './types';
 import * as endpoints from './api-endpoints';
 import * as a from './types/assistants';
+import * as ag from './types/agents';
 import * as m from './types/mutations';
 import * as q from './types/queries';
 import * as f from './types/files';
@@ -351,7 +352,7 @@ export const updateAction = (data: m.UpdateActionVariables): Promise<m.UpdateAct
   );
 };
 
-export function getActions(): Promise<a.Action[]> {
+export function getActions(): Promise<ag.Action[]> {
   return request.get(
     endpoints.agents({
       path: 'actions',
@@ -407,7 +408,7 @@ export const updateAgent = ({
 
 export const duplicateAgent = ({
   agent_id,
-}: m.DuplicateAgentBody): Promise<{ agent: a.Agent; actions: a.Action[] }> => {
+}: m.DuplicateAgentBody): Promise<{ agent: a.Agent; actions: ag.Action[] }> => {
   return request.post(
     endpoints.agents({
       path: `${agent_id}/duplicate`,
diff --git a/packages/data-provider/src/mcp.ts b/packages/data-provider/src/mcp.ts
index ffcb65cda1..990b46e511 100644
--- a/packages/data-provider/src/mcp.ts
+++ b/packages/data-provider/src/mcp.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import type { TUser } from './types';
 import { extractEnvVariable } from './utils';
-import { TokenExchangeMethodEnum } from './types/assistants';
+import { TokenExchangeMethodEnum } from './types/agents';
 
 const BaseOptionsSchema = z.object({
   iconPath: z.string().optional(),
diff --git a/packages/data-provider/src/types/agents.ts b/packages/data-provider/src/types/agents.ts
index d4218440c6..ff286c21f4 100644
--- a/packages/data-provider/src/types/agents.ts
+++ b/packages/data-provider/src/types/agents.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-namespace */
 import { StepTypes, ContentTypes, ToolCallTypes } from './runs';
+import type { TAttachment, TPlugin } from 'src/schemas';
 import type { FunctionToolCall } from './assistants';
-import type { TAttachment } from 'src/schemas';
 
 export namespace Agents {
   export type MessageType = 'human' | 'ai' | 'generic' | 'system' | 'function' | 'tool' | 'remove';
@@ -279,3 +279,79 @@ export type ToolCallResult = {
   conversationId: string;
   attachments?: TAttachment[];
 };
+
+export enum AuthTypeEnum {
+  ServiceHttp = 'service_http',
+  OAuth = 'oauth',
+  None = 'none',
+}
+
+export enum AuthorizationTypeEnum {
+  Bearer = 'bearer',
+  Basic = 'basic',
+  Custom = 'custom',
+}
+
+export enum TokenExchangeMethodEnum {
+  DefaultPost = 'default_post',
+  BasicAuthHeader = 'basic_auth_header',
+}
+
+export type Action = {
+  action_id: string;
+  type?: string;
+  settings?: Record<string, unknown>;
+  metadata: ActionMetadata;
+  version: number | string;
+} & ({ assistant_id: string; agent_id?: never } | { assistant_id?: never; agent_id: string });
+
+export type ActionMetadata = {
+  api_key?: string;
+  auth?: ActionAuth;
+  domain?: string;
+  privacy_policy_url?: string;
+  raw_spec?: string;
+  oauth_client_id?: string;
+  oauth_client_secret?: string;
+};
+
+export type ActionAuth = {
+  authorization_type?: AuthorizationTypeEnum;
+  custom_auth_header?: string;
+  type?: AuthTypeEnum;
+  authorization_content_type?: string;
+  authorization_url?: string;
+  client_url?: string;
+  scope?: string;
+  token_exchange_method?: TokenExchangeMethodEnum;
+};
+
+export type ActionMetadataRuntime = ActionMetadata & {
+  oauth_access_token?: string;
+  oauth_refresh_token?: string;
+  oauth_token_expires_at?: Date;
+};
+
+export type MCP = {
+  mcp_id: string;
+  metadata: MCPMetadata;
+} & ({ assistant_id: string; agent_id?: never } | { assistant_id?: never; agent_id: string });
+
+export type MCPMetadata = Omit<ActionMetadata, 'auth'> & {
+  name?: string;
+  description?: string;
+  url?: string;
+  tools?: string[];
+  auth?: MCPAuth;
+  icon?: string;
+  trust?: boolean;
+};
+
+export type MCPAuth = ActionAuth;
+
+export type AgentToolType = {
+  tool_id: string;
+  metadata: ToolMetadata;
+} & ({ assistant_id: string; agent_id?: never } | { assistant_id?: never; agent_id: string });
+
+export type ToolMetadata = TPlugin;
diff --git a/packages/data-provider/src/types/assistants.ts b/packages/data-provider/src/types/assistants.ts
index c1e6f16965..c5dadc382b 100644
--- a/packages/data-provider/src/types/assistants.ts
+++ b/packages/data-provider/src/types/assistants.ts
@@ -487,77 +487,6 @@ export const actionDomainSeparator = '---';
 export const hostImageIdSuffix = '_host_copy';
 export const hostImageNamePrefix = 'host_copy_';
 
-export enum AuthTypeEnum {
-  ServiceHttp = 'service_http',
-  OAuth = 'oauth',
-  None = 'none',
-}
-
-export enum AuthorizationTypeEnum {
-  Bearer = 'bearer',
-  Basic = 'basic',
-  Custom = 'custom',
-}
-
-export enum TokenExchangeMethodEnum {
-  DefaultPost = 'default_post',
-  BasicAuthHeader = 'basic_auth_header',
-}
-
-export type ActionAuth = {
-  authorization_type?: AuthorizationTypeEnum;
-  custom_auth_header?: string;
-  type?: AuthTypeEnum;
-  authorization_content_type?: string;
-  authorization_url?: string;
-  client_url?: string;
-  scope?: string;
-  token_exchange_method?: TokenExchangeMethodEnum;
-};
-
-export type MCPAuth = ActionAuth;
-
-export type ActionMetadata = {
-  api_key?: string;
-  auth?: ActionAuth;
-  domain?: string;
-  privacy_policy_url?: string;
-  raw_spec?: string;
-  oauth_client_id?: string;
-  oauth_client_secret?: string;
-};
-
-export type MCPMetadata = Omit<ActionMetadata, 'auth'> & {
-  name?: string;
-  description?: string;
-  url?: string;
-  tools?: string[];
-  auth?: MCPAuth;
-  icon?: string;
-  trust?: boolean;
-};
-
-export type ActionMetadataRuntime = ActionMetadata & {
-  oauth_access_token?: string;
-  oauth_refresh_token?: string;
-  oauth_token_expires_at?: Date;
-};
-
-/* Assistant types */
-
-export type Action = {
-  action_id: string;
-  type?: string;
-  settings?: Record<string, unknown>;
-  metadata: ActionMetadata;
-  version: number | string;
-} & ({ assistant_id: string; agent_id?: never } | { assistant_id?: never; agent_id: string });
-
-export type MCP = {
-  mcp_id: string;
-  metadata: MCPMetadata;
-} & ({ assistant_id: string; agent_id?: never } | { assistant_id?: never; agent_id: string });
-
 export type AssistantAvatar = {
   filepath: string;
   source: string;
diff --git a/packages/data-provider/src/types/mutations.ts b/packages/data-provider/src/types/mutations.ts
index 4e1f01debe..cd6cae75c8 100644
--- a/packages/data-provider/src/types/mutations.ts
+++ b/packages/data-provider/src/types/mutations.ts
@@ -6,14 +6,13 @@ import {
   Assistant,
   AssistantCreateParams,
   AssistantUpdateParams,
-  ActionMetadata,
   FunctionTool,
   AssistantDocument,
-  Action,
   Agent,
   AgentCreateParams,
   AgentUpdateParams,
 } from './assistants';
+import { Action, ActionMetadata } from './agents';
 
 export type MutationOptions<
   Response,

From 3e4b01de82e30897fc01cdd9327ae5823fde9023 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Thu, 19 Jun 2025 18:27:55 -0400
Subject: [PATCH 41/49] =?UTF-8?q?=F0=9F=97=9D=EF=B8=8F=20feat:=20User=20Pr?=
 =?UTF-8?q?ovided=20Credentials=20for=20MCP=20Servers=20(#7980)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🗝️ feat: Per-User Credentials for MCP Servers

chore: add aider to gitignore

feat: fill custom variables to MCP server

feat: replace placeholders with custom user MCP variables

feat: handle MCP install/uninstall (uses pluginauths)

feat: add MCP custom variables dialog to MCPSelect

feat: add MCP custom variables dialog to the side panel

feat: do not require to fill MCP credentials for in tools dialog

feat: add translations keys (en+cs) for custom MCP variables

fix: handle LIBRECHAT_USER_ID correctly during MCP var replacement

style: remove unused MCP translation keys

style: fix eslint for MCP custom vars

chore: move aider gitignore to AI section

* feat: Add Plugin Authentication Methods to data-schemas

* refactor: Replace PluginAuth model methods with new utility functions for improved code organization and maintainability

* refactor: Move IPluginAuth interface to types directory for better organization and update pluginAuth schema to use the new import

* refactor: Remove unused getUsersPluginsAuthValuesMap function and streamline PluginService.js; add new getPluginAuthMap function for improved plugin authentication handling

* chore: fix typing for optional tools property with GenericTool[] type

* chore: update librechat-data-provider version to 0.7.88

* refactor: optimize getUserMCPAuthMap function by reducing variable usage and improving server key collection logic

* refactor: streamline MCP tool creation by removing customUserVars parameter and enhancing user-specific authentication handling to avoid closure encapsulation

* refactor: extract processSingleValue function to streamline MCP environment variable processing and enhance readability

* refactor: enhance MCP tool processing logic by simplifying conditions and improving authentication handling for custom user variables

* ci: fix action tests

* chore: fix imports, remove comments

* chore: remove non-english translations

* fix: remove newline at end of translation.json file

---------

Co-authored-by: Aleš Kůtek <kutekales@gmail.com>
---
 .gitignore                                    |   1 +
 api/app/clients/tools/util/handleTools.js     |   8 +-
 api/server/controllers/PluginController.js    |  57 +++-
 api/server/controllers/UserController.js      |  61 ++++-
 api/server/controllers/agents/client.js       |  24 +-
 api/server/routes/config.js                   |  17 +-
 api/server/services/Config/getCustomConfig.js |  48 +++-
 api/server/services/MCP.js                    |   6 +-
 api/server/services/PluginService.js          |  56 ++--
 .../src/components/Chat/Input/MCPSelect.tsx   | 207 ++++++++++++--
 .../src/components/SidePanel/MCP/MCPPanel.tsx | 253 ++++++++++++++++++
 .../SidePanel/MCP/MCPPanelSkeleton.tsx        |  21 ++
 .../src/components/Tools/ToolSelectDialog.tsx |  25 +-
 client/src/components/ui/MCPConfigDialog.tsx  | 122 +++++++++
 client/src/components/ui/MultiSelect.tsx      |  51 ++--
 client/src/hooks/Nav/useSideNavLinks.ts       |  20 ++
 client/src/locales/en/translation.json        |  13 +
 package-lock.json                             |   2 +-
 packages/api/src/agents/auth.ts               |  93 +++++++
 packages/api/src/agents/run.ts                |  10 +-
 packages/api/src/index.ts                     |   1 +
 packages/api/src/mcp/auth.ts                  |  58 ++++
 packages/api/src/mcp/manager.ts               |  37 ++-
 packages/api/src/mcp/types/index.ts           |  10 +-
 packages/api/src/mcp/utils.ts                 |   3 +
 packages/data-provider/package.json           |   2 +-
 packages/data-provider/specs/actions.spec.ts  |  10 +-
 packages/data-provider/specs/mcp.spec.ts      | 183 +++++++++++++
 packages/data-provider/src/config.ts          |  15 +-
 packages/data-provider/src/data-service.ts    |   6 +-
 packages/data-provider/src/mcp.ts             |  82 ++++--
 packages/data-schemas/src/methods/index.ts    |   7 +-
 .../data-schemas/src/methods/pluginAuth.ts    | 140 ++++++++++
 .../data-schemas/src/schema/pluginAuth.ts     |  12 +-
 packages/data-schemas/src/types/index.ts      |   1 +
 packages/data-schemas/src/types/pluginAuth.ts |  40 +++
 36 files changed, 1536 insertions(+), 166 deletions(-)
 create mode 100644 client/src/components/SidePanel/MCP/MCPPanel.tsx
 create mode 100644 client/src/components/SidePanel/MCP/MCPPanelSkeleton.tsx
 create mode 100644 client/src/components/ui/MCPConfigDialog.tsx
 create mode 100644 packages/api/src/agents/auth.ts
 create mode 100644 packages/api/src/mcp/auth.ts
 create mode 100644 packages/data-schemas/src/methods/pluginAuth.ts
 create mode 100644 packages/data-schemas/src/types/pluginAuth.ts

diff --git a/.gitignore b/.gitignore
index f49594afdf..c9658f17e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,7 @@ bower_components/
 # AI
 .clineignore
 .cursor
+.aider*
 
 # Floobits
 .floo
diff --git a/api/app/clients/tools/util/handleTools.js b/api/app/clients/tools/util/handleTools.js
index b5a40fc4a3..c233c0f762 100644
--- a/api/app/clients/tools/util/handleTools.js
+++ b/api/app/clients/tools/util/handleTools.js
@@ -1,15 +1,14 @@
+const { mcpToolPattern } = require('@librechat/api');
 const { logger } = require('@librechat/data-schemas');
 const { SerpAPI } = require('@langchain/community/tools/serpapi');
 const { Calculator } = require('@langchain/community/tools/calculator');
 const { EnvVar, createCodeExecutionTool, createSearchTool } = require('@librechat/agents');
 const {
   Tools,
-  Constants,
   EToolResources,
   loadWebSearchAuth,
   replaceSpecialVars,
 } = require('librechat-data-provider');
-const { getUserPluginAuthValue } = require('~/server/services/PluginService');
 const {
   availableTools,
   manifestToolMap,
@@ -29,12 +28,11 @@ const {
 } = require('../');
 const { primeFiles: primeCodeFiles } = require('~/server/services/Files/Code/process');
 const { createFileSearchTool, primeFiles: primeSearchFiles } = require('./fileSearch');
+const { getUserPluginAuthValue } = require('~/server/services/PluginService');
 const { loadAuthValues } = require('~/server/services/Tools/credentials');
 const { getCachedTools } = require('~/server/services/Config');
 const { createMCPTool } = require('~/server/services/MCP');
 
-const mcpToolPattern = new RegExp(`^.+${Constants.mcp_delimiter}.+$`);
-
 /**
  * Validates the availability and authentication of tools for a user based on environment variables or user-specific plugin authentication values.
  * Tools without required authentication or with valid authentication are considered valid.
@@ -94,7 +92,7 @@ const validateTools = async (user, tools = []) => {
     return Array.from(validToolsSet.values());
   } catch (err) {
     logger.error('[validateTools] There was a problem validating tools', err);
-    throw new Error('There was a problem validating tools');
+    throw new Error(err);
   }
 };
 
diff --git a/api/server/controllers/PluginController.js b/api/server/controllers/PluginController.js
index 98e9cbfc45..f7aad84aeb 100644
--- a/api/server/controllers/PluginController.js
+++ b/api/server/controllers/PluginController.js
@@ -5,6 +5,7 @@ const { getToolkitKey } = require('~/server/services/ToolService');
 const { getMCPManager, getFlowStateManager } = require('~/config');
 const { availableTools } = require('~/app/clients/tools');
 const { getLogStores } = require('~/cache');
+const { Constants } = require('librechat-data-provider');
 
 /**
  * Filters out duplicate plugins from the list of plugins.
@@ -173,16 +174,56 @@ const getAvailableTools = async (req, res) => {
     });
 
     const toolDefinitions = await getCachedTools({ includeGlobal: true });
-    const tools = authenticatedPlugins.filter(
-      (plugin) =>
-        toolDefinitions[plugin.pluginKey] !== undefined ||
-        (plugin.toolkit === true &&
-          Object.keys(toolDefinitions).some((key) => getToolkitKey(key) === plugin.pluginKey)),
-    );
 
-    await cache.set(CacheKeys.TOOLS, tools);
-    res.status(200).json(tools);
+    const toolsOutput = [];
+    for (const plugin of authenticatedPlugins) {
+      const isToolDefined = toolDefinitions[plugin.pluginKey] !== undefined;
+      const isToolkit =
+        plugin.toolkit === true &&
+        Object.keys(toolDefinitions).some((key) => getToolkitKey(key) === plugin.pluginKey);
+
+      if (!isToolDefined && !isToolkit) {
+        continue;
+      }
+
+      const toolToAdd = { ...plugin };
+
+      if (!plugin.pluginKey.includes(Constants.mcp_delimiter)) {
+        toolsOutput.push(toolToAdd);
+        continue;
+      }
+
+      const parts = plugin.pluginKey.split(Constants.mcp_delimiter);
+      const serverName = parts[parts.length - 1];
+      const serverConfig = customConfig?.mcpServers?.[serverName];
+
+      if (!serverConfig?.customUserVars) {
+        toolsOutput.push(toolToAdd);
+        continue;
+      }
+
+      const customVarKeys = Object.keys(serverConfig.customUserVars);
+
+      if (customVarKeys.length === 0) {
+        toolToAdd.authConfig = [];
+        toolToAdd.authenticated = true;
+      } else {
+        toolToAdd.authConfig = Object.entries(serverConfig.customUserVars).map(([key, value]) => ({
+          authField: key,
+          label: value.title || key,
+          description: value.description || '',
+        }));
+        toolToAdd.authenticated = false;
+      }
+
+      toolsOutput.push(toolToAdd);
+    }
+
+    const finalTools = filterUniquePlugins(toolsOutput);
+    await cache.set(CacheKeys.TOOLS, finalTools);
+    res.status(200).json(finalTools);
   } catch (error) {
+    logger.error('[getAvailableTools]', error);
     res.status(500).json({ message: error.message });
   }
 };
diff --git a/api/server/controllers/UserController.js b/api/server/controllers/UserController.js
index bcffb2189c..69791dd7a5 100644
--- a/api/server/controllers/UserController.js
+++ b/api/server/controllers/UserController.js
@@ -1,5 +1,6 @@
 const {
   Tools,
+  Constants,
   FileSources,
   webSearchKeys,
   extractWebSearchEnvVars,
@@ -23,6 +24,7 @@ const { processDeleteRequest } = require('~/server/services/Files/process');
 const { Transaction, Balance, User } = require('~/db/models');
 const { deleteToolCalls } = require('~/models/ToolCall');
 const { deleteAllSharedLinks } = require('~/models');
+const { getMCPManager } = require('~/config');
 
 const getUserController = async (req, res) => {
   /** @type {MongoUser} */
@@ -102,10 +104,22 @@ const updateUserPluginsController = async (req, res) => {
     }
 
     let keys = Object.keys(auth);
-    if (keys.length === 0 && pluginKey !== Tools.web_search) {
+    const values = Object.values(auth); // Used in 'install' block
+
+    const isMCPTool = pluginKey.startsWith('mcp_') || pluginKey.includes(Constants.mcp_delimiter);
+
+    // Early exit condition:
+    // If keys are empty (meaning auth: {} was likely sent for uninstall, or auth was empty for install)
+    // AND it's not web_search (which has special key handling to populate `keys` for uninstall)
+    // AND it's NOT (an uninstall action FOR an MCP tool - we need to proceed for this case to clear all its auth)
+    // THEN return.
+    if (
+      keys.length === 0 &&
+      pluginKey !== Tools.web_search &&
+      !(action === 'uninstall' && isMCPTool)
+    ) {
       return res.status(200).send();
     }
-    const values = Object.values(auth);
 
     /** @type {number} */
     let status = 200;
@@ -132,16 +146,53 @@ const updateUserPluginsController = async (req, res) => {
         }
       }
     } else if (action === 'uninstall') {
-      for (let i = 0; i < keys.length; i++) {
-        authService = await deleteUserPluginAuth(user.id, keys[i]);
+      // const isMCPTool was defined earlier
+      if (isMCPTool && keys.length === 0) {
+        // This handles the case where auth: {} is sent for an MCP tool uninstall.
+        // It means "delete all credentials associated with this MCP pluginKey".
+        authService = await deleteUserPluginAuth(user.id, null, true, pluginKey);
         if (authService instanceof Error) {
-          logger.error('[authService]', authService);
+          logger.error(
+            `[authService] Error deleting all auth for MCP tool ${pluginKey}:`,
+            authService,
+          );
           ({ status, message } = authService);
         }
+      } else {
+        // This handles:
+        // 1. Web_search uninstall (keys will be populated with all webSearchKeys if auth was {}).
+        // 2. Other tools uninstall (if keys were provided).
+        // 3. MCP tool uninstall if specific keys were provided in `auth` (not current frontend behavior).
+        // If keys is empty for non-MCP tools (and not web_search), this loop won't run, and nothing is deleted.
+        for (let i = 0; i < keys.length; i++) {
+          authService = await deleteUserPluginAuth(user.id, keys[i]); // Deletes by authField name
+          if (authService instanceof Error) {
+            logger.error('[authService] Error deleting specific auth key:', authService);
+            ({ status, message } = authService);
+          }
+        }
       }
     }
 
     if (status === 200) {
+      // If auth was updated successfully, disconnect MCP sessions as they might use these credentials
+      if (pluginKey.startsWith(Constants.mcp_prefix)) {
+        try {
+          const mcpManager = getMCPManager(user.id);
+          if (mcpManager) {
+            logger.info(
+              `[updateUserPluginsController] Disconnecting MCP connections for user ${user.id} after plugin auth update for ${pluginKey}.`,
+            );
+            await mcpManager.disconnectUserConnections(user.id);
+          }
+        } catch (disconnectError) {
+          logger.error(
+            `[updateUserPluginsController] Error disconnecting MCP connections for user ${user.id} after plugin auth update:`,
+            disconnectError,
+          );
+          // Do not fail the request for this, but log it.
+        }
+      }
       return res.status(status).send();
     }
 
diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.js
index 41e457e5b8..6769348d95 100644
--- a/api/server/controllers/agents/client.js
+++ b/api/server/controllers/agents/client.js
@@ -31,11 +31,15 @@ const {
 } = require('librechat-data-provider');
 const { DynamicStructuredTool } = require('@langchain/core/tools');
 const { getBufferString, HumanMessage } = require('@langchain/core/messages');
-const { getCustomEndpointConfig, checkCapability } = require('~/server/services/Config');
+const {
+  getCustomEndpointConfig,
+  createGetMCPAuthMap,
+  checkCapability,
+} = require('~/server/services/Config');
 const { addCacheControl, createContextHandlers } = require('~/app/clients/prompts');
 const { initializeAgent } = require('~/server/services/Endpoints/agents/agent');
 const { spendTokens, spendStructuredTokens } = require('~/models/spendTokens');
-const { setMemory, deleteMemory, getFormattedMemories } = require('~/models');
+const { getFormattedMemories, deleteMemory, setMemory } = require('~/models');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
 const initOpenAI = require('~/server/services/Endpoints/openAI/initialize');
 const { checkAccess } = require('~/server/middleware/roles/access');
@@ -679,6 +683,8 @@ class AgentClient extends BaseClient {
         version: 'v2',
       };
 
+      const getUserMCPAuthMap = await createGetMCPAuthMap();
+
       const toolSet = new Set((this.options.agent.tools ?? []).map((tool) => tool && tool.name));
       let { messages: initialMessages, indexTokenCountMap } = formatAgentMessages(
         payload,
@@ -798,6 +804,20 @@ class AgentClient extends BaseClient {
           run.Graph.contentData = contentData;
         }
 
+        try {
+          if (getUserMCPAuthMap) {
+            config.configurable.userMCPAuthMap = await getUserMCPAuthMap({
+              tools: agent.tools,
+              userId: this.options.req.user.id,
+            });
+          }
+        } catch (err) {
+          logger.error(
+            `[api/server/controllers/agents/client.js #chatCompletion] Error getting custom user vars for agent ${agent.id}`,
+            err,
+          );
+        }
+
         await run.processStream({ messages }, config, {
           keepContent: i !== 0,
           tokenCounter: createTokenCounter(this.getEncoding()),
diff --git a/api/server/routes/config.js b/api/server/routes/config.js
index a53a636d05..e50fb9f452 100644
--- a/api/server/routes/config.js
+++ b/api/server/routes/config.js
@@ -1,10 +1,11 @@
 const express = require('express');
+const { logger } = require('@librechat/data-schemas');
 const { CacheKeys, defaultSocialLogins, Constants } = require('librechat-data-provider');
+const { getCustomConfig } = require('~/server/services/Config/getCustomConfig');
 const { getLdapConfig } = require('~/server/services/Config/ldap');
 const { getProjectByName } = require('~/models/Project');
 const { isEnabled } = require('~/server/utils');
 const { getLogStores } = require('~/cache');
-const { logger } = require('~/config');
 
 const router = express.Router();
 const emailLoginEnabled =
@@ -21,12 +22,15 @@ const publicSharedLinksEnabled =
 
 router.get('/', async function (req, res) {
   const cache = getLogStores(CacheKeys.CONFIG_STORE);
+
   const cachedStartupConfig = await cache.get(CacheKeys.STARTUP_CONFIG);
   if (cachedStartupConfig) {
     res.send(cachedStartupConfig);
     return;
   }
 
+  const config = await getCustomConfig();
+
   const isBirthday = () => {
     const today = new Date();
     return today.getMonth() === 1 && today.getDate() === 11;
@@ -96,6 +100,17 @@ router.get('/', async function (req, res) {
       bundlerURL: process.env.SANDPACK_BUNDLER_URL,
       staticBundlerURL: process.env.SANDPACK_STATIC_BUNDLER_URL,
     };
+
+    payload.mcpServers = {};
+    if (config.mcpServers) {
+      for (const serverName in config.mcpServers) {
+        const serverConfig = config.mcpServers[serverName];
+        payload.mcpServers[serverName] = {
+          customUserVars: serverConfig?.customUserVars || {},
+        };
+      }
+    }
+
     /** @type {TCustomConfig['webSearch']} */
     const webSearchConfig = req.app.locals.webSearch;
     if (
diff --git a/api/server/services/Config/getCustomConfig.js b/api/server/services/Config/getCustomConfig.js
index 74828789fc..0851b89a46 100644
--- a/api/server/services/Config/getCustomConfig.js
+++ b/api/server/services/Config/getCustomConfig.js
@@ -1,6 +1,10 @@
+const { logger } = require('@librechat/data-schemas');
+const { getUserMCPAuthMap } = require('@librechat/api');
 const { CacheKeys, EModelEndpoint } = require('librechat-data-provider');
 const { normalizeEndpointName, isEnabled } = require('~/server/utils');
 const loadCustomConfig = require('./loadCustomConfig');
+const { getCachedTools } = require('./getCachedTools');
+const { findPluginAuthsByKeys } = require('~/models');
 const getLogStores = require('~/cache/getLogStores');
 
 /**
@@ -50,4 +54,46 @@ const getCustomEndpointConfig = async (endpoint) => {
   );
 };
 
-module.exports = { getCustomConfig, getBalanceConfig, getCustomEndpointConfig };
+async function createGetMCPAuthMap() {
+  const customConfig = await getCustomConfig();
+  const mcpServers = customConfig?.mcpServers;
+  const hasCustomUserVars = Object.values(mcpServers).some((server) => server.customUserVars);
+  if (!hasCustomUserVars) {
+    return;
+  }
+
+  /**
+   * @param {Object} params
+   * @param {GenericTool[]} [params.tools]
+   * @param {string} params.userId
+   * @returns {Promise<Record<string, Record<string, string>> | undefined>}
+   */
+  return async function ({ tools, userId }) {
+    try {
+      if (!tools || tools.length === 0) {
+        return;
+      }
+      const appTools = await getCachedTools({
+        userId,
+      });
+      return await getUserMCPAuthMap({
+        tools,
+        userId,
+        appTools,
+        findPluginAuthsByKeys,
+      });
+    } catch (err) {
+      logger.error(
+        `[api/server/controllers/agents/client.js #chatCompletion] Error getting custom user vars for agent`,
+        err,
+      );
+    }
+  };
+}
+
+module.exports = {
+  getCustomConfig,
+  getBalanceConfig,
+  createGetMCPAuthMap,
+  getCustomEndpointConfig,
+};
diff --git a/api/server/services/MCP.js b/api/server/services/MCP.js
index 9720305668..527fe2d514 100644
--- a/api/server/services/MCP.js
+++ b/api/server/services/MCP.js
@@ -168,6 +168,9 @@ async function createMCPTool({ req, res, toolKey, provider: _provider }) {
         derivedSignal.addEventListener('abort', abortHandler, { once: true });
       }
 
+      const customUserVars =
+        config?.configurable?.userMCPAuthMap?.[`${Constants.mcp_prefix}${serverName}`];
+
       const result = await mcpManager.callTool({
         serverName,
         toolName,
@@ -175,8 +178,9 @@ async function createMCPTool({ req, res, toolKey, provider: _provider }) {
         toolArguments,
         options: {
           signal: derivedSignal,
-          user: config?.configurable?.user,
         },
+        user: config?.configurable?.user,
+        customUserVars,
         flowManager,
         tokenMethods: {
           findToken,
diff --git a/api/server/services/PluginService.js b/api/server/services/PluginService.js
index 04c5abb32b..af42e0471c 100644
--- a/api/server/services/PluginService.js
+++ b/api/server/services/PluginService.js
@@ -1,6 +1,6 @@
 const { logger } = require('@librechat/data-schemas');
 const { encrypt, decrypt } = require('@librechat/api');
-const { PluginAuth } = require('~/db/models');
+const { findOnePluginAuth, updatePluginAuth, deletePluginAuth } = require('~/models');
 
 /**
  * Asynchronously retrieves and decrypts the authentication value for a user's plugin, based on a specified authentication field.
@@ -25,7 +25,7 @@ const { PluginAuth } = require('~/db/models');
  */
 const getUserPluginAuthValue = async (userId, authField, throwError = true) => {
   try {
-    const pluginAuth = await PluginAuth.findOne({ userId, authField }).lean();
+    const pluginAuth = await findOnePluginAuth({ userId, authField });
     if (!pluginAuth) {
       throw new Error(`No plugin auth ${authField} found for user ${userId}`);
     }
@@ -79,23 +79,12 @@ const getUserPluginAuthValue = async (userId, authField, throwError = true) => {
 const updateUserPluginAuth = async (userId, authField, pluginKey, value) => {
   try {
     const encryptedValue = await encrypt(value);
-    const pluginAuth = await PluginAuth.findOne({ userId, authField }).lean();
-    if (pluginAuth) {
-      return await PluginAuth.findOneAndUpdate(
-        { userId, authField },
-        { $set: { value: encryptedValue } },
-        { new: true, upsert: true },
-      ).lean();
-    } else {
-      const newPluginAuth = await new PluginAuth({
-        userId,
-        authField,
-        value: encryptedValue,
-        pluginKey,
-      });
-      await newPluginAuth.save();
-      return newPluginAuth.toObject();
-    }
+    return await updatePluginAuth({
+      userId,
+      authField,
+      pluginKey,
+      value: encryptedValue,
+    });
   } catch (err) {
     logger.error('[updateUserPluginAuth]', err);
     return err;
@@ -105,26 +94,25 @@ const updateUserPluginAuth = async (userId, authField, pluginKey, value) => {
 /**
  * @async
  * @param {string} userId
- * @param {string} authField
- * @param {boolean} [all]
+ * @param {string | null} authField - The specific authField to delete, or null if `all` is true.
+ * @param {boolean} [all=false] - Whether to delete all auths for the user (or for a specific pluginKey if provided).
+ * @param {string} [pluginKey] - Optional. If `all` is true and `pluginKey` is provided, delete all auths for this user and pluginKey.
  * @returns {Promise<import('mongoose').DeleteResult>}
  * @throws {Error}
  */
-const deleteUserPluginAuth = async (userId, authField, all = false) => {
-  if (all) {
-    try {
-      const response = await PluginAuth.deleteMany({ userId });
-      return response;
-    } catch (err) {
-      logger.error('[deleteUserPluginAuth]', err);
-      return err;
-    }
-  }
-
+const deleteUserPluginAuth = async (userId, authField, all = false, pluginKey) => {
   try {
-    return await PluginAuth.deleteOne({ userId, authField });
+    return await deletePluginAuth({
+      userId,
+      authField,
+      pluginKey,
+      all,
+    });
   } catch (err) {
-    logger.error('[deleteUserPluginAuth]', err);
+    logger.error(
+      `[deleteUserPluginAuth] Error deleting ${all ? 'all' : 'single'} auth(s) for userId: ${userId}${pluginKey ? ` and pluginKey: ${pluginKey}` : ''}`,
+      err,
+    );
     return err;
   }
 };
diff --git a/client/src/components/Chat/Input/MCPSelect.tsx b/client/src/components/Chat/Input/MCPSelect.tsx
index 0cb0206bcd..ebe56c8024 100644
--- a/client/src/components/Chat/Input/MCPSelect.tsx
+++ b/client/src/components/Chat/Input/MCPSelect.tsx
@@ -1,13 +1,31 @@
-import React, { memo, useRef, useMemo, useEffect, useCallback } from 'react';
+import React, { memo, useRef, useMemo, useEffect, useCallback, useState } from 'react';
 import { useRecoilState } from 'recoil';
+import { Settings2 } from 'lucide-react';
+import { useUpdateUserPluginsMutation } from 'librechat-data-provider/react-query';
 import { Constants, EModelEndpoint, LocalStorageKeys } from 'librechat-data-provider';
+import type { TPlugin, TPluginAuthConfig, TUpdateUserPlugins } from 'librechat-data-provider';
+import MCPConfigDialog, { type ConfigFieldDetail } from '~/components/ui/MCPConfigDialog';
 import { useAvailableToolsQuery } from '~/data-provider';
 import useLocalStorage from '~/hooks/useLocalStorageAlt';
 import MultiSelect from '~/components/ui/MultiSelect';
 import { ephemeralAgentByConvoId } from '~/store';
+import { useToastContext } from '~/Providers';
 import MCPIcon from '~/components/ui/MCPIcon';
 import { useLocalize } from '~/hooks';
 
+interface McpServerInfo {
+  name: string;
+  pluginKey: string;
+  authConfig?: TPluginAuthConfig[];
+  authenticated?: boolean;
+}
+
+// Helper function to extract mcp_serverName from a full pluginKey like action_mcp_serverName
+const getBaseMCPPluginKey = (fullPluginKey: string): string => {
+  const parts = fullPluginKey.split(Constants.mcp_delimiter);
+  return Constants.mcp_prefix + parts[parts.length - 1];
+};
+
 const storageCondition = (value: unknown, rawCurrentValue?: string | null) => {
   if (rawCurrentValue) {
     try {
@@ -24,20 +42,45 @@ const storageCondition = (value: unknown, rawCurrentValue?: string | null) => {
 
 function MCPSelect({ conversationId }: { conversationId?: string | null }) {
   const localize = useLocalize();
+  const { showToast } = useToastContext();
   const key = conversationId ?? Constants.NEW_CONVO;
   const hasSetFetched = useRef<string | null>(null);
+  const [isConfigModalOpen, setIsConfigModalOpen] = useState(false);
+  const [selectedToolForConfig, setSelectedToolForConfig] = useState<McpServerInfo | null>(null);
 
-  const { data: mcpServerSet, isFetched } = useAvailableToolsQuery(EModelEndpoint.agents, {
-    select: (data) => {
-      const serverNames = new Set<string>();
+  const { data: mcpToolDetails, isFetched } = useAvailableToolsQuery(EModelEndpoint.agents, {
+    select: (data: TPlugin[]) => {
+      const mcpToolsMap = new Map<string, McpServerInfo>();
       data.forEach((tool) => {
         const isMCP = tool.pluginKey.includes(Constants.mcp_delimiter);
         if (isMCP && tool.chatMenu !== false) {
           const parts = tool.pluginKey.split(Constants.mcp_delimiter);
-          serverNames.add(parts[parts.length - 1]);
+          const serverName = parts[parts.length - 1];
+          if (!mcpToolsMap.has(serverName)) {
+            mcpToolsMap.set(serverName, {
+              name: serverName,
+              pluginKey: tool.pluginKey,
+              authConfig: tool.authConfig,
+              authenticated: tool.authenticated,
+            });
+          }
         }
       });
-      return serverNames;
+      return Array.from(mcpToolsMap.values());
+    },
+  });
+
+  const updateUserPluginsMutation = useUpdateUserPluginsMutation({
+    onSuccess: () => {
+      setIsConfigModalOpen(false);
+      showToast({ message: localize('com_nav_mcp_vars_updated'), status: 'success' });
+    },
+    onError: (error: unknown) => {
+      console.error('Error updating MCP auth:', error);
+      showToast({
+        message: localize('com_nav_mcp_vars_update_error'),
+        status: 'error',
+      });
     },
   });
 
@@ -76,12 +119,12 @@ function MCPSelect({ conversationId }: { conversationId?: string | null }) {
       return;
     }
     hasSetFetched.current = key;
-    if ((mcpServerSet?.size ?? 0) > 0) {
-      setMCPValues(mcpValues.filter((mcp) => mcpServerSet?.has(mcp)));
+    if ((mcpToolDetails?.length ?? 0) > 0) {
+      setMCPValues(mcpValues.filter((mcp) => mcpToolDetails?.some((tool) => tool.name === mcp)));
       return;
     }
     setMCPValues([]);
-  }, [isFetched, setMCPValues, mcpServerSet, key, mcpValues]);
+  }, [isFetched, setMCPValues, mcpToolDetails, key, mcpValues]);
 
   const renderSelectedValues = useCallback(
     (values: string[], placeholder?: string) => {
@@ -96,28 +139,140 @@ function MCPSelect({ conversationId }: { conversationId?: string | null }) {
     [localize],
   );
 
-  const mcpServers = useMemo(() => {
-    return Array.from(mcpServerSet ?? []);
-  }, [mcpServerSet]);
+  const mcpServerNames = useMemo(() => {
+    return (mcpToolDetails ?? []).map((tool) => tool.name);
+  }, [mcpToolDetails]);
 
-  if (!mcpServerSet || mcpServerSet.size === 0) {
+  const handleConfigSave = useCallback(
+    (targetName: string, authData: Record<string, string>) => {
+      if (selectedToolForConfig && selectedToolForConfig.name === targetName) {
+        const basePluginKey = getBaseMCPPluginKey(selectedToolForConfig.pluginKey);
+
+        const payload: TUpdateUserPlugins = {
+          pluginKey: basePluginKey,
+          action: 'install',
+          auth: authData,
+        };
+        updateUserPluginsMutation.mutate(payload);
+      }
+    },
+    [selectedToolForConfig, updateUserPluginsMutation],
+  );
+
+  const handleConfigRevoke = useCallback(
+    (targetName: string) => {
+      if (selectedToolForConfig && selectedToolForConfig.name === targetName) {
+        const basePluginKey = getBaseMCPPluginKey(selectedToolForConfig.pluginKey);
+
+        const payload: TUpdateUserPlugins = {
+          pluginKey: basePluginKey,
+          action: 'uninstall',
+          auth: {},
+        };
+        updateUserPluginsMutation.mutate(payload);
+      }
+    },
+    [selectedToolForConfig, updateUserPluginsMutation],
+  );
+
+  const renderItemContent = useCallback(
+    (serverName: string, defaultContent: React.ReactNode) => {
+      const tool = mcpToolDetails?.find((t) => t.name === serverName);
+      const hasAuthConfig = tool?.authConfig && tool.authConfig.length > 0;
+
+      // Common wrapper for the main content (check mark + text)
+      // Ensures Check & Text are adjacent and the group takes available space.
+      const mainContentWrapper = (
+        <div className="flex flex-grow items-center">{defaultContent}</div>
+      );
+
+      if (tool && hasAuthConfig) {
+        return (
+          <div className="flex w-full items-center justify-between">
+            {mainContentWrapper}
+            <button
+              type="button"
+              onClick={(e) => {
+                e.stopPropagation();
+                e.preventDefault();
+                setSelectedToolForConfig(tool);
+                setIsConfigModalOpen(true);
+              }}
+              className="ml-2 flex h-6 w-6 items-center justify-center rounded p-1 hover:bg-black/10 dark:hover:bg-white/10"
+              aria-label={`Configure ${serverName}`}
+            >
+              <Settings2 className={`h-4 w-4 ${tool.authenticated ? 'text-green-500' : ''}`} />
+            </button>
+          </div>
+        );
+      }
+      // For items without a settings icon, return the consistently wrapped main content.
+      return mainContentWrapper;
+    },
+    [mcpToolDetails, setSelectedToolForConfig, setIsConfigModalOpen],
+  );
+
+  if (!mcpToolDetails || mcpToolDetails.length === 0) {
     return null;
   }
 
   return (
-    <MultiSelect
-      items={mcpServers ?? []}
-      selectedValues={mcpValues ?? []}
-      setSelectedValues={setMCPValues}
-      defaultSelectedValues={mcpValues ?? []}
-      renderSelectedValues={renderSelectedValues}
-      placeholder={localize('com_ui_mcp_servers')}
-      popoverClassName="min-w-fit"
-      className="badge-icon min-w-fit"
-      selectIcon={<MCPIcon className="icon-md text-text-primary" />}
-      selectItemsClassName="border border-blue-600/50 bg-blue-500/10 hover:bg-blue-700/10"
-      selectClassName="group relative inline-flex items-center justify-center md:justify-start gap-1.5 rounded-full border border-border-medium text-sm font-medium transition-all md:w-full size-9 p-2 md:p-3 bg-transparent shadow-sm hover:bg-surface-hover hover:shadow-md active:shadow-inner"
-    />
+    <>
+      <MultiSelect
+        items={mcpServerNames}
+        selectedValues={mcpValues ?? []}
+        setSelectedValues={setMCPValues}
+        defaultSelectedValues={mcpValues ?? []}
+        renderSelectedValues={renderSelectedValues}
+        renderItemContent={renderItemContent}
+        placeholder={localize('com_ui_mcp_servers')}
+        popoverClassName="min-w-fit"
+        className="badge-icon min-w-fit"
+        selectIcon={<MCPIcon className="icon-md text-text-primary" />}
+        selectItemsClassName="border border-blue-600/50 bg-blue-500/10 hover:bg-blue-700/10"
+        selectClassName="group relative inline-flex items-center justify-center md:justify-start gap-1.5 rounded-full border border-border-medium text-sm font-medium transition-all md:w-full size-9 p-2 md:p-3 bg-transparent shadow-sm hover:bg-surface-hover hover:shadow-md active:shadow-inner"
+      />
+      {selectedToolForConfig && (
+        <MCPConfigDialog
+          isOpen={isConfigModalOpen}
+          onOpenChange={setIsConfigModalOpen}
+          serverName={selectedToolForConfig.name}
+          fieldsSchema={(() => {
+            const schema: Record<string, ConfigFieldDetail> = {};
+            if (selectedToolForConfig?.authConfig) {
+              selectedToolForConfig.authConfig.forEach((field) => {
+                schema[field.authField] = {
+                  title: field.label,
+                  description: field.description,
+                };
+              });
+            }
+            return schema;
+          })()}
+          initialValues={(() => {
+            const initial: Record<string, string> = {};
+            // Note: Actual initial values might need to be fetched if they are stored user-specifically
+            if (selectedToolForConfig?.authConfig) {
+              selectedToolForConfig.authConfig.forEach((field) => {
+                initial[field.authField] = ''; // Or fetched value
+              });
+            }
+            return initial;
+          })()}
+          onSave={(authData) => {
+            if (selectedToolForConfig) {
+              handleConfigSave(selectedToolForConfig.name, authData);
+            }
+          }}
+          onRevoke={() => {
+            if (selectedToolForConfig) {
+              handleConfigRevoke(selectedToolForConfig.name);
+            }
+          }}
+          isSubmitting={updateUserPluginsMutation.isLoading}
+        />
+      )}
+    </>
   );
 }
 
diff --git a/client/src/components/SidePanel/MCP/MCPPanel.tsx b/client/src/components/SidePanel/MCP/MCPPanel.tsx
new file mode 100644
index 0000000000..aa2bf72112
--- /dev/null
+++ b/client/src/components/SidePanel/MCP/MCPPanel.tsx
@@ -0,0 +1,253 @@
+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 { useUpdateUserPluginsMutation } from 'librechat-data-provider/react-query';
+import type { TUpdateUserPlugins } from 'librechat-data-provider';
+import { Button, Input, Label } from '~/components/ui';
+import { useGetStartupConfig } from '~/data-provider';
+import MCPPanelSkeleton from './MCPPanelSkeleton';
+import { useToastContext } from '~/Providers';
+import { useLocalize } from '~/hooks';
+
+interface ServerConfigWithVars {
+  serverName: string;
+  config: {
+    customUserVars: Record<string, { title: string; description: string }>;
+  };
+}
+
+export default function MCPPanel() {
+  const localize = useLocalize();
+  const { showToast } = useToastContext();
+  const { data: startupConfig, isLoading: startupConfigLoading } = useGetStartupConfig();
+  const [selectedServerNameForEditing, setSelectedServerNameForEditing] = useState<string | null>(
+    null,
+  );
+
+  const mcpServerDefinitions = useMemo(() => {
+    if (!startupConfig?.mcpServers) {
+      return [];
+    }
+    return Object.entries(startupConfig.mcpServers)
+      .filter(
+        ([, serverConfig]) =>
+          serverConfig.customUserVars && Object.keys(serverConfig.customUserVars).length > 0,
+      )
+      .map(([serverName, config]) => ({
+        serverName,
+        iconPath: null,
+        config: {
+          ...config,
+          customUserVars: config.customUserVars ?? {},
+        },
+      }));
+  }, [startupConfig?.mcpServers]);
+
+  const updateUserPluginsMutation = useUpdateUserPluginsMutation({
+    onSuccess: () => {
+      showToast({ message: localize('com_nav_mcp_vars_updated'), status: 'success' });
+    },
+    onError: (error) => {
+      console.error('Error updating MCP custom user variables:', error);
+      showToast({
+        message: localize('com_nav_mcp_vars_update_error'),
+        status: 'error',
+      });
+    },
+  });
+
+  const handleSaveServerVars = useCallback(
+    (serverName: string, updatedValues: Record<string, string>) => {
+      const payload: TUpdateUserPlugins = {
+        pluginKey: `${Constants.mcp_prefix}${serverName}`,
+        action: 'install', // 'install' action is used to set/update credentials/variables
+        auth: updatedValues,
+      };
+      updateUserPluginsMutation.mutate(payload);
+    },
+    [updateUserPluginsMutation],
+  );
+
+  const handleRevokeServerVars = useCallback(
+    (serverName: string) => {
+      const payload: TUpdateUserPlugins = {
+        pluginKey: `${Constants.mcp_prefix}${serverName}`,
+        action: 'uninstall', // 'uninstall' action clears the variables
+        auth: {}, // Empty auth for uninstall
+      };
+      updateUserPluginsMutation.mutate(payload);
+    },
+    [updateUserPluginsMutation],
+  );
+
+  const handleServerClickToEdit = (serverName: string) => {
+    setSelectedServerNameForEditing(serverName);
+  };
+
+  const handleGoBackToList = () => {
+    setSelectedServerNameForEditing(null);
+  };
+
+  if (startupConfigLoading) {
+    return <MCPPanelSkeleton />;
+  }
+
+  if (mcpServerDefinitions.length === 0) {
+    return (
+      <div className="p-4 text-center text-sm text-gray-500">
+        {localize('com_sidepanel_mcp_no_servers_with_vars')}
+      </div>
+    );
+  }
+
+  if (selectedServerNameForEditing) {
+    // Editing View
+    const serverBeingEdited = mcpServerDefinitions.find(
+      (s) => s.serverName === selectedServerNameForEditing,
+    );
+
+    if (!serverBeingEdited) {
+      // Fallback to list view if server not found
+      setSelectedServerNameForEditing(null);
+      return (
+        <div className="p-4 text-center text-sm text-gray-500">
+          {localize('com_ui_error')}: {localize('com_ui_mcp_server_not_found')}
+        </div>
+      );
+    }
+
+    return (
+      <div className="h-auto max-w-full overflow-x-hidden p-3">
+        <Button
+          variant="outline"
+          onClick={handleGoBackToList}
+          className="mb-3 flex items-center px-3 py-2 text-sm"
+        >
+          <ChevronLeft className="mr-1 h-4 w-4" />
+          {localize('com_ui_back')}
+        </Button>
+        <h3 className="mb-3 text-lg font-medium">
+          {localize('com_sidepanel_mcp_variables_for', { '0': serverBeingEdited.serverName })}
+        </h3>
+        <MCPVariableEditor
+          server={serverBeingEdited}
+          onSave={handleSaveServerVars}
+          onRevoke={handleRevokeServerVars}
+          isSubmitting={updateUserPluginsMutation.isLoading}
+        />
+      </div>
+    );
+  } else {
+    // Server List View
+    return (
+      <div className="h-auto max-w-full overflow-x-hidden p-3">
+        <div className="space-y-2">
+          {mcpServerDefinitions.map((server) => (
+            <Button
+              key={server.serverName}
+              variant="outline"
+              className="w-full justify-start dark:hover:bg-gray-700"
+              onClick={() => handleServerClickToEdit(server.serverName)}
+            >
+              {server.serverName}
+            </Button>
+          ))}
+        </div>
+      </div>
+    );
+  }
+}
+
+// Inner component for the form - remains the same
+interface MCPVariableEditorProps {
+  server: ServerConfigWithVars;
+  onSave: (serverName: string, updatedValues: Record<string, string>) => void;
+  onRevoke: (serverName: string) => void;
+  isSubmitting: boolean;
+}
+
+function MCPVariableEditor({ server, onSave, onRevoke, isSubmitting }: MCPVariableEditorProps) {
+  const localize = useLocalize();
+
+  const {
+    control,
+    handleSubmit,
+    reset,
+    formState: { errors, isDirty },
+  } = useForm<Record<string, string>>({
+    defaultValues: {}, // Initialize empty, will be reset by useEffect
+  });
+
+  useEffect(() => {
+    // Always initialize with empty strings based on the schema
+    const initialFormValues = Object.keys(server.config.customUserVars).reduce(
+      (acc, key) => {
+        acc[key] = '';
+        return acc;
+      },
+      {} as Record<string, string>,
+    );
+    reset(initialFormValues);
+  }, [reset, server.config.customUserVars]);
+
+  const onFormSubmit = (data: Record<string, string>) => {
+    onSave(server.serverName, data);
+  };
+
+  const handleRevokeClick = () => {
+    onRevoke(server.serverName);
+  };
+
+  return (
+    <form onSubmit={handleSubmit(onFormSubmit)} className="mb-4 mt-2 space-y-4">
+      {Object.entries(server.config.customUserVars).map(([key, details]) => (
+        <div key={key} className="space-y-2">
+          <Label htmlFor={`${server.serverName}-${key}`} className="text-sm font-medium">
+            {details.title}
+          </Label>
+          <Controller
+            name={key}
+            control={control}
+            defaultValue={''}
+            render={({ field }) => (
+              <Input
+                id={`${server.serverName}-${key}`}
+                type="text"
+                {...field}
+                placeholder={localize('com_sidepanel_mcp_enter_value', { '0': details.title })}
+                className="w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 dark:border-gray-600 dark:bg-gray-700 dark:text-white sm:text-sm"
+              />
+            )}
+          />
+          {details.description && (
+            <p
+              className="text-xs text-text-secondary [&_a]:text-blue-500 [&_a]:hover:text-blue-600 dark:[&_a]:text-blue-400 dark:[&_a]:hover:text-blue-300"
+              dangerouslySetInnerHTML={{ __html: details.description }}
+            />
+          )}
+          {errors[key] && <p className="text-xs text-red-500">{errors[key]?.message}</p>}
+        </div>
+      ))}
+      <div className="flex justify-end gap-2 pt-2">
+        {Object.keys(server.config.customUserVars).length > 0 && (
+          <Button
+            type="button"
+            onClick={handleRevokeClick}
+            className="bg-red-600 text-white hover:bg-red-700 dark:hover:bg-red-800"
+            disabled={isSubmitting}
+          >
+            {localize('com_ui_revoke')}
+          </Button>
+        )}
+        <Button
+          type="submit"
+          className="bg-green-500 text-white hover:bg-green-600"
+          disabled={isSubmitting || !isDirty}
+        >
+          {isSubmitting ? localize('com_ui_saving') : localize('com_ui_save')}
+        </Button>
+      </div>
+    </form>
+  );
+}
diff --git a/client/src/components/SidePanel/MCP/MCPPanelSkeleton.tsx b/client/src/components/SidePanel/MCP/MCPPanelSkeleton.tsx
new file mode 100644
index 0000000000..61afbfcc2f
--- /dev/null
+++ b/client/src/components/SidePanel/MCP/MCPPanelSkeleton.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { Skeleton } from '~/components/ui';
+
+export default function MCPPanelSkeleton() {
+  return (
+    <div className="space-y-6 p-2">
+      {[1, 2].map((serverIdx) => (
+        <div key={serverIdx} className="space-y-4">
+          <Skeleton className="h-6 w-1/3 rounded-lg" /> {/* Server Name */}
+          {[1, 2].map((varIdx) => (
+            <div key={varIdx} className="space-y-2">
+              <Skeleton className="h-5 w-1/4 rounded-lg" /> {/* Variable Title */}
+              <Skeleton className="h-8 w-full rounded-lg" /> {/* Input Field */}
+              <Skeleton className="h-4 w-2/3 rounded-lg" /> {/* Description */}
+            </div>
+          ))}
+        </div>
+      ))}
+    </div>
+  );
+}
diff --git a/client/src/components/Tools/ToolSelectDialog.tsx b/client/src/components/Tools/ToolSelectDialog.tsx
index b3bc558405..cf8c958921 100644
--- a/client/src/components/Tools/ToolSelectDialog.tsx
+++ b/client/src/components/Tools/ToolSelectDialog.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { Search, X } from 'lucide-react';
 import { useFormContext } from 'react-hook-form';
-import { isAgentsEndpoint } from 'librechat-data-provider';
+import { Constants, isAgentsEndpoint } from 'librechat-data-provider';
 import { Dialog, DialogPanel, DialogTitle, Description } from '@headlessui/react';
 import { useUpdateUserPluginsMutation } from 'librechat-data-provider/react-query';
 import type {
@@ -125,16 +125,23 @@ function ToolSelectDialog({
     const getAvailablePluginFromKey = tools?.find((p) => p.pluginKey === pluginKey);
     setSelectedPlugin(getAvailablePluginFromKey);
 
-    const { authConfig, authenticated = false } = getAvailablePluginFromKey ?? {};
+    const isMCPTool = pluginKey.includes(Constants.mcp_delimiter);
 
-    if (authConfig && authConfig.length > 0 && !authenticated) {
-      setShowPluginAuthForm(true);
+    if (isMCPTool) {
+      // MCP tools have their variables configured elsewhere (e.g., MCPPanel or MCPSelect),
+      // so we directly proceed to install without showing the auth form.
+      handleInstall({ pluginKey, action: 'install', auth: {} });
     } else {
-      handleInstall({
-        pluginKey,
-        action: 'install',
-        auth: {},
-      });
+      const { authConfig, authenticated = false } = getAvailablePluginFromKey ?? {};
+      if (authConfig && authConfig.length > 0 && !authenticated) {
+        setShowPluginAuthForm(true);
+      } else {
+        handleInstall({
+          pluginKey,
+          action: 'install',
+          auth: {},
+        });
+      }
     }
   };
 
diff --git a/client/src/components/ui/MCPConfigDialog.tsx b/client/src/components/ui/MCPConfigDialog.tsx
new file mode 100644
index 0000000000..d1a53bd902
--- /dev/null
+++ b/client/src/components/ui/MCPConfigDialog.tsx
@@ -0,0 +1,122 @@
+import React, { useEffect } from 'react';
+import { useForm, Controller } from 'react-hook-form';
+import { Input, Label, OGDialog, Button } from '~/components/ui';
+import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
+import { useLocalize } from '~/hooks';
+
+export interface ConfigFieldDetail {
+  title: string;
+  description: string;
+}
+
+interface MCPConfigDialogProps {
+  isOpen: boolean;
+  onOpenChange: (isOpen: boolean) => void;
+  fieldsSchema: Record<string, ConfigFieldDetail>;
+  initialValues: Record<string, string>;
+  onSave: (updatedValues: Record<string, string>) => void;
+  isSubmitting?: boolean;
+  onRevoke?: () => void;
+  serverName: string;
+}
+
+export default function MCPConfigDialog({
+  isOpen,
+  onOpenChange,
+  fieldsSchema,
+  initialValues,
+  onSave,
+  isSubmitting = false,
+  onRevoke,
+  serverName,
+}: MCPConfigDialogProps) {
+  const localize = useLocalize();
+  const {
+    control,
+    handleSubmit,
+    reset,
+    formState: { errors, _ },
+  } = useForm<Record<string, string>>({
+    defaultValues: initialValues,
+  });
+
+  useEffect(() => {
+    if (isOpen) {
+      reset(initialValues);
+    }
+  }, [isOpen, initialValues, reset]);
+
+  const onFormSubmit = (data: Record<string, string>) => {
+    onSave(data);
+  };
+
+  const handleRevoke = () => {
+    if (onRevoke) {
+      onRevoke();
+    }
+  };
+
+  const dialogTitle = localize('com_ui_configure_mcp_variables_for', { 0: serverName });
+  const dialogDescription = localize('com_ui_mcp_dialog_desc');
+
+  return (
+    <OGDialog open={isOpen} onOpenChange={onOpenChange}>
+      <OGDialogTemplate
+        className="sm:max-w-lg"
+        title={dialogTitle}
+        description={dialogDescription}
+        headerClassName="px-6 pt-6 pb-4"
+        main={
+          <form onSubmit={handleSubmit(onFormSubmit)} className="space-y-4 px-6 pb-2">
+            {Object.entries(fieldsSchema).map(([key, details]) => (
+              <div key={key} className="space-y-2">
+                <Label htmlFor={key} className="text-sm font-medium">
+                  {details.title}
+                </Label>
+                <Controller
+                  name={key}
+                  control={control}
+                  defaultValue={initialValues[key] || ''}
+                  render={({ field }) => (
+                    <Input
+                      id={key}
+                      type="text"
+                      {...field}
+                      placeholder={localize('com_ui_mcp_enter_var', { 0: details.title })}
+                      className="w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 dark:border-gray-600 dark:bg-gray-700 dark:text-white sm:text-sm"
+                    />
+                  )}
+                />
+                {details.description && (
+                  <p
+                    className="text-xs text-text-secondary [&_a]:text-blue-500 [&_a]:hover:text-blue-600 dark:[&_a]:text-blue-400 dark:[&_a]:hover:text-blue-300"
+                    dangerouslySetInnerHTML={{ __html: details.description }}
+                  />
+                )}
+                {errors[key] && <p className="text-xs text-red-500">{errors[key]?.message}</p>}
+              </div>
+            ))}
+          </form>
+        }
+        selection={{
+          selectHandler: handleSubmit(onFormSubmit),
+          selectClasses: 'bg-green-500 hover:bg-green-600 text-white',
+          selectText: isSubmitting ? localize('com_ui_saving') : localize('com_ui_save'),
+        }}
+        buttons={
+          onRevoke && (
+            <Button
+              onClick={handleRevoke}
+              className="bg-red-600 text-white hover:bg-red-700 dark:hover:bg-red-800"
+              disabled={isSubmitting}
+            >
+              {localize('com_ui_revoke')}
+            </Button>
+          )
+        }
+        footerClassName="flex justify-end gap-2 px-6 pb-6 pt-2"
+        showCancelButton={true}
+      />
+    </OGDialog>
+  );
+}
diff --git a/client/src/components/ui/MultiSelect.tsx b/client/src/components/ui/MultiSelect.tsx
index ddbd5c90a4..e0b74a4577 100644
--- a/client/src/components/ui/MultiSelect.tsx
+++ b/client/src/components/ui/MultiSelect.tsx
@@ -26,6 +26,11 @@ interface MultiSelectProps<T extends string> {
   selectItemsClassName?: string;
   selectedValues: T[];
   setSelectedValues: (values: T[]) => void;
+  renderItemContent?: (
+    value: T,
+    defaultContent: React.ReactNode,
+    isSelected: boolean,
+  ) => React.ReactNode;
 }
 
 function defaultRender<T extends string>(values: T[], placeholder?: string) {
@@ -54,9 +59,9 @@ export default function MultiSelect<T extends string>({
   selectItemsClassName,
   selectedValues = [],
   setSelectedValues,
+  renderItemContent,
 }: MultiSelectProps<T>) {
   const selectRef = useRef<HTMLButtonElement>(null);
-  // const [selectedValues, setSelectedValues] = React.useState<T[]>(defaultSelectedValues);
 
   const handleValueChange = (values: T[]) => {
     setSelectedValues(values);
@@ -105,23 +110,33 @@ export default function MultiSelect<T extends string>({
             popoverClassName,
           )}
         >
-          {items.map((value) => (
-            <SelectItem
-              key={value}
-              value={value}
-              className={cn(
-                'flex items-center gap-2 rounded-lg px-2 py-1.5 hover:cursor-pointer',
-                'scroll-m-1 outline-none transition-colors',
-                'hover:bg-black/[0.075] dark:hover:bg-white/10',
-                'data-[active-item]:bg-black/[0.075] dark:data-[active-item]:bg-white/10',
-                'w-full min-w-0 text-sm',
-                itemClassName,
-              )}
-            >
-              <SelectItemCheck className="text-primary" />
-              <span className="truncate">{value}</span>
-            </SelectItem>
-          ))}
+          {items.map((value) => {
+            const defaultContent = (
+              <>
+                <SelectItemCheck className="text-primary" />
+                <span className="truncate">{value}</span>
+              </>
+            );
+            const isCurrentItemSelected = selectedValues.includes(value);
+            return (
+              <SelectItem
+                key={value}
+                value={value}
+                className={cn(
+                  'flex items-center gap-2 rounded-lg px-2 py-1.5 hover:cursor-pointer',
+                  'scroll-m-1 outline-none transition-colors',
+                  'hover:bg-black/[0.075] dark:hover:bg-white/10',
+                  'data-[active-item]:bg-black/[0.075] dark:data-[active-item]:bg-white/10',
+                  'w-full min-w-0 text-sm',
+                  itemClassName,
+                )}
+              >
+                {renderItemContent
+                  ? renderItemContent(value, defaultContent, isCurrentItemSelected)
+                  : defaultContent}
+              </SelectItem>
+            );
+          })}
         </SelectPopover>
       </SelectProvider>
     </div>
diff --git a/client/src/hooks/Nav/useSideNavLinks.ts b/client/src/hooks/Nav/useSideNavLinks.ts
index 822bde3ace..abc4688f73 100644
--- a/client/src/hooks/Nav/useSideNavLinks.ts
+++ b/client/src/hooks/Nav/useSideNavLinks.ts
@@ -17,7 +17,10 @@ import PanelSwitch from '~/components/SidePanel/Builder/PanelSwitch';
 import PromptsAccordion from '~/components/Prompts/PromptsAccordion';
 import Parameters from '~/components/SidePanel/Parameters/Panel';
 import FilesPanel from '~/components/SidePanel/Files/Panel';
+import MCPPanel from '~/components/SidePanel/MCP/MCPPanel';
 import { Blocks, AttachmentIcon } from '~/components/svg';
+import { useGetStartupConfig } from '~/data-provider';
+import MCPIcon from '~/components/ui/MCPIcon';
 import { useHasAccess } from '~/hooks';
 
 export default function useSideNavLinks({
@@ -59,6 +62,7 @@ export default function useSideNavLinks({
     permissionType: PermissionTypes.AGENTS,
     permission: Permissions.CREATE,
   });
+  const { data: startupConfig } = useGetStartupConfig();
 
   const Links = useMemo(() => {
     const links: NavLink[] = [];
@@ -149,6 +153,21 @@ export default function useSideNavLinks({
       });
     }
 
+    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',
       label: '',
@@ -171,6 +190,7 @@ export default function useSideNavLinks({
     hasAccessToBookmarks,
     hasAccessToCreateAgents,
     hidePanel,
+    startupConfig,
   ]);
 
   return Links;
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index 0d6d40f398..5bc7a38f6b 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -423,6 +423,8 @@
   "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_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",
   "com_nav_my_files": "My Files",
   "com_nav_not_supported": "Not Supported",
@@ -447,6 +449,7 @@
   "com_nav_setting_chat": "Chat",
   "com_nav_setting_data": "Data controls",
   "com_nav_setting_general": "General",
+  "com_nav_setting_mcp": "MCP Settings",
   "com_nav_setting_personalization": "Personalization",
   "com_nav_setting_speech": "Speech",
   "com_nav_settings": "Settings",
@@ -480,8 +483,15 @@
   "com_sidepanel_conversation_tags": "Bookmarks",
   "com_sidepanel_hide_panel": "Hide Panel",
   "com_sidepanel_manage_files": "Manage Files",
+  "com_sidepanel_mcp_enter_value": "Enter value for {{0}}",
+  "com_sidepanel_mcp_no_servers_with_vars": "No MCP servers with configurable variables.",
+  "com_sidepanel_mcp_variables_for": "MCP Variables for {{0}}",
   "com_sidepanel_parameters": "Parameters",
   "com_sources_image_alt": "Search result image",
+  "com_ui_configure_mcp_variables_for": "Configure Variables for {{0}}",
+  "com_ui_mcp_dialog_desc": "Please enter the necessary information below.",
+  "com_ui_mcp_enter_var": "Enter value for {{0}}",
+  "com_ui_saving": "Saving...",
   "com_sources_more_sources": "+{{count}} sources",
   "com_sources_tab_all": "All",
   "com_sources_tab_images": "Images",
@@ -570,6 +580,7 @@
   "com_ui_authentication_type": "Authentication Type",
   "com_ui_avatar": "Avatar",
   "com_ui_azure": "Azure",
+  "com_ui_back": "Back",
   "com_ui_back_to_chat": "Back to Chat",
   "com_ui_back_to_prompts": "Back to Prompts",
   "com_ui_backup_codes": "Backup Codes",
@@ -795,6 +806,7 @@
   "com_ui_manage": "Manage",
   "com_ui_max_tags": "Maximum number allowed is {{0}}, using latest values.",
   "com_ui_mcp_servers": "MCP Servers",
+  "com_ui_mcp_server_not_found": "Server not found.",
   "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",
@@ -1020,6 +1032,7 @@
   "com_user_message": "You",
   "com_warning_resubmit_unsupported": "Resubmitting the AI message is not supported for this endpoint.",
   "com_ui_add_mcp": "Add MCP",
+  "com_ui_add_mcp": "Add MCP",
   "com_ui_add_mcp_server": "Add MCP Server",
   "com_ui_edit_mcp_server": "Edit MCP Server",
   "com_agents_mcps_disabled": "You need to create an agent before adding MCPs.",
diff --git a/package-lock.json b/package-lock.json
index 75ce0ea9fd..a7384d0f90 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46322,7 +46322,7 @@
     },
     "packages/data-provider": {
       "name": "librechat-data-provider",
-      "version": "0.7.87",
+      "version": "0.7.88",
       "license": "ISC",
       "dependencies": {
         "axios": "^1.8.2",
diff --git a/packages/api/src/agents/auth.ts b/packages/api/src/agents/auth.ts
new file mode 100644
index 0000000000..564ef84b5a
--- /dev/null
+++ b/packages/api/src/agents/auth.ts
@@ -0,0 +1,93 @@
+import { logger } from '@librechat/data-schemas';
+import type { IPluginAuth, PluginAuthMethods } from '@librechat/data-schemas';
+import { decrypt } from '../crypto/encryption';
+
+export interface GetPluginAuthMapParams {
+  userId: string;
+  pluginKeys: string[];
+  throwError?: boolean;
+  findPluginAuthsByKeys: PluginAuthMethods['findPluginAuthsByKeys'];
+}
+
+export type PluginAuthMap = Record<string, Record<string, string>>;
+
+/**
+ * Retrieves and decrypts authentication values for multiple plugins
+ * @returns A map where keys are pluginKeys and values are objects of authField:decryptedValue pairs
+ */
+export async function getPluginAuthMap({
+  userId,
+  pluginKeys,
+  throwError = true,
+  findPluginAuthsByKeys,
+}: GetPluginAuthMapParams): Promise<PluginAuthMap> {
+  try {
+    /** Early return for empty plugin keys */
+    if (!pluginKeys?.length) {
+      return {};
+    }
+
+    /** All plugin auths for current user query */
+    const pluginAuths = await findPluginAuthsByKeys({ userId, pluginKeys });
+
+    /** Group auth records by pluginKey for efficient lookup */
+    const authsByPlugin = new Map<string, IPluginAuth[]>();
+    for (const auth of pluginAuths) {
+      if (!auth.pluginKey) {
+        logger.warn(`[getPluginAuthMap] Missing pluginKey for userId ${userId}`);
+        continue;
+      }
+      const existing = authsByPlugin.get(auth.pluginKey) || [];
+      existing.push(auth);
+      authsByPlugin.set(auth.pluginKey, existing);
+    }
+
+    const authMap: PluginAuthMap = {};
+    const decryptionPromises: Promise<void>[] = [];
+
+    /** Single loop through requested pluginKeys */
+    for (const pluginKey of pluginKeys) {
+      authMap[pluginKey] = {};
+      const auths = authsByPlugin.get(pluginKey) || [];
+
+      for (const auth of auths) {
+        decryptionPromises.push(
+          (async () => {
+            try {
+              const decryptedValue = await decrypt(auth.value);
+              authMap[pluginKey][auth.authField] = decryptedValue;
+            } catch (error) {
+              const message = error instanceof Error ? error.message : 'Unknown error';
+              logger.error(
+                `[getPluginAuthMap] Decryption failed for userId ${userId}, plugin ${pluginKey}, field ${auth.authField}: ${message}`,
+              );
+
+              if (throwError) {
+                throw new Error(
+                  `Decryption failed for plugin ${pluginKey}, field ${auth.authField}: ${message}`,
+                );
+              }
+            }
+          })(),
+        );
+      }
+    }
+
+    await Promise.all(decryptionPromises);
+    return authMap;
+  } catch (error) {
+    if (!throwError) {
+      /** Empty objects for each plugin key on error */
+      return pluginKeys.reduce((acc, key) => {
+        acc[key] = {};
+        return acc;
+      }, {} as PluginAuthMap);
+    }
+
+    const message = error instanceof Error ? error.message : 'Unknown error';
+    logger.error(
+      `[getPluginAuthMap] Failed to fetch auth values for userId ${userId}, plugins: ${pluginKeys.join(', ')}: ${message}`,
+    );
+    throw error;
+  }
+}
diff --git a/packages/api/src/agents/run.ts b/packages/api/src/agents/run.ts
index 22f8c4ae93..41ec02d9b9 100644
--- a/packages/api/src/agents/run.ts
+++ b/packages/api/src/agents/run.ts
@@ -1,6 +1,12 @@
 import { Run, Providers } from '@librechat/agents';
 import { providerEndpointMap, KnownEndpoints } from 'librechat-data-provider';
-import type { StandardGraphConfig, EventHandler, GraphEvents, IState } from '@librechat/agents';
+import type {
+  StandardGraphConfig,
+  EventHandler,
+  GenericTool,
+  GraphEvents,
+  IState,
+} from '@librechat/agents';
 import type { Agent } from 'librechat-data-provider';
 import type * as t from '~/types';
 
@@ -32,7 +38,7 @@ export async function createRun({
   streaming = true,
   streamUsage = true,
 }: {
-  agent: Agent;
+  agent: Omit<Agent, 'tools'> & { tools?: GenericTool[] };
   signal: AbortSignal;
   runId?: string;
   streaming?: boolean;
diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
index b7859e7ca4..0341de44b0 100644
--- a/packages/api/src/index.ts
+++ b/packages/api/src/index.ts
@@ -1,6 +1,7 @@
 /* MCP */
 export * from './mcp/manager';
 export * from './mcp/oauth';
+export * from './mcp/auth';
 /* Utilities */
 export * from './mcp/utils';
 export * from './utils';
diff --git a/packages/api/src/mcp/auth.ts b/packages/api/src/mcp/auth.ts
new file mode 100644
index 0000000000..7f6f6001fa
--- /dev/null
+++ b/packages/api/src/mcp/auth.ts
@@ -0,0 +1,58 @@
+import { logger } from '@librechat/data-schemas';
+import { Constants } from 'librechat-data-provider';
+import type { PluginAuthMethods } from '@librechat/data-schemas';
+import type { GenericTool } from '@librechat/agents';
+import { getPluginAuthMap } from '~/agents/auth';
+import { mcpToolPattern } from './utils';
+
+export async function getUserMCPAuthMap({
+  userId,
+  tools,
+  appTools,
+  findPluginAuthsByKeys,
+}: {
+  userId: string;
+  tools: GenericTool[] | undefined;
+  appTools: Record<string, unknown>;
+  findPluginAuthsByKeys: PluginAuthMethods['findPluginAuthsByKeys'];
+}) {
+  if (!tools || tools.length === 0) {
+    return {};
+  }
+
+  const uniqueMcpServers = new Set<string>();
+
+  for (const tool of tools) {
+    const toolKey = tool.name;
+    if (toolKey && appTools[toolKey] && mcpToolPattern.test(toolKey)) {
+      const parts = toolKey.split(Constants.mcp_delimiter);
+      const serverName = parts[parts.length - 1];
+      uniqueMcpServers.add(`${Constants.mcp_prefix}${serverName}`);
+    }
+  }
+
+  if (uniqueMcpServers.size === 0) {
+    return {};
+  }
+
+  const mcpPluginKeysToFetch = Array.from(uniqueMcpServers);
+
+  let allMcpCustomUserVars: Record<string, Record<string, string>> = {};
+  try {
+    allMcpCustomUserVars = await getPluginAuthMap({
+      userId,
+      pluginKeys: mcpPluginKeysToFetch,
+      throwError: false,
+      findPluginAuthsByKeys,
+    });
+  } catch (err) {
+    logger.error(
+      `[handleTools] Error batch fetching customUserVars for MCP tools (keys: ${mcpPluginKeysToFetch.join(
+        ', ',
+      )}), user ${userId}: ${err instanceof Error ? err.message : 'Unknown error'}`,
+      err,
+    );
+  }
+
+  return allMcpCustomUserVars;
+}
diff --git a/packages/api/src/mcp/manager.ts b/packages/api/src/mcp/manager.ts
index 0a60784457..19d4d4e72b 100644
--- a/packages/api/src/mcp/manager.ts
+++ b/packages/api/src/mcp/manager.ts
@@ -14,10 +14,6 @@ import { MCPTokenStorage } from './oauth/tokens';
 import { formatToolContent } from './parsers';
 import { MCPConnection } from './connection';
 
-export interface CallToolOptions extends RequestOptions {
-  user?: TUser;
-}
-
 export class MCPManager {
   private static instance: MCPManager | null = null;
   /** App-level connections initialized at startup */
@@ -28,7 +24,11 @@ export class MCPManager {
   private userLastActivity: Map<string, number> = new Map();
   private readonly USER_CONNECTION_IDLE_TIMEOUT = 15 * 60 * 1000; // 15 minutes (TODO: make configurable)
   private mcpConfigs: t.MCPServers = {};
-  private processMCPEnv?: (obj: MCPOptions, user?: TUser) => MCPOptions; // Store the processing function
+  private processMCPEnv?: (
+    obj: MCPOptions,
+    user?: TUser,
+    customUserVars?: Record<string, string>,
+  ) => MCPOptions; // Store the processing function
   /** Store MCP server instructions */
   private serverInstructions: Map<string, string> = new Map();
 
@@ -63,7 +63,6 @@ export class MCPManager {
     if (!tokenMethods) {
       logger.info('[MCP] No token methods provided, token persistence will not be available');
     }
-
     const entries = Object.entries(mcpServers);
     const initializedServers = new Set();
     const connectionResults = await Promise.allSettled(
@@ -382,6 +381,7 @@ export class MCPManager {
     user,
     serverName,
     flowManager,
+    customUserVars,
     tokenMethods,
     oauthStart,
     oauthEnd,
@@ -390,6 +390,7 @@ export class MCPManager {
     user: TUser;
     serverName: string;
     flowManager: FlowStateManager<MCPOAuthTokens | null>;
+    customUserVars?: Record<string, string>;
     tokenMethods?: TokenMethods;
     oauthStart?: (authURL: string) => Promise<void>;
     oauthEnd?: () => Promise<void>;
@@ -444,9 +445,8 @@ export class MCPManager {
     }
 
     if (this.processMCPEnv) {
-      config = { ...(this.processMCPEnv(config, user) ?? {}) };
+      config = { ...(this.processMCPEnv(config, user, customUserVars) ?? {}) };
     }
-
     /** If no in-memory tokens, tokens from persistent storage */
     let tokens: MCPOAuthTokens | null = null;
     if (tokenMethods?.findToken) {
@@ -752,7 +752,6 @@ export class MCPManager {
     getServerTools?: (serverName: string) => Promise<t.LCManifestTool[] | undefined>;
   }): Promise<t.LCToolManifest> {
     const mcpTools: t.LCManifestTool[] = [];
-
     for (const [serverName, connection] of this.connections.entries()) {
       try {
         /** Attempt to ensure connection is active, with reconnection if needed */
@@ -784,13 +783,21 @@ export class MCPManager {
         const serverTools: t.LCManifestTool[] = [];
         for (const tool of tools) {
           const pluginKey = `${tool.name}${CONSTANTS.mcp_delimiter}${serverName}`;
+
+          const config = this.mcpConfigs[serverName];
           const manifestTool: t.LCManifestTool = {
             name: tool.name,
             pluginKey,
             description: tool.description ?? '',
             icon: connection.iconPath,
+            authConfig: config?.customUserVars
+              ? Object.entries(config.customUserVars).map(([key, value]) => ({
+                  authField: key,
+                  label: value.title || key,
+                  description: value.description || '',
+                }))
+              : undefined,
           };
-          const config = this.mcpConfigs[serverName];
           if (config?.chatMenu === false) {
             manifestTool.chatMenu = false;
           }
@@ -814,6 +821,7 @@ export class MCPManager {
    * for user-specific connections upon successful call initiation.
    */
   async callTool({
+    user,
     serverName,
     toolName,
     provider,
@@ -823,20 +831,22 @@ export class MCPManager {
     flowManager,
     oauthStart,
     oauthEnd,
+    customUserVars,
   }: {
+    user?: TUser;
     serverName: string;
     toolName: string;
     provider: t.Provider;
     toolArguments?: Record<string, unknown>;
-    options?: CallToolOptions;
+    options?: RequestOptions;
     tokenMethods?: TokenMethods;
+    customUserVars?: Record<string, string>;
     flowManager: FlowStateManager<MCPOAuthTokens | null>;
     oauthStart?: (authURL: string) => Promise<void>;
     oauthEnd?: () => Promise<void>;
   }): Promise<t.FormattedToolResponse> {
     /** User-specific connection */
     let connection: MCPConnection | undefined;
-    const { user, ...callOptions } = options ?? {};
     const userId = user?.id;
     const logPrefix = userId ? `[MCP][User: ${userId}][${serverName}]` : `[MCP][${serverName}]`;
 
@@ -852,6 +862,7 @@ export class MCPManager {
           oauthStart,
           oauthEnd,
           signal: options?.signal,
+          customUserVars,
         });
       } else {
         /** App-level connection */
@@ -883,7 +894,7 @@ export class MCPManager {
         CallToolResultSchema,
         {
           timeout: connection.timeout,
-          ...callOptions,
+          ...options,
         },
       );
       if (userId) {
diff --git a/packages/api/src/mcp/types/index.ts b/packages/api/src/mcp/types/index.ts
index bfd73633eb..d95251eecc 100644
--- a/packages/api/src/mcp/types/index.ts
+++ b/packages/api/src/mcp/types/index.ts
@@ -14,7 +14,15 @@ export type StdioOptions = z.infer<typeof StdioOptionsSchema>;
 export type WebSocketOptions = z.infer<typeof WebSocketOptionsSchema>;
 export type SSEOptions = z.infer<typeof SSEOptionsSchema>;
 export type StreamableHTTPOptions = z.infer<typeof StreamableHTTPOptionsSchema>;
-export type MCPOptions = z.infer<typeof MCPOptionsSchema>;
+export type MCPOptions = z.infer<typeof MCPOptionsSchema> & {
+  customUserVars?: Record<
+    string,
+    {
+      title: string;
+      description: string;
+    }
+  >;
+};
 export type MCPServers = z.infer<typeof MCPServersSchema>;
 export interface MCPResource {
   uri: string;
diff --git a/packages/api/src/mcp/utils.ts b/packages/api/src/mcp/utils.ts
index f315976fcf..631ce5c210 100644
--- a/packages/api/src/mcp/utils.ts
+++ b/packages/api/src/mcp/utils.ts
@@ -1,3 +1,6 @@
+import { Constants } from 'librechat-data-provider';
+
+export const mcpToolPattern = new RegExp(`^.+${Constants.mcp_delimiter}.+$`);
 /**
  * Normalizes a server name to match the pattern ^[a-zA-Z0-9_.-]+$
  * This is required for Azure OpenAI models with Tool Calling
diff --git a/packages/data-provider/package.json b/packages/data-provider/package.json
index 146121cb44..d46bfcf716 100644
--- a/packages/data-provider/package.json
+++ b/packages/data-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "librechat-data-provider",
-  "version": "0.7.87",
+  "version": "0.7.88",
   "description": "data services for librechat apps",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
diff --git a/packages/data-provider/specs/actions.spec.ts b/packages/data-provider/specs/actions.spec.ts
index 6d84c79373..818c72c832 100644
--- a/packages/data-provider/specs/actions.spec.ts
+++ b/packages/data-provider/specs/actions.spec.ts
@@ -1,6 +1,8 @@
-import axios from 'axios';
 import { z } from 'zod';
-import { OpenAPIV3 } from 'openapi-types';
+import axios from 'axios';
+import type { OpenAPIV3 } from 'openapi-types';
+import type { ParametersSchema } from '../src/actions';
+import type { FlowchartSchema } from './openapiSpecs';
 import {
   createURL,
   resolveRef,
@@ -15,9 +17,7 @@ import {
   scholarAIOpenapiSpec,
   swapidev,
 } from './openapiSpecs';
-import { AuthorizationTypeEnum, AuthTypeEnum } from '../src/types/assistants';
-import type { FlowchartSchema } from './openapiSpecs';
-import type { ParametersSchema } from '../src/actions';
+import { AuthorizationTypeEnum, AuthTypeEnum } from '../src/types/agents';
 
 jest.mock('axios');
 const mockedAxios = axios as jest.Mocked<typeof axios>;
diff --git a/packages/data-provider/specs/mcp.spec.ts b/packages/data-provider/specs/mcp.spec.ts
index f2b62c0f89..37493f1bbc 100644
--- a/packages/data-provider/specs/mcp.spec.ts
+++ b/packages/data-provider/specs/mcp.spec.ts
@@ -525,5 +525,188 @@ describe('Environment Variable Extraction (MCP)', () => {
       const result3 = processMCPEnv(obj3, userWithBoth);
       expect('headers' in result3 && result3.headers?.['User-Id']).toBe('user-789');
     });
+
+    it('should process customUserVars in env field', () => {
+      const user = createTestUser();
+      const customUserVars = {
+        CUSTOM_VAR_1: 'custom-value-1',
+        CUSTOM_VAR_2: 'custom-value-2',
+      };
+      const obj: MCPOptions = {
+        command: 'node',
+        args: ['server.js'],
+        env: {
+          VAR_A: '{{CUSTOM_VAR_1}}',
+          VAR_B: 'Value with {{CUSTOM_VAR_2}}',
+          VAR_C: '${TEST_API_KEY}',
+          VAR_D: '{{LIBRECHAT_USER_EMAIL}}',
+        },
+      };
+
+      const result = processMCPEnv(obj, user, customUserVars);
+
+      expect('env' in result && result.env).toEqual({
+        VAR_A: 'custom-value-1',
+        VAR_B: 'Value with custom-value-2',
+        VAR_C: 'test-api-key-value',
+        VAR_D: 'test@example.com',
+      });
+    });
+
+    it('should process customUserVars in headers field', () => {
+      const user = createTestUser();
+      const customUserVars = {
+        USER_TOKEN: 'user-specific-token',
+        REGION: 'us-west-1',
+      };
+      const obj: MCPOptions = {
+        type: 'sse',
+        url: 'https://example.com/api',
+        headers: {
+          Authorization: 'Bearer {{USER_TOKEN}}',
+          'X-Region': '{{REGION}}',
+          'X-System-Key': '${TEST_API_KEY}',
+          'X-User-Id': '{{LIBRECHAT_USER_ID}}',
+        },
+      };
+
+      const result = processMCPEnv(obj, user, customUserVars);
+
+      expect('headers' in result && result.headers).toEqual({
+        Authorization: 'Bearer user-specific-token',
+        'X-Region': 'us-west-1',
+        'X-System-Key': 'test-api-key-value',
+        'X-User-Id': 'test-user-id',
+      });
+    });
+
+    it('should process customUserVars in URL field', () => {
+      const user = createTestUser();
+      const customUserVars = {
+        API_VERSION: 'v2',
+        TENANT_ID: 'tenant123',
+      };
+      const obj: MCPOptions = {
+        type: 'websocket',
+        url: 'wss://example.com/{{TENANT_ID}}/api/{{API_VERSION}}?user={{LIBRECHAT_USER_ID}}&key=${TEST_API_KEY}',
+      };
+
+      const result = processMCPEnv(obj, user, customUserVars);
+
+      expect('url' in result && result.url).toBe(
+        'wss://example.com/tenant123/api/v2?user=test-user-id&key=test-api-key-value',
+      );
+    });
+
+    it('should prioritize customUserVars over user fields and system env vars if placeholders are the same (though not recommended)', () => {
+      // This tests the order of operations: customUserVars -> userFields -> systemEnv
+      // BUt it's generally not recommended to have overlapping placeholder names.
+      process.env.LIBRECHAT_USER_EMAIL = 'system-email-should-be-overridden';
+      const user = createTestUser({ email: 'user-email-should-be-overridden' });
+      const customUserVars = {
+        LIBRECHAT_USER_EMAIL: 'custom-email-wins',
+      };
+      const obj: MCPOptions = {
+        type: 'sse',
+        url: 'https://example.com/api',
+        headers: {
+          'Test-Email': '{{LIBRECHAT_USER_EMAIL}}', // Placeholder that could match custom, user, or system
+        },
+      };
+
+      const result = processMCPEnv(obj, user, customUserVars);
+      expect('headers' in result && result.headers?.['Test-Email']).toBe('custom-email-wins');
+
+      // Clean up env var
+      delete process.env.LIBRECHAT_USER_EMAIL;
+    });
+
+    it('should handle customUserVars with no matching placeholders', () => {
+      const user = createTestUser();
+      const customUserVars = {
+        UNUSED_VAR: 'unused-value',
+      };
+      const obj: MCPOptions = {
+        command: 'node',
+        args: ['server.js'],
+        env: {
+          API_KEY: '${TEST_API_KEY}',
+        },
+      };
+
+      const result = processMCPEnv(obj, user, customUserVars);
+      expect('env' in result && result.env).toEqual({
+        API_KEY: 'test-api-key-value',
+      });
+    });
+
+    it('should handle placeholders with no matching customUserVars (falling back to user/system vars)', () => {
+      const user = createTestUser({ email: 'user-provided-email@example.com' });
+      // No customUserVars provided or customUserVars is empty
+      const customUserVars = {};
+      const obj: MCPOptions = {
+        type: 'sse',
+        url: 'https://example.com/api',
+        headers: {
+          'User-Email-Header': '{{LIBRECHAT_USER_EMAIL}}', // Should use user.email
+          'System-Key-Header': '${TEST_API_KEY}', // Should use process.env.TEST_API_KEY
+          'Non-Existent-Custom': '{{NON_EXISTENT_CUSTOM_VAR}}', // Should remain as placeholder
+        },
+      };
+
+      const result = processMCPEnv(obj, user, customUserVars);
+      expect('headers' in result && result.headers).toEqual({
+        'User-Email-Header': 'user-provided-email@example.com',
+        'System-Key-Header': 'test-api-key-value',
+        'Non-Existent-Custom': '{{NON_EXISTENT_CUSTOM_VAR}}',
+      });
+    });
+
+    it('should correctly process a mix of all variable types', () => {
+      const user = createTestUser({ id: 'userXYZ', username: 'john.doe' });
+      const customUserVars = {
+        CUSTOM_ENDPOINT_ID: 'ep123',
+        ANOTHER_CUSTOM: 'another_val',
+      };
+
+      const obj = {
+        type: 'streamable-http' as const,
+        url: 'https://{{CUSTOM_ENDPOINT_ID}}.example.com/users/{{LIBRECHAT_USER_USERNAME}}',
+        headers: {
+          'X-Auth-Token': '{{CUSTOM_TOKEN_FROM_USER_SETTINGS}}', // Assuming this would be a custom var
+          'X-User-ID': '{{LIBRECHAT_USER_ID}}',
+          'X-System-Test-Key': '${TEST_API_KEY}', // Using existing env var from beforeEach
+        },
+        env: {
+          PROCESS_MODE: '{{PROCESS_MODE_CUSTOM}}', // Another custom var
+          USER_HOME_DIR: '/home/{{LIBRECHAT_USER_USERNAME}}',
+          SYSTEM_PATH: '${PATH}', // Example of a system env var
+        },
+      };
+
+      // Simulate customUserVars that would be passed, including those for headers and env
+      const allCustomVarsForCall = {
+        ...customUserVars,
+        CUSTOM_TOKEN_FROM_USER_SETTINGS: 'secretToken123!',
+        PROCESS_MODE_CUSTOM: 'production',
+      };
+
+      // Cast obj to MCPOptions when calling processMCPEnv.
+      // This acknowledges the object might not strictly conform to one schema in the union,
+      // but we are testing the function's ability to handle these properties if present.
+      const result = processMCPEnv(obj as MCPOptions, user, allCustomVarsForCall);
+
+      expect('url' in result && result.url).toBe('https://ep123.example.com/users/john.doe');
+      expect('headers' in result && result.headers).toEqual({
+        'X-Auth-Token': 'secretToken123!',
+        'X-User-ID': 'userXYZ',
+        'X-System-Test-Key': 'test-api-key-value', // Expecting value of TEST_API_KEY
+      });
+      expect('env' in result && result.env).toEqual({
+        PROCESS_MODE: 'production',
+        USER_HOME_DIR: '/home/john.doe',
+        SYSTEM_PATH: process.env.PATH, // Actual value of PATH from the test environment
+      });
+    });
   });
 });
diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.ts
index 145487d7ef..4d1c95b69f 100644
--- a/packages/data-provider/src/config.ts
+++ b/packages/data-provider/src/config.ts
@@ -588,6 +588,18 @@ export type TStartupConfig = {
     scraperType?: ScraperTypes;
     rerankerType?: RerankerTypes;
   };
+  mcpServers?: Record<
+    string,
+    {
+      customUserVars: Record<
+        string,
+        {
+          title: string;
+          description: string;
+        }
+      >;
+    }
+  >;
 };
 
 export enum OCRStrategy {
@@ -885,7 +897,6 @@ export const defaultModels = {
   [EModelEndpoint.assistants]: [...sharedOpenAIModels, 'chatgpt-4o-latest'],
   [EModelEndpoint.agents]: sharedOpenAIModels, // TODO: Add agent models (agentsModels)
   [EModelEndpoint.google]: [
-    // Shared Google Models between Vertex AI & Gen AI
     // Gemini 2.0 Models
     'gemini-2.0-flash-001',
     'gemini-2.0-flash-exp',
@@ -1395,6 +1406,8 @@ export enum Constants {
   GLOBAL_PROJECT_NAME = 'instance',
   /** Delimiter for MCP tools */
   mcp_delimiter = '_mcp_',
+  /** Prefix for MCP plugins */
+  mcp_prefix = 'mcp_',
   /** Placeholder Agent ID for Ephemeral Agents */
   EPHEMERAL_AGENT_ID = 'ephemeral',
 }
diff --git a/packages/data-provider/src/data-service.ts b/packages/data-provider/src/data-service.ts
index b956364835..08a666dd78 100644
--- a/packages/data-provider/src/data-service.ts
+++ b/packages/data-provider/src/data-service.ts
@@ -151,7 +151,11 @@ export const updateUserPlugins = (payload: t.TUpdateUserPlugins) => {
 
 /* Config */
 
-export const getStartupConfig = (): Promise<config.TStartupConfig> => {
+export const getStartupConfig = (): Promise<
+  config.TStartupConfig & {
+    mcpCustomUserVars?: Record<string, { title: string; description: string }>;
+  }
+> => {
   return request.get(endpoints.config());
 };
 
diff --git a/packages/data-provider/src/mcp.ts b/packages/data-provider/src/mcp.ts
index 990b46e511..05b37115fc 100644
--- a/packages/data-provider/src/mcp.ts
+++ b/packages/data-provider/src/mcp.ts
@@ -39,6 +39,15 @@ const BaseOptionsSchema = z.object({
       token_exchange_method: z.nativeEnum(TokenExchangeMethodEnum).optional(),
     })
     .optional(),
+  customUserVars: z
+    .record(
+      z.string(),
+      z.object({
+        title: z.string(),
+        description: z.string(),
+      }),
+    )
+    .optional(),
 });
 
 export const StdioOptionsSchema = BaseOptionsSchema.extend({
@@ -191,13 +200,55 @@ function processUserPlaceholders(value: string, user?: TUser): string {
   return value;
 }
 
+function processSingleValue({
+  originalValue,
+  customUserVars,
+  user,
+}: {
+  originalValue: string;
+  customUserVars?: Record<string, string>;
+  user?: TUser;
+}): string {
+  let value = originalValue;
+
+  // 1. Replace custom user variables
+  if (customUserVars) {
+    for (const [varName, varVal] of Object.entries(customUserVars)) {
+      /** Escaped varName for use in regex to avoid issues with special characters */
+      const escapedVarName = varName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+      const placeholderRegex = new RegExp(`\\{\\{${escapedVarName}\\}\\}`, 'g');
+      value = value.replace(placeholderRegex, varVal);
+    }
+  }
+
+  // 2.A. Special handling for LIBRECHAT_USER_ID placeholder
+  // This ensures {{LIBRECHAT_USER_ID}} is replaced only if user.id is available.
+  // If user.id is null/undefined, the placeholder remains
+  if (user && user.id != null && value.includes('{{LIBRECHAT_USER_ID}}')) {
+    value = value.replace(/\{\{LIBRECHAT_USER_ID\}\}/g, String(user.id));
+  }
+
+  // 2.B. Replace other standard user field placeholders (e.g., {{LIBRECHAT_USER_EMAIL}})
+  value = processUserPlaceholders(value, user);
+
+  // 3. Replace system environment variables
+  value = extractEnvVariable(value);
+
+  return value;
+}
+
 /**
  * Recursively processes an object to replace environment variables in string values
  * @param obj - The object to process
  * @param user - The user object containing all user fields
+ * @param customUserVars - vars that user set in settings
  * @returns - The processed object with environment variables replaced
  */
-export function processMCPEnv(obj: Readonly<MCPOptions>, user?: TUser): MCPOptions {
+export function processMCPEnv(
+  obj: Readonly<MCPOptions>,
+  user?: TUser,
+  customUserVars?: Record<string, string>,
+): MCPOptions {
   if (obj === null || obj === undefined) {
     return obj;
   }
@@ -206,32 +257,25 @@ export function processMCPEnv(obj: Readonly<MCPOptions>, user?: TUser): MCPOptio
 
   if ('env' in newObj && newObj.env) {
     const processedEnv: Record<string, string> = {};
-    for (const [key, value] of Object.entries(newObj.env)) {
-      let processedValue = extractEnvVariable(value);
-      processedValue = processUserPlaceholders(processedValue, user);
-      processedEnv[key] = processedValue;
+    for (const [key, originalValue] of Object.entries(newObj.env)) {
+      processedEnv[key] = processSingleValue({ originalValue, customUserVars, user });
     }
     newObj.env = processedEnv;
-  } else if ('headers' in newObj && newObj.headers) {
-    const processedHeaders: Record<string, string> = {};
-    for (const [key, value] of Object.entries(newObj.headers)) {
-      const userId = user?.id;
-      if (value === '{{LIBRECHAT_USER_ID}}' && userId != null) {
-        processedHeaders[key] = String(userId);
-        continue;
-      }
+  }
 
-      let processedValue = extractEnvVariable(value);
-      processedValue = processUserPlaceholders(processedValue, user);
-      processedHeaders[key] = processedValue;
+  // Process headers if they exist (for WebSocket, SSE, StreamableHTTP types)
+  // Note: `env` and `headers` are on different branches of the MCPOptions union type.
+  if ('headers' in newObj && newObj.headers) {
+    const processedHeaders: Record<string, string> = {};
+    for (const [key, originalValue] of Object.entries(newObj.headers)) {
+      processedHeaders[key] = processSingleValue({ originalValue, customUserVars, user });
     }
     newObj.headers = processedHeaders;
   }
 
+  // Process URL if it exists (for WebSocket, SSE, StreamableHTTP types)
   if ('url' in newObj && newObj.url) {
-    let processedUrl = extractEnvVariable(newObj.url);
-    processedUrl = processUserPlaceholders(processedUrl, user);
-    newObj.url = processedUrl;
+    newObj.url = processSingleValue({ originalValue: newObj.url, customUserVars, user });
   }
 
   return newObj;
diff --git a/packages/data-schemas/src/methods/index.ts b/packages/data-schemas/src/methods/index.ts
index be4308ecd9..57f0fc2f2c 100644
--- a/packages/data-schemas/src/methods/index.ts
+++ b/packages/data-schemas/src/methods/index.ts
@@ -5,6 +5,7 @@ import { createRoleMethods, type RoleMethods } from './role';
 /* Memories */
 import { createMemoryMethods, type MemoryMethods } from './memory';
 import { createShareMethods, type ShareMethods } from './share';
+import { createPluginAuthMethods, type PluginAuthMethods } from './pluginAuth';
 
 /**
  * Creates all database methods for all collections
@@ -17,13 +18,15 @@ export function createMethods(mongoose: typeof import('mongoose')) {
     ...createRoleMethods(mongoose),
     ...createMemoryMethods(mongoose),
     ...createShareMethods(mongoose),
+    ...createPluginAuthMethods(mongoose),
   };
 }
 
-export type { MemoryMethods, ShareMethods, TokenMethods };
+export type { MemoryMethods, ShareMethods, TokenMethods, PluginAuthMethods };
 export type AllMethods = UserMethods &
   SessionMethods &
   TokenMethods &
   RoleMethods &
   MemoryMethods &
-  ShareMethods;
+  ShareMethods &
+  PluginAuthMethods;
diff --git a/packages/data-schemas/src/methods/pluginAuth.ts b/packages/data-schemas/src/methods/pluginAuth.ts
new file mode 100644
index 0000000000..f0256f859f
--- /dev/null
+++ b/packages/data-schemas/src/methods/pluginAuth.ts
@@ -0,0 +1,140 @@
+import type { DeleteResult, Model } from 'mongoose';
+import type { IPluginAuth } from '~/schema/pluginAuth';
+import type {
+  FindPluginAuthsByKeysParams,
+  UpdatePluginAuthParams,
+  DeletePluginAuthParams,
+  FindPluginAuthParams,
+} from '~/types';
+
+// Factory function that takes mongoose instance and returns the methods
+export function createPluginAuthMethods(mongoose: typeof import('mongoose')) {
+  const PluginAuth: Model<IPluginAuth> = mongoose.models.PluginAuth;
+
+  /**
+   * Finds a single plugin auth entry by userId and authField
+   */
+  async function findOnePluginAuth({
+    userId,
+    authField,
+  }: FindPluginAuthParams): Promise<IPluginAuth | null> {
+    try {
+      return await PluginAuth.findOne({ userId, authField }).lean();
+    } catch (error) {
+      throw new Error(
+        `Failed to find plugin auth: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      );
+    }
+  }
+
+  /**
+   * Finds multiple plugin auth entries by userId and pluginKeys
+   */
+  async function findPluginAuthsByKeys({
+    userId,
+    pluginKeys,
+  }: FindPluginAuthsByKeysParams): Promise<IPluginAuth[]> {
+    try {
+      if (!pluginKeys || pluginKeys.length === 0) {
+        return [];
+      }
+
+      return await PluginAuth.find({
+        userId,
+        pluginKey: { $in: pluginKeys },
+      }).lean();
+    } catch (error) {
+      throw new Error(
+        `Failed to find plugin auths: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      );
+    }
+  }
+
+  /**
+   * Updates or creates a plugin auth entry
+   */
+  async function updatePluginAuth({
+    userId,
+    authField,
+    pluginKey,
+    value,
+  }: UpdatePluginAuthParams): Promise<IPluginAuth> {
+    try {
+      const existingAuth = await PluginAuth.findOne({ userId, pluginKey, authField }).lean();
+
+      if (existingAuth) {
+        return await PluginAuth.findOneAndUpdate(
+          { userId, pluginKey, authField },
+          { $set: { value } },
+          { new: true, upsert: true },
+        ).lean();
+      } else {
+        const newPluginAuth = await new PluginAuth({
+          userId,
+          authField,
+          value,
+          pluginKey,
+        });
+        await newPluginAuth.save();
+        return newPluginAuth.toObject();
+      }
+    } catch (error) {
+      throw new Error(
+        `Failed to update plugin auth: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      );
+    }
+  }
+
+  /**
+   * Deletes plugin auth entries based on provided parameters
+   */
+  async function deletePluginAuth({
+    userId,
+    authField,
+    pluginKey,
+    all = false,
+  }: DeletePluginAuthParams): Promise<DeleteResult> {
+    try {
+      if (all) {
+        const filter: DeletePluginAuthParams = { userId };
+        if (pluginKey) {
+          filter.pluginKey = pluginKey;
+        }
+        return await PluginAuth.deleteMany(filter);
+      }
+
+      if (!authField) {
+        throw new Error('authField is required when all is false');
+      }
+
+      return await PluginAuth.deleteOne({ userId, authField });
+    } catch (error) {
+      throw new Error(
+        `Failed to delete plugin auth: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      );
+    }
+  }
+
+  /**
+   * Deletes all plugin auth entries for a user
+   */
+  async function deleteAllUserPluginAuths(userId: string): Promise<DeleteResult> {
+    try {
+      return await PluginAuth.deleteMany({ userId });
+    } catch (error) {
+      throw new Error(
+        `Failed to delete all user plugin auths: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      );
+    }
+  }
+
+  return {
+    findOnePluginAuth,
+    findPluginAuthsByKeys,
+    updatePluginAuth,
+    deletePluginAuth,
+    deleteAllUserPluginAuths,
+  };
+}
+
+export type PluginAuthMethods = ReturnType<typeof createPluginAuthMethods>;
diff --git a/packages/data-schemas/src/schema/pluginAuth.ts b/packages/data-schemas/src/schema/pluginAuth.ts
index 5c29024453..534c49d127 100644
--- a/packages/data-schemas/src/schema/pluginAuth.ts
+++ b/packages/data-schemas/src/schema/pluginAuth.ts
@@ -1,13 +1,5 @@
-import { Schema, Document } from 'mongoose';
-
-export interface IPluginAuth extends Document {
-  authField: string;
-  value: string;
-  userId: string;
-  pluginKey?: string;
-  createdAt?: Date;
-  updatedAt?: Date;
-}
+import { Schema } from 'mongoose';
+import type { IPluginAuth } from '~/types';
 
 const pluginAuthSchema: Schema<IPluginAuth> = new Schema(
   {
diff --git a/packages/data-schemas/src/types/index.ts b/packages/data-schemas/src/types/index.ts
index 3dfe1334e5..f8a508a314 100644
--- a/packages/data-schemas/src/types/index.ts
+++ b/packages/data-schemas/src/types/index.ts
@@ -14,5 +14,6 @@ export * from './action';
 export * from './assistant';
 export * from './file';
 export * from './share';
+export * from './pluginAuth';
 /* Memories */
 export * from './memory';
diff --git a/packages/data-schemas/src/types/pluginAuth.ts b/packages/data-schemas/src/types/pluginAuth.ts
new file mode 100644
index 0000000000..421769eaa3
--- /dev/null
+++ b/packages/data-schemas/src/types/pluginAuth.ts
@@ -0,0 +1,40 @@
+import type { Document } from 'mongoose';
+
+export interface IPluginAuth extends Document {
+  authField: string;
+  value: string;
+  userId: string;
+  pluginKey?: string;
+  createdAt?: Date;
+  updatedAt?: Date;
+}
+
+export interface PluginAuthQuery {
+  userId: string;
+  authField?: string;
+  pluginKey?: string;
+}
+
+export interface FindPluginAuthParams {
+  userId: string;
+  authField: string;
+}
+
+export interface FindPluginAuthsByKeysParams {
+  userId: string;
+  pluginKeys: string[];
+}
+
+export interface UpdatePluginAuthParams {
+  userId: string;
+  authField: string;
+  pluginKey: string;
+  value: string;
+}
+
+export interface DeletePluginAuthParams {
+  userId: string;
+  authField?: string;
+  pluginKey?: string;
+  all?: boolean;
+}

From a5e8d009a1e11aa7d3c347ba530c7b60156b123e Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Thu, 19 Jun 2025 19:00:45 -0400
Subject: [PATCH 42/49] =?UTF-8?q?=F0=9F=94=A7=20fix:=20Logger=20Paths=20an?=
 =?UTF-8?q?d=20Exclude=20`index.html`=20from=20Service=20Worker=20Caching?=
 =?UTF-8?q?=20(#7982)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/data-schemas/package.json              | 2 +-
 packages/data-schemas/src/config/meiliLogger.ts | 2 +-
 packages/data-schemas/src/config/winston.ts     | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/data-schemas/package.json b/packages/data-schemas/package.json
index 9234db4032..cbe0e5578a 100644
--- a/packages/data-schemas/package.json
+++ b/packages/data-schemas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@librechat/data-schemas",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Mongoose schemas and models for LibreChat",
   "type": "module",
   "main": "dist/index.cjs",
diff --git a/packages/data-schemas/src/config/meiliLogger.ts b/packages/data-schemas/src/config/meiliLogger.ts
index 1341c328fd..0d4d39475b 100644
--- a/packages/data-schemas/src/config/meiliLogger.ts
+++ b/packages/data-schemas/src/config/meiliLogger.ts
@@ -2,7 +2,7 @@ import path from 'path';
 import winston from 'winston';
 import 'winston-daily-rotate-file';
 
-const logDir = path.join(__dirname, '..', 'logs');
+const logDir = path.join(__dirname, '..', '..', '..', 'api', 'logs');
 
 const { NODE_ENV, DEBUG_LOGGING = 'false' } = process.env;
 
diff --git a/packages/data-schemas/src/config/winston.ts b/packages/data-schemas/src/config/winston.ts
index 598d967394..7e52872962 100644
--- a/packages/data-schemas/src/config/winston.ts
+++ b/packages/data-schemas/src/config/winston.ts
@@ -3,10 +3,8 @@ import winston from 'winston';
 import 'winston-daily-rotate-file';
 import { redactFormat, redactMessage, debugTraverse, jsonTruncateFormat } from './parsers';
 
-// Define log directory
-const logDir = path.join(__dirname, '..', 'logs');
+const logDir = path.join(__dirname, '..', '..', '..', 'api', 'logs');
 
-// Type-safe environment variables
 const { NODE_ENV, DEBUG_LOGGING, CONSOLE_JSON, DEBUG_CONSOLE } = process.env;
 
 const useConsoleJson = typeof CONSOLE_JSON === 'string' && CONSOLE_JSON.toLowerCase() === 'true';
@@ -15,7 +13,6 @@ const useDebugConsole = typeof DEBUG_CONSOLE === 'string' && DEBUG_CONSOLE.toLow
 
 const useDebugLogging = typeof DEBUG_LOGGING === 'string' && DEBUG_LOGGING.toLowerCase() === 'true';
 
-// Define custom log levels
 const levels: winston.config.AbstractConfigSetLevels = {
   error: 0,
   warn: 1,

From d53cd1f3912f4d73a781155e24add9208af5645a Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Thu, 19 Jun 2025 19:21:38 -0400
Subject: [PATCH 43/49] =?UTF-8?q?=F0=9F=94=A7=20fix:=20Immutability=20Issu?=
 =?UTF-8?q?e=20in=20`useChatFunctions`=20(#7983)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: Use mutable version of conversation in useChatFunctions

* fix: Use cloneDeep for conversation in useChatFunctions to ensure immutability

---------

Co-authored-by: lucioperca <lucioperca@users.noreply.github.com>
---
 client/src/hooks/Chat/useChatFunctions.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/src/hooks/Chat/useChatFunctions.ts b/client/src/hooks/Chat/useChatFunctions.ts
index eec8e03bd3..5a86eeb7c6 100644
--- a/client/src/hooks/Chat/useChatFunctions.ts
+++ b/client/src/hooks/Chat/useChatFunctions.ts
@@ -1,4 +1,5 @@
 import { v4 } from 'uuid';
+import { cloneDeep } from 'lodash';
 import { useQueryClient } from '@tanstack/react-query';
 import {
   Constants,
@@ -51,10 +52,10 @@ export default function useChatFunctions({
   getMessages,
   setMessages,
   isSubmitting,
-  conversation,
   latestMessage,
   setSubmission,
   setLatestMessage,
+  conversation: immutableConversation,
 }: {
   index?: number;
   isSubmitting: boolean;
@@ -77,8 +78,8 @@ export default function useChatFunctions({
   const isTemporary = useRecoilValue(store.isTemporary);
   const codeArtifacts = useRecoilValue(store.codeArtifacts);
   const includeShadcnui = useRecoilValue(store.includeShadcnui);
-  const { getExpiry } = useUserKey(conversation?.endpoint ?? '');
   const customPromptMode = useRecoilValue(store.customPromptMode);
+  const { getExpiry } = useUserKey(immutableConversation?.endpoint ?? '');
   const setShowStopButton = useSetRecoilState(store.showStopButtonByIndex(index));
   const resetLatestMultiMessage = useResetRecoilState(store.latestMessageFamily(index + 1));
 
@@ -108,6 +109,8 @@ export default function useChatFunctions({
       return;
     }
 
+    const conversation = cloneDeep(immutableConversation);
+
     const endpoint = conversation?.endpoint;
     if (endpoint === null) {
       console.error('No endpoint available');

From 299c484c7ada1f81c8defdc6f4dc28e8fc587018 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 19 Jun 2025 20:45:05 -0400
Subject: [PATCH 44/49] =?UTF-8?q?=F0=9F=8C=8D=20i18n:=20Update=20translati?=
 =?UTF-8?q?on.json=20with=20latest=20translations=20(#7893)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 client/src/locales/en/translation.json | 83 +++++++++++++-------------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index 5bc7a38f6b..34ef2a7448 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -17,6 +17,12 @@
   "com_agents_file_search_disabled": "Agent must be created before uploading files for File Search.",
   "com_agents_file_search_info": "When enabled, the agent will be informed of the exact filenames listed below, allowing it to retrieve relevant context from these files.",
   "com_agents_instructions_placeholder": "The system instructions that the agent uses",
+  "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_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.",
   "com_agents_missing_provider_model": "Please select a provider and model before creating an agent.",
   "com_agents_name_placeholder": "Optional: The name of the agent",
   "com_agents_no_access": "You don't have access to edit this agent.",
@@ -277,7 +283,6 @@
   "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_heic_conversion": "Failed to convert HEIC image to JPEG. Please try converting the image manually or use a different format.",
-  "com_info_heic_converting": "Converting HEIC image to JPEG...",
   "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.",
   "com_error_invalid_user_key": "Invalid key provided. Please provide a valid key and try again.",
@@ -290,6 +295,7 @@
   "com_files_table": "something needs to go here. was empty",
   "com_generated_files": "Generated files:",
   "com_hide_examples": "Hide Examples",
+  "com_info_heic_converting": "Converting HEIC image to JPEG...",
   "com_nav_2fa": "Two-Factor Authentication (2FA)",
   "com_nav_account_settings": "Account Settings",
   "com_nav_always_make_prod": "Always make new versions production",
@@ -488,10 +494,6 @@
   "com_sidepanel_mcp_variables_for": "MCP Variables for {{0}}",
   "com_sidepanel_parameters": "Parameters",
   "com_sources_image_alt": "Search result image",
-  "com_ui_configure_mcp_variables_for": "Configure Variables for {{0}}",
-  "com_ui_mcp_dialog_desc": "Please enter the necessary information below.",
-  "com_ui_mcp_enter_var": "Enter value for {{0}}",
-  "com_ui_saving": "Saving...",
   "com_sources_more_sources": "+{{count}} sources",
   "com_sources_tab_all": "All",
   "com_sources_tab_images": "Images",
@@ -510,6 +512,8 @@
   "com_ui_accept": "I accept",
   "com_ui_action_button": "Action Button",
   "com_ui_add": "Add",
+  "com_ui_add_mcp": "Add MCP",
+  "com_ui_add_mcp_server": "Add MCP Server",
   "com_ui_add_model_preset": "Add a model or preset for an additional response",
   "com_ui_add_multi_conversation": "Add multi-conversation",
   "com_ui_adding_details": "Adding details",
@@ -578,6 +582,7 @@
   "com_ui_auth_url": "Authorization URL",
   "com_ui_authentication": "Authentication",
   "com_ui_authentication_type": "Authentication Type",
+  "com_ui_available_tools": "Available Tools",
   "com_ui_avatar": "Avatar",
   "com_ui_azure": "Azure",
   "com_ui_back": "Back",
@@ -620,11 +625,13 @@
   "com_ui_client_secret": "Client Secret",
   "com_ui_close": "Close",
   "com_ui_close_menu": "Close Menu",
+  "com_ui_close_window": "Close Window",
   "com_ui_code": "Code",
   "com_ui_collapse_chat": "Collapse Chat",
   "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_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?",
   "com_ui_confirm_change": "Confirm Change",
@@ -675,6 +682,10 @@
   "com_ui_delete_confirm": "This will delete",
   "com_ui_delete_confirm_prompt_version_var": "This will delete the selected version for \"{{0}}.\" If no other versions exist, the prompt will be deleted.",
   "com_ui_delete_conversation": "Delete chat?",
+  "com_ui_delete_mcp": "Delete MCP",
+  "com_ui_delete_mcp_confirm": "Are you sure you want to delete this MCP server?",
+  "com_ui_delete_mcp_error": "Failed to delete MCP server",
+  "com_ui_delete_mcp_success": "MCP server deleted successfully",
   "com_ui_delete_memory": "Delete Memory",
   "com_ui_delete_prompt": "Delete Prompt?",
   "com_ui_delete_shared_link": "Delete shared link?",
@@ -684,6 +695,7 @@
   "com_ui_descending": "Desc",
   "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_disabling": "Disabling...",
   "com_ui_download": "Download",
   "com_ui_download_artifact": "Download Artifact",
@@ -699,6 +711,7 @@
   "com_ui_duplication_success": "Successfully duplicated conversation",
   "com_ui_edit": "Edit",
   "com_ui_edit_editing_image": "Editing image",
+  "com_ui_edit_mcp_server": "Edit MCP Server",
   "com_ui_edit_memory": "Edit Memory",
   "com_ui_empty_category": "-",
   "com_ui_endpoint": "Endpoint",
@@ -778,6 +791,7 @@
   "com_ui_hide_image_details": "Hide Image Details",
   "com_ui_hide_qr": "Hide QR Code",
   "com_ui_host": "Host",
+  "com_ui_icon": "Icon",
   "com_ui_idea": "Ideas",
   "com_ui_image_created": "Image created",
   "com_ui_image_details": "Image Details",
@@ -805,8 +819,11 @@
   "com_ui_logo": "{{0}} Logo",
   "com_ui_manage": "Manage",
   "com_ui_max_tags": "Maximum number allowed is {{0}}, using latest values.",
-  "com_ui_mcp_servers": "MCP Servers",
+  "com_ui_mcp_dialog_desc": "Please enter the necessary information below.",
+  "com_ui_mcp_enter_var": "Enter value for {{0}}",
   "com_ui_mcp_server_not_found": "Server not found.",
+  "com_ui_mcp_servers": "MCP Servers",
+  "com_ui_mcp_url": "MCP Server URL",
   "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",
@@ -847,21 +864,20 @@
   "com_ui_not_used": "Not Used",
   "com_ui_nothing_found": "Nothing found",
   "com_ui_oauth": "OAuth",
-  "com_ui_oauth_success_title": "Authentication Successful",
-  "com_ui_oauth_success_description": "Your authentication was successful. This window will close in",
   "com_ui_oauth_connected_to": "Connected to",
-  "com_ui_oauth_error_title": "Authentication Failed",
-  "com_ui_oauth_error_missing_code": "Authorization code is missing. Please try again.",
-  "com_ui_oauth_error_missing_state": "State parameter is missing. Please try again.",
-  "com_ui_oauth_error_invalid_state": "Invalid state parameter. Please try again.",
   "com_ui_oauth_error_callback_failed": "Authentication callback failed. Please try again.",
   "com_ui_oauth_error_generic": "Authentication failed. Please try again.",
-  "com_ui_close_window": "Close Window",
-  "com_ui_seconds": "seconds",
+  "com_ui_oauth_error_invalid_state": "Invalid state parameter. Please try again.",
+  "com_ui_oauth_error_missing_code": "Authorization code is missing. Please try again.",
+  "com_ui_oauth_error_missing_state": "State parameter is missing. Please try again.",
+  "com_ui_oauth_error_title": "Authentication Failed",
+  "com_ui_oauth_success_description": "Your authentication was successful. This window will close in",
+  "com_ui_oauth_success_title": "Authentication Successful",
   "com_ui_of": "of",
   "com_ui_off": "Off",
   "com_ui_on": "On",
   "com_ui_openai": "OpenAI",
+  "com_ui_optional": "(optional)",
   "com_ui_page": "Page",
   "com_ui_preferences_updated": "Preferences updated successfully",
   "com_ui_prev": "Prev",
@@ -912,11 +928,14 @@
   "com_ui_save_badge_changes": "Save badge changes?",
   "com_ui_save_submit": "Save & Submit",
   "com_ui_saved": "Saved!",
+  "com_ui_saving": "Saving...",
   "com_ui_schema": "Schema",
   "com_ui_scope": "Scope",
   "com_ui_search": "Search",
+  "com_ui_seconds": "seconds",
   "com_ui_secret_key": "Secret Key",
   "com_ui_select": "Select",
+  "com_ui_select_all": "Select All",
   "com_ui_select_file": "Select a file",
   "com_ui_select_model": "Select a model",
   "com_ui_select_provider": "Select a provider",
@@ -968,13 +987,19 @@
   "com_ui_token_exchange_method": "Token Exchange Method",
   "com_ui_token_url": "Token URL",
   "com_ui_tokens": "tokens",
+  "com_ui_tool_collection_prefix": "A collection of tools from",
+  "com_ui_tool_info": "Tool Information",
+  "com_ui_tool_more_info": "More information about this tool",
   "com_ui_tools": "Tools",
   "com_ui_travel": "Travel",
+  "com_ui_trust_app": "I trust this application",
   "com_ui_unarchive": "Unarchive",
   "com_ui_unarchive_error": "Failed to unarchive conversation",
   "com_ui_unknown": "Unknown",
   "com_ui_untitled": "Untitled",
   "com_ui_update": "Update",
+  "com_ui_update_mcp_error": "There was an error creating or updating the MCP.",
+  "com_ui_update_mcp_success": "Successfully created or updated MCP",
   "com_ui_upload": "Upload",
   "com_ui_upload_code_files": "Upload for Code Interpreter",
   "com_ui_upload_delay": "Uploading \"{{0}}\" is taking more time than anticipated. Please wait while the file finishes indexing for retrieval.",
@@ -1030,31 +1055,5 @@
   "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_ui_add_mcp": "Add MCP",
-  "com_ui_add_mcp": "Add MCP",
-  "com_ui_add_mcp_server": "Add MCP Server",
-  "com_ui_edit_mcp_server": "Edit MCP Server",
-  "com_agents_mcps_disabled": "You need to create an agent before adding MCPs.",
-  "com_ui_delete_mcp": "Delete MCP",
-  "com_ui_delete_mcp_confirm": "Are you sure you want to delete this MCP server?",
-  "com_ui_delete_mcp_success": "MCP server deleted successfully",
-  "com_ui_delete_mcp_error": "Failed to delete MCP server",
-  "com_agents_mcp_info": "Add MCP servers to your agent to enable it to perform tasks and interact with external services",
-  "com_ui_update_mcp_error": "There was an error creating or updating the MCP.",
-  "com_ui_update_mcp_success": "Successfully created or updated MCP",
-  "com_ui_available_tools": "Available Tools",
-  "com_ui_select_all": "Select All",
-  "com_ui_deselect_all": "Deselect All",
-  "com_agents_mcp_name_placeholder": "Custom Tool",
-  "com_ui_optional": "(optional)",
-  "com_agents_mcp_description_placeholder": "Explain what it does in a few words",
-  "com_ui_mcp_url": "MCP Server URL",
-  "com_ui_trust_app": "I trust this application",
-  "com_agents_mcp_trust_subtext": "Custom connectors are not verified by LibreChat",
-  "com_ui_icon": "Icon",
-  "com_agents_mcp_icon_size": "Minimum size 128 x 128 px",
-  "com_ui_tool_collection_prefix": "A collection of tools from",
-  "com_ui_tool_info": "Tool Information",
-  "com_ui_tool_more_info": "More information about this tool"
-}
+  "com_warning_resubmit_unsupported": "Resubmitting the AI message is not supported for this endpoint."
+}
\ No newline at end of file

From 97085073d2766de5c639ed78721b10195f9e8d30 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Thu, 19 Jun 2025 22:54:49 -0400
Subject: [PATCH 45/49] =?UTF-8?q?=F0=9F=94=A7=20fix:=20Potential=20Null=20?=
 =?UTF-8?q?Values=20for=20Custom=20Config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/server/routes/config.js                   | 5 ++---
 api/server/services/Config/getCustomConfig.js | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/api/server/routes/config.js b/api/server/routes/config.js
index e50fb9f452..dd93037dd9 100644
--- a/api/server/routes/config.js
+++ b/api/server/routes/config.js
@@ -29,8 +29,6 @@ router.get('/', async function (req, res) {
     return;
   }
 
-  const config = await getCustomConfig();
-
   const isBirthday = () => {
     const today = new Date();
     return today.getMonth() === 1 && today.getDate() === 11;
@@ -102,7 +100,8 @@ router.get('/', async function (req, res) {
     };
 
     payload.mcpServers = {};
-    if (config.mcpServers) {
+    const config = await getCustomConfig();
+    if (config?.mcpServers != null) {
       for (const serverName in config.mcpServers) {
         const serverConfig = config.mcpServers[serverName];
         payload.mcpServers[serverName] = {
diff --git a/api/server/services/Config/getCustomConfig.js b/api/server/services/Config/getCustomConfig.js
index 0851b89a46..d1ee5c3278 100644
--- a/api/server/services/Config/getCustomConfig.js
+++ b/api/server/services/Config/getCustomConfig.js
@@ -57,7 +57,7 @@ const getCustomEndpointConfig = async (endpoint) => {
 async function createGetMCPAuthMap() {
   const customConfig = await getCustomConfig();
   const mcpServers = customConfig?.mcpServers;
-  const hasCustomUserVars = Object.values(mcpServers).some((server) => server.customUserVars);
+  const hasCustomUserVars = Object.values(mcpServers ?? {}).some((server) => server.customUserVars);
   if (!hasCustomUserVars) {
     return;
   }

From fa54c9ae9001fbad409797e5e1ae76d3c8638f0f Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Fri, 20 Jun 2025 15:49:24 -0400
Subject: [PATCH 46/49] =?UTF-8?q?=F0=9F=93=A6=20chore:=20Bump=20Agents=20P?=
 =?UTF-8?q?ackages=20(#7992)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: update peer dependency for @librechat/agents to version 2.4.41

* 🔧 chore: proxy handling in OpenAI endpoint to use undici

* 🔧 chore: update @anthropic-ai/sdk to version 0.52.0 and refactor proxy handling to use undici

* 🔧 chore: update globIgnores in vite.config.ts to exclude index.html from caching

* 🔧 ci: update proxy handling in getLLMConfig to use fetchOptions and ProxyAgent

* 🔧 chore: refactor proxy handling in Anthropic and OpenAI clients to use fetchOptions

* refactor: agent initialization to streamline model parameters and resendFiles handling

* chore: update @google/generative-ai to version 0.24.0
---
 api/app/clients/AnthropicClient.js            |   3 +-
 api/app/clients/OpenAIClient.js               |   5 +-
 api/app/clients/specs/AnthropicClient.test.js |   4 +-
 api/package.json                              |  14 +-
 api/server/services/Endpoints/agents/agent.js |  60 +-
 .../services/Endpoints/agents/initialize.js   |   2 +-
 .../services/Endpoints/anthropic/llm.js       |   7 +-
 .../services/Endpoints/anthropic/llm.spec.js  |   8 +-
 client/vite.config.ts                         |   2 +-
 package-lock.json                             | 744 +++++++++++++-----
 packages/api/package.json                     |   3 +-
 packages/api/src/endpoints/openai/llm.ts      |   8 +-
 12 files changed, 598 insertions(+), 262 deletions(-)

diff --git a/api/app/clients/AnthropicClient.js b/api/app/clients/AnthropicClient.js
index 037f1e7c46..a3fba29d5c 100644
--- a/api/app/clients/AnthropicClient.js
+++ b/api/app/clients/AnthropicClient.js
@@ -190,10 +190,11 @@ class AnthropicClient extends BaseClient {
         reverseProxyUrl: this.options.reverseProxyUrl,
       }),
       apiKey: this.apiKey,
+      fetchOptions: {},
     };
 
     if (this.options.proxy) {
-      options.httpAgent = new HttpsProxyAgent(this.options.proxy);
+      options.fetchOptions.agent = new HttpsProxyAgent(this.options.proxy);
     }
 
     if (this.options.reverseProxyUrl) {
diff --git a/api/app/clients/OpenAIClient.js b/api/app/clients/OpenAIClient.js
index f3a7e67c12..2d4146bd9c 100644
--- a/api/app/clients/OpenAIClient.js
+++ b/api/app/clients/OpenAIClient.js
@@ -1159,6 +1159,7 @@ ${convo}
       logger.debug('[OpenAIClient] chatCompletion', { baseURL, modelOptions });
       const opts = {
         baseURL,
+        fetchOptions: {},
       };
 
       if (this.useOpenRouter) {
@@ -1177,7 +1178,7 @@ ${convo}
       }
 
       if (this.options.proxy) {
-        opts.httpAgent = new HttpsProxyAgent(this.options.proxy);
+        opts.fetchOptions.agent = new HttpsProxyAgent(this.options.proxy);
       }
 
       /** @type {TAzureConfig | undefined} */
@@ -1395,7 +1396,7 @@ ${convo}
           ...modelOptions,
           stream: true,
         };
-        const stream = await openai.beta.chat.completions
+        const stream = await openai.chat.completions
           .stream(params)
           .on('abort', () => {
             /* Do nothing here */
diff --git a/api/app/clients/specs/AnthropicClient.test.js b/api/app/clients/specs/AnthropicClient.test.js
index 9867859087..fbcd2b75e4 100644
--- a/api/app/clients/specs/AnthropicClient.test.js
+++ b/api/app/clients/specs/AnthropicClient.test.js
@@ -309,7 +309,7 @@ describe('AnthropicClient', () => {
       };
       client.setOptions({ modelOptions, promptCache: true });
       const anthropicClient = client.getClient(modelOptions);
-      expect(anthropicClient.defaultHeaders).not.toHaveProperty('anthropic-beta');
+      expect(anthropicClient._options.defaultHeaders).toBeUndefined();
     });
 
     it('should not add beta header for other models', () => {
@@ -320,7 +320,7 @@ describe('AnthropicClient', () => {
         },
       });
       const anthropicClient = client.getClient();
-      expect(anthropicClient.defaultHeaders).not.toHaveProperty('anthropic-beta');
+      expect(anthropicClient._options.defaultHeaders).toBeUndefined();
     });
   });
 
diff --git a/api/package.json b/api/package.json
index 636e8cb8f3..6633a99c3f 100644
--- a/api/package.json
+++ b/api/package.json
@@ -34,21 +34,21 @@
   },
   "homepage": "https://librechat.ai",
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.37.0",
+    "@anthropic-ai/sdk": "^0.52.0",
     "@aws-sdk/client-s3": "^3.758.0",
     "@aws-sdk/s3-request-presigner": "^3.758.0",
     "@azure/identity": "^4.7.0",
     "@azure/search-documents": "^12.0.0",
     "@azure/storage-blob": "^12.27.0",
-    "@google/generative-ai": "^0.23.0",
+    "@google/generative-ai": "^0.24.0",
     "@googleapis/youtube": "^20.0.0",
     "@keyv/redis": "^4.3.3",
-    "@langchain/community": "^0.3.44",
-    "@langchain/core": "^0.3.57",
-    "@langchain/google-genai": "^0.2.9",
-    "@langchain/google-vertexai": "^0.2.9",
+    "@langchain/community": "^0.3.47",
+    "@langchain/core": "^0.3.60",
+    "@langchain/google-genai": "^0.2.13",
+    "@langchain/google-vertexai": "^0.2.13",
     "@langchain/textsplitters": "^0.1.0",
-    "@librechat/agents": "^2.4.38",
+    "@librechat/agents": "^2.4.41",
     "@librechat/api": "*",
     "@librechat/data-schemas": "*",
     "@node-saml/passport-saml": "^5.0.0",
diff --git a/api/server/services/Endpoints/agents/agent.js b/api/server/services/Endpoints/agents/agent.js
index 13a42140db..e135401467 100644
--- a/api/server/services/Endpoints/agents/agent.js
+++ b/api/server/services/Endpoints/agents/agent.js
@@ -63,11 +63,17 @@ const initializeAgent = async ({
   }
   let currentFiles;
 
-  if (
-    isInitialAgent &&
-    conversationId != null &&
-    (agent.model_parameters?.resendFiles ?? true) === true
-  ) {
+  const _modelOptions = structuredClone(
+    Object.assign(
+      { model: agent.model },
+      agent.model_parameters ?? { model: agent.model },
+      isInitialAgent === true ? endpointOption?.model_parameters : {},
+    ),
+  );
+
+  const { resendFiles = true, ...modelOptions } = _modelOptions;
+
+  if (isInitialAgent && conversationId != null && resendFiles) {
     const fileIds = (await getConvoFiles(conversationId)) ?? [];
     /** @type {Set<EToolResources>} */
     const toolResourceSet = new Set();
@@ -117,15 +123,11 @@ const initializeAgent = async ({
     getOptions = initCustom;
     agent.provider = Providers.OPENAI;
   }
-  const model_parameters = Object.assign(
-    {},
-    agent.model_parameters ?? { model: agent.model },
-    isInitialAgent === true ? endpointOption?.model_parameters : {},
-  );
+
   const _endpointOption =
     isInitialAgent === true
-      ? Object.assign({}, endpointOption, { model_parameters })
-      : { model_parameters };
+      ? Object.assign({}, endpointOption, { model_parameters: modelOptions })
+      : { model_parameters: modelOptions };
 
   const options = await getOptions({
     req,
@@ -136,6 +138,20 @@ const initializeAgent = async ({
     endpointOption: _endpointOption,
   });
 
+  const tokensModel =
+    agent.provider === EModelEndpoint.azureOpenAI ? agent.model : modelOptions.model;
+  const maxTokens = optionalChainWithEmptyCheck(
+    modelOptions.maxOutputTokens,
+    modelOptions.maxTokens,
+    0,
+  );
+  const maxContextTokens = optionalChainWithEmptyCheck(
+    modelOptions.maxContextTokens,
+    modelOptions.max_context_tokens,
+    getModelMaxTokens(tokensModel, providerEndpointMap[provider]),
+    4096,
+  );
+
   if (
     agent.endpoint === EModelEndpoint.azureOpenAI &&
     options.llmConfig?.azureOpenAIApiInstanceName == null
@@ -148,15 +164,11 @@ const initializeAgent = async ({
   }
 
   /** @type {import('@librechat/agents').ClientOptions} */
-  agent.model_parameters = Object.assign(model_parameters, options.llmConfig);
+  agent.model_parameters = { ...options.llmConfig };
   if (options.configOptions) {
     agent.model_parameters.configuration = options.configOptions;
   }
 
-  if (!agent.model_parameters.model) {
-    agent.model_parameters.model = agent.model;
-  }
-
   if (agent.instructions && agent.instructions !== '') {
     agent.instructions = replaceSpecialVars({
       text: agent.instructions,
@@ -171,23 +183,11 @@ const initializeAgent = async ({
     });
   }
 
-  const tokensModel =
-    agent.provider === EModelEndpoint.azureOpenAI ? agent.model : agent.model_parameters.model;
-  const maxTokens = optionalChainWithEmptyCheck(
-    agent.model_parameters.maxOutputTokens,
-    agent.model_parameters.maxTokens,
-    0,
-  );
-  const maxContextTokens = optionalChainWithEmptyCheck(
-    agent.model_parameters.maxContextTokens,
-    agent.max_context_tokens,
-    getModelMaxTokens(tokensModel, providerEndpointMap[provider]),
-    4096,
-  );
   return {
     ...agent,
     tools,
     attachments,
+    resendFiles,
     toolContextMap,
     maxContextTokens: (maxContextTokens - maxTokens) * 0.9,
   };
diff --git a/api/server/services/Endpoints/agents/initialize.js b/api/server/services/Endpoints/agents/initialize.js
index e3154fe13a..e4ffcf4730 100644
--- a/api/server/services/Endpoints/agents/initialize.js
+++ b/api/server/services/Endpoints/agents/initialize.js
@@ -130,8 +130,8 @@ const initializeClient = async ({ req, res, endpointOption }) => {
     iconURL: endpointOption.iconURL,
     attachments: primaryConfig.attachments,
     endpointType: endpointOption.endpointType,
+    resendFiles: primaryConfig.resendFiles ?? true,
     maxContextTokens: primaryConfig.maxContextTokens,
-    resendFiles: primaryConfig.model_parameters?.resendFiles ?? true,
     endpoint:
       primaryConfig.id === Constants.EPHEMERAL_AGENT_ID
         ? primaryConfig.endpoint
diff --git a/api/server/services/Endpoints/anthropic/llm.js b/api/server/services/Endpoints/anthropic/llm.js
index 9f20b8e61d..66496f00fd 100644
--- a/api/server/services/Endpoints/anthropic/llm.js
+++ b/api/server/services/Endpoints/anthropic/llm.js
@@ -1,4 +1,4 @@
-const { HttpsProxyAgent } = require('https-proxy-agent');
+const { ProxyAgent } = require('undici');
 const { anthropicSettings, removeNullishValues } = require('librechat-data-provider');
 const { checkPromptCacheSupport, getClaudeHeaders, configureReasoning } = require('./helpers');
 
@@ -67,7 +67,10 @@ function getLLMConfig(apiKey, options = {}) {
   }
 
   if (options.proxy) {
-    requestOptions.clientOptions.httpAgent = new HttpsProxyAgent(options.proxy);
+    const proxyAgent = new ProxyAgent(options.proxy);
+    requestOptions.clientOptions.fetchOptions = {
+      dispatcher: proxyAgent,
+    };
   }
 
   if (options.reverseProxyUrl) {
diff --git a/api/server/services/Endpoints/anthropic/llm.spec.js b/api/server/services/Endpoints/anthropic/llm.spec.js
index 9c453efb92..f3f77ee897 100644
--- a/api/server/services/Endpoints/anthropic/llm.spec.js
+++ b/api/server/services/Endpoints/anthropic/llm.spec.js
@@ -21,8 +21,12 @@ describe('getLLMConfig', () => {
       proxy: 'http://proxy:8080',
     });
 
-    expect(result.llmConfig.clientOptions).toHaveProperty('httpAgent');
-    expect(result.llmConfig.clientOptions.httpAgent).toHaveProperty('proxy', 'http://proxy:8080');
+    expect(result.llmConfig.clientOptions).toHaveProperty('fetchOptions');
+    expect(result.llmConfig.clientOptions.fetchOptions).toHaveProperty('dispatcher');
+    expect(result.llmConfig.clientOptions.fetchOptions.dispatcher).toBeDefined();
+    expect(result.llmConfig.clientOptions.fetchOptions.dispatcher.constructor.name).toBe(
+      'ProxyAgent',
+    );
   });
 
   it('should include reverse proxy URL when provided', () => {
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 9a091d9f53..152cf4255e 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -46,7 +46,7 @@ export default defineConfig(({ command }) => ({
           'assets/maskable-icon.png',
           'manifest.webmanifest',
         ],
-        globIgnores: ['images/**/*', '**/*.map'],
+        globIgnores: ['images/**/*', '**/*.map', 'index.html'],
         maximumFileSizeToCacheInBytes: 4 * 1024 * 1024,
         navigateFallbackDenylist: [/^\/oauth/, /^\/api/],
       },
diff --git a/package-lock.json b/package-lock.json
index a7384d0f90..0301bdce1b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,21 +50,21 @@
       "version": "v0.7.8",
       "license": "ISC",
       "dependencies": {
-        "@anthropic-ai/sdk": "^0.37.0",
+        "@anthropic-ai/sdk": "^0.52.0",
         "@aws-sdk/client-s3": "^3.758.0",
         "@aws-sdk/s3-request-presigner": "^3.758.0",
         "@azure/identity": "^4.7.0",
         "@azure/search-documents": "^12.0.0",
         "@azure/storage-blob": "^12.27.0",
-        "@google/generative-ai": "^0.23.0",
+        "@google/generative-ai": "^0.24.0",
         "@googleapis/youtube": "^20.0.0",
         "@keyv/redis": "^4.3.3",
-        "@langchain/community": "^0.3.44",
-        "@langchain/core": "^0.3.57",
-        "@langchain/google-genai": "^0.2.9",
-        "@langchain/google-vertexai": "^0.2.9",
+        "@langchain/community": "^0.3.47",
+        "@langchain/core": "^0.3.60",
+        "@langchain/google-genai": "^0.2.13",
+        "@langchain/google-vertexai": "^0.2.13",
         "@langchain/textsplitters": "^0.1.0",
-        "@librechat/agents": "^2.4.38",
+        "@librechat/agents": "^2.4.41",
         "@librechat/api": "*",
         "@librechat/data-schemas": "*",
         "@node-saml/passport-saml": "^5.0.0",
@@ -140,17 +140,12 @@
       }
     },
     "api/node_modules/@anthropic-ai/sdk": {
-      "version": "0.37.0",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/sdk/-/sdk-0.37.0.tgz",
-      "integrity": "sha512-tHjX2YbkUBwEgg0JZU3EFSSAQPoK4qQR/NFYa8Vtzd5UAyXzZksCw2In69Rml4R/TyHPBfRYaLK35XiOe33pjw==",
-      "dependencies": {
-        "@types/node": "^18.11.18",
-        "@types/node-fetch": "^2.6.4",
-        "abort-controller": "^3.0.0",
-        "agentkeepalive": "^4.2.1",
-        "form-data-encoder": "1.7.2",
-        "formdata-node": "^4.3.2",
-        "node-fetch": "^2.6.7"
+      "version": "0.52.0",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/sdk/-/sdk-0.52.0.tgz",
+      "integrity": "sha512-d4c+fg+xy9e46c8+YnrrgIQR45CZlAi7PwdzIfDXDM6ACxEZli1/fxhURsq30ZpMZy6LvSkr41jGq5aF5TD7rQ==",
+      "license": "MIT",
+      "bin": {
+        "anthropic-ai-sdk": "bin/cli"
       }
     },
     "api/node_modules/@aws-sdk/client-sso": {
@@ -781,14 +776,6 @@
         }
       }
     },
-    "api/node_modules/@google/generative-ai": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/@google/generative-ai/-/generative-ai-0.23.0.tgz",
-      "integrity": "sha512-8vGoguvLG22U3t9XpXvbxjxy/yfBhE27pqptz5QVKXwBSh9sUXXmZWS8ZdGMqifK7kiuZQCG2cjGJNUdBsgX+g==",
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "api/node_modules/@keyv/redis": {
       "version": "4.3.3",
       "resolved": "https://registry.npmjs.org/@keyv/redis/-/redis-4.3.3.tgz",
@@ -803,9 +790,9 @@
       }
     },
     "api/node_modules/@langchain/community": {
-      "version": "0.3.44",
-      "resolved": "https://registry.npmjs.org/@langchain/community/-/community-0.3.44.tgz",
-      "integrity": "sha512-lOA7rw0lC6WCRO/xoacx4Gpbx1ncscAilYn9LVjyiBxJw47d01iq8hdkGdBW5OFISub/wCK4FmHih2S4WJicAg==",
+      "version": "0.3.47",
+      "resolved": "https://registry.npmjs.org/@langchain/community/-/community-0.3.47.tgz",
+      "integrity": "sha512-Vo42kAfkXpTFSevhEkeqqE55az8NyQgDktCbitXYuhipNbFYx08XVvqEDkFkB20MM/Z7u+cvLb+DxCqnKuH0CQ==",
       "license": "MIT",
       "dependencies": {
         "@langchain/openai": ">=0.2.0 <0.6.0",
@@ -815,10 +802,9 @@
         "flat": "^5.0.2",
         "js-yaml": "^4.1.0",
         "langchain": ">=0.2.3 <0.3.0 || >=0.3.4 <0.4.0",
-        "langsmith": "^0.3.29",
+        "langsmith": "^0.3.33",
         "uuid": "^10.0.0",
-        "zod": "^3.22.3",
-        "zod-to-json-schema": "^3.22.5"
+        "zod": "^3.25.32"
       },
       "engines": {
         "node": ">=18"
@@ -851,11 +837,11 @@
         "@google-ai/generativelanguage": "*",
         "@google-cloud/storage": "^6.10.1 || ^7.7.0",
         "@gradientai/nodejs-sdk": "^1.2.0",
-        "@huggingface/inference": "^2.6.4",
-        "@huggingface/transformers": "^3.2.3",
+        "@huggingface/inference": "^4.0.5",
+        "@huggingface/transformers": "^3.5.2",
         "@ibm-cloud/watsonx-ai": "*",
         "@lancedb/lancedb": "^0.12.0",
-        "@langchain/core": ">=0.2.21 <0.4.0",
+        "@langchain/core": ">=0.3.58 <0.4.0",
         "@layerup/layerup-security": "^1.5.12",
         "@libsql/client": "^0.14.0",
         "@mendable/firecrawl-js": "^1.4.3",
@@ -925,7 +911,7 @@
         "mammoth": "^1.6.0",
         "mariadb": "^3.4.0",
         "mem0ai": "^2.1.8",
-        "mongodb": ">=5.2.0",
+        "mongodb": "^6.17.0",
         "mysql2": "^3.9.8",
         "neo4j-driver": "*",
         "notion-to-md": "^3.1.0",
@@ -1329,21 +1315,41 @@
       }
     },
     "api/node_modules/@langchain/openai": {
-      "version": "0.5.11",
-      "resolved": "https://registry.npmjs.org/@langchain/openai/-/openai-0.5.11.tgz",
-      "integrity": "sha512-DAp7x+NfjSqDvKVMle8yb85nzz+3ctP7zGJaeRS0vLmvkY9qf/jRkowsM0mcsIiEUKhG/AHzWqvxbhktb/jJ6Q==",
+      "version": "0.5.14",
+      "resolved": "https://registry.npmjs.org/@langchain/openai/-/openai-0.5.14.tgz",
+      "integrity": "sha512-0GEj5K/qi1MRuZ4nE7NvyI4jTG+RSewLZqsExUwRukWdeqmkPNHGrogTa5ZDt7eaJxAaY7EgLC5ZnvCM3L1oug==",
       "license": "MIT",
       "dependencies": {
         "js-tiktoken": "^1.0.12",
-        "openai": "^4.96.0",
-        "zod": "^3.22.4",
-        "zod-to-json-schema": "^3.22.3"
+        "openai": "^5.3.0",
+        "zod": "^3.25.32"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@langchain/core": ">=0.3.48 <0.4.0"
+        "@langchain/core": ">=0.3.58 <0.4.0"
+      }
+    },
+    "api/node_modules/@langchain/openai/node_modules/openai": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/openai/-/openai-5.5.1.tgz",
+      "integrity": "sha512-5i19097mGotHA1eFsM6Tjd/tJ8uo9sa5Ysv4Q6bKJ2vtN6rc0MzMrUefXnLXYAJcmMQrC1Efhj0AvfIkXrQamw==",
+      "license": "Apache-2.0",
+      "bin": {
+        "openai": "bin/cli"
+      },
+      "peerDependencies": {
+        "ws": "^8.18.0",
+        "zod": "^3.23.8"
+      },
+      "peerDependenciesMeta": {
+        "ws": {
+          "optional": true
+        },
+        "zod": {
+          "optional": true
+        }
       }
     },
     "api/node_modules/@smithy/abort-controller": {
@@ -2090,14 +2096,6 @@
         "node": ">=18.0.0"
       }
     },
-    "api/node_modules/@types/node": {
-      "version": "18.19.14",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.14.tgz",
-      "integrity": "sha512-EnQ4Us2rmOS64nHDWr0XqAD8DsO6f3XR6lf9UIIrZQpUzPVdN/oPuEzfDWNHSyXLvoGgjuEm/sPwFGSSs35Wtg==",
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
     "api/node_modules/agent-base": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
@@ -2142,6 +2140,104 @@
         "node": ">= 0.6"
       }
     },
+    "api/node_modules/gaxios": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.1.0.tgz",
+      "integrity": "sha512-y1Q0MX1Ba6eg67Zz92kW0MHHhdtWksYckQy1KJsI6P4UlDQ8cvdvpLEPslD/k7vFkdPppMESFGTvk7XpSiKj8g==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "extend": "^3.0.2",
+        "https-proxy-agent": "^7.0.1",
+        "node-fetch": "^3.3.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "api/node_modules/gaxios/node_modules/node-fetch": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
+      }
+    },
+    "api/node_modules/google-auth-library": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.1.0.tgz",
+      "integrity": "sha512-GspVjZj1RbyRWpQ9FbAXMKjFGzZwDKnUHi66JJ+tcjcu5/xYAP1pdlWotCuIkMwjfVsxxDvsGZXGLzRt72D0sQ==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "base64-js": "^1.3.0",
+        "ecdsa-sig-formatter": "^1.0.11",
+        "gaxios": "^7.0.0",
+        "gcp-metadata": "^7.0.0",
+        "google-logging-utils": "^1.0.0",
+        "gtoken": "^8.0.0",
+        "jws": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "api/node_modules/google-auth-library/node_modules/gcp-metadata": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-7.0.0.tgz",
+      "integrity": "sha512-3PfRTzvT3Msu0Hy8Gf9ypxJvaClG2IB9pyH0r8QOmRBW5mUcrHgYpF4GYP+XulDbfhxEhBYtJtJJQb5S2wM+LA==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "gaxios": "^7.0.0",
+        "google-logging-utils": "^1.0.0",
+        "json-bigint": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "api/node_modules/google-logging-utils": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.1.tgz",
+      "integrity": "sha512-rcX58I7nqpu4mbKztFeOAObbomBbHU2oIb/d3tJfF3dizGSApqtSwYJigGCooHdnMyQBIw8BrWyK96w3YXgr6A==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "api/node_modules/gtoken": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-8.0.0.tgz",
+      "integrity": "sha512-+CqsMbHPiSTdtSO14O51eMNlrp9N79gmeqmXeouJOhfucAedHw9noVe/n5uJk3tbKE6a+6ZCQg3RPhVhHByAIw==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "gaxios": "^7.0.0",
+        "jws": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "api/node_modules/https-proxy-agent": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
@@ -2243,14 +2339,6 @@
         "node": ">=14"
       }
     },
-    "api/node_modules/mongodb-connection-string-url/node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "api/node_modules/mongodb-connection-string-url/node_modules/whatwg-url": {
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz",
@@ -2383,15 +2471,6 @@
         "@img/sharp-win32-x64": "0.33.5"
       }
     },
-    "api/node_modules/undici": {
-      "version": "7.10.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.10.0.tgz",
-      "integrity": "sha512-u5otvFBOBZvmdjWLVW+5DAc9Nkq8f24g0O9oY7qw2JVIF1VocIFoyz9JFkuVOS2j41AufeO0xnlweJ2RLT8nGw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=20.18.1"
-      }
-    },
     "api/node_modules/uuid": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
@@ -16752,6 +16831,7 @@
       "version": "0.24.0",
       "resolved": "https://registry.npmjs.org/@google/generative-ai/-/generative-ai-0.24.0.tgz",
       "integrity": "sha512-fnEITCGEB7NdX0BhoYZ/cq/7WPZ1QS5IzJJfC3Tg/OwkvBetMiVJciyaan297OvE4B9Jg1xvo0zIazX/9sGu1Q==",
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=18.0.0"
       }
@@ -17857,65 +17937,46 @@
       }
     },
     "node_modules/@langchain/anthropic": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/@langchain/anthropic/-/anthropic-0.3.21.tgz",
-      "integrity": "sha512-iyVZ9PHcNbABVzWFWtolcDUqHYCEkl1yypRYXE98tTPiNhGo6g/MgKky96TEcOnJ0VNHD6qlzo9LhQl87OplvA==",
+      "version": "0.3.23",
+      "resolved": "https://registry.npmjs.org/@langchain/anthropic/-/anthropic-0.3.23.tgz",
+      "integrity": "sha512-lwp43HUcCM0bJqJEwBwutskvV85G3R3rQDW5XNCntPDzelW+fCmlsm40P7dg7uG/3uOtDGhj4eDMapKpbPvtlA==",
       "license": "MIT",
       "dependencies": {
-        "@anthropic-ai/sdk": "^0.39.0",
-        "fast-xml-parser": "^4.4.1",
-        "zod": "^3.22.4",
-        "zod-to-json-schema": "^3.22.4"
+        "@anthropic-ai/sdk": "^0.52.0",
+        "fast-xml-parser": "^4.4.1"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@langchain/core": ">=0.3.48 <0.4.0"
+        "@langchain/core": ">=0.3.58 <0.4.0"
       }
     },
     "node_modules/@langchain/anthropic/node_modules/@anthropic-ai/sdk": {
-      "version": "0.39.0",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/sdk/-/sdk-0.39.0.tgz",
-      "integrity": "sha512-eMyDIPRZbt1CCLErRCi3exlAvNkBtRe+kW5vvJyef93PmNr/clstYgHhtvmkxN82nlKgzyGPCyGxrm0JQ1ZIdg==",
+      "version": "0.52.0",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/sdk/-/sdk-0.52.0.tgz",
+      "integrity": "sha512-d4c+fg+xy9e46c8+YnrrgIQR45CZlAi7PwdzIfDXDM6ACxEZli1/fxhURsq30ZpMZy6LvSkr41jGq5aF5TD7rQ==",
       "license": "MIT",
-      "dependencies": {
-        "@types/node": "^18.11.18",
-        "@types/node-fetch": "^2.6.4",
-        "abort-controller": "^3.0.0",
-        "agentkeepalive": "^4.2.1",
-        "form-data-encoder": "1.7.2",
-        "formdata-node": "^4.3.2",
-        "node-fetch": "^2.6.7"
-      }
-    },
-    "node_modules/@langchain/anthropic/node_modules/@types/node": {
-      "version": "18.19.87",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.87.tgz",
-      "integrity": "sha512-OIAAu6ypnVZHmsHCeJ+7CCSub38QNBS9uceMQeg7K5Ur0Jr+wG9wEOEvvMbhp09pxD5czIUy/jND7s7Tb6Nw7A==",
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~5.26.4"
+      "bin": {
+        "anthropic-ai-sdk": "bin/cli"
       }
     },
     "node_modules/@langchain/aws": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/@langchain/aws/-/aws-0.1.10.tgz",
-      "integrity": "sha512-PWA68aPBdLgmOvzsVgVpBec3sfwyCgsx/fpaTsf75k6TfHp4KBzqGGLGzgYo5/QBrInRkxVawJL1eKu4APy2nw==",
+      "version": "0.1.11",
+      "resolved": "https://registry.npmjs.org/@langchain/aws/-/aws-0.1.11.tgz",
+      "integrity": "sha512-JNnEmJaJB5TzcniPYGZi6dlpmZyzeyVsS+Za0Ye1DhCpcNmEiWRy514gVcTPQUEl5EcpIR51B/YyowI7zUzVvg==",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-bedrock-agent-runtime": "^3.755.0",
         "@aws-sdk/client-bedrock-runtime": "^3.755.0",
         "@aws-sdk/client-kendra": "^3.750.0",
-        "@aws-sdk/credential-provider-node": "^3.750.0",
-        "zod": "^3.23.8",
-        "zod-to-json-schema": "^3.22.5"
+        "@aws-sdk/credential-provider-node": "^3.750.0"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@langchain/core": ">=0.3.48 <0.4.0"
+        "@langchain/core": ">=0.3.58 <0.4.0"
       }
     },
     "node_modules/@langchain/aws/node_modules/@aws-sdk/client-sso": {
@@ -18771,9 +18832,9 @@
       }
     },
     "node_modules/@langchain/core": {
-      "version": "0.3.57",
-      "resolved": "https://registry.npmjs.org/@langchain/core/-/core-0.3.57.tgz",
-      "integrity": "sha512-jz28qCTKJmi47b6jqhQ6vYRTG5jRpqhtPQjriRTB5wR8mgvzo6xKs0fG/kExS3ZvM79ytD1npBvgf8i19xOo9Q==",
+      "version": "0.3.60",
+      "resolved": "https://registry.npmjs.org/@langchain/core/-/core-0.3.60.tgz",
+      "integrity": "sha512-FlUjO7ovGnaKcb2JPmw5ajPaZj18LVjh/vAURtdzzFy4UsYBLv/5Y3HJQ2KgDdrl6sW/UyfG0zWdnhZQ1A5eJw==",
       "license": "MIT",
       "dependencies": {
         "@cfworker/json-schema": "^4.0.2",
@@ -18781,12 +18842,12 @@
         "camelcase": "6",
         "decamelize": "1.2.0",
         "js-tiktoken": "^1.0.12",
-        "langsmith": "^0.3.29",
+        "langsmith": "^0.3.33",
         "mustache": "^4.2.0",
         "p-queue": "^6.6.2",
         "p-retry": "4",
         "uuid": "^10.0.0",
-        "zod": "^3.22.4",
+        "zod": "^3.25.32",
         "zod-to-json-schema": "^3.22.3"
       },
       "engines": {
@@ -18818,34 +18879,71 @@
       }
     },
     "node_modules/@langchain/deepseek": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@langchain/deepseek/-/deepseek-0.0.1.tgz",
-      "integrity": "sha512-jgrbitvV4p7Kqo/Fyni9coCliNXUrJ2XChdR8eHvQg3RL+w13DIQjJn2mrkCrb7v6Is1rI7It2x3yIbADL71Yg==",
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@langchain/deepseek/-/deepseek-0.0.2.tgz",
+      "integrity": "sha512-u13KbPUXW7uhcybbRzYdRroBgqVUSgG0SJM15c7Etld2yjRQC2c4O/ga9eQZdLh/kaDlQfH/ZITFdjHe77RnGw==",
+      "license": "MIT",
       "dependencies": {
-        "@langchain/openai": "^0.4.2",
-        "zod": "^3.24.1"
+        "@langchain/openai": "^0.5.5"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@langchain/core": ">=0.3.0 <0.4.0"
+        "@langchain/core": ">=0.3.58 <0.4.0"
+      }
+    },
+    "node_modules/@langchain/deepseek/node_modules/@langchain/openai": {
+      "version": "0.5.14",
+      "resolved": "https://registry.npmjs.org/@langchain/openai/-/openai-0.5.14.tgz",
+      "integrity": "sha512-0GEj5K/qi1MRuZ4nE7NvyI4jTG+RSewLZqsExUwRukWdeqmkPNHGrogTa5ZDt7eaJxAaY7EgLC5ZnvCM3L1oug==",
+      "license": "MIT",
+      "dependencies": {
+        "js-tiktoken": "^1.0.12",
+        "openai": "^5.3.0",
+        "zod": "^3.25.32"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@langchain/core": ">=0.3.58 <0.4.0"
+      }
+    },
+    "node_modules/@langchain/deepseek/node_modules/openai": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/openai/-/openai-5.5.1.tgz",
+      "integrity": "sha512-5i19097mGotHA1eFsM6Tjd/tJ8uo9sa5Ysv4Q6bKJ2vtN6rc0MzMrUefXnLXYAJcmMQrC1Efhj0AvfIkXrQamw==",
+      "license": "Apache-2.0",
+      "bin": {
+        "openai": "bin/cli"
+      },
+      "peerDependencies": {
+        "ws": "^8.18.0",
+        "zod": "^3.23.8"
+      },
+      "peerDependenciesMeta": {
+        "ws": {
+          "optional": true
+        },
+        "zod": {
+          "optional": true
+        }
       }
     },
     "node_modules/@langchain/google-common": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/@langchain/google-common/-/google-common-0.2.9.tgz",
-      "integrity": "sha512-T6U6zK906ruitDWjrWLk542LotCkqZSENogNAzS+QvGKW1KpLtdgcIhvfKDFP8rCMj4X1QfIW6OXo2a6URnK0w==",
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/@langchain/google-common/-/google-common-0.2.13.tgz",
+      "integrity": "sha512-Wd254vAajKxK3bIYPmuFRrk90oN3YIDzwwiO+3ojYKoWP+EBzW3eg3B4f8ofvGXUkJPxEwp/u8ymSsVUElUGlw==",
       "license": "MIT",
       "dependencies": {
-        "uuid": "^10.0.0",
-        "zod-to-json-schema": "^3.22.4"
+        "uuid": "^10.0.0"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@langchain/core": ">=0.3.55 <0.4.0"
+        "@langchain/core": ">=0.3.58 <0.4.0"
       }
     },
     "node_modules/@langchain/google-common/node_modules/uuid": {
@@ -18862,36 +18960,143 @@
       }
     },
     "node_modules/@langchain/google-gauth": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/@langchain/google-gauth/-/google-gauth-0.2.9.tgz",
-      "integrity": "sha512-x9SjEzIhPN7XzXhQ1Aj68OjsQcnTKa070UGs030rn3US2MUQWvqaxcKKnKhE7XiwdLsvuUXrsbqv09XUNzu3Fg==",
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/@langchain/google-gauth/-/google-gauth-0.2.13.tgz",
+      "integrity": "sha512-JAIMtdmN+6/5aPRz3XUCFQ8+4TP272V8QCLhcyZ9LhDlnmY5DJv+LhzjMk9L5XZx9sRnKRvthVWiAY0Xbs3qAg==",
       "license": "MIT",
       "dependencies": {
-        "@langchain/google-common": "^0.2.9",
-        "google-auth-library": "^9.15.1"
+        "@langchain/google-common": "^0.2.13",
+        "google-auth-library": "^10.1.0"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@langchain/core": ">=0.3.55 <0.4.0"
+        "@langchain/core": ">=0.3.58 <0.4.0"
+      }
+    },
+    "node_modules/@langchain/google-gauth/node_modules/agent-base": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@langchain/google-gauth/node_modules/gaxios": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.1.0.tgz",
+      "integrity": "sha512-y1Q0MX1Ba6eg67Zz92kW0MHHhdtWksYckQy1KJsI6P4UlDQ8cvdvpLEPslD/k7vFkdPppMESFGTvk7XpSiKj8g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "extend": "^3.0.2",
+        "https-proxy-agent": "^7.0.1",
+        "node-fetch": "^3.3.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@langchain/google-gauth/node_modules/gcp-metadata": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-7.0.0.tgz",
+      "integrity": "sha512-3PfRTzvT3Msu0Hy8Gf9ypxJvaClG2IB9pyH0r8QOmRBW5mUcrHgYpF4GYP+XulDbfhxEhBYtJtJJQb5S2wM+LA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "gaxios": "^7.0.0",
+        "google-logging-utils": "^1.0.0",
+        "json-bigint": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@langchain/google-gauth/node_modules/google-auth-library": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.1.0.tgz",
+      "integrity": "sha512-GspVjZj1RbyRWpQ9FbAXMKjFGzZwDKnUHi66JJ+tcjcu5/xYAP1pdlWotCuIkMwjfVsxxDvsGZXGLzRt72D0sQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "base64-js": "^1.3.0",
+        "ecdsa-sig-formatter": "^1.0.11",
+        "gaxios": "^7.0.0",
+        "gcp-metadata": "^7.0.0",
+        "google-logging-utils": "^1.0.0",
+        "gtoken": "^8.0.0",
+        "jws": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@langchain/google-gauth/node_modules/google-logging-utils": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.1.tgz",
+      "integrity": "sha512-rcX58I7nqpu4mbKztFeOAObbomBbHU2oIb/d3tJfF3dizGSApqtSwYJigGCooHdnMyQBIw8BrWyK96w3YXgr6A==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@langchain/google-gauth/node_modules/gtoken": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-8.0.0.tgz",
+      "integrity": "sha512-+CqsMbHPiSTdtSO14O51eMNlrp9N79gmeqmXeouJOhfucAedHw9noVe/n5uJk3tbKE6a+6ZCQg3RPhVhHByAIw==",
+      "license": "MIT",
+      "dependencies": {
+        "gaxios": "^7.0.0",
+        "jws": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@langchain/google-gauth/node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@langchain/google-gauth/node_modules/node-fetch": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "license": "MIT",
+      "dependencies": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
       }
     },
     "node_modules/@langchain/google-genai": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/@langchain/google-genai/-/google-genai-0.2.9.tgz",
-      "integrity": "sha512-AcHAD0VX8Qci5ApLYd6ojMTJUk4ZTeMQrsOYsOVv09sy3FtrLHkRxZXkb0qgtDS9EJ+w40904B+s6s2H9+HZmQ==",
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/@langchain/google-genai/-/google-genai-0.2.13.tgz",
+      "integrity": "sha512-ReZe4oNUhPNEijYo9CGA3/CJUwVPaaoYnyplZyYTbUNPAwwRH5aR1e6bppKFBb+ZZeTRCR25JFDIPnXJFfjaBg==",
       "license": "MIT",
       "dependencies": {
         "@google/generative-ai": "^0.24.0",
-        "uuid": "^11.1.0",
-        "zod-to-json-schema": "^3.22.4"
+        "uuid": "^11.1.0"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@langchain/core": ">=0.3.55 <0.4.0"
+        "@langchain/core": ">=0.3.58 <0.4.0"
       }
     },
     "node_modules/@langchain/google-genai/node_modules/uuid": {
@@ -18907,36 +19112,36 @@
       }
     },
     "node_modules/@langchain/google-vertexai": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/@langchain/google-vertexai/-/google-vertexai-0.2.9.tgz",
-      "integrity": "sha512-41LyACkSyQK5iKh58UBNVDkteeTqKapeu6SdYGfdqVP6erckciDClwmZUKO2UefDco9X0SCKphR+tPWpWFPoag==",
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/@langchain/google-vertexai/-/google-vertexai-0.2.13.tgz",
+      "integrity": "sha512-Y97f0IBr4uWsyJTcDJROWXuu+qh4elSDLK1e6MD+mrxCx+UlgcXCReg4zvEFJzqpBKrfFt+lvXstJ6XTR6Zfyg==",
       "license": "MIT",
       "dependencies": {
-        "@langchain/google-gauth": "^0.2.9"
+        "@langchain/google-gauth": "^0.2.10"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@langchain/core": ">=0.3.55 <0.4.0"
+        "@langchain/core": ">=0.3.58 <0.4.0"
       }
     },
     "node_modules/@langchain/langgraph": {
-      "version": "0.2.74",
-      "resolved": "https://registry.npmjs.org/@langchain/langgraph/-/langgraph-0.2.74.tgz",
-      "integrity": "sha512-oHpEi5sTZTPaeZX1UnzfM2OAJ21QGQrwReTV6+QnX7h8nDCBzhtipAw1cK616S+X8zpcVOjgOtJuaJhXa4mN8w==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@langchain/langgraph/-/langgraph-0.3.4.tgz",
+      "integrity": "sha512-Vuja8Qtu3Zjx7k4fK7Cnw+p8gtvIRPciWp9btPhAs3aUo6aBgOJOZVcK5Ii3mHfEHK/aQmRElR0x/u/YwykOrg==",
       "license": "MIT",
       "dependencies": {
-        "@langchain/langgraph-checkpoint": "~0.0.17",
+        "@langchain/langgraph-checkpoint": "~0.0.18",
         "@langchain/langgraph-sdk": "~0.0.32",
         "uuid": "^10.0.0",
-        "zod": "^3.23.8"
+        "zod": "^3.25.32"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@langchain/core": ">=0.2.36 <0.3.0 || >=0.3.40 < 0.4.0",
+        "@langchain/core": ">=0.3.58 < 0.4.0",
         "zod-to-json-schema": "^3.x"
       },
       "peerDependenciesMeta": {
@@ -18974,9 +19179,9 @@
       }
     },
     "node_modules/@langchain/langgraph-sdk": {
-      "version": "0.0.82",
-      "resolved": "https://registry.npmjs.org/@langchain/langgraph-sdk/-/langgraph-sdk-0.0.82.tgz",
-      "integrity": "sha512-QxhGtDArHkqsJAbO5RuZsCyvDmPWf4pUpkOpLDzPEQXCBuasrBRgB6pxQWof2l6kfMYCfrc6lp3jL6TAqapmjQ==",
+      "version": "0.0.84",
+      "resolved": "https://registry.npmjs.org/@langchain/langgraph-sdk/-/langgraph-sdk-0.0.84.tgz",
+      "integrity": "sha512-l0PFQyJ+6m6aclORNPPWlcRwgKcXVXsPaJCbCUYFABR3yf4cOpsjhUNR0cJ7+2cS400oieHjGRdGGyO/hbSjhg==",
       "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.15",
@@ -19011,20 +19216,19 @@
       }
     },
     "node_modules/@langchain/mistralai": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@langchain/mistralai/-/mistralai-0.2.0.tgz",
-      "integrity": "sha512-VdfbKZopAuSXf/vlXbriGWLK3c7j5s47DoB3S31xpprY2BMSKZZiX9vE9TsgxMfAPuIDPIYcfgU7p1upvTYt8g==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@langchain/mistralai/-/mistralai-0.2.1.tgz",
+      "integrity": "sha512-s91BlNcuxaaZGnVukyl81nwGrWpeE0EYiAdEFoBmZwlT4yLpx+QpPhRsGKrTg/Vm7Nscy6Wd8Xy2PJ93wftMdw==",
+      "license": "MIT",
       "dependencies": {
         "@mistralai/mistralai": "^1.3.1",
-        "uuid": "^10.0.0",
-        "zod": "^3.23.8",
-        "zod-to-json-schema": "^3.22.4"
+        "uuid": "^10.0.0"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@langchain/core": ">=0.3.7 <0.4.0"
+        "@langchain/core": ">=0.3.58 <0.4.0"
       }
     },
     "node_modules/@langchain/mistralai/node_modules/uuid": {
@@ -19040,20 +19244,19 @@
       }
     },
     "node_modules/@langchain/ollama": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@langchain/ollama/-/ollama-0.2.0.tgz",
-      "integrity": "sha512-jLlYFqt+nbhaJKLakk7lRTWHZJ7wHeJLM6yuv4jToQ8zPzpL//372+MjggDoW0mnw8ofysg1T2C6mEJspKJtiA==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@langchain/ollama/-/ollama-0.2.3.tgz",
+      "integrity": "sha512-1Obe45jgQspqLMBVlayQbGdywFmri8DgmGRdzNu0li56cG5RReYlRCFVDZBRMMvF9JhsP5eXRyfyivtKfITHWQ==",
+      "license": "MIT",
       "dependencies": {
         "ollama": "^0.5.12",
-        "uuid": "^10.0.0",
-        "zod": "^3.24.1",
-        "zod-to-json-schema": "^3.24.1"
+        "uuid": "^10.0.0"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@langchain/core": ">=0.2.21 <0.4.0"
+        "@langchain/core": ">=0.3.58 <0.4.0"
       }
     },
     "node_modules/@langchain/ollama/node_modules/uuid": {
@@ -19130,18 +19333,56 @@
       }
     },
     "node_modules/@langchain/xai": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/@langchain/xai/-/xai-0.0.2.tgz",
-      "integrity": "sha512-wVOs7SfJs4VWk/oiHJomaoaZ+r9nQhPqbEXlQ2D8L0d54PxYhb1ILR9rub9LT1RpqazSX8HG4A8+hX4R01qkSg==",
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@langchain/xai/-/xai-0.0.3.tgz",
+      "integrity": "sha512-NA+0d6z/1focGuakceOz/AspWN9xcz7mYpjLFuCDtOPRLzdjUTRiqljXx9RVSl/VQMA8AzHCOA64m3asYZAYWg==",
+      "license": "MIT",
       "dependencies": {
-        "@langchain/openai": "~0.4.4",
-        "zod": "^3.24.2"
+        "@langchain/openai": "^0.5.5"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@langchain/core": ">=0.2.21 <0.4.0"
+        "@langchain/core": ">=0.3.58 <0.4.0"
+      }
+    },
+    "node_modules/@langchain/xai/node_modules/@langchain/openai": {
+      "version": "0.5.14",
+      "resolved": "https://registry.npmjs.org/@langchain/openai/-/openai-0.5.14.tgz",
+      "integrity": "sha512-0GEj5K/qi1MRuZ4nE7NvyI4jTG+RSewLZqsExUwRukWdeqmkPNHGrogTa5ZDt7eaJxAaY7EgLC5ZnvCM3L1oug==",
+      "license": "MIT",
+      "dependencies": {
+        "js-tiktoken": "^1.0.12",
+        "openai": "^5.3.0",
+        "zod": "^3.25.32"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@langchain/core": ">=0.3.58 <0.4.0"
+      }
+    },
+    "node_modules/@langchain/xai/node_modules/openai": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/openai/-/openai-5.5.1.tgz",
+      "integrity": "sha512-5i19097mGotHA1eFsM6Tjd/tJ8uo9sa5Ysv4Q6bKJ2vtN6rc0MzMrUefXnLXYAJcmMQrC1Efhj0AvfIkXrQamw==",
+      "license": "Apache-2.0",
+      "bin": {
+        "openai": "bin/cli"
+      },
+      "peerDependencies": {
+        "ws": "^8.18.0",
+        "zod": "^3.23.8"
+      },
+      "peerDependenciesMeta": {
+        "ws": {
+          "optional": true
+        },
+        "zod": {
+          "optional": true
+        }
       }
     },
     "node_modules/@lezer/common": {
@@ -19196,23 +19437,23 @@
       }
     },
     "node_modules/@librechat/agents": {
-      "version": "2.4.38",
-      "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-2.4.38.tgz",
-      "integrity": "sha512-GfQ36TpKrC60vesTM0MrBaE8aEC50yBp0CsT4ERHO9HbCjH8na+CA14Ldps1cGwinL4gtyDH2gB0nVuhgEtYAg==",
+      "version": "2.4.41",
+      "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-2.4.41.tgz",
+      "integrity": "sha512-kYmdk5WVRp0qZxTx6BuGCs4l0Ir9iBLLx4ZY4/1wxr80al5/vq3P8wbgGdKMeO2qTu4ZaT4RyWRQYWBg5HDkUQ==",
       "license": "MIT",
       "dependencies": {
-        "@langchain/anthropic": "^0.3.21",
-        "@langchain/aws": "^0.1.10",
-        "@langchain/community": "^0.3.44",
-        "@langchain/core": "^0.3.57",
-        "@langchain/deepseek": "^0.0.1",
-        "@langchain/google-genai": "^0.2.9",
-        "@langchain/google-vertexai": "^0.2.9",
-        "@langchain/langgraph": "^0.2.73",
-        "@langchain/mistralai": "^0.2.0",
-        "@langchain/ollama": "^0.2.0",
-        "@langchain/openai": "^0.5.11",
-        "@langchain/xai": "^0.0.2",
+        "@langchain/anthropic": "^0.3.23",
+        "@langchain/aws": "^0.1.11",
+        "@langchain/community": "^0.3.47",
+        "@langchain/core": "^0.3.60",
+        "@langchain/deepseek": "^0.0.2",
+        "@langchain/google-genai": "^0.2.13",
+        "@langchain/google-vertexai": "^0.2.13",
+        "@langchain/langgraph": "^0.3.4",
+        "@langchain/mistralai": "^0.2.1",
+        "@langchain/ollama": "^0.2.3",
+        "@langchain/openai": "^0.5.14",
+        "@langchain/xai": "^0.0.3",
         "cheerio": "^1.0.0",
         "dotenv": "^16.4.7",
         "https-proxy-agent": "^7.0.6",
@@ -19223,9 +19464,9 @@
       }
     },
     "node_modules/@librechat/agents/node_modules/@langchain/community": {
-      "version": "0.3.45",
-      "resolved": "https://registry.npmjs.org/@langchain/community/-/community-0.3.45.tgz",
-      "integrity": "sha512-KkAGmnP+w5tozLYsj/kGKwyfuPnCcA6MyDXfNF7oDo7L1TxhUgdEKhvNsY7ooLXz6Xh/LV5Kqp2B8U0jfYCQKQ==",
+      "version": "0.3.47",
+      "resolved": "https://registry.npmjs.org/@langchain/community/-/community-0.3.47.tgz",
+      "integrity": "sha512-Vo42kAfkXpTFSevhEkeqqE55az8NyQgDktCbitXYuhipNbFYx08XVvqEDkFkB20MM/Z7u+cvLb+DxCqnKuH0CQ==",
       "license": "MIT",
       "dependencies": {
         "@langchain/openai": ">=0.2.0 <0.6.0",
@@ -19235,10 +19476,9 @@
         "flat": "^5.0.2",
         "js-yaml": "^4.1.0",
         "langchain": ">=0.2.3 <0.3.0 || >=0.3.4 <0.4.0",
-        "langsmith": "^0.3.29",
+        "langsmith": "^0.3.33",
         "uuid": "^10.0.0",
-        "zod": "^3.22.3",
-        "zod-to-json-schema": "^3.22.5"
+        "zod": "^3.25.32"
       },
       "engines": {
         "node": ">=18"
@@ -19271,11 +19511,11 @@
         "@google-ai/generativelanguage": "*",
         "@google-cloud/storage": "^6.10.1 || ^7.7.0",
         "@gradientai/nodejs-sdk": "^1.2.0",
-        "@huggingface/inference": "^2.6.4",
-        "@huggingface/transformers": "^3.2.3",
+        "@huggingface/inference": "^4.0.5",
+        "@huggingface/transformers": "^3.5.2",
         "@ibm-cloud/watsonx-ai": "*",
         "@lancedb/lancedb": "^0.12.0",
-        "@langchain/core": ">=0.2.21 <0.4.0",
+        "@langchain/core": ">=0.3.58 <0.4.0",
         "@layerup/layerup-security": "^1.5.12",
         "@libsql/client": "^0.14.0",
         "@mendable/firecrawl-js": "^1.4.3",
@@ -19345,7 +19585,7 @@
         "mammoth": "^1.6.0",
         "mariadb": "^3.4.0",
         "mem0ai": "^2.1.8",
-        "mongodb": ">=5.2.0",
+        "mongodb": "^6.17.0",
         "mysql2": "^3.9.8",
         "neo4j-driver": "*",
         "notion-to-md": "^3.1.0",
@@ -19749,21 +19989,20 @@
       }
     },
     "node_modules/@librechat/agents/node_modules/@langchain/openai": {
-      "version": "0.5.11",
-      "resolved": "https://registry.npmjs.org/@langchain/openai/-/openai-0.5.11.tgz",
-      "integrity": "sha512-DAp7x+NfjSqDvKVMle8yb85nzz+3ctP7zGJaeRS0vLmvkY9qf/jRkowsM0mcsIiEUKhG/AHzWqvxbhktb/jJ6Q==",
+      "version": "0.5.14",
+      "resolved": "https://registry.npmjs.org/@langchain/openai/-/openai-0.5.14.tgz",
+      "integrity": "sha512-0GEj5K/qi1MRuZ4nE7NvyI4jTG+RSewLZqsExUwRukWdeqmkPNHGrogTa5ZDt7eaJxAaY7EgLC5ZnvCM3L1oug==",
       "license": "MIT",
       "dependencies": {
         "js-tiktoken": "^1.0.12",
-        "openai": "^4.96.0",
-        "zod": "^3.22.4",
-        "zod-to-json-schema": "^3.22.3"
+        "openai": "^5.3.0",
+        "zod": "^3.25.32"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@langchain/core": ">=0.3.48 <0.4.0"
+        "@langchain/core": ">=0.3.58 <0.4.0"
       }
     },
     "node_modules/@librechat/agents/node_modules/agent-base": {
@@ -19788,6 +20027,27 @@
         "node": ">= 14"
       }
     },
+    "node_modules/@librechat/agents/node_modules/openai": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/openai/-/openai-5.5.1.tgz",
+      "integrity": "sha512-5i19097mGotHA1eFsM6Tjd/tJ8uo9sa5Ysv4Q6bKJ2vtN6rc0MzMrUefXnLXYAJcmMQrC1Efhj0AvfIkXrQamw==",
+      "license": "Apache-2.0",
+      "bin": {
+        "openai": "bin/cli"
+      },
+      "peerDependencies": {
+        "ws": "^8.18.0",
+        "zod": "^3.23.8"
+      },
+      "peerDependenciesMeta": {
+        "ws": {
+          "optional": true
+        },
+        "zod": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@librechat/agents/node_modules/uuid": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
@@ -27551,6 +27811,15 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
+    "node_modules/cheerio/node_modules/undici": {
+      "version": "6.21.3",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.3.tgz",
+      "integrity": "sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.17"
+      }
+    },
     "node_modules/cheerio/node_modules/whatwg-mimetype": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
@@ -28554,6 +28823,15 @@
       "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
       "dev": true
     },
+    "node_modules/data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/data-urls": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
@@ -30727,6 +31005,29 @@
       "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
       "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="
     },
+    "node_modules/fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      },
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      }
+    },
     "node_modules/file-entry-cache": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
@@ -31107,6 +31408,18 @@
         "node": ">= 14"
       }
     },
+    "node_modules/formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "license": "MIT",
+      "dependencies": {
+        "fetch-blob": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
     "node_modules/formidable": {
       "version": "3.5.4",
       "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.4.tgz",
@@ -34583,9 +34896,9 @@
       }
     },
     "node_modules/langsmith": {
-      "version": "0.3.29",
-      "resolved": "https://registry.npmjs.org/langsmith/-/langsmith-0.3.29.tgz",
-      "integrity": "sha512-JPF2B339qpYy9FyuY4Yz1aWYtgPlFc/a+VTj3L/JcFLHCiMP7+Ig8I9jO+o1QwVa+JU3iugL1RS0wwc+Glw0zA==",
+      "version": "0.3.33",
+      "resolved": "https://registry.npmjs.org/langsmith/-/langsmith-0.3.33.tgz",
+      "integrity": "sha512-imNIaBL6+ElE5eMzNHYwFxo6W/6rHlqcaUjCYoIeGdCYWlARxE3CTGKul5DJnaUgGP2CTLFeNXyvRx5HWC/4KQ==",
       "license": "MIT",
       "dependencies": {
         "@types/uuid": "^10.0.0",
@@ -44153,12 +44466,12 @@
       "dev": true
     },
     "node_modules/undici": {
-      "version": "6.21.3",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.3.tgz",
-      "integrity": "sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw==",
+      "version": "7.10.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.10.0.tgz",
+      "integrity": "sha512-u5otvFBOBZvmdjWLVW+5DAc9Nkq8f24g0O9oY7qw2JVIF1VocIFoyz9JFkuVOS2j41AufeO0xnlweJ2RLT8nGw==",
       "license": "MIT",
       "engines": {
-        "node": ">=18.17"
+        "node": ">=20.18.1"
       }
     },
     "node_modules/undici-types": {
@@ -45069,6 +45382,15 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/webidl-conversions": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
@@ -46174,9 +46496,10 @@
       }
     },
     "node_modules/zod": {
-      "version": "3.24.2",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz",
-      "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==",
+      "version": "3.25.67",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
+      "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
@@ -46232,7 +46555,7 @@
         "typescript": "^5.0.4"
       },
       "peerDependencies": {
-        "@librechat/agents": "^2.4.37",
+        "@librechat/agents": "^2.4.41",
         "@librechat/data-schemas": "*",
         "@modelcontextprotocol/sdk": "^1.12.3",
         "axios": "^1.8.2",
@@ -46243,6 +46566,7 @@
         "librechat-data-provider": "*",
         "node-fetch": "2.7.0",
         "tiktoken": "^1.0.15",
+        "undici": "^7.10.0",
         "zod": "^3.22.4"
       }
     },
@@ -46462,7 +46786,7 @@
     },
     "packages/data-schemas": {
       "name": "@librechat/data-schemas",
-      "version": "0.0.9",
+      "version": "0.0.10",
       "license": "MIT",
       "devDependencies": {
         "@rollup/plugin-alias": "^5.1.0",
diff --git a/packages/api/package.json b/packages/api/package.json
index 1c2ab534e3..aa4fc43772 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -69,7 +69,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "peerDependencies": {
-    "@librechat/agents": "^2.4.37",
+    "@librechat/agents": "^2.4.41",
     "@librechat/data-schemas": "*",
     "@modelcontextprotocol/sdk": "^1.12.3",
     "axios": "^1.8.2",
@@ -80,6 +80,7 @@
     "librechat-data-provider": "*",
     "node-fetch": "2.7.0",
     "tiktoken": "^1.0.15",
+    "undici": "^7.10.0",
     "zod": "^3.22.4"
   }
 }
diff --git a/packages/api/src/endpoints/openai/llm.ts b/packages/api/src/endpoints/openai/llm.ts
index 2f9a3f6011..ec7c4b863d 100644
--- a/packages/api/src/endpoints/openai/llm.ts
+++ b/packages/api/src/endpoints/openai/llm.ts
@@ -1,4 +1,4 @@
-import { HttpsProxyAgent } from 'https-proxy-agent';
+import { ProxyAgent } from 'undici';
 import { KnownEndpoints } from 'librechat-data-provider';
 import type * as t from '~/types';
 import { sanitizeModelName, constructAzureURL } from '~/utils/azure';
@@ -102,8 +102,10 @@ export function getOpenAIConfig(
   }
 
   if (proxy) {
-    const proxyAgent = new HttpsProxyAgent(proxy);
-    configOptions.httpAgent = proxyAgent;
+    const proxyAgent = new ProxyAgent(proxy);
+    configOptions.fetchOptions = {
+      dispatcher: proxyAgent,
+    };
   }
 
   if (azure) {

From 72cd159a373fb8c05e41dbf62ef2e174799feeae Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Fri, 20 Jun 2025 18:05:19 -0400
Subject: [PATCH 47/49] =?UTF-8?q?=F0=9F=94=83=20refactor:=20Optimize=20Mei?=
 =?UTF-8?q?liSearch=20Sync=20Processing=20and=20Tracking=20(#7994)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/db/indexSync.js                           | 137 ++++--
 .../src/models/plugins/mongoMeili.ts          | 397 +++++++++++++-----
 2 files changed, 404 insertions(+), 130 deletions(-)

diff --git a/api/db/indexSync.js b/api/db/indexSync.js
index e8bcd55e37..945346a906 100644
--- a/api/db/indexSync.js
+++ b/api/db/indexSync.js
@@ -1,8 +1,11 @@
 const mongoose = require('mongoose');
 const { MeiliSearch } = require('meilisearch');
 const { logger } = require('@librechat/data-schemas');
+const { FlowStateManager } = require('@librechat/api');
+const { CacheKeys } = require('librechat-data-provider');
 
 const { isEnabled } = require('~/server/utils');
+const { getLogStores } = require('~/cache');
 
 const Conversation = mongoose.models.Conversation;
 const Message = mongoose.models.Message;
@@ -28,43 +31,123 @@ class MeiliSearchClient {
   }
 }
 
+/**
+ * Performs the actual sync operations for messages and conversations
+ */
+async function performSync() {
+  const client = MeiliSearchClient.getInstance();
+
+  const { status } = await client.health();
+  if (status !== 'available') {
+    throw new Error('Meilisearch not available');
+  }
+
+  if (indexingDisabled === true) {
+    logger.info('[indexSync] Indexing is disabled, skipping...');
+    return { messagesSync: false, convosSync: false };
+  }
+
+  let messagesSync = false;
+  let convosSync = false;
+
+  // Check if we need to sync messages
+  const messageProgress = await Message.getSyncProgress();
+  if (!messageProgress.isComplete) {
+    logger.info(
+      `[indexSync] Messages need syncing: ${messageProgress.totalProcessed}/${messageProgress.totalDocuments} indexed`,
+    );
+
+    // Check if we should do a full sync or incremental
+    const messageCount = await Message.countDocuments();
+    const messagesIndexed = messageProgress.totalProcessed;
+    const syncThreshold = parseInt(process.env.MEILI_SYNC_THRESHOLD || '1000', 10);
+
+    if (messageCount - messagesIndexed > syncThreshold) {
+      logger.info('[indexSync] Starting full message sync due to large difference');
+      await Message.syncWithMeili();
+      messagesSync = true;
+    } else if (messageCount !== messagesIndexed) {
+      logger.warn('[indexSync] Messages out of sync, performing incremental sync');
+      await Message.syncWithMeili();
+      messagesSync = true;
+    }
+  } else {
+    logger.info(
+      `[indexSync] Messages are fully synced: ${messageProgress.totalProcessed}/${messageProgress.totalDocuments}`,
+    );
+  }
+
+  // Check if we need to sync conversations
+  const convoProgress = await Conversation.getSyncProgress();
+  if (!convoProgress.isComplete) {
+    logger.info(
+      `[indexSync] Conversations need syncing: ${convoProgress.totalProcessed}/${convoProgress.totalDocuments} indexed`,
+    );
+
+    const convoCount = await Conversation.countDocuments();
+    const convosIndexed = convoProgress.totalProcessed;
+    const syncThreshold = parseInt(process.env.MEILI_SYNC_THRESHOLD || '1000', 10);
+
+    if (convoCount - convosIndexed > syncThreshold) {
+      logger.info('[indexSync] Starting full conversation sync due to large difference');
+      await Conversation.syncWithMeili();
+      convosSync = true;
+    } else if (convoCount !== convosIndexed) {
+      logger.warn('[indexSync] Convos out of sync, performing incremental sync');
+      await Conversation.syncWithMeili();
+      convosSync = true;
+    }
+  } else {
+    logger.info(
+      `[indexSync] Conversations are fully synced: ${convoProgress.totalProcessed}/${convoProgress.totalDocuments}`,
+    );
+  }
+
+  return { messagesSync, convosSync };
+}
+
+/**
+ * Main index sync function that uses FlowStateManager to prevent concurrent execution
+ */
 async function indexSync() {
   if (!searchEnabled) {
     return;
   }
-  try {
-    const client = MeiliSearchClient.getInstance();
 
-    const { status } = await client.health();
-    if (status !== 'available') {
-      throw new Error('Meilisearch not available');
+  logger.info('[indexSync] Starting index synchronization check...');
+
+  try {
+    // Get or create FlowStateManager instance
+    const flowsCache = getLogStores(CacheKeys.FLOWS);
+    if (!flowsCache) {
+      logger.warn('[indexSync] Flows cache not available, falling back to direct sync');
+      return await performSync();
     }
 
-    if (indexingDisabled === true) {
-      logger.info('[indexSync] Indexing is disabled, skipping...');
+    const flowManager = new FlowStateManager(flowsCache, {
+      ttl: 60000 * 10, // 10 minutes TTL for sync operations
+    });
+
+    // Use a unique flow ID for the sync operation
+    const flowId = 'meili-index-sync';
+    const flowType = 'MEILI_SYNC';
+
+    // This will only execute the handler if no other instance is running the sync
+    const result = await flowManager.createFlowWithHandler(flowId, flowType, performSync);
+
+    if (result.messagesSync || result.convosSync) {
+      logger.info('[indexSync] Sync completed successfully');
+    } else {
+      logger.debug('[indexSync] No sync was needed');
+    }
+
+    return result;
+  } catch (err) {
+    if (err.message.includes('flow already exists')) {
+      logger.info('[indexSync] Sync already running on another instance');
       return;
     }
 
-    const messageCount = await Message.countDocuments();
-    const convoCount = await Conversation.countDocuments();
-    const messages = await client.index('messages').getStats();
-    const convos = await client.index('convos').getStats();
-    const messagesIndexed = messages.numberOfDocuments;
-    const convosIndexed = convos.numberOfDocuments;
-
-    logger.debug(`[indexSync] There are ${messageCount} messages and ${messagesIndexed} indexed`);
-    logger.debug(`[indexSync] There are ${convoCount} convos and ${convosIndexed} indexed`);
-
-    if (messageCount !== messagesIndexed) {
-      logger.debug('[indexSync] Messages out of sync, indexing');
-      Message.syncWithMeili();
-    }
-
-    if (convoCount !== convosIndexed) {
-      logger.debug('[indexSync] Convos out of sync, indexing');
-      Conversation.syncWithMeili();
-    }
-  } catch (err) {
     if (err.message.includes('not found')) {
       logger.debug('[indexSync] Creating indices...');
       currentTimeout = setTimeout(async () => {
diff --git a/packages/data-schemas/src/models/plugins/mongoMeili.ts b/packages/data-schemas/src/models/plugins/mongoMeili.ts
index d44dfd806b..84a8c7efe8 100644
--- a/packages/data-schemas/src/models/plugins/mongoMeili.ts
+++ b/packages/data-schemas/src/models/plugins/mongoMeili.ts
@@ -19,6 +19,8 @@ interface MongoMeiliOptions {
   indexName: string;
   primaryKey: string;
   mongoose: typeof import('mongoose');
+  syncBatchSize?: number;
+  syncDelayMs?: number;
 }
 
 interface MeiliIndexable {
@@ -31,6 +33,13 @@ interface ContentItem {
   text?: string;
 }
 
+interface SyncProgress {
+  lastSyncedId?: string;
+  totalProcessed: number;
+  totalDocuments: number;
+  isComplete: boolean;
+}
+
 interface _DocumentWithMeiliIndex extends Document {
   _meiliIndex?: boolean;
   preprocessObjectForIndex?: () => Record<string, unknown>;
@@ -45,7 +54,24 @@ interface _DocumentWithMeiliIndex extends Document {
 export type DocumentWithMeiliIndex = _DocumentWithMeiliIndex & IConversation & Partial<IMessage>;
 
 export interface SchemaWithMeiliMethods extends Model<DocumentWithMeiliIndex> {
-  syncWithMeili(): Promise<void>;
+  syncWithMeili(options?: { resumeFromId?: string }): Promise<void>;
+  getSyncProgress(): Promise<SyncProgress>;
+  processSyncBatch(
+    index: Index<MeiliIndexable>,
+    documents: Array<Record<string, unknown>>,
+    updateOps: Array<{
+      updateOne: {
+        filter: Record<string, unknown>;
+        update: { $set: { _meiliIndex: boolean } };
+      };
+    }>,
+  ): Promise<void>;
+  cleanupMeiliIndex(
+    index: Index<MeiliIndexable>,
+    primaryKey: string,
+    batchSize: number,
+    delayMs: number,
+  ): Promise<void>;
   setMeiliIndexSettings(settings: Record<string, unknown>): Promise<unknown>;
   meiliSearch(
     q: string,
@@ -66,6 +92,14 @@ const searchEnabled = process.env.SEARCH != null && process.env.SEARCH.toLowerCa
 const meiliEnabled =
   process.env.MEILI_HOST != null && process.env.MEILI_MASTER_KEY != null && searchEnabled;
 
+/**
+ * Get sync configuration from environment variables
+ */
+const getSyncConfig = () => ({
+  batchSize: parseInt(process.env.MEILI_SYNC_BATCH_SIZE || '100', 10),
+  delayMs: parseInt(process.env.MEILI_SYNC_DELAY_MS || '100', 10),
+});
+
 /**
  * Local implementation of parseTextParts to avoid dependency on librechat-data-provider
  * Extracts text content from an array of content items
@@ -101,6 +135,26 @@ const validateOptions = (options: Partial<MongoMeiliOptions>): void => {
   });
 };
 
+/**
+ * Helper function to process documents in batches with rate limiting
+ */
+const processBatch = async <T>(
+  items: T[],
+  batchSize: number,
+  delayMs: number,
+  processor: (batch: T[]) => Promise<void>,
+): Promise<void> => {
+  for (let i = 0; i < items.length; i += batchSize) {
+    const batch = items.slice(i, i + batchSize);
+    await processor(batch);
+
+    // Add delay between batches to prevent overwhelming resources
+    if (i + batchSize < items.length && delayMs > 0) {
+      await new Promise((resolve) => setTimeout(resolve, delayMs));
+    }
+  }
+};
+
 /**
  * Factory function to create a MeiliMongooseModel class which extends a Mongoose model.
  * This class contains static and instance methods to synchronize and manage the MeiliSearch index
@@ -109,127 +163,213 @@ const validateOptions = (options: Partial<MongoMeiliOptions>): void => {
  * @param config - Configuration object.
  * @param config.index - The MeiliSearch index object.
  * @param config.attributesToIndex - List of attributes to index.
+ * @param config.syncOptions - Sync configuration options.
  * @returns A class definition that will be loaded into the Mongoose schema.
  */
 const createMeiliMongooseModel = ({
   index,
   attributesToIndex,
+  syncOptions,
 }: {
   index: Index<MeiliIndexable>;
   attributesToIndex: string[];
+  syncOptions: { batchSize: number; delayMs: number };
 }) => {
   const primaryKey = attributesToIndex[0];
+  const syncConfig = { ...getSyncConfig(), ...syncOptions };
 
   class MeiliMongooseModel {
     /**
-     * Synchronizes the data between the MongoDB collection and the MeiliSearch index.
-     *
-     * The synchronization process involves:
-     *   1. Fetching all documents from the MongoDB collection and MeiliSearch index.
-     *   2. Comparing documents from both sources.
-     *   3. Deleting documents from MeiliSearch that no longer exist in MongoDB.
-     *   4. Adding documents to MeiliSearch that exist in MongoDB but not in the index.
-     *   5. Updating documents in MeiliSearch if key fields (such as `text` or `title`) differ.
-     *   6. Updating the `_meiliIndex` field in MongoDB to indicate the indexing status.
-     *
-     * Note: The function processes documents in batches because MeiliSearch's
-     * `index.getDocuments` requires an exact limit and `index.addDocuments` does not handle
-     * partial failures in a batch.
-     *
-     * @returns {Promise<void>} Resolves when the synchronization is complete.
+     * Get the current sync progress
      */
-    static async syncWithMeili(this: SchemaWithMeiliMethods): Promise<void> {
+    static async getSyncProgress(this: SchemaWithMeiliMethods): Promise<SyncProgress> {
+      const totalDocuments = await this.countDocuments();
+      const indexedDocuments = await this.countDocuments({ _meiliIndex: true });
+
+      return {
+        totalProcessed: indexedDocuments,
+        totalDocuments,
+        isComplete: indexedDocuments === totalDocuments,
+      };
+    }
+
+    /**
+     * Synchronizes the data between the MongoDB collection and the MeiliSearch index.
+     * Now uses streaming and batching to reduce memory usage.
+     */
+    static async syncWithMeili(
+      this: SchemaWithMeiliMethods,
+      options?: { resumeFromId?: string },
+    ): Promise<void> {
       try {
-        let moreDocuments = true;
-        const mongoDocuments = await this.find().lean();
+        const startTime = Date.now();
+        const { batchSize, delayMs } = syncConfig;
+
+        logger.info(
+          `[syncWithMeili] Starting sync for ${primaryKey === 'messageId' ? 'messages' : 'conversations'} with batch size ${batchSize}`,
+        );
+
+        // Build query with resume capability
+        const query: FilterQuery<unknown> = {};
+        if (options?.resumeFromId) {
+          query._id = { $gt: options.resumeFromId };
+        }
+
+        // Get total count for progress tracking
+        const totalCount = await this.countDocuments(query);
+        let processedCount = 0;
+
+        // First, handle documents that need to be removed from Meili
+        await this.cleanupMeiliIndex(index, primaryKey, batchSize, delayMs);
+
+        // Process MongoDB documents in batches using cursor
+        const cursor = this.find(query)
+          .select(attributesToIndex.join(' ') + ' _meiliIndex')
+          .sort({ _id: 1 })
+          .batchSize(batchSize)
+          .cursor();
 
         const format = (doc: Record<string, unknown>) =>
           _.omitBy(_.pick(doc, attributesToIndex), (v, k) => k.startsWith('$'));
 
-        const mongoMap = new Map(
-          mongoDocuments.map((doc) => {
-            const typedDoc = doc as Record<string, unknown>;
-            return [typedDoc[primaryKey], format(typedDoc)];
-          }),
-        );
-        const indexMap = new Map<unknown, Record<string, unknown>>();
-        let offset = 0;
-        const batchSize = 1000;
-
-        while (moreDocuments) {
-          const batch = await index.getDocuments({ limit: batchSize, offset });
-          if (batch.results.length === 0) {
-            moreDocuments = false;
-          }
-          for (const doc of batch.results) {
-            indexMap.set(doc[primaryKey], format(doc));
-          }
-          offset += batchSize;
-        }
-
-        logger.debug('[syncWithMeili]', { indexMap: indexMap.size, mongoMap: mongoMap.size });
-
-        const updateOps: Array<{
+        let documentBatch: Array<Record<string, unknown>> = [];
+        let updateOps: Array<{
           updateOne: {
             filter: Record<string, unknown>;
             update: { $set: { _meiliIndex: boolean } };
           };
         }> = [];
 
-        // Process documents present in the MeiliSearch index
-        for (const [id, doc] of indexMap) {
-          const update: Record<string, unknown> = {};
-          update[primaryKey] = id;
-          if (mongoMap.has(id)) {
-            const mongoDoc = mongoMap.get(id);
-            if (
-              (doc.text && doc.text !== mongoDoc?.text) ||
-              (doc.title && doc.title !== mongoDoc?.title)
-            ) {
-              logger.debug(
-                `[syncWithMeili] ${id} had document discrepancy in ${
-                  doc.text ? 'text' : 'title'
-                } field`,
-              );
-              updateOps.push({
-                updateOne: { filter: update, update: { $set: { _meiliIndex: true } } },
-              });
-              await index.addDocuments([doc]);
+        // Process documents in streaming fashion
+        for await (const doc of cursor) {
+          const typedDoc = doc.toObject() as unknown as Record<string, unknown>;
+          const formatted = format(typedDoc);
+
+          // Check if document needs indexing
+          if (!typedDoc._meiliIndex) {
+            documentBatch.push(formatted);
+            updateOps.push({
+              updateOne: {
+                filter: { _id: typedDoc._id },
+                update: { $set: { _meiliIndex: true } },
+              },
+            });
+          }
+
+          processedCount++;
+
+          // Process batch when it reaches the configured size
+          if (documentBatch.length >= batchSize) {
+            await this.processSyncBatch(index, documentBatch, updateOps);
+            documentBatch = [];
+            updateOps = [];
+
+            // Log progress
+            const progress = Math.round((processedCount / totalCount) * 100);
+            logger.info(`[syncWithMeili] Progress: ${progress}% (${processedCount}/${totalCount})`);
+
+            // Add delay to prevent overwhelming resources
+            if (delayMs > 0) {
+              await new Promise((resolve) => setTimeout(resolve, delayMs));
             }
-          } else {
-            await index.deleteDocument(id as string);
-            updateOps.push({
-              updateOne: { filter: update, update: { $set: { _meiliIndex: false } } },
-            });
           }
         }
 
-        // Process documents present in MongoDB
-        for (const [id, doc] of mongoMap) {
-          const update: Record<string, unknown> = {};
-          update[primaryKey] = id;
-          if (!indexMap.has(id)) {
-            await index.addDocuments([doc]);
-            updateOps.push({
-              updateOne: { filter: update, update: { $set: { _meiliIndex: true } } },
-            });
-          } else if (doc._meiliIndex === false) {
-            updateOps.push({
-              updateOne: { filter: update, update: { $set: { _meiliIndex: true } } },
-            });
-          }
+        // Process remaining documents
+        if (documentBatch.length > 0) {
+          await this.processSyncBatch(index, documentBatch, updateOps);
         }
 
+        const duration = Date.now() - startTime;
+        logger.info(
+          `[syncWithMeili] Completed sync for ${primaryKey === 'messageId' ? 'messages' : 'conversations'} in ${duration}ms`,
+        );
+      } catch (error) {
+        logger.error('[syncWithMeili] Error during sync:', error);
+        throw error;
+      }
+    }
+
+    /**
+     * Process a batch of documents for syncing
+     */
+    static async processSyncBatch(
+      this: SchemaWithMeiliMethods,
+      index: Index<MeiliIndexable>,
+      documents: Array<Record<string, unknown>>,
+      updateOps: Array<{
+        updateOne: {
+          filter: Record<string, unknown>;
+          update: { $set: { _meiliIndex: boolean } };
+        };
+      }>,
+    ): Promise<void> {
+      if (documents.length === 0) {
+        return;
+      }
+
+      try {
+        // Add documents to MeiliSearch
+        await index.addDocuments(documents);
+
+        // Update MongoDB to mark documents as indexed
         if (updateOps.length > 0) {
           await this.collection.bulkWrite(updateOps);
-          logger.debug(
-            `[syncWithMeili] Finished indexing ${
-              primaryKey === 'messageId' ? 'messages' : 'conversations'
-            }`,
-          );
         }
       } catch (error) {
-        logger.error('[syncWithMeili] Error adding document to Meili:', error);
+        logger.error('[processSyncBatch] Error processing batch:', error);
+        // Don't throw - allow sync to continue with other documents
+      }
+    }
+
+    /**
+     * Clean up documents in MeiliSearch that no longer exist in MongoDB
+     */
+    static async cleanupMeiliIndex(
+      this: SchemaWithMeiliMethods,
+      index: Index<MeiliIndexable>,
+      primaryKey: string,
+      batchSize: number,
+      delayMs: number,
+    ): Promise<void> {
+      try {
+        let offset = 0;
+        let moreDocuments = true;
+
+        while (moreDocuments) {
+          const batch = await index.getDocuments({ limit: batchSize, offset });
+          if (batch.results.length === 0) {
+            moreDocuments = false;
+            break;
+          }
+
+          const meiliIds = batch.results.map((doc) => doc[primaryKey]);
+          const query: Record<string, unknown> = {};
+          query[primaryKey] = { $in: meiliIds };
+
+          // Find which documents exist in MongoDB
+          const existingDocs = await this.find(query).select(primaryKey).lean();
+
+          const existingIds = new Set(
+            existingDocs.map((doc: Record<string, unknown>) => doc[primaryKey]),
+          );
+
+          // Delete documents that don't exist in MongoDB
+          const toDelete = meiliIds.filter((id) => !existingIds.has(id));
+          if (toDelete.length > 0) {
+            await Promise.all(toDelete.map((id) => index.deleteDocument(id as string)));
+            logger.debug(`[cleanupMeiliIndex] Deleted ${toDelete.length} orphaned documents`);
+          }
+
+          offset += batchSize;
+
+          // Add delay between batches
+          if (delayMs > 0) {
+            await new Promise((resolve) => setTimeout(resolve, delayMs));
+          }
+        }
+      } catch (error) {
+        logger.error('[cleanupMeiliIndex] Error during cleanup:', error);
       }
     }
 
@@ -313,18 +453,29 @@ const createMeiliMongooseModel = ({
     }
 
     /**
-     * Adds the current document to the MeiliSearch index
+     * Adds the current document to the MeiliSearch index with retry logic
      */
     async addObjectToMeili(
       this: DocumentWithMeiliIndex,
       next: CallbackWithoutResultAndOptionalError,
     ): Promise<void> {
       const object = this.preprocessObjectForIndex!();
-      try {
-        await index.addDocuments([object]);
-      } catch (error) {
-        logger.error('[addObjectToMeili] Error adding document to Meili:', error);
-        return next();
+      const maxRetries = 3;
+      let retryCount = 0;
+
+      while (retryCount < maxRetries) {
+        try {
+          await index.addDocuments([object]);
+          break;
+        } catch (error) {
+          retryCount++;
+          if (retryCount >= maxRetries) {
+            logger.error('[addObjectToMeili] Error adding document to Meili after retries:', error);
+            return next();
+          }
+          // Exponential backoff
+          await new Promise((resolve) => setTimeout(resolve, Math.pow(2, retryCount) * 1000));
+        }
       }
 
       try {
@@ -445,6 +596,8 @@ const createMeiliMongooseModel = ({
  * @param options.apiKey - The MeiliSearch API key.
  * @param options.indexName - The name of the MeiliSearch index.
  * @param options.primaryKey - The primary key field for indexing.
+ * @param options.syncBatchSize - Batch size for sync operations.
+ * @param options.syncDelayMs - Delay between batches in milliseconds.
  */
 export default function mongoMeili(schema: Schema, options: MongoMeiliOptions): void {
   const mongoose = options.mongoose;
@@ -461,11 +614,38 @@ export default function mongoMeili(schema: Schema, options: MongoMeiliOptions):
   });
 
   const { host, apiKey, indexName, primaryKey } = options;
+  const syncOptions = {
+    batchSize: options.syncBatchSize || getSyncConfig().batchSize,
+    delayMs: options.syncDelayMs || getSyncConfig().delayMs,
+  };
 
   const client = new MeiliSearch({ host, apiKey });
-  client.createIndex(indexName, { primaryKey });
+
+  /** Create index only if it doesn't exist */
   const index = client.index<MeiliIndexable>(indexName);
 
+  // Check if index exists and create if needed
+  (async () => {
+    try {
+      await index.getRawInfo();
+      logger.debug(`[mongoMeili] Index ${indexName} already exists`);
+    } catch (error) {
+      const errorCode = (error as { code?: string })?.code;
+      if (errorCode === 'index_not_found') {
+        try {
+          logger.info(`[mongoMeili] Creating new index: ${indexName}`);
+          await client.createIndex(indexName, { primaryKey });
+          logger.info(`[mongoMeili] Successfully created index: ${indexName}`);
+        } catch (createError) {
+          // Index might have been created by another instance
+          logger.debug(`[mongoMeili] Index ${indexName} may already exist:`, createError);
+        }
+      } else {
+        logger.error(`[mongoMeili] Error checking index ${indexName}:`, error);
+      }
+    }
+  })();
+
   // Collect attributes from the schema that should be indexed
   const attributesToIndex: string[] = [
     ...Object.entries(schema.obj).reduce<string[]>((results, [key, value]) => {
@@ -474,7 +654,7 @@ export default function mongoMeili(schema: Schema, options: MongoMeiliOptions):
     }, []),
   ];
 
-  schema.loadClass(createMeiliMongooseModel({ index, attributesToIndex }));
+  schema.loadClass(createMeiliMongooseModel({ index, attributesToIndex, syncOptions }));
 
   // Register Mongoose hooks
   schema.post('save', function (doc: DocumentWithMeiliIndex, next) {
@@ -497,17 +677,23 @@ export default function mongoMeili(schema: Schema, options: MongoMeiliOptions):
 
     try {
       const conditions = (this as Query<unknown, unknown>).getQuery();
+      const { batchSize, delayMs } = syncOptions;
 
       if (Object.prototype.hasOwnProperty.call(schema.obj, 'messages')) {
         const convoIndex = client.index('convos');
         const deletedConvos = await mongoose
           .model('Conversation')
           .find(conditions as FilterQuery<unknown>)
+          .select('conversationId')
           .lean();
-        const promises = deletedConvos.map((convo: Record<string, unknown>) =>
-          convoIndex.deleteDocument(convo.conversationId as string),
-        );
-        await Promise.all(promises);
+
+        // Process deletions in batches
+        await processBatch(deletedConvos, batchSize, delayMs, async (batch) => {
+          const promises = batch.map((convo: Record<string, unknown>) =>
+            convoIndex.deleteDocument(convo.conversationId as string),
+          );
+          await Promise.all(promises);
+        });
       }
 
       if (Object.prototype.hasOwnProperty.call(schema.obj, 'messageId')) {
@@ -515,11 +701,16 @@ export default function mongoMeili(schema: Schema, options: MongoMeiliOptions):
         const deletedMessages = await mongoose
           .model('Message')
           .find(conditions as FilterQuery<unknown>)
+          .select('messageId')
           .lean();
-        const promises = deletedMessages.map((message: Record<string, unknown>) =>
-          messageIndex.deleteDocument(message.messageId as string),
-        );
-        await Promise.all(promises);
+
+        // Process deletions in batches
+        await processBatch(deletedMessages, batchSize, delayMs, async (batch) => {
+          const promises = batch.map((message: Record<string, unknown>) =>
+            messageIndex.deleteDocument(message.messageId as string),
+          );
+          await Promise.all(promises);
+        });
       }
       return next();
     } catch (error) {

From 0587a1cc7ca7c9d206e5402ca46fc201cfe081bd Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Fri, 20 Jun 2025 20:44:13 -0400
Subject: [PATCH 48/49] =?UTF-8?q?=F0=9F=94=83=20refactor:=20Index=20Sync?=
 =?UTF-8?q?=20in=20Background?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/server/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/server/index.js b/api/server/index.js
index b1132873c7..8c7db3e226 100644
--- a/api/server/index.js
+++ b/api/server/index.js
@@ -39,7 +39,9 @@ const startServer = async () => {
   await connectDb();
 
   logger.info('Connected to MongoDB');
-  await indexSync();
+  indexSync().catch((err) => {
+    logger.error('[indexSync] Background sync failed:', err);
+  });
 
   app.disable('x-powered-by');
   app.set('trust proxy', trusted_proxy);

From d835f4830764798739c08418b0cca843baee4cc9 Mon Sep 17 00:00:00 2001
From: Rakshit Tiwari <rak1729e@gmail.com>
Date: Sat, 21 Jun 2025 20:20:30 +0530
Subject: [PATCH 49/49] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20feat:=20Support?=
 =?UTF-8?q?=20`.h`=20Files=20(#7978)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/data-provider/src/file-config.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/data-provider/src/file-config.ts b/packages/data-provider/src/file-config.ts
index 80521b4c47..f09fce7cc5 100644
--- a/packages/data-provider/src/file-config.ts
+++ b/packages/data-provider/src/file-config.ts
@@ -115,7 +115,7 @@ export const excelMimeTypes =
   /^application\/(vnd\.ms-excel|msexcel|x-msexcel|x-ms-excel|x-excel|x-dos_ms_excel|xls|x-xls|vnd\.openxmlformats-officedocument\.spreadsheetml\.sheet)$/;
 
 export const textMimeTypes =
-  /^(text\/(x-c|x-csharp|tab-separated-values|x-c\+\+|x-java|html|markdown|x-php|x-python|x-script\.python|x-ruby|x-tex|plain|css|vtt|javascript|csv))$/;
+  /^(text\/(x-c|x-csharp|tab-separated-values|x-c\+\+|x-h|x-java|html|markdown|x-php|x-python|x-script\.python|x-ruby|x-tex|plain|css|vtt|javascript|csv))$/;
 
 export const applicationMimeTypes =
   /^(application\/(epub\+zip|csv|json|pdf|x-tar|typescript|vnd\.openxmlformats-officedocument\.(wordprocessingml\.document|presentationml\.presentation|spreadsheetml\.sheet)|xml|zip))$/;
@@ -142,6 +142,7 @@ export const codeTypeMapping: { [key: string]: string } = {
   c: 'text/x-c',
   cs: 'text/x-csharp',
   cpp: 'text/x-c++',
+  h: 'text/x-h',
   md: 'text/markdown',
   php: 'text/x-php',
   py: 'text/x-python',
@@ -159,7 +160,7 @@ export const codeTypeMapping: { [key: string]: string } = {
 };
 
 export const retrievalMimeTypes = [
-  /^(text\/(x-c|x-c\+\+|html|x-java|markdown|x-php|x-python|x-script\.python|x-ruby|x-tex|plain|vtt|xml))$/,
+  /^(text\/(x-c|x-c\+\+|x-h|html|x-java|markdown|x-php|x-python|x-script\.python|x-ruby|x-tex|plain|vtt|xml))$/,
   /^(application\/(json|pdf|vnd\.openxmlformats-officedocument\.(wordprocessingml\.document|presentationml\.presentation)))$/,
 ];