.env.example

@@ -677,8 +677,7 @@ AZURE_CONTAINER_NAME=files
 #========================#
 
 ALLOW_SHARED_LINKS=true
-# Allows unauthenticated access to shared links. Defaults to false (auth required) if not set.
-ALLOW_SHARED_LINKS_PUBLIC=false
+ALLOW_SHARED_LINKS_PUBLIC=true
 
 #==============================#
 # Static File Cache Control    #
@@ -850,24 +849,3 @@ OPENWEATHER_API_KEY=
 # Skip code challenge method validation (e.g., for AWS Cognito that supports S256 but doesn't advertise it)
 # When set to true, forces S256 code challenge even if not advertised in .well-known/openid-configuration
 # MCP_SKIP_CODE_CHALLENGE_CHECK=false
-
-# Circuit breaker: max connect/disconnect cycles before tripping (per server)
-# MCP_CB_MAX_CYCLES=7
-
-# Circuit breaker: sliding window (ms) for counting cycles
-# MCP_CB_CYCLE_WINDOW_MS=45000
-
-# Circuit breaker: cooldown (ms) after the cycle breaker trips
-# MCP_CB_CYCLE_COOLDOWN_MS=15000
-
-# Circuit breaker: max consecutive failed connection rounds before backoff
-# MCP_CB_MAX_FAILED_ROUNDS=3
-
-# Circuit breaker: sliding window (ms) for counting failed rounds
-# MCP_CB_FAILED_WINDOW_MS=120000
-
-# Circuit breaker: base backoff (ms) after failed round threshold is reached
-# MCP_CB_BASE_BACKOFF_MS=30000
-
-# Circuit breaker: max backoff cap (ms) for exponential backoff
-# MCP_CB_MAX_BACKOFF_MS=300000

.github/workflows/backend-review.yml

@@ -9,159 +9,11 @@ on:
     paths:
       - 'api/**'
       - 'packages/**'
-
-env:
-  NODE_ENV: CI
-  NODE_OPTIONS: '--max-old-space-size=${{ secrets.NODE_MAX_OLD_SPACE_SIZE || 6144 }}'
-
 jobs:
-  build:
-    name: Build packages
+  tests_Backend:
+    name: Run Backend unit tests
+    timeout-minutes: 60
     runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Use Node.js 20.19
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.19'
-
-      - name: Restore node_modules cache
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            api/node_modules
-            packages/api/node_modules
-            packages/data-provider/node_modules
-            packages/data-schemas/node_modules
-          key: node-modules-backend-${{ runner.os }}-20.19-${{ hashFiles('package-lock.json') }}
-
-      - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: npm ci
-
-      - name: Restore data-provider build cache
-        id: cache-data-provider
-        uses: actions/cache@v4
-        with:
-          path: packages/data-provider/dist
-          key: build-data-provider-${{ runner.os }}-${{ hashFiles('packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json') }}
-
-      - name: Build data-provider
-        if: steps.cache-data-provider.outputs.cache-hit != 'true'
-        run: npm run build:data-provider
-
-      - name: Restore data-schemas build cache
-        id: cache-data-schemas
-        uses: actions/cache@v4
-        with:
-          path: packages/data-schemas/dist
-          key: build-data-schemas-${{ runner.os }}-${{ hashFiles('packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/rollup.config.js', 'packages/data-schemas/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json') }}
-
-      - name: Build data-schemas
-        if: steps.cache-data-schemas.outputs.cache-hit != 'true'
-        run: npm run build:data-schemas
-
-      - name: Restore api build cache
-        id: cache-api
-        uses: actions/cache@v4
-        with:
-          path: packages/api/dist
-          key: build-api-${{ runner.os }}-${{ hashFiles('packages/api/src/**', 'packages/api/tsconfig*.json', 'packages/api/server-rollup.config.js', 'packages/api/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json', 'packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/rollup.config.js', 'packages/data-schemas/package.json') }}
-
-      - name: Build api
-        if: steps.cache-api.outputs.cache-hit != 'true'
-        run: npm run build:api
-
-      - name: Upload data-provider build
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-data-provider
-          path: packages/data-provider/dist
-          retention-days: 2
-
-      - name: Upload data-schemas build
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-data-schemas
-          path: packages/data-schemas/dist
-          retention-days: 2
-
-      - name: Upload api build
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-api
-          path: packages/api/dist
-          retention-days: 2
-
-  circular-deps:
-    name: Circular dependency checks
-    needs: build
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Use Node.js 20.19
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.19'
-
-      - name: Restore node_modules cache
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            api/node_modules
-            packages/api/node_modules
-            packages/data-provider/node_modules
-            packages/data-schemas/node_modules
-          key: node-modules-backend-${{ runner.os }}-20.19-${{ hashFiles('package-lock.json') }}
-
-      - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: npm ci
-
-      - name: Download data-provider build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-data-provider
-          path: packages/data-provider/dist
-
-      - name: Download data-schemas build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-data-schemas
-          path: packages/data-schemas/dist
-
-      - name: Rebuild @librechat/api and check for circular dependencies
-        run: |
-          output=$(npm run build:api 2>&1)
-          echo "$output"
-          if echo "$output" | grep -q "Circular depend"; then
-            echo "Error: Circular dependency detected in @librechat/api!"
-            exit 1
-          fi
-
-      - name: Detect circular dependencies in rollup
-        working-directory: ./packages/data-provider
-        run: |
-          output=$(npm run rollup:api)
-          echo "$output"
-          if echo "$output" | grep -q "Circular dependency"; then
-            echo "Error: Circular dependency detected!"
-            exit 1
-          fi
-
-  test-api:
-    name: 'Tests: api'
-    needs: build
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
     env:
       MONGO_URI: ${{ secrets.MONGO_URI }}
       OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
@@ -171,187 +23,60 @@ jobs:
       BAN_VIOLATIONS: ${{ secrets.BAN_VIOLATIONS }}
       BAN_DURATION: ${{ secrets.BAN_DURATION }}
       BAN_INTERVAL: ${{ secrets.BAN_INTERVAL }}
+      NODE_ENV: CI
+      NODE_OPTIONS: '--max-old-space-size=${{ secrets.NODE_MAX_OLD_SPACE_SIZE || 6144 }}'
     steps:
       - uses: actions/checkout@v4
-
-      - name: Use Node.js 20.19
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: '20.19'
-
-      - name: Restore node_modules cache
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            api/node_modules
-            packages/api/node_modules
-            packages/data-provider/node_modules
-            packages/data-schemas/node_modules
-          key: node-modules-backend-${{ runner.os }}-20.19-${{ hashFiles('package-lock.json') }}
+          node-version: 20
+          cache: 'npm'
 
       - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: npm ci
 
-      - name: Download data-provider build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-data-provider
-          path: packages/data-provider/dist
+      - name: Install Data Provider Package
+        run: npm run build:data-provider
 
-      - name: Download data-schemas build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-data-schemas
-          path: packages/data-schemas/dist
+      - name: Install Data Schemas Package
+        run: npm run build:data-schemas
 
-      - name: Download api build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-api
-          path: packages/api/dist
+      - name: Build API Package & Detect Circular Dependencies
+        run: |
+          output=$(npm run build:api 2>&1)
+          echo "$output"
+          if echo "$output" | grep -q "Circular depend"; then
+            echo "Error: Circular dependency detected in @librechat/api!"
+            exit 1
+          fi
 
       - name: Create empty auth.json file
         run: |
           mkdir -p api/data
           echo '{}' > api/data/auth.json
 
+      - name: Check for Circular dependency in rollup
+        working-directory: ./packages/data-provider
+        run: |
+          output=$(npm run rollup:api)
+          echo "$output"
+          if echo "$output" | grep -q "Circular dependency"; then
+            echo "Error: Circular dependency detected!"
+            exit 1
+          fi
+
       - name: Prepare .env.test file
         run: cp api/test/.env.test.example api/test/.env.test
 
       - name: Run unit tests
         run: cd api && npm run test:ci
 
-  test-data-provider:
-    name: 'Tests: data-provider'
-    needs: build
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Use Node.js 20.19
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.19'
-
-      - name: Restore node_modules cache
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            api/node_modules
-            packages/api/node_modules
-            packages/data-provider/node_modules
-            packages/data-schemas/node_modules
-          key: node-modules-backend-${{ runner.os }}-20.19-${{ hashFiles('package-lock.json') }}
-
-      - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: npm ci
-
-      - name: Download data-provider build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-data-provider
-          path: packages/data-provider/dist
-
-      - name: Run unit tests
+      - name: Run librechat-data-provider unit tests
         run: cd packages/data-provider && npm run test:ci
 
-  test-data-schemas:
-    name: 'Tests: data-schemas'
-    needs: build
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Use Node.js 20.19
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.19'
-
-      - name: Restore node_modules cache
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            api/node_modules
-            packages/api/node_modules
-            packages/data-provider/node_modules
-            packages/data-schemas/node_modules
-          key: node-modules-backend-${{ runner.os }}-20.19-${{ hashFiles('package-lock.json') }}
-
-      - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: npm ci
-
-      - name: Download data-provider build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-data-provider
-          path: packages/data-provider/dist
-
-      - name: Download data-schemas build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-data-schemas
-          path: packages/data-schemas/dist
-
-      - name: Run unit tests
+      - name: Run @librechat/data-schemas unit tests
         run: cd packages/data-schemas && npm run test:ci
 
-  test-packages-api:
-    name: 'Tests: @librechat/api'
-    needs: build
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Use Node.js 20.19
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.19'
-
-      - name: Restore node_modules cache
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            api/node_modules
-            packages/api/node_modules
-            packages/data-provider/node_modules
-            packages/data-schemas/node_modules
-          key: node-modules-backend-${{ runner.os }}-20.19-${{ hashFiles('package-lock.json') }}
-
-      - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: npm ci
-
-      - name: Download data-provider build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-data-provider
-          path: packages/data-provider/dist
-
-      - name: Download data-schemas build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-data-schemas
-          path: packages/data-schemas/dist
-
-      - name: Download api build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-api
-          path: packages/api/dist
-
-      - name: Run unit tests
+      - name: Run @librechat/api unit tests
         run: cd packages/api && npm run test:ci

.github/workflows/frontend-review.yml

@@ -2,7 +2,7 @@ name: Frontend Unit Tests
 
 on:
   pull_request:
-    branches:
+    branches: 
       - main
       - dev
       - dev-staging
@@ -11,200 +11,51 @@ on:
       - 'client/**'
       - 'packages/data-provider/**'
 
-env:
-  NODE_OPTIONS: '--max-old-space-size=${{ secrets.NODE_MAX_OLD_SPACE_SIZE || 6144 }}'
-
 jobs:
-  build:
-    name: Build packages
+  tests_frontend_ubuntu:
+    name: Run frontend unit tests on Ubuntu
+    timeout-minutes: 60
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    env:
+      NODE_OPTIONS: '--max-old-space-size=${{ secrets.NODE_MAX_OLD_SPACE_SIZE || 6144 }}'
     steps:
       - uses: actions/checkout@v4
-
-      - name: Use Node.js 20.19
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: '20.19'
-
-      - name: Restore node_modules cache
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            client/node_modules
-            packages/client/node_modules
-            packages/data-provider/node_modules
-          key: node-modules-frontend-${{ runner.os }}-20.19-${{ hashFiles('package-lock.json') }}
+          node-version: 20
+          cache: 'npm'
 
       - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: npm ci
 
-      - name: Restore data-provider build cache
-        id: cache-data-provider
-        uses: actions/cache@v4
-        with:
-          path: packages/data-provider/dist
-          key: build-data-provider-${{ runner.os }}-${{ hashFiles('packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json') }}
-
-      - name: Build data-provider
-        if: steps.cache-data-provider.outputs.cache-hit != 'true'
-        run: npm run build:data-provider
-
-      - name: Restore client-package build cache
-        id: cache-client-package
-        uses: actions/cache@v4
-        with:
-          path: packages/client/dist
-          key: build-client-package-${{ runner.os }}-${{ hashFiles('packages/client/src/**', 'packages/client/tsconfig*.json', 'packages/client/rollup.config.js', 'packages/client/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json') }}
-
-      - name: Build client-package
-        if: steps.cache-client-package.outputs.cache-hit != 'true'
-        run: npm run build:client-package
-
-      - name: Upload data-provider build
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-data-provider
-          path: packages/data-provider/dist
-          retention-days: 2
-
-      - name: Upload client-package build
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-client-package
-          path: packages/client/dist
-          retention-days: 2
-
-  test-ubuntu:
-    name: 'Tests: Ubuntu'
-    needs: build
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Use Node.js 20.19
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.19'
-
-      - name: Restore node_modules cache
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            client/node_modules
-            packages/client/node_modules
-            packages/data-provider/node_modules
-          key: node-modules-frontend-${{ runner.os }}-20.19-${{ hashFiles('package-lock.json') }}
-
-      - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: npm ci
-
-      - name: Download data-provider build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-data-provider
-          path: packages/data-provider/dist
-
-      - name: Download client-package build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-client-package
-          path: packages/client/dist
+      - name: Build Client
+        run: npm run frontend:ci
 
       - name: Run unit tests
         run: npm run test:ci --verbose
         working-directory: client
 
-  test-windows:
-    name: 'Tests: Windows'
-    needs: build
+  tests_frontend_windows:
+    name: Run frontend unit tests on Windows
+    timeout-minutes: 60
     runs-on: windows-latest
-    timeout-minutes: 20
+    env:
+      NODE_OPTIONS: '--max-old-space-size=${{ secrets.NODE_MAX_OLD_SPACE_SIZE || 6144 }}'
     steps:
       - uses: actions/checkout@v4
-
-      - name: Use Node.js 20.19
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: '20.19'
-
-      - name: Restore node_modules cache
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            client/node_modules
-            packages/client/node_modules
-            packages/data-provider/node_modules
-          key: node-modules-frontend-${{ runner.os }}-20.19-${{ hashFiles('package-lock.json') }}
+          node-version: 20
+          cache: 'npm'
 
       - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: npm ci
 
-      - name: Download data-provider build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-data-provider
-          path: packages/data-provider/dist
-
-      - name: Download client-package build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-client-package
-          path: packages/client/dist
+      - name: Build Client
+        run: npm run frontend:ci
 
       - name: Run unit tests
         run: npm run test:ci --verbose
-        working-directory: client
-
-  build-verify:
-    name: Vite build verification
-    needs: build
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Use Node.js 20.19
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.19'
-
-      - name: Restore node_modules cache
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            node_modules
-            client/node_modules
-            packages/client/node_modules
-            packages/data-provider/node_modules
-          key: node-modules-frontend-${{ runner.os }}-20.19-${{ hashFiles('package-lock.json') }}
-
-      - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: npm ci
-
-      - name: Download data-provider build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-data-provider
-          path: packages/data-provider/dist
-
-      - name: Download client-package build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-client-package
-          path: packages/client/dist
-
-      - name: Build client
-        run: cd client && npm run build:ci
+        working-directory: client

AGENTS.md

@@ -149,15 +149,7 @@ Multi-line imports count total character length across all lines. Consolidate va
 - Run tests from their workspace directory: `cd api && npx jest <pattern>`, `cd packages/api && npx jest <pattern>`, etc.
 - Frontend tests: `__tests__` directories alongside components; use `test/layout-test-utils` for rendering.
 - Cover loading, success, and error states for UI/data flows.
-
-### Philosophy
-
-- **Real logic over mocks.** Exercise actual code paths with real dependencies. Mocking is a last resort.
-- **Spies over mocks.** Assert that real functions are called with expected arguments and frequency without replacing underlying logic.
-- **MongoDB**: use `mongodb-memory-server` for a real in-memory MongoDB instance. Test actual queries and schema validation, not mocked DB calls.
-- **MCP**: use real `@modelcontextprotocol/sdk` exports for servers, transports, and tool definitions. Mirror real scenarios, don't stub SDK internals.
-- Only mock what you cannot control: external HTTP APIs, rate-limited services, non-deterministic system calls.
-- Heavy mocking is a code smell, not a testing strategy.
+- Mock data-provider hooks and external dependencies.
 
 ---
 

Dockerfile

@@ -1,4 +1,4 @@
-# v0.8.3
+# v0.8.3-rc2
 
 # Base node image
 FROM node:20-alpine AS node

Dockerfile.multi

@@ -1,5 +1,5 @@
 # Dockerfile.multi
-# v0.8.3
+# v0.8.3-rc2
 
 # Set configurable max-old-space-size with default
 ARG NODE_MAX_OLD_SPACE_SIZE=6144

api/app/clients/tools/structured/specs/DALLE3-proxy.spec.js

@@ -1,6 +1,7 @@
 const DALLE3 = require('../DALLE3');
 const { ProxyAgent } = require('undici');
 
+jest.mock('tiktoken');
 const processFileURL = jest.fn();
 
 describe('DALLE3 Proxy Configuration', () => {

api/app/clients/tools/structured/specs/DALLE3.spec.js

@@ -14,6 +14,15 @@ jest.mock('@librechat/data-schemas', () => {
   };
 });
 
+jest.mock('tiktoken', () => {
+  return {
+    encoding_for_model: jest.fn().mockReturnValue({
+      encode: jest.fn(),
+      decode: jest.fn(),
+    }),
+  };
+});
+
 const processFileURL = jest.fn();
 
 const generate = jest.fn();

api/db/indexSync.js

@@ -236,12 +236,8 @@ async function performSync(flowManager, flowId, flowType) {
       const messageCount = messageProgress.totalDocuments;
       const messagesIndexed = messageProgress.totalProcessed;
       const unindexedMessages = messageCount - messagesIndexed;
-      const noneIndexed = messagesIndexed === 0 && unindexedMessages > 0;
 
-      if (settingsUpdated || noneIndexed || unindexedMessages > syncThreshold) {
-        if (noneIndexed && !settingsUpdated) {
-          logger.info('[indexSync] No messages marked as indexed, forcing full sync');
-        }
+      if (settingsUpdated || unindexedMessages > syncThreshold) {
         logger.info(`[indexSync] Starting message sync (${unindexedMessages} unindexed)`);
         await Message.syncWithMeili();
         messagesSync = true;
@@ -265,13 +261,9 @@ async function performSync(flowManager, flowId, flowType) {
 
       const convoCount = convoProgress.totalDocuments;
       const convosIndexed = convoProgress.totalProcessed;
-      const unindexedConvos = convoCount - convosIndexed;
-      const noneConvosIndexed = convosIndexed === 0 && unindexedConvos > 0;
 
-      if (settingsUpdated || noneConvosIndexed || unindexedConvos > syncThreshold) {
-        if (noneConvosIndexed && !settingsUpdated) {
-          logger.info('[indexSync] No conversations marked as indexed, forcing full sync');
-        }
+      const unindexedConvos = convoCount - convosIndexed;
+      if (settingsUpdated || unindexedConvos > syncThreshold) {
         logger.info(`[indexSync] Starting convos sync (${unindexedConvos} unindexed)`);
         await Conversation.syncWithMeili();
         convosSync = true;

api/db/indexSync.spec.js

@@ -462,69 +462,4 @@ describe('performSync() - syncThreshold logic', () => {
     );
     expect(mockLogger.info).toHaveBeenCalledWith('[indexSync] Starting convos sync (50 unindexed)');
   });
-
-  test('forces sync when zero documents indexed (reset scenario) even if below threshold', async () => {
-    Message.getSyncProgress.mockResolvedValue({
-      totalProcessed: 0,
-      totalDocuments: 680,
-      isComplete: false,
-    });
-
-    Conversation.getSyncProgress.mockResolvedValue({
-      totalProcessed: 0,
-      totalDocuments: 76,
-      isComplete: false,
-    });
-
-    Message.syncWithMeili.mockResolvedValue(undefined);
-    Conversation.syncWithMeili.mockResolvedValue(undefined);
-
-    const indexSync = require('./indexSync');
-    await indexSync();
-
-    expect(Message.syncWithMeili).toHaveBeenCalledTimes(1);
-    expect(Conversation.syncWithMeili).toHaveBeenCalledTimes(1);
-    expect(mockLogger.info).toHaveBeenCalledWith(
-      '[indexSync] No messages marked as indexed, forcing full sync',
-    );
-    expect(mockLogger.info).toHaveBeenCalledWith(
-      '[indexSync] Starting message sync (680 unindexed)',
-    );
-    expect(mockLogger.info).toHaveBeenCalledWith(
-      '[indexSync] No conversations marked as indexed, forcing full sync',
-    );
-    expect(mockLogger.info).toHaveBeenCalledWith('[indexSync] Starting convos sync (76 unindexed)');
-  });
-
-  test('does NOT force sync when some documents already indexed and below threshold', async () => {
-    Message.getSyncProgress.mockResolvedValue({
-      totalProcessed: 630,
-      totalDocuments: 680,
-      isComplete: false,
-    });
-
-    Conversation.getSyncProgress.mockResolvedValue({
-      totalProcessed: 70,
-      totalDocuments: 76,
-      isComplete: false,
-    });
-
-    const indexSync = require('./indexSync');
-    await indexSync();
-
-    expect(Message.syncWithMeili).not.toHaveBeenCalled();
-    expect(Conversation.syncWithMeili).not.toHaveBeenCalled();
-    expect(mockLogger.info).not.toHaveBeenCalledWith(
-      '[indexSync] No messages marked as indexed, forcing full sync',
-    );
-    expect(mockLogger.info).not.toHaveBeenCalledWith(
-      '[indexSync] No conversations marked as indexed, forcing full sync',
-    );
-    expect(mockLogger.info).toHaveBeenCalledWith(
-      '[indexSync] 50 messages unindexed (below threshold: 1000, skipping)',
-    );
-    expect(mockLogger.info).toHaveBeenCalledWith(
-      '[indexSync] 6 convos unindexed (below threshold: 1000, skipping)',
-    );
-  });
 });

api/jest.config.js

@@ -3,13 +3,12 @@ module.exports = {
   clearMocks: true,
   roots: ['<rootDir>'],
   coverageDirectory: 'coverage',
-  maxWorkers: '50%',
   testTimeout: 30000, // 30 seconds timeout for all tests
   setupFiles: ['./test/jestSetup.js', './test/__mocks__/logger.js'],
   moduleNameMapper: {
     '~/(.*)': '<rootDir>/$1',
     '~/data/auth.json': '<rootDir>/__mocks__/auth.mock.json',
-    '^openid-client/passport$': '<rootDir>/test/__mocks__/openid-client-passport.js',
+    '^openid-client/passport$': '<rootDir>/test/__mocks__/openid-client-passport.js', // Mock for the passport strategy part
     '^openid-client$': '<rootDir>/test/__mocks__/openid-client.js',
   },
   transformIgnorePatterns: ['/node_modules/(?!(openid-client|oauth4webapi|jose)/).*/'],

api/models/Conversation.js

@@ -228,7 +228,7 @@ module.exports = {
             },
           ],
         };
-      } catch (_err) {
+      } catch (err) {
         logger.warn('[getConvosByCursor] Invalid cursor format, starting from beginning');
       }
       if (cursorFilter) {
@@ -361,7 +361,6 @@ module.exports = {
 
       const deleteMessagesResult = await deleteMessages({
         conversationId: { $in: conversationIds },
-        user,
       });
 
       return { ...deleteConvoResult, messages: deleteMessagesResult };

api/models/Conversation.spec.js

@@ -549,7 +549,6 @@ describe('Conversation Operations', () => {
       expect(result.messages.deletedCount).toBe(5);
       expect(deleteMessages).toHaveBeenCalledWith({
         conversationId: { $in: [mockConversationData.conversationId] },
-        user: 'user123',
       });
 
       // Verify conversation was deleted

api/models/tx.js

@@ -4,18 +4,31 @@ const defaultRate = 6;
 /**
  * Token Pricing Configuration
  *
- * Pattern Matching
- * ================
- * `findMatchingPattern` (from @librechat/api) uses `modelName.includes(key)` and selects
- * the LONGEST matching key. If a key's length equals the model name's length (exact match),
- * it returns immediately. Definition order does NOT affect correctness.
+ * IMPORTANT: Key Ordering for Pattern Matching
+ * ============================================
+ * The `findMatchingPattern` function iterates through object keys in REVERSE order
+ * (last-defined keys are checked first) and uses `modelName.includes(key)` for matching.
  *
- * Key ordering matters only for:
- *   1. Performance: list older/less common models first so newer/common models
- *      are found earlier in the reverse scan.
- *   2. Same-length tie-breaking: the last-defined key wins on equal-length matches.
+ * This means:
+ * 1. BASE PATTERNS must be defined FIRST (e.g., "kimi", "moonshot")
+ * 2. SPECIFIC PATTERNS must be defined AFTER their base patterns (e.g., "kimi-k2", "kimi-k2.5")
+ *
+ * Example ordering for Kimi models:
+ *   kimi: { prompt: 0.6, completion: 2.5 },       // Base pattern - checked last
+ *   'kimi-k2': { prompt: 0.6, completion: 2.5 },  // More specific - checked before "kimi"
+ *   'kimi-k2.5': { prompt: 0.6, completion: 3.0 }, // Most specific - checked first
+ *
+ * Why this matters:
+ * - Model name "kimi-k2.5" contains both "kimi" and "kimi-k2" as substrings
+ * - If "kimi" were checked first, it would incorrectly match and return wrong pricing
+ * - By defining specific patterns AFTER base patterns, they're checked first in reverse iteration
  *
  * This applies to BOTH `tokenValues` and `cacheTokenValues` objects.
+ *
+ * When adding new model families:
+ * 1. Define the base/generic pattern first
+ * 2. Define increasingly specific patterns after
+ * 3. Ensure no pattern is a substring of another that should match differently
  */
 
 /**
@@ -138,9 +151,6 @@ const tokenValues = Object.assign(
     'gpt-5.1': { prompt: 1.25, completion: 10 },
     'gpt-5.2': { prompt: 1.75, completion: 14 },
     'gpt-5.3': { prompt: 1.75, completion: 14 },
-    'gpt-5.4': { prompt: 2.5, completion: 15 },
-    // TODO: gpt-5.4-pro pricing not yet officially published — verify before release
-    'gpt-5.4-pro': { prompt: 5, completion: 30 },
     'gpt-5-nano': { prompt: 0.05, completion: 0.4 },
     'gpt-5-mini': { prompt: 0.25, completion: 2 },
     'gpt-5-pro': { prompt: 15, completion: 120 },
@@ -312,7 +322,7 @@ const cacheTokenValues = {
   //   gpt-4o (incl. mini), o1 (incl. mini/preview): 50% off
   //   gpt-4.1 (incl. mini/nano), o3 (incl. mini), o4-mini: 75% off
   //   gpt-5.x (excl. pro variants): 90% off
-  //   gpt-5-pro, gpt-5.2-pro, gpt-5.4-pro: no caching
+  //   gpt-5-pro, gpt-5.2-pro: no caching
   'gpt-4o': { write: 2.5, read: 1.25 },
   'gpt-4o-mini': { write: 0.15, read: 0.075 },
   'gpt-4.1': { write: 2, read: 0.5 },
@@ -322,7 +332,6 @@ const cacheTokenValues = {
   'gpt-5.1': { write: 1.25, read: 0.125 },
   'gpt-5.2': { write: 1.75, read: 0.175 },
   'gpt-5.3': { write: 1.75, read: 0.175 },
-  'gpt-5.4': { write: 2.5, read: 0.25 },
   'gpt-5-mini': { write: 0.25, read: 0.025 },
   'gpt-5-nano': { write: 0.05, read: 0.005 },
   o1: { write: 15, read: 7.5 },

api/models/tx.spec.js

@@ -59,17 +59,6 @@ describe('getValueKey', () => {
     expect(getValueKey('openai/gpt-5.3')).toBe('gpt-5.3');
   });
 
-  it('should return "gpt-5.4" for model name containing "gpt-5.4"', () => {
-    expect(getValueKey('gpt-5.4')).toBe('gpt-5.4');
-    expect(getValueKey('gpt-5.4-thinking')).toBe('gpt-5.4');
-    expect(getValueKey('openai/gpt-5.4')).toBe('gpt-5.4');
-  });
-
-  it('should return "gpt-5.4-pro" for model name containing "gpt-5.4-pro"', () => {
-    expect(getValueKey('gpt-5.4-pro')).toBe('gpt-5.4-pro');
-    expect(getValueKey('openai/gpt-5.4-pro')).toBe('gpt-5.4-pro');
-  });
-
   it('should return "gpt-3.5-turbo-1106" for model name containing "gpt-3.5-turbo-1106"', () => {
     expect(getValueKey('gpt-3.5-turbo-1106-some-other-info')).toBe('gpt-3.5-turbo-1106');
     expect(getValueKey('openai/gpt-3.5-turbo-1106')).toBe('gpt-3.5-turbo-1106');
@@ -411,33 +400,6 @@ describe('getMultiplier', () => {
     );
   });
 
-  it('should return the correct multiplier for gpt-5.4', () => {
-    expect(getMultiplier({ model: 'gpt-5.4', tokenType: 'prompt' })).toBe(
-      tokenValues['gpt-5.4'].prompt,
-    );
-    expect(getMultiplier({ model: 'gpt-5.4', tokenType: 'completion' })).toBe(
-      tokenValues['gpt-5.4'].completion,
-    );
-    expect(getMultiplier({ model: 'gpt-5.4-thinking', tokenType: 'prompt' })).toBe(
-      tokenValues['gpt-5.4'].prompt,
-    );
-    expect(getMultiplier({ model: 'openai/gpt-5.4', tokenType: 'completion' })).toBe(
-      tokenValues['gpt-5.4'].completion,
-    );
-  });
-
-  it('should return the correct multiplier for gpt-5.4-pro', () => {
-    expect(getMultiplier({ model: 'gpt-5.4-pro', tokenType: 'prompt' })).toBe(
-      tokenValues['gpt-5.4-pro'].prompt,
-    );
-    expect(getMultiplier({ model: 'gpt-5.4-pro', tokenType: 'completion' })).toBe(
-      tokenValues['gpt-5.4-pro'].completion,
-    );
-    expect(getMultiplier({ model: 'openai/gpt-5.4-pro', tokenType: 'prompt' })).toBe(
-      tokenValues['gpt-5.4-pro'].prompt,
-    );
-  });
-
   it('should return the correct multiplier for gpt-4o', () => {
     const valueKey = getValueKey('gpt-4o-2024-08-06');
     expect(getMultiplier({ valueKey, tokenType: 'prompt' })).toBe(tokenValues['gpt-4o'].prompt);
@@ -1415,7 +1377,6 @@ describe('getCacheMultiplier', () => {
       'gpt-5.1',
       'gpt-5.2',
       'gpt-5.3',
-      'gpt-5.4',
       'gpt-5-mini',
       'gpt-5-nano',
       'o1',
@@ -1452,20 +1413,10 @@ describe('getCacheMultiplier', () => {
     expect(getCacheMultiplier({ model: 'gpt-5-pro', cacheType: 'write' })).toBeNull();
     expect(getCacheMultiplier({ model: 'gpt-5.2-pro', cacheType: 'read' })).toBeNull();
     expect(getCacheMultiplier({ model: 'gpt-5.2-pro', cacheType: 'write' })).toBeNull();
-    expect(getCacheMultiplier({ model: 'gpt-5.4-pro', cacheType: 'read' })).toBeNull();
-    expect(getCacheMultiplier({ model: 'gpt-5.4-pro', cacheType: 'write' })).toBeNull();
   });
 
   it('should have consistent 10% cache read pricing for gpt-5.x models', () => {
-    const gpt5CacheModels = [
-      'gpt-5',
-      'gpt-5.1',
-      'gpt-5.2',
-      'gpt-5.3',
-      'gpt-5.4',
-      'gpt-5-mini',
-      'gpt-5-nano',
-    ];
+    const gpt5CacheModels = ['gpt-5', 'gpt-5.1', 'gpt-5.2', 'gpt-5.3', 'gpt-5-mini', 'gpt-5-nano'];
     for (const model of gpt5CacheModels) {
       expect(cacheTokenValues[model].read).toBeCloseTo(cacheTokenValues[model].write * 0.1, 10);
     }

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@librechat/backend",
-  "version": "v0.8.3",
+  "version": "v0.8.3-rc2",
   "description": "",
   "scripts": {
     "start": "echo 'please run this from the root directory'",
@@ -51,7 +51,6 @@
     "@modelcontextprotocol/sdk": "^1.27.1",
     "@node-saml/passport-saml": "^5.1.0",
     "@smithy/node-http-handler": "^4.4.5",
-    "ai-tokenizer": "^1.0.6",
     "axios": "^1.13.5",
     "bcryptjs": "^2.4.3",
     "compression": "^1.8.1",
@@ -64,10 +63,10 @@
     "eventsource": "^3.0.2",
     "express": "^5.2.1",
     "express-mongo-sanitize": "^2.2.0",
-    "express-rate-limit": "^8.3.0",
+    "express-rate-limit": "^8.2.1",
     "express-session": "^1.18.2",
     "express-static-gzip": "^2.2.0",
-    "file-type": "^21.3.2",
+    "file-type": "^18.7.0",
     "firebase": "^11.0.2",
     "form-data": "^4.0.4",
     "handlebars": "^4.7.7",
@@ -88,7 +87,7 @@
     "mime": "^3.0.0",
     "module-alias": "^2.2.3",
     "mongoose": "^8.12.1",
-    "multer": "^2.1.1",
+    "multer": "^2.1.0",
     "nanoid": "^3.3.7",
     "node-fetch": "^2.7.0",
     "nodemailer": "^7.0.11",
@@ -107,9 +106,10 @@
     "pdfjs-dist": "^5.4.624",
     "rate-limit-redis": "^4.2.0",
     "sharp": "^0.33.5",
+    "tiktoken": "^1.0.15",
     "traverse": "^0.6.7",
     "ua-parser-js": "^1.0.36",
-    "undici": "^7.24.1",
+    "undici": "^7.18.2",
     "winston": "^3.11.0",
     "winston-daily-rotate-file": "^5.0.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",

api/server/controllers/TwoFactorController.js

@@ -1,6 +1,5 @@
 const { encryptV3, logger } = require('@librechat/data-schemas');
 const {
-  verifyOTPOrBackupCode,
   generateBackupCodes,
   generateTOTPSecret,
   verifyBackupCode,
@@ -14,42 +13,24 @@ const safeAppTitle = (process.env.APP_TITLE || 'LibreChat').replace(/\s+/g, '');
 /**
  * Enable 2FA for the user by generating a new TOTP secret and backup codes.
  * The secret is encrypted and stored, and 2FA is marked as disabled until confirmed.
- * If 2FA is already enabled, requires OTP or backup code verification to re-enroll.
  */
 const enable2FA = async (req, res) => {
   try {
     const userId = req.user.id;
-    const existingUser = await getUserById(
-      userId,
-      '+totpSecret +backupCodes _id twoFactorEnabled email',
-    );
-
-    if (existingUser && existingUser.twoFactorEnabled) {
-      const { token, backupCode } = req.body;
-      const result = await verifyOTPOrBackupCode({
-        user: existingUser,
-        token,
-        backupCode,
-        persistBackupUse: false,
-      });
-
-      if (!result.verified) {
-        const msg = result.message ?? 'TOTP token or backup code is required to re-enroll 2FA';
-        return res.status(result.status ?? 400).json({ message: msg });
-      }
-    }
-
     const secret = generateTOTPSecret();
     const { plainCodes, codeObjects } = await generateBackupCodes();
+
+    // Encrypt the secret with v3 encryption before saving.
     const encryptedSecret = encryptV3(secret);
 
+    // Update the user record: store the secret & backup codes and set twoFactorEnabled to false.
     const user = await updateUser(userId, {
-      pendingTotpSecret: encryptedSecret,
-      pendingBackupCodes: codeObjects,
+      totpSecret: encryptedSecret,
+      backupCodes: codeObjects,
+      twoFactorEnabled: false,
     });
 
-    const email = user.email || (existingUser && existingUser.email) || '';
-    const otpauthUrl = `otpauth://totp/${safeAppTitle}:${email}?secret=${secret}&issuer=${safeAppTitle}`;
+    const otpauthUrl = `otpauth://totp/${safeAppTitle}:${user.email}?secret=${secret}&issuer=${safeAppTitle}`;
 
     return res.status(200).json({ otpauthUrl, backupCodes: plainCodes });
   } catch (err) {
@@ -65,14 +46,13 @@ const verify2FA = async (req, res) => {
   try {
     const userId = req.user.id;
     const { token, backupCode } = req.body;
-    const user = await getUserById(userId, '+totpSecret +pendingTotpSecret +backupCodes _id');
-    const secretSource = user?.pendingTotpSecret ?? user?.totpSecret;
+    const user = await getUserById(userId, '_id totpSecret backupCodes');
 
-    if (!user || !secretSource) {
+    if (!user || !user.totpSecret) {
       return res.status(400).json({ message: '2FA not initiated' });
     }
 
-    const secret = await getTOTPSecret(secretSource);
+    const secret = await getTOTPSecret(user.totpSecret);
     let isVerified = false;
 
     if (token) {
@@ -98,28 +78,15 @@ const confirm2FA = async (req, res) => {
   try {
     const userId = req.user.id;
     const { token } = req.body;
-    const user = await getUserById(
-      userId,
-      '+totpSecret +pendingTotpSecret +pendingBackupCodes _id',
-    );
-    const secretSource = user?.pendingTotpSecret ?? user?.totpSecret;
+    const user = await getUserById(userId, '_id totpSecret');
 
-    if (!user || !secretSource) {
+    if (!user || !user.totpSecret) {
       return res.status(400).json({ message: '2FA not initiated' });
     }
 
-    const secret = await getTOTPSecret(secretSource);
+    const secret = await getTOTPSecret(user.totpSecret);
     if (await verifyTOTP(secret, token)) {
-      const update = {
-        totpSecret: user.pendingTotpSecret ?? user.totpSecret,
-        twoFactorEnabled: true,
-        pendingTotpSecret: null,
-        pendingBackupCodes: [],
-      };
-      if (user.pendingBackupCodes?.length) {
-        update.backupCodes = user.pendingBackupCodes;
-      }
-      await updateUser(userId, update);
+      await updateUser(userId, { twoFactorEnabled: true });
       return res.status(200).json();
     }
     return res.status(400).json({ message: 'Invalid token.' });
@@ -137,27 +104,31 @@ const disable2FA = async (req, res) => {
   try {
     const userId = req.user.id;
     const { token, backupCode } = req.body;
-    const user = await getUserById(userId, '+totpSecret +backupCodes _id twoFactorEnabled');
+    const user = await getUserById(userId, '_id totpSecret backupCodes');
 
     if (!user || !user.totpSecret) {
       return res.status(400).json({ message: '2FA is not setup for this user' });
     }
 
     if (user.twoFactorEnabled) {
-      const result = await verifyOTPOrBackupCode({ user, token, backupCode });
+      const secret = await getTOTPSecret(user.totpSecret);
+      let isVerified = false;
 
-      if (!result.verified) {
-        const msg = result.message ?? 'Either token or backup code is required to disable 2FA';
-        return res.status(result.status ?? 400).json({ message: msg });
+      if (token) {
+        isVerified = await verifyTOTP(secret, token);
+      } else if (backupCode) {
+        isVerified = await verifyBackupCode({ user, backupCode });
+      } else {
+        return res
+          .status(400)
+          .json({ message: 'Either token or backup code is required to disable 2FA' });
+      }
+
+      if (!isVerified) {
+        return res.status(401).json({ message: 'Invalid token or backup code' });
       }
     }
-    await updateUser(userId, {
-      totpSecret: null,
-      backupCodes: [],
-      twoFactorEnabled: false,
-      pendingTotpSecret: null,
-      pendingBackupCodes: [],
-    });
+    await updateUser(userId, { totpSecret: null, backupCodes: [], twoFactorEnabled: false });
     return res.status(200).json();
   } catch (err) {
     logger.error('[disable2FA]', err);
@@ -167,28 +138,10 @@ const disable2FA = async (req, res) => {
 
 /**
  * Regenerate backup codes for the user.
- * Requires OTP or backup code verification if 2FA is already enabled.
  */
 const regenerateBackupCodes = async (req, res) => {
   try {
     const userId = req.user.id;
-    const user = await getUserById(userId, '+totpSecret +backupCodes _id twoFactorEnabled');
-
-    if (!user) {
-      return res.status(404).json({ message: 'User not found' });
-    }
-
-    if (user.twoFactorEnabled) {
-      const { token, backupCode } = req.body;
-      const result = await verifyOTPOrBackupCode({ user, token, backupCode });
-
-      if (!result.verified) {
-        const msg =
-          result.message ?? 'TOTP token or backup code is required to regenerate backup codes';
-        return res.status(result.status ?? 400).json({ message: msg });
-      }
-    }
-
     const { plainCodes, codeObjects } = await generateBackupCodes();
     await updateUser(userId, { backupCodes: codeObjects });
     return res.status(200).json({

api/server/controllers/UserController.js

@@ -14,7 +14,6 @@ const {
   deleteMessages,
   deletePresets,
   deleteUserKey,
-  getUserById,
   deleteConvos,
   deleteFiles,
   updateUser,
@@ -35,7 +34,6 @@ const {
   User,
 } = require('~/db/models');
 const { updateUserPluginAuth, deleteUserPluginAuth } = require('~/server/services/PluginService');
-const { verifyOTPOrBackupCode } = require('~/server/services/twoFactorService');
 const { verifyEmail, resendVerificationEmail } = require('~/server/services/AuthService');
 const { getMCPManager, getFlowStateManager, getMCPServersRegistry } = require('~/config');
 const { invalidateCachedTools } = require('~/server/services/Config/getCachedTools');
@@ -243,22 +241,6 @@ const deleteUserController = async (req, res) => {
   const { user } = req;
 
   try {
-    const existingUser = await getUserById(
-      user.id,
-      '+totpSecret +backupCodes _id twoFactorEnabled',
-    );
-    if (existingUser && existingUser.twoFactorEnabled) {
-      const { token, backupCode } = req.body;
-      const result = await verifyOTPOrBackupCode({ user: existingUser, token, backupCode });
-
-      if (!result.verified) {
-        const msg =
-          result.message ??
-          'TOTP token or backup code is required to delete account with 2FA enabled';
-        return res.status(result.status ?? 400).json({ message: msg });
-      }
-    }
-
     await deleteMessages({ user: user.id }); // delete user messages
     await deleteAllUserSessions({ userId: user.id }); // delete user sessions
     await Transaction.deleteMany({ user: user.id }); // delete user transactions

api/server/controllers/__tests__/TwoFactorController.spec.js

@@ -1,264 +0,0 @@
-const mockGetUserById = jest.fn();
-const mockUpdateUser = jest.fn();
-const mockVerifyOTPOrBackupCode = jest.fn();
-const mockGenerateTOTPSecret = jest.fn();
-const mockGenerateBackupCodes = jest.fn();
-const mockEncryptV3 = jest.fn();
-
-jest.mock('@librechat/data-schemas', () => ({
-  encryptV3: (...args) => mockEncryptV3(...args),
-  logger: { error: jest.fn() },
-}));
-
-jest.mock('~/server/services/twoFactorService', () => ({
-  verifyOTPOrBackupCode: (...args) => mockVerifyOTPOrBackupCode(...args),
-  generateBackupCodes: (...args) => mockGenerateBackupCodes(...args),
-  generateTOTPSecret: (...args) => mockGenerateTOTPSecret(...args),
-  verifyBackupCode: jest.fn(),
-  getTOTPSecret: jest.fn(),
-  verifyTOTP: jest.fn(),
-}));
-
-jest.mock('~/models', () => ({
-  getUserById: (...args) => mockGetUserById(...args),
-  updateUser: (...args) => mockUpdateUser(...args),
-}));
-
-const { enable2FA, regenerateBackupCodes } = require('~/server/controllers/TwoFactorController');
-
-function createRes() {
-  const res = {};
-  res.status = jest.fn().mockReturnValue(res);
-  res.json = jest.fn().mockReturnValue(res);
-  return res;
-}
-
-const PLAIN_CODES = ['code1', 'code2', 'code3'];
-const CODE_OBJECTS = [
-  { codeHash: 'h1', used: false, usedAt: null },
-  { codeHash: 'h2', used: false, usedAt: null },
-  { codeHash: 'h3', used: false, usedAt: null },
-];
-
-beforeEach(() => {
-  jest.clearAllMocks();
-  mockGenerateTOTPSecret.mockReturnValue('NEWSECRET');
-  mockGenerateBackupCodes.mockResolvedValue({ plainCodes: PLAIN_CODES, codeObjects: CODE_OBJECTS });
-  mockEncryptV3.mockReturnValue('encrypted-secret');
-});
-
-describe('enable2FA', () => {
-  it('allows first-time setup without token — writes to pending fields', async () => {
-    const req = { user: { id: 'user1' }, body: {} };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue({ _id: 'user1', twoFactorEnabled: false, email: 'a@b.com' });
-    mockUpdateUser.mockResolvedValue({ email: 'a@b.com' });
-
-    await enable2FA(req, res);
-
-    expect(res.status).toHaveBeenCalledWith(200);
-    expect(res.json).toHaveBeenCalledWith(
-      expect.objectContaining({ otpauthUrl: expect.any(String), backupCodes: PLAIN_CODES }),
-    );
-    expect(mockVerifyOTPOrBackupCode).not.toHaveBeenCalled();
-    const updateCall = mockUpdateUser.mock.calls[0][1];
-    expect(updateCall).toHaveProperty('pendingTotpSecret', 'encrypted-secret');
-    expect(updateCall).toHaveProperty('pendingBackupCodes', CODE_OBJECTS);
-    expect(updateCall).not.toHaveProperty('twoFactorEnabled');
-    expect(updateCall).not.toHaveProperty('totpSecret');
-    expect(updateCall).not.toHaveProperty('backupCodes');
-  });
-
-  it('re-enrollment writes to pending fields, leaving live 2FA intact', async () => {
-    const req = { user: { id: 'user1' }, body: { token: '123456' } };
-    const res = createRes();
-    const existingUser = {
-      _id: 'user1',
-      twoFactorEnabled: true,
-      totpSecret: 'enc-secret',
-      email: 'a@b.com',
-    };
-    mockGetUserById.mockResolvedValue(existingUser);
-    mockVerifyOTPOrBackupCode.mockResolvedValue({ verified: true });
-    mockUpdateUser.mockResolvedValue({ email: 'a@b.com' });
-
-    await enable2FA(req, res);
-
-    expect(mockVerifyOTPOrBackupCode).toHaveBeenCalledWith({
-      user: existingUser,
-      token: '123456',
-      backupCode: undefined,
-      persistBackupUse: false,
-    });
-    expect(res.status).toHaveBeenCalledWith(200);
-    const updateCall = mockUpdateUser.mock.calls[0][1];
-    expect(updateCall).toHaveProperty('pendingTotpSecret', 'encrypted-secret');
-    expect(updateCall).toHaveProperty('pendingBackupCodes', CODE_OBJECTS);
-    expect(updateCall).not.toHaveProperty('twoFactorEnabled');
-    expect(updateCall).not.toHaveProperty('totpSecret');
-  });
-
-  it('allows re-enrollment with valid backup code (persistBackupUse: false)', async () => {
-    const req = { user: { id: 'user1' }, body: { backupCode: 'backup123' } };
-    const res = createRes();
-    const existingUser = {
-      _id: 'user1',
-      twoFactorEnabled: true,
-      totpSecret: 'enc-secret',
-      email: 'a@b.com',
-    };
-    mockGetUserById.mockResolvedValue(existingUser);
-    mockVerifyOTPOrBackupCode.mockResolvedValue({ verified: true });
-    mockUpdateUser.mockResolvedValue({ email: 'a@b.com' });
-
-    await enable2FA(req, res);
-
-    expect(mockVerifyOTPOrBackupCode).toHaveBeenCalledWith(
-      expect.objectContaining({ persistBackupUse: false }),
-    );
-    expect(res.status).toHaveBeenCalledWith(200);
-  });
-
-  it('returns error when no token provided and 2FA is enabled', async () => {
-    const req = { user: { id: 'user1' }, body: {} };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue({
-      _id: 'user1',
-      twoFactorEnabled: true,
-      totpSecret: 'enc-secret',
-    });
-    mockVerifyOTPOrBackupCode.mockResolvedValue({ verified: false, status: 400 });
-
-    await enable2FA(req, res);
-
-    expect(res.status).toHaveBeenCalledWith(400);
-    expect(mockUpdateUser).not.toHaveBeenCalled();
-  });
-
-  it('returns 401 when invalid token provided and 2FA is enabled', async () => {
-    const req = { user: { id: 'user1' }, body: { token: 'wrong' } };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue({
-      _id: 'user1',
-      twoFactorEnabled: true,
-      totpSecret: 'enc-secret',
-    });
-    mockVerifyOTPOrBackupCode.mockResolvedValue({
-      verified: false,
-      status: 401,
-      message: 'Invalid token or backup code',
-    });
-
-    await enable2FA(req, res);
-
-    expect(res.status).toHaveBeenCalledWith(401);
-    expect(res.json).toHaveBeenCalledWith({ message: 'Invalid token or backup code' });
-    expect(mockUpdateUser).not.toHaveBeenCalled();
-  });
-});
-
-describe('regenerateBackupCodes', () => {
-  it('returns 404 when user not found', async () => {
-    const req = { user: { id: 'user1' }, body: {} };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue(null);
-
-    await regenerateBackupCodes(req, res);
-
-    expect(res.status).toHaveBeenCalledWith(404);
-    expect(res.json).toHaveBeenCalledWith({ message: 'User not found' });
-  });
-
-  it('requires OTP when 2FA is enabled', async () => {
-    const req = { user: { id: 'user1' }, body: { token: '123456' } };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue({
-      _id: 'user1',
-      twoFactorEnabled: true,
-      totpSecret: 'enc-secret',
-    });
-    mockVerifyOTPOrBackupCode.mockResolvedValue({ verified: true });
-    mockUpdateUser.mockResolvedValue({});
-
-    await regenerateBackupCodes(req, res);
-
-    expect(mockVerifyOTPOrBackupCode).toHaveBeenCalled();
-    expect(res.status).toHaveBeenCalledWith(200);
-    expect(res.json).toHaveBeenCalledWith({
-      backupCodes: PLAIN_CODES,
-      backupCodesHash: CODE_OBJECTS,
-    });
-  });
-
-  it('returns error when no token provided and 2FA is enabled', async () => {
-    const req = { user: { id: 'user1' }, body: {} };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue({
-      _id: 'user1',
-      twoFactorEnabled: true,
-      totpSecret: 'enc-secret',
-    });
-    mockVerifyOTPOrBackupCode.mockResolvedValue({ verified: false, status: 400 });
-
-    await regenerateBackupCodes(req, res);
-
-    expect(res.status).toHaveBeenCalledWith(400);
-  });
-
-  it('returns 401 when invalid token provided and 2FA is enabled', async () => {
-    const req = { user: { id: 'user1' }, body: { token: 'wrong' } };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue({
-      _id: 'user1',
-      twoFactorEnabled: true,
-      totpSecret: 'enc-secret',
-    });
-    mockVerifyOTPOrBackupCode.mockResolvedValue({
-      verified: false,
-      status: 401,
-      message: 'Invalid token or backup code',
-    });
-
-    await regenerateBackupCodes(req, res);
-
-    expect(res.status).toHaveBeenCalledWith(401);
-    expect(res.json).toHaveBeenCalledWith({ message: 'Invalid token or backup code' });
-  });
-
-  it('includes backupCodesHash in response', async () => {
-    const req = { user: { id: 'user1' }, body: { token: '123456' } };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue({
-      _id: 'user1',
-      twoFactorEnabled: true,
-      totpSecret: 'enc-secret',
-    });
-    mockVerifyOTPOrBackupCode.mockResolvedValue({ verified: true });
-    mockUpdateUser.mockResolvedValue({});
-
-    await regenerateBackupCodes(req, res);
-
-    const responseBody = res.json.mock.calls[0][0];
-    expect(responseBody).toHaveProperty('backupCodesHash', CODE_OBJECTS);
-    expect(responseBody).toHaveProperty('backupCodes', PLAIN_CODES);
-  });
-
-  it('allows regeneration without token when 2FA is not enabled', async () => {
-    const req = { user: { id: 'user1' }, body: {} };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue({
-      _id: 'user1',
-      twoFactorEnabled: false,
-    });
-    mockUpdateUser.mockResolvedValue({});
-
-    await regenerateBackupCodes(req, res);
-
-    expect(mockVerifyOTPOrBackupCode).not.toHaveBeenCalled();
-    expect(res.status).toHaveBeenCalledWith(200);
-    expect(res.json).toHaveBeenCalledWith({
-      backupCodes: PLAIN_CODES,
-      backupCodesHash: CODE_OBJECTS,
-    });
-  });
-});

api/server/controllers/__tests__/deleteUser.spec.js

@@ -1,302 +0,0 @@
-const mockGetUserById = jest.fn();
-const mockDeleteMessages = jest.fn();
-const mockDeleteAllUserSessions = jest.fn();
-const mockDeleteUserById = jest.fn();
-const mockDeleteAllSharedLinks = jest.fn();
-const mockDeletePresets = jest.fn();
-const mockDeleteUserKey = jest.fn();
-const mockDeleteConvos = jest.fn();
-const mockDeleteFiles = jest.fn();
-const mockGetFiles = jest.fn();
-const mockUpdateUserPlugins = jest.fn();
-const mockUpdateUser = jest.fn();
-const mockFindToken = jest.fn();
-const mockVerifyOTPOrBackupCode = jest.fn();
-const mockDeleteUserPluginAuth = jest.fn();
-const mockProcessDeleteRequest = jest.fn();
-const mockDeleteToolCalls = jest.fn();
-const mockDeleteUserAgents = jest.fn();
-const mockDeleteUserPrompts = jest.fn();
-
-jest.mock('@librechat/data-schemas', () => ({
-  logger: { error: jest.fn(), info: jest.fn() },
-  webSearchKeys: [],
-}));
-
-jest.mock('librechat-data-provider', () => ({
-  Tools: {},
-  CacheKeys: {},
-  Constants: { mcp_delimiter: '::', mcp_prefix: 'mcp_' },
-  FileSources: {},
-}));
-
-jest.mock('@librechat/api', () => ({
-  MCPOAuthHandler: {},
-  MCPTokenStorage: {},
-  normalizeHttpError: jest.fn(),
-  extractWebSearchEnvVars: jest.fn(),
-}));
-
-jest.mock('~/models', () => ({
-  deleteAllUserSessions: (...args) => mockDeleteAllUserSessions(...args),
-  deleteAllSharedLinks: (...args) => mockDeleteAllSharedLinks(...args),
-  updateUserPlugins: (...args) => mockUpdateUserPlugins(...args),
-  deleteUserById: (...args) => mockDeleteUserById(...args),
-  deleteMessages: (...args) => mockDeleteMessages(...args),
-  deletePresets: (...args) => mockDeletePresets(...args),
-  deleteUserKey: (...args) => mockDeleteUserKey(...args),
-  getUserById: (...args) => mockGetUserById(...args),
-  deleteConvos: (...args) => mockDeleteConvos(...args),
-  deleteFiles: (...args) => mockDeleteFiles(...args),
-  updateUser: (...args) => mockUpdateUser(...args),
-  findToken: (...args) => mockFindToken(...args),
-  getFiles: (...args) => mockGetFiles(...args),
-}));
-
-jest.mock('~/db/models', () => ({
-  ConversationTag: { deleteMany: jest.fn() },
-  AgentApiKey: { deleteMany: jest.fn() },
-  Transaction: { deleteMany: jest.fn() },
-  MemoryEntry: { deleteMany: jest.fn() },
-  Assistant: { deleteMany: jest.fn() },
-  AclEntry: { deleteMany: jest.fn() },
-  Balance: { deleteMany: jest.fn() },
-  Action: { deleteMany: jest.fn() },
-  Group: { updateMany: jest.fn() },
-  Token: { deleteMany: jest.fn() },
-  User: {},
-}));
-
-jest.mock('~/server/services/PluginService', () => ({
-  updateUserPluginAuth: jest.fn(),
-  deleteUserPluginAuth: (...args) => mockDeleteUserPluginAuth(...args),
-}));
-
-jest.mock('~/server/services/twoFactorService', () => ({
-  verifyOTPOrBackupCode: (...args) => mockVerifyOTPOrBackupCode(...args),
-}));
-
-jest.mock('~/server/services/AuthService', () => ({
-  verifyEmail: jest.fn(),
-  resendVerificationEmail: jest.fn(),
-}));
-
-jest.mock('~/config', () => ({
-  getMCPManager: jest.fn(),
-  getFlowStateManager: jest.fn(),
-  getMCPServersRegistry: jest.fn(),
-}));
-
-jest.mock('~/server/services/Config/getCachedTools', () => ({
-  invalidateCachedTools: jest.fn(),
-}));
-
-jest.mock('~/server/services/Files/S3/crud', () => ({
-  needsRefresh: jest.fn(),
-  getNewS3URL: jest.fn(),
-}));
-
-jest.mock('~/server/services/Files/process', () => ({
-  processDeleteRequest: (...args) => mockProcessDeleteRequest(...args),
-}));
-
-jest.mock('~/server/services/Config', () => ({
-  getAppConfig: jest.fn(),
-}));
-
-jest.mock('~/models/ToolCall', () => ({
-  deleteToolCalls: (...args) => mockDeleteToolCalls(...args),
-}));
-
-jest.mock('~/models/Prompt', () => ({
-  deleteUserPrompts: (...args) => mockDeleteUserPrompts(...args),
-}));
-
-jest.mock('~/models/Agent', () => ({
-  deleteUserAgents: (...args) => mockDeleteUserAgents(...args),
-}));
-
-jest.mock('~/cache', () => ({
-  getLogStores: jest.fn(),
-}));
-
-const { deleteUserController } = require('~/server/controllers/UserController');
-
-function createRes() {
-  const res = {};
-  res.status = jest.fn().mockReturnValue(res);
-  res.json = jest.fn().mockReturnValue(res);
-  res.send = jest.fn().mockReturnValue(res);
-  return res;
-}
-
-function stubDeletionMocks() {
-  mockDeleteMessages.mockResolvedValue();
-  mockDeleteAllUserSessions.mockResolvedValue();
-  mockDeleteUserKey.mockResolvedValue();
-  mockDeletePresets.mockResolvedValue();
-  mockDeleteConvos.mockResolvedValue();
-  mockDeleteUserPluginAuth.mockResolvedValue();
-  mockDeleteUserById.mockResolvedValue();
-  mockDeleteAllSharedLinks.mockResolvedValue();
-  mockGetFiles.mockResolvedValue([]);
-  mockProcessDeleteRequest.mockResolvedValue();
-  mockDeleteFiles.mockResolvedValue();
-  mockDeleteToolCalls.mockResolvedValue();
-  mockDeleteUserAgents.mockResolvedValue();
-  mockDeleteUserPrompts.mockResolvedValue();
-}
-
-beforeEach(() => {
-  jest.clearAllMocks();
-  stubDeletionMocks();
-});
-
-describe('deleteUserController - 2FA enforcement', () => {
-  it('proceeds with deletion when 2FA is not enabled', async () => {
-    const req = { user: { id: 'user1', _id: 'user1', email: 'a@b.com' }, body: {} };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue({ _id: 'user1', twoFactorEnabled: false });
-
-    await deleteUserController(req, res);
-
-    expect(res.status).toHaveBeenCalledWith(200);
-    expect(res.send).toHaveBeenCalledWith({ message: 'User deleted' });
-    expect(mockDeleteMessages).toHaveBeenCalled();
-    expect(mockVerifyOTPOrBackupCode).not.toHaveBeenCalled();
-  });
-
-  it('proceeds with deletion when user has no 2FA record', async () => {
-    const req = { user: { id: 'user1', _id: 'user1', email: 'a@b.com' }, body: {} };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue(null);
-
-    await deleteUserController(req, res);
-
-    expect(res.status).toHaveBeenCalledWith(200);
-    expect(res.send).toHaveBeenCalledWith({ message: 'User deleted' });
-  });
-
-  it('returns error when 2FA is enabled and verification fails with 400', async () => {
-    const req = { user: { id: 'user1', _id: 'user1' }, body: {} };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue({
-      _id: 'user1',
-      twoFactorEnabled: true,
-      totpSecret: 'enc-secret',
-    });
-    mockVerifyOTPOrBackupCode.mockResolvedValue({ verified: false, status: 400 });
-
-    await deleteUserController(req, res);
-
-    expect(res.status).toHaveBeenCalledWith(400);
-    expect(mockDeleteMessages).not.toHaveBeenCalled();
-  });
-
-  it('returns 401 when 2FA is enabled and invalid TOTP token provided', async () => {
-    const existingUser = {
-      _id: 'user1',
-      twoFactorEnabled: true,
-      totpSecret: 'enc-secret',
-    };
-    const req = { user: { id: 'user1', _id: 'user1' }, body: { token: 'wrong' } };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue(existingUser);
-    mockVerifyOTPOrBackupCode.mockResolvedValue({
-      verified: false,
-      status: 401,
-      message: 'Invalid token or backup code',
-    });
-
-    await deleteUserController(req, res);
-
-    expect(mockVerifyOTPOrBackupCode).toHaveBeenCalledWith({
-      user: existingUser,
-      token: 'wrong',
-      backupCode: undefined,
-    });
-    expect(res.status).toHaveBeenCalledWith(401);
-    expect(res.json).toHaveBeenCalledWith({ message: 'Invalid token or backup code' });
-    expect(mockDeleteMessages).not.toHaveBeenCalled();
-  });
-
-  it('returns 401 when 2FA is enabled and invalid backup code provided', async () => {
-    const existingUser = {
-      _id: 'user1',
-      twoFactorEnabled: true,
-      totpSecret: 'enc-secret',
-      backupCodes: [],
-    };
-    const req = { user: { id: 'user1', _id: 'user1' }, body: { backupCode: 'bad-code' } };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue(existingUser);
-    mockVerifyOTPOrBackupCode.mockResolvedValue({
-      verified: false,
-      status: 401,
-      message: 'Invalid token or backup code',
-    });
-
-    await deleteUserController(req, res);
-
-    expect(mockVerifyOTPOrBackupCode).toHaveBeenCalledWith({
-      user: existingUser,
-      token: undefined,
-      backupCode: 'bad-code',
-    });
-    expect(res.status).toHaveBeenCalledWith(401);
-    expect(mockDeleteMessages).not.toHaveBeenCalled();
-  });
-
-  it('deletes account when valid TOTP token provided with 2FA enabled', async () => {
-    const existingUser = {
-      _id: 'user1',
-      twoFactorEnabled: true,
-      totpSecret: 'enc-secret',
-    };
-    const req = {
-      user: { id: 'user1', _id: 'user1', email: 'a@b.com' },
-      body: { token: '123456' },
-    };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue(existingUser);
-    mockVerifyOTPOrBackupCode.mockResolvedValue({ verified: true });
-
-    await deleteUserController(req, res);
-
-    expect(mockVerifyOTPOrBackupCode).toHaveBeenCalledWith({
-      user: existingUser,
-      token: '123456',
-      backupCode: undefined,
-    });
-    expect(res.status).toHaveBeenCalledWith(200);
-    expect(res.send).toHaveBeenCalledWith({ message: 'User deleted' });
-    expect(mockDeleteMessages).toHaveBeenCalled();
-  });
-
-  it('deletes account when valid backup code provided with 2FA enabled', async () => {
-    const existingUser = {
-      _id: 'user1',
-      twoFactorEnabled: true,
-      totpSecret: 'enc-secret',
-      backupCodes: [{ codeHash: 'h1', used: false }],
-    };
-    const req = {
-      user: { id: 'user1', _id: 'user1', email: 'a@b.com' },
-      body: { backupCode: 'valid-code' },
-    };
-    const res = createRes();
-    mockGetUserById.mockResolvedValue(existingUser);
-    mockVerifyOTPOrBackupCode.mockResolvedValue({ verified: true });
-
-    await deleteUserController(req, res);
-
-    expect(mockVerifyOTPOrBackupCode).toHaveBeenCalledWith({
-      user: existingUser,
-      token: undefined,
-      backupCode: 'valid-code',
-    });
-    expect(res.status).toHaveBeenCalledWith(200);
-    expect(res.send).toHaveBeenCalledWith({ message: 'User deleted' });
-    expect(mockDeleteMessages).toHaveBeenCalled();
-  });
-});

api/server/controllers/agents/client.js

@@ -1172,11 +1172,7 @@ class AgentClient extends BaseClient {
     }
   }
 
-  /** Anthropic Claude models use a distinct BPE tokenizer; all others default to o200k_base. */
   getEncoding() {
-    if (this.model && this.model.toLowerCase().includes('claude')) {
-      return 'claude';
-    }
     return 'o200k_base';
   }
 

api/server/controllers/mcp.js

@@ -7,11 +7,9 @@
  */
 const { logger } = require('@librechat/data-schemas');
 const {
-  MCPErrorCodes,
-  redactServerSecrets,
-  redactAllServerSecrets,
   isMCPDomainNotAllowedError,
   isMCPInspectionFailedError,
+  MCPErrorCodes,
 } = require('@librechat/api');
 const { Constants, MCPServerUserInputSchema } = require('librechat-data-provider');
 const { cacheMCPServerTools, getMCPServerTools } = require('~/server/services/Config');
@@ -183,8 +181,10 @@ const getMCPServersList = async (req, res) => {
       return res.status(401).json({ message: 'Unauthorized' });
     }
 
+    // 2. Get all server configs from registry (YAML + DB)
     const serverConfigs = await getMCPServersRegistry().getAllServerConfigs(userId);
-    return res.json(redactAllServerSecrets(serverConfigs));
+
+    return res.json(serverConfigs);
   } catch (error) {
     logger.error('[getMCPServersList]', error);
     res.status(500).json({ error: error.message });
@@ -215,7 +215,7 @@ const createMCPServerController = async (req, res) => {
     );
     res.status(201).json({
       serverName: result.serverName,
-      ...redactServerSecrets(result.config),
+      ...result.config,
     });
   } catch (error) {
     logger.error('[createMCPServer]', error);
@@ -243,7 +243,7 @@ const getMCPServerById = async (req, res) => {
       return res.status(404).json({ message: 'MCP server not found' });
     }
 
-    res.status(200).json(redactServerSecrets(parsedConfig));
+    res.status(200).json(parsedConfig);
   } catch (error) {
     logger.error('[getMCPServerById]', error);
     res.status(500).json({ message: error.message });
@@ -274,7 +274,7 @@ const updateMCPServerController = async (req, res) => {
       userId,
     );
 
-    res.status(200).json(redactServerSecrets(parsedConfig));
+    res.status(200).json(parsedConfig);
   } catch (error) {
     logger.error('[updateMCPServer]', error);
     const mcpErrorResponse = handleMCPError(error, res);

api/server/middleware/limiters/forkLimiters.js

@@ -48,7 +48,7 @@ const createForkHandler = (ip = true) => {
     };
 
     await logViolation(req, res, type, errorMessage, forkViolationScore);
-    res.status(429).json({ message: 'Too many requests. Try again later' });
+    res.status(429).json({ message: 'Too many conversation fork requests. Try again later' });
   };
 };
 

api/server/routes/__test-utils__/convos-route-mocks.js

@@ -1,93 +0,0 @@
-module.exports = {
-  agents: () => ({ sleep: jest.fn() }),
-
-  api: (overrides = {}) => ({
-    isEnabled: jest.fn(),
-    resolveImportMaxFileSize: jest.fn(() => 262144000),
-    createAxiosInstance: jest.fn(() => ({
-      get: jest.fn(),
-      post: jest.fn(),
-      put: jest.fn(),
-      delete: jest.fn(),
-    })),
-    logAxiosError: jest.fn(),
-    ...overrides,
-  }),
-
-  dataSchemas: () => ({
-    logger: {
-      debug: jest.fn(),
-      info: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-    },
-    createModels: jest.fn(() => ({
-      User: {},
-      Conversation: {},
-      Message: {},
-      SharedLink: {},
-    })),
-  }),
-
-  dataProvider: (overrides = {}) => ({
-    CacheKeys: { GEN_TITLE: 'GEN_TITLE' },
-    EModelEndpoint: {
-      azureAssistants: 'azureAssistants',
-      assistants: 'assistants',
-    },
-    ...overrides,
-  }),
-
-  conversationModel: () => ({
-    getConvosByCursor: jest.fn(),
-    getConvo: jest.fn(),
-    deleteConvos: jest.fn(),
-    saveConvo: jest.fn(),
-  }),
-
-  toolCallModel: () => ({ deleteToolCalls: jest.fn() }),
-
-  sharedModels: () => ({
-    deleteAllSharedLinks: jest.fn(),
-    deleteConvoSharedLink: jest.fn(),
-  }),
-
-  requireJwtAuth: () => (req, res, next) => next(),
-
-  middlewarePassthrough: () => ({
-    createImportLimiters: jest.fn(() => ({
-      importIpLimiter: (req, res, next) => next(),
-      importUserLimiter: (req, res, next) => next(),
-    })),
-    createForkLimiters: jest.fn(() => ({
-      forkIpLimiter: (req, res, next) => next(),
-      forkUserLimiter: (req, res, next) => next(),
-    })),
-    configMiddleware: (req, res, next) => next(),
-    validateConvoAccess: (req, res, next) => next(),
-  }),
-
-  forkUtils: () => ({
-    forkConversation: jest.fn(),
-    duplicateConversation: jest.fn(),
-  }),
-
-  importUtils: () => ({ importConversations: jest.fn() }),
-
-  logStores: () => jest.fn(),
-
-  multerSetup: () => ({
-    storage: {},
-    importFileFilter: jest.fn(),
-  }),
-
-  multerLib: () =>
-    jest.fn(() => ({
-      single: jest.fn(() => (req, res, next) => {
-        req.file = { path: '/tmp/test-file.json' };
-        next();
-      }),
-    })),
-
-  assistantEndpoint: () => ({ initializeClient: jest.fn() }),
-};

api/server/routes/__tests__/convos-duplicate-ratelimit.spec.js

@@ -1,135 +0,0 @@
-const express = require('express');
-const request = require('supertest');
-
-const MOCKS = '../__test-utils__/convos-route-mocks';
-
-jest.mock('@librechat/agents', () => require(MOCKS).agents());
-jest.mock('@librechat/api', () => require(MOCKS).api({ limiterCache: jest.fn(() => undefined) }));
-jest.mock('@librechat/data-schemas', () => require(MOCKS).dataSchemas());
-jest.mock('librechat-data-provider', () =>
-  require(MOCKS).dataProvider({ ViolationTypes: { FILE_UPLOAD_LIMIT: 'file_upload_limit' } }),
-);
-
-jest.mock('~/cache/logViolation', () => jest.fn().mockResolvedValue(undefined));
-jest.mock('~/cache/getLogStores', () => require(MOCKS).logStores());
-jest.mock('~/models/Conversation', () => require(MOCKS).conversationModel());
-jest.mock('~/models/ToolCall', () => require(MOCKS).toolCallModel());
-jest.mock('~/models', () => require(MOCKS).sharedModels());
-jest.mock('~/server/middleware/requireJwtAuth', () => require(MOCKS).requireJwtAuth());
-
-jest.mock('~/server/middleware', () => {
-  const { createForkLimiters } = jest.requireActual('~/server/middleware/limiters/forkLimiters');
-  return {
-    createImportLimiters: jest.fn(() => ({
-      importIpLimiter: (req, res, next) => next(),
-      importUserLimiter: (req, res, next) => next(),
-    })),
-    createForkLimiters,
-    configMiddleware: (req, res, next) => next(),
-    validateConvoAccess: (req, res, next) => next(),
-  };
-});
-
-jest.mock('~/server/utils/import/fork', () => require(MOCKS).forkUtils());
-jest.mock('~/server/utils/import', () => require(MOCKS).importUtils());
-jest.mock('~/server/routes/files/multer', () => require(MOCKS).multerSetup());
-jest.mock('multer', () => require(MOCKS).multerLib());
-jest.mock('~/server/services/Endpoints/azureAssistants', () => require(MOCKS).assistantEndpoint());
-jest.mock('~/server/services/Endpoints/assistants', () => require(MOCKS).assistantEndpoint());
-
-describe('POST /api/convos/duplicate - Rate Limiting', () => {
-  let app;
-  let duplicateConversation;
-  const savedEnv = {};
-
-  beforeAll(() => {
-    savedEnv.FORK_USER_MAX = process.env.FORK_USER_MAX;
-    savedEnv.FORK_USER_WINDOW = process.env.FORK_USER_WINDOW;
-    savedEnv.FORK_IP_MAX = process.env.FORK_IP_MAX;
-    savedEnv.FORK_IP_WINDOW = process.env.FORK_IP_WINDOW;
-  });
-
-  afterAll(() => {
-    for (const key of Object.keys(savedEnv)) {
-      if (savedEnv[key] === undefined) {
-        delete process.env[key];
-      } else {
-        process.env[key] = savedEnv[key];
-      }
-    }
-  });
-
-  const setupApp = () => {
-    jest.clearAllMocks();
-    jest.isolateModules(() => {
-      const convosRouter = require('../convos');
-      ({ duplicateConversation } = require('~/server/utils/import/fork'));
-
-      app = express();
-      app.use(express.json());
-      app.use((req, res, next) => {
-        req.user = { id: 'rate-limit-test-user' };
-        next();
-      });
-      app.use('/api/convos', convosRouter);
-    });
-
-    duplicateConversation.mockResolvedValue({
-      conversation: { conversationId: 'duplicated-conv' },
-    });
-  };
-
-  describe('user limit', () => {
-    beforeEach(() => {
-      process.env.FORK_USER_MAX = '2';
-      process.env.FORK_USER_WINDOW = '1';
-      process.env.FORK_IP_MAX = '100';
-      process.env.FORK_IP_WINDOW = '1';
-      setupApp();
-    });
-
-    it('should return 429 after exceeding the user rate limit', async () => {
-      const userMax = parseInt(process.env.FORK_USER_MAX, 10);
-
-      for (let i = 0; i < userMax; i++) {
-        const res = await request(app)
-          .post('/api/convos/duplicate')
-          .send({ conversationId: 'conv-123' });
-        expect(res.status).toBe(201);
-      }
-
-      const res = await request(app)
-        .post('/api/convos/duplicate')
-        .send({ conversationId: 'conv-123' });
-      expect(res.status).toBe(429);
-      expect(res.body.message).toMatch(/too many/i);
-    });
-  });
-
-  describe('IP limit', () => {
-    beforeEach(() => {
-      process.env.FORK_USER_MAX = '100';
-      process.env.FORK_USER_WINDOW = '1';
-      process.env.FORK_IP_MAX = '2';
-      process.env.FORK_IP_WINDOW = '1';
-      setupApp();
-    });
-
-    it('should return 429 after exceeding the IP rate limit', async () => {
-      const ipMax = parseInt(process.env.FORK_IP_MAX, 10);
-
-      for (let i = 0; i < ipMax; i++) {
-        const res = await request(app)
-          .post('/api/convos/duplicate')
-          .send({ conversationId: 'conv-123' });
-        expect(res.status).toBe(201);
-      }
-
-      const res = await request(app)
-        .post('/api/convos/duplicate')
-        .send({ conversationId: 'conv-123' });
-      expect(res.status).toBe(429);
-      expect(res.body.message).toMatch(/too many/i);
-    });
-  });
-});

api/server/routes/__tests__/convos-import.spec.js

@@ -1,98 +0,0 @@
-const express = require('express');
-const request = require('supertest');
-const multer = require('multer');
-
-const importFileFilter = (req, file, cb) => {
-  if (file.mimetype === 'application/json') {
-    cb(null, true);
-  } else {
-    cb(new Error('Only JSON files are allowed'), false);
-  }
-};
-
-/** Proxy app that mirrors the production multer + error-handling pattern */
-function createImportApp(fileSize) {
-  const app = express();
-  const upload = multer({
-    storage: multer.memoryStorage(),
-    fileFilter: importFileFilter,
-    limits: { fileSize },
-  });
-  const uploadSingle = upload.single('file');
-
-  function handleUpload(req, res, next) {
-    uploadSingle(req, res, (err) => {
-      if (err && err.code === 'LIMIT_FILE_SIZE') {
-        return res.status(413).json({ message: 'File exceeds the maximum allowed size' });
-      }
-      if (err) {
-        return next(err);
-      }
-      next();
-    });
-  }
-
-  app.post('/import', handleUpload, (req, res) => {
-    res.status(201).json({ message: 'success', size: req.file.size });
-  });
-
-  app.use((err, _req, res, _next) => {
-    res.status(400).json({ error: err.message });
-  });
-
-  return app;
-}
-
-describe('Conversation Import - Multer File Size Limits', () => {
-  describe('multer rejects files exceeding the configured limit', () => {
-    it('returns 413 for files larger than the limit', async () => {
-      const limit = 1024;
-      const app = createImportApp(limit);
-      const oversized = Buffer.alloc(limit + 512, 'x');
-
-      const res = await request(app)
-        .post('/import')
-        .attach('file', oversized, { filename: 'import.json', contentType: 'application/json' });
-
-      expect(res.status).toBe(413);
-      expect(res.body.message).toBe('File exceeds the maximum allowed size');
-    });
-
-    it('accepts files within the limit', async () => {
-      const limit = 4096;
-      const app = createImportApp(limit);
-      const valid = Buffer.from(JSON.stringify({ title: 'test' }));
-
-      const res = await request(app)
-        .post('/import')
-        .attach('file', valid, { filename: 'import.json', contentType: 'application/json' });
-
-      expect(res.status).toBe(201);
-      expect(res.body.message).toBe('success');
-    });
-
-    it('rejects at the exact boundary (limit + 1 byte)', async () => {
-      const limit = 512;
-      const app = createImportApp(limit);
-      const boundary = Buffer.alloc(limit + 1, 'a');
-
-      const res = await request(app)
-        .post('/import')
-        .attach('file', boundary, { filename: 'import.json', contentType: 'application/json' });
-
-      expect(res.status).toBe(413);
-    });
-
-    it('accepts a file just under the limit', async () => {
-      const limit = 512;
-      const app = createImportApp(limit);
-      const underLimit = Buffer.alloc(limit - 1, 'b');
-
-      const res = await request(app)
-        .post('/import')
-        .attach('file', underLimit, { filename: 'import.json', contentType: 'application/json' });
-
-      expect(res.status).toBe(201);
-    });
-  });
-});

api/server/routes/__tests__/convos.spec.js

@@ -1,24 +1,109 @@
 const express = require('express');
 const request = require('supertest');
 
-const MOCKS = '../__test-utils__/convos-route-mocks';
+jest.mock('@librechat/agents', () => ({
+  sleep: jest.fn(),
+}));
 
-jest.mock('@librechat/agents', () => require(MOCKS).agents());
-jest.mock('@librechat/api', () => require(MOCKS).api());
-jest.mock('@librechat/data-schemas', () => require(MOCKS).dataSchemas());
-jest.mock('librechat-data-provider', () => require(MOCKS).dataProvider());
-jest.mock('~/models/Conversation', () => require(MOCKS).conversationModel());
-jest.mock('~/models/ToolCall', () => require(MOCKS).toolCallModel());
-jest.mock('~/models', () => require(MOCKS).sharedModels());
-jest.mock('~/server/middleware/requireJwtAuth', () => require(MOCKS).requireJwtAuth());
-jest.mock('~/server/middleware', () => require(MOCKS).middlewarePassthrough());
-jest.mock('~/server/utils/import/fork', () => require(MOCKS).forkUtils());
-jest.mock('~/server/utils/import', () => require(MOCKS).importUtils());
-jest.mock('~/cache/getLogStores', () => require(MOCKS).logStores());
-jest.mock('~/server/routes/files/multer', () => require(MOCKS).multerSetup());
-jest.mock('multer', () => require(MOCKS).multerLib());
-jest.mock('~/server/services/Endpoints/azureAssistants', () => require(MOCKS).assistantEndpoint());
-jest.mock('~/server/services/Endpoints/assistants', () => require(MOCKS).assistantEndpoint());
+jest.mock('@librechat/api', () => ({
+  isEnabled: jest.fn(),
+  createAxiosInstance: jest.fn(() => ({
+    get: jest.fn(),
+    post: jest.fn(),
+    put: jest.fn(),
+    delete: jest.fn(),
+  })),
+  logAxiosError: jest.fn(),
+}));
+
+jest.mock('@librechat/data-schemas', () => ({
+  logger: {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  },
+  createModels: jest.fn(() => ({
+    User: {},
+    Conversation: {},
+    Message: {},
+    SharedLink: {},
+  })),
+}));
+
+jest.mock('~/models/Conversation', () => ({
+  getConvosByCursor: jest.fn(),
+  getConvo: jest.fn(),
+  deleteConvos: jest.fn(),
+  saveConvo: jest.fn(),
+}));
+
+jest.mock('~/models/ToolCall', () => ({
+  deleteToolCalls: jest.fn(),
+}));
+
+jest.mock('~/models', () => ({
+  deleteAllSharedLinks: jest.fn(),
+  deleteConvoSharedLink: jest.fn(),
+}));
+
+jest.mock('~/server/middleware/requireJwtAuth', () => (req, res, next) => next());
+
+jest.mock('~/server/middleware', () => ({
+  createImportLimiters: jest.fn(() => ({
+    importIpLimiter: (req, res, next) => next(),
+    importUserLimiter: (req, res, next) => next(),
+  })),
+  createForkLimiters: jest.fn(() => ({
+    forkIpLimiter: (req, res, next) => next(),
+    forkUserLimiter: (req, res, next) => next(),
+  })),
+  configMiddleware: (req, res, next) => next(),
+  validateConvoAccess: (req, res, next) => next(),
+}));
+
+jest.mock('~/server/utils/import/fork', () => ({
+  forkConversation: jest.fn(),
+  duplicateConversation: jest.fn(),
+}));
+
+jest.mock('~/server/utils/import', () => ({
+  importConversations: jest.fn(),
+}));
+
+jest.mock('~/cache/getLogStores', () => jest.fn());
+
+jest.mock('~/server/routes/files/multer', () => ({
+  storage: {},
+  importFileFilter: jest.fn(),
+}));
+
+jest.mock('multer', () => {
+  return jest.fn(() => ({
+    single: jest.fn(() => (req, res, next) => {
+      req.file = { path: '/tmp/test-file.json' };
+      next();
+    }),
+  }));
+});
+
+jest.mock('librechat-data-provider', () => ({
+  CacheKeys: {
+    GEN_TITLE: 'GEN_TITLE',
+  },
+  EModelEndpoint: {
+    azureAssistants: 'azureAssistants',
+    assistants: 'assistants',
+  },
+}));
+
+jest.mock('~/server/services/Endpoints/azureAssistants', () => ({
+  initializeClient: jest.fn(),
+}));
+
+jest.mock('~/server/services/Endpoints/assistants', () => ({
+  initializeClient: jest.fn(),
+}));
 
 describe('Convos Routes', () => {
   let app;

api/server/routes/__tests__/mcp.spec.js

@@ -32,9 +32,6 @@ jest.mock('@librechat/api', () => {
       getFlowState: jest.fn(),
       completeOAuthFlow: jest.fn(),
       generateFlowId: jest.fn(),
-      resolveStateToFlowId: jest.fn(async (state) => state),
-      storeStateMapping: jest.fn(),
-      deleteStateMapping: jest.fn(),
     },
     MCPTokenStorage: {
       storeTokens: jest.fn(),
@@ -183,10 +180,7 @@ describe('MCP Routes', () => {
       MCPOAuthHandler.initiateOAuthFlow.mockResolvedValue({
         authorizationUrl: 'https://oauth.example.com/auth',
         flowId: 'test-user-id:test-server',
-        flowMetadata: { state: 'random-state-value' },
       });
-      MCPOAuthHandler.storeStateMapping.mockResolvedValue();
-      mockFlowManager.initFlow = jest.fn().mockResolvedValue();
 
       const response = await request(app).get('/api/mcp/test-server/oauth/initiate').query({
         userId: 'test-user-id',
@@ -373,121 +367,6 @@ describe('MCP Routes', () => {
       expect(response.headers.location).toBe(`${basePath}/oauth/error?error=invalid_state`);
     });
 
-    describe('CSRF fallback via active PENDING flow', () => {
-      it('should proceed when a fresh PENDING flow exists and no cookies are present', async () => {
-        const flowId = 'test-user-id:test-server';
-        const mockFlowManager = {
-          getFlowState: jest.fn().mockResolvedValue({
-            status: 'PENDING',
-            createdAt: Date.now(),
-          }),
-          completeFlow: jest.fn().mockResolvedValue(true),
-          deleteFlow: jest.fn().mockResolvedValue(true),
-        };
-        const mockFlowState = {
-          serverName: 'test-server',
-          userId: 'test-user-id',
-          metadata: {},
-          clientInfo: {},
-          codeVerifier: 'test-verifier',
-        };
-
-        getLogStores.mockReturnValue({});
-        require('~/config').getFlowStateManager.mockReturnValue(mockFlowManager);
-        MCPOAuthHandler.getFlowState.mockResolvedValue(mockFlowState);
-        MCPOAuthHandler.completeOAuthFlow.mockResolvedValue({
-          access_token: 'test-token',
-        });
-        MCPTokenStorage.storeTokens.mockResolvedValue();
-        mockRegistryInstance.getServerConfig.mockResolvedValue({});
-
-        const mockMcpManager = {
-          getUserConnection: jest.fn().mockResolvedValue({
-            fetchTools: jest.fn().mockResolvedValue([]),
-          }),
-        };
-        require('~/config').getMCPManager.mockReturnValue(mockMcpManager);
-        require('~/config').getOAuthReconnectionManager.mockReturnValue({
-          clearReconnection: jest.fn(),
-        });
-        require('~/server/services/Config/mcp').updateMCPServerTools.mockResolvedValue();
-
-        const response = await request(app)
-          .get('/api/mcp/test-server/oauth/callback')
-          .query({ code: 'test-code', state: flowId });
-
-        const basePath = getBasePath();
-        expect(response.status).toBe(302);
-        expect(response.headers.location).toContain(`${basePath}/oauth/success`);
-      });
-
-      it('should reject when no PENDING flow exists and no cookies are present', async () => {
-        const flowId = 'test-user-id:test-server';
-        const mockFlowManager = {
-          getFlowState: jest.fn().mockResolvedValue(null),
-        };
-
-        getLogStores.mockReturnValue({});
-        require('~/config').getFlowStateManager.mockReturnValue(mockFlowManager);
-
-        const response = await request(app)
-          .get('/api/mcp/test-server/oauth/callback')
-          .query({ code: 'test-code', state: flowId });
-
-        const basePath = getBasePath();
-        expect(response.status).toBe(302);
-        expect(response.headers.location).toBe(
-          `${basePath}/oauth/error?error=csrf_validation_failed`,
-        );
-      });
-
-      it('should reject when only a COMPLETED flow exists (not PENDING)', async () => {
-        const flowId = 'test-user-id:test-server';
-        const mockFlowManager = {
-          getFlowState: jest.fn().mockResolvedValue({
-            status: 'COMPLETED',
-            createdAt: Date.now(),
-          }),
-        };
-
-        getLogStores.mockReturnValue({});
-        require('~/config').getFlowStateManager.mockReturnValue(mockFlowManager);
-
-        const response = await request(app)
-          .get('/api/mcp/test-server/oauth/callback')
-          .query({ code: 'test-code', state: flowId });
-
-        const basePath = getBasePath();
-        expect(response.status).toBe(302);
-        expect(response.headers.location).toBe(
-          `${basePath}/oauth/error?error=csrf_validation_failed`,
-        );
-      });
-
-      it('should reject when PENDING flow is stale (older than PENDING_STALE_MS)', async () => {
-        const flowId = 'test-user-id:test-server';
-        const mockFlowManager = {
-          getFlowState: jest.fn().mockResolvedValue({
-            status: 'PENDING',
-            createdAt: Date.now() - 3 * 60 * 1000,
-          }),
-        };
-
-        getLogStores.mockReturnValue({});
-        require('~/config').getFlowStateManager.mockReturnValue(mockFlowManager);
-
-        const response = await request(app)
-          .get('/api/mcp/test-server/oauth/callback')
-          .query({ code: 'test-code', state: flowId });
-
-        const basePath = getBasePath();
-        expect(response.status).toBe(302);
-        expect(response.headers.location).toBe(
-          `${basePath}/oauth/error?error=csrf_validation_failed`,
-        );
-      });
-    });
-
     it('should handle OAuth callback successfully', async () => {
       // mockRegistryInstance is defined at the top of the file
       const mockFlowManager = {
@@ -1693,14 +1572,12 @@ describe('MCP Routes', () => {
     it('should return all server configs for authenticated user', async () => {
       const mockServerConfigs = {
         'server-1': {
-          type: 'sse',
-          url: 'http://server1.com/sse',
-          title: 'Server 1',
+          endpoint: 'http://server1.com',
+          name: 'Server 1',
         },
         'server-2': {
-          type: 'sse',
-          url: 'http://server2.com/sse',
-          title: 'Server 2',
+          endpoint: 'http://server2.com',
+          name: 'Server 2',
         },
       };
 
@@ -1709,18 +1586,7 @@ describe('MCP Routes', () => {
       const response = await request(app).get('/api/mcp/servers');
 
       expect(response.status).toBe(200);
-      expect(response.body['server-1']).toMatchObject({
-        type: 'sse',
-        url: 'http://server1.com/sse',
-        title: 'Server 1',
-      });
-      expect(response.body['server-2']).toMatchObject({
-        type: 'sse',
-        url: 'http://server2.com/sse',
-        title: 'Server 2',
-      });
-      expect(response.body['server-1'].headers).toBeUndefined();
-      expect(response.body['server-2'].headers).toBeUndefined();
+      expect(response.body).toEqual(mockServerConfigs);
       expect(mockRegistryInstance.getAllServerConfigs).toHaveBeenCalledWith('test-user-id');
     });
 
@@ -1775,10 +1641,10 @@ describe('MCP Routes', () => {
       const response = await request(app).post('/api/mcp/servers').send({ config: validConfig });
 
       expect(response.status).toBe(201);
-      expect(response.body.serverName).toBe('test-sse-server');
-      expect(response.body.type).toBe('sse');
-      expect(response.body.url).toBe('https://mcp-server.example.com/sse');
-      expect(response.body.title).toBe('Test SSE Server');
+      expect(response.body).toEqual({
+        serverName: 'test-sse-server',
+        ...validConfig,
+      });
       expect(mockRegistryInstance.addServer).toHaveBeenCalledWith(
         'temp_server_name',
         expect.objectContaining({
@@ -1832,78 +1698,6 @@ describe('MCP Routes', () => {
       expect(response.body.message).toBe('Invalid configuration');
     });
 
-    it('should reject SSE URL containing env variable references', async () => {
-      const response = await request(app)
-        .post('/api/mcp/servers')
-        .send({
-          config: {
-            type: 'sse',
-            url: 'http://attacker.com/?secret=${JWT_SECRET}',
-          },
-        });
-
-      expect(response.status).toBe(400);
-      expect(response.body.message).toBe('Invalid configuration');
-      expect(mockRegistryInstance.addServer).not.toHaveBeenCalled();
-    });
-
-    it('should reject streamable-http URL containing env variable references', async () => {
-      const response = await request(app)
-        .post('/api/mcp/servers')
-        .send({
-          config: {
-            type: 'streamable-http',
-            url: 'http://attacker.com/?key=${CREDS_KEY}&iv=${CREDS_IV}',
-          },
-        });
-
-      expect(response.status).toBe(400);
-      expect(response.body.message).toBe('Invalid configuration');
-      expect(mockRegistryInstance.addServer).not.toHaveBeenCalled();
-    });
-
-    it('should reject websocket URL containing env variable references', async () => {
-      const response = await request(app)
-        .post('/api/mcp/servers')
-        .send({
-          config: {
-            type: 'websocket',
-            url: 'ws://attacker.com/?secret=${MONGO_URI}',
-          },
-        });
-
-      expect(response.status).toBe(400);
-      expect(response.body.message).toBe('Invalid configuration');
-      expect(mockRegistryInstance.addServer).not.toHaveBeenCalled();
-    });
-
-    it('should redact secrets from create response', async () => {
-      const validConfig = {
-        type: 'sse',
-        url: 'https://mcp-server.example.com/sse',
-        title: 'Test Server',
-      };
-
-      mockRegistryInstance.addServer.mockResolvedValue({
-        serverName: 'test-server',
-        config: {
-          ...validConfig,
-          apiKey: { source: 'admin', authorization_type: 'bearer', key: 'admin-secret-key' },
-          oauth: { client_id: 'cid', client_secret: 'admin-oauth-secret' },
-          headers: { Authorization: 'Bearer leaked-token' },
-        },
-      });
-
-      const response = await request(app).post('/api/mcp/servers').send({ config: validConfig });
-
-      expect(response.status).toBe(201);
-      expect(response.body.apiKey?.key).toBeUndefined();
-      expect(response.body.oauth?.client_secret).toBeUndefined();
-      expect(response.body.headers).toBeUndefined();
-      expect(response.body.apiKey?.source).toBe('admin');
-      expect(response.body.oauth?.client_id).toBe('cid');
-    });
-
     it('should return 500 when registry throws error', async () => {
       const validConfig = {
         type: 'sse',
@@ -1933,9 +1727,7 @@ describe('MCP Routes', () => {
       const response = await request(app).get('/api/mcp/servers/test-server');
 
       expect(response.status).toBe(200);
-      expect(response.body.type).toBe('sse');
-      expect(response.body.url).toBe('https://mcp-server.example.com/sse');
-      expect(response.body.title).toBe('Test Server');
+      expect(response.body).toEqual(mockConfig);
       expect(mockRegistryInstance.getServerConfig).toHaveBeenCalledWith(
         'test-server',
         'test-user-id',
@@ -1951,29 +1743,6 @@ describe('MCP Routes', () => {
       expect(response.body).toEqual({ message: 'MCP server not found' });
     });
 
-    it('should redact secrets from get response', async () => {
-      mockRegistryInstance.getServerConfig.mockResolvedValue({
-        type: 'sse',
-        url: 'https://mcp-server.example.com/sse',
-        title: 'Secret Server',
-        apiKey: { source: 'admin', authorization_type: 'bearer', key: 'decrypted-admin-key' },
-        oauth: { client_id: 'cid', client_secret: 'decrypted-oauth-secret' },
-        headers: { Authorization: 'Bearer internal-token' },
-        oauth_headers: { 'X-OAuth': 'secret-value' },
-      });
-
-      const response = await request(app).get('/api/mcp/servers/secret-server');
-
-      expect(response.status).toBe(200);
-      expect(response.body.title).toBe('Secret Server');
-      expect(response.body.apiKey?.key).toBeUndefined();
-      expect(response.body.apiKey?.source).toBe('admin');
-      expect(response.body.oauth?.client_secret).toBeUndefined();
-      expect(response.body.oauth?.client_id).toBe('cid');
-      expect(response.body.headers).toBeUndefined();
-      expect(response.body.oauth_headers).toBeUndefined();
-    });
-
     it('should return 500 when registry throws error', async () => {
       mockRegistryInstance.getServerConfig.mockRejectedValue(new Error('Database error'));
 
@@ -2000,9 +1769,7 @@ describe('MCP Routes', () => {
         .send({ config: updatedConfig });
 
       expect(response.status).toBe(200);
-      expect(response.body.type).toBe('sse');
-      expect(response.body.url).toBe('https://updated-mcp-server.example.com/sse');
-      expect(response.body.title).toBe('Updated Server');
+      expect(response.body).toEqual(updatedConfig);
       expect(mockRegistryInstance.updateServer).toHaveBeenCalledWith(
         'test-server',
         expect.objectContaining({
@@ -2014,35 +1781,6 @@ describe('MCP Routes', () => {
       );
     });
 
-    it('should redact secrets from update response', async () => {
-      const validConfig = {
-        type: 'sse',
-        url: 'https://mcp-server.example.com/sse',
-        title: 'Updated Server',
-      };
-
-      mockRegistryInstance.updateServer.mockResolvedValue({
-        ...validConfig,
-        apiKey: { source: 'admin', authorization_type: 'bearer', key: 'preserved-admin-key' },
-        oauth: { client_id: 'cid', client_secret: 'preserved-oauth-secret' },
-        headers: { Authorization: 'Bearer internal-token' },
-        env: { DATABASE_URL: 'postgres://admin:pass@localhost/db' },
-      });
-
-      const response = await request(app)
-        .patch('/api/mcp/servers/test-server')
-        .send({ config: validConfig });
-
-      expect(response.status).toBe(200);
-      expect(response.body.title).toBe('Updated Server');
-      expect(response.body.apiKey?.key).toBeUndefined();
-      expect(response.body.apiKey?.source).toBe('admin');
-      expect(response.body.oauth?.client_secret).toBeUndefined();
-      expect(response.body.oauth?.client_id).toBe('cid');
-      expect(response.body.headers).toBeUndefined();
-      expect(response.body.env).toBeUndefined();
-    });
-
     it('should return 400 for invalid configuration', async () => {
       const invalidConfig = {
         type: 'sse',
@@ -2059,51 +1797,6 @@ describe('MCP Routes', () => {
       expect(response.body.errors).toBeDefined();
     });
 
-    it('should reject SSE URL containing env variable references', async () => {
-      const response = await request(app)
-        .patch('/api/mcp/servers/test-server')
-        .send({
-          config: {
-            type: 'sse',
-            url: 'http://attacker.com/?secret=${JWT_SECRET}',
-          },
-        });
-
-      expect(response.status).toBe(400);
-      expect(response.body.message).toBe('Invalid configuration');
-      expect(mockRegistryInstance.updateServer).not.toHaveBeenCalled();
-    });
-
-    it('should reject streamable-http URL containing env variable references', async () => {
-      const response = await request(app)
-        .patch('/api/mcp/servers/test-server')
-        .send({
-          config: {
-            type: 'streamable-http',
-            url: 'http://attacker.com/?key=${CREDS_KEY}',
-          },
-        });
-
-      expect(response.status).toBe(400);
-      expect(response.body.message).toBe('Invalid configuration');
-      expect(mockRegistryInstance.updateServer).not.toHaveBeenCalled();
-    });
-
-    it('should reject websocket URL containing env variable references', async () => {
-      const response = await request(app)
-        .patch('/api/mcp/servers/test-server')
-        .send({
-          config: {
-            type: 'websocket',
-            url: 'ws://attacker.com/?secret=${MONGO_URI}',
-          },
-        });
-
-      expect(response.status).toBe(400);
-      expect(response.body.message).toBe('Invalid configuration');
-      expect(mockRegistryInstance.updateServer).not.toHaveBeenCalled();
-    });
-
     it('should return 500 when registry throws error', async () => {
       const validConfig = {
         type: 'sse',

api/server/routes/__tests__/messages-delete.spec.js

@@ -1,200 +0,0 @@
-const mongoose = require('mongoose');
-const express = require('express');
-const request = require('supertest');
-const { v4: uuidv4 } = require('uuid');
-const { MongoMemoryServer } = require('mongodb-memory-server');
-
-jest.mock('@librechat/agents', () => ({
-  sleep: jest.fn(),
-}));
-
-jest.mock('@librechat/api', () => ({
-  unescapeLaTeX: jest.fn((x) => x),
-  countTokens: jest.fn().mockResolvedValue(10),
-}));
-
-jest.mock('@librechat/data-schemas', () => ({
-  ...jest.requireActual('@librechat/data-schemas'),
-  logger: {
-    debug: jest.fn(),
-    info: jest.fn(),
-    warn: jest.fn(),
-    error: jest.fn(),
-  },
-}));
-
-jest.mock('librechat-data-provider', () => ({
-  ...jest.requireActual('librechat-data-provider'),
-}));
-
-jest.mock('~/models', () => ({
-  saveConvo: jest.fn(),
-  getMessage: jest.fn(),
-  saveMessage: jest.fn(),
-  getMessages: jest.fn(),
-  updateMessage: jest.fn(),
-  deleteMessages: jest.fn(),
-}));
-
-jest.mock('~/server/services/Artifacts/update', () => ({
-  findAllArtifacts: jest.fn(),
-  replaceArtifactContent: jest.fn(),
-}));
-
-jest.mock('~/server/middleware/requireJwtAuth', () => (req, res, next) => next());
-
-jest.mock('~/server/middleware', () => ({
-  requireJwtAuth: (req, res, next) => next(),
-  validateMessageReq: (req, res, next) => next(),
-}));
-
-jest.mock('~/models/Conversation', () => ({
-  getConvosQueried: jest.fn(),
-}));
-
-jest.mock('~/db/models', () => ({
-  Message: {
-    findOne: jest.fn(),
-    find: jest.fn(),
-    meiliSearch: jest.fn(),
-  },
-}));
-
-/* ─── Model-level tests: real MongoDB, proves cross-user deletion is prevented ─── */
-
-const { messageSchema } = require('@librechat/data-schemas');
-
-describe('deleteMessages – model-level IDOR prevention', () => {
-  let mongoServer;
-  let Message;
-
-  const ownerUserId = 'user-owner-111';
-  const attackerUserId = 'user-attacker-222';
-
-  beforeAll(async () => {
-    mongoServer = await MongoMemoryServer.create();
-    Message = mongoose.models.Message || mongoose.model('Message', messageSchema);
-    await mongoose.connect(mongoServer.getUri());
-  });
-
-  afterAll(async () => {
-    await mongoose.disconnect();
-    await mongoServer.stop();
-  });
-
-  beforeEach(async () => {
-    await Message.deleteMany({});
-  });
-
-  it("should NOT delete another user's message when attacker supplies victim messageId", async () => {
-    const conversationId = uuidv4();
-    const victimMsgId = 'victim-msg-001';
-
-    await Message.create({
-      messageId: victimMsgId,
-      conversationId,
-      user: ownerUserId,
-      text: 'Sensitive owner data',
-    });
-
-    await Message.deleteMany({ messageId: victimMsgId, user: attackerUserId });
-
-    const victimMsg = await Message.findOne({ messageId: victimMsgId }).lean();
-    expect(victimMsg).not.toBeNull();
-    expect(victimMsg.user).toBe(ownerUserId);
-    expect(victimMsg.text).toBe('Sensitive owner data');
-  });
-
-  it("should delete the user's own message", async () => {
-    const conversationId = uuidv4();
-    const ownMsgId = 'own-msg-001';
-
-    await Message.create({
-      messageId: ownMsgId,
-      conversationId,
-      user: ownerUserId,
-      text: 'My message',
-    });
-
-    const result = await Message.deleteMany({ messageId: ownMsgId, user: ownerUserId });
-    expect(result.deletedCount).toBe(1);
-
-    const deleted = await Message.findOne({ messageId: ownMsgId }).lean();
-    expect(deleted).toBeNull();
-  });
-
-  it('should scope deletion by conversationId, messageId, and user together', async () => {
-    const convoA = uuidv4();
-    const convoB = uuidv4();
-
-    await Message.create([
-      { messageId: 'msg-a1', conversationId: convoA, user: ownerUserId, text: 'A1' },
-      { messageId: 'msg-b1', conversationId: convoB, user: ownerUserId, text: 'B1' },
-    ]);
-
-    await Message.deleteMany({ messageId: 'msg-a1', conversationId: convoA, user: attackerUserId });
-
-    const remaining = await Message.find({ user: ownerUserId }).lean();
-    expect(remaining).toHaveLength(2);
-  });
-});
-
-/* ─── Route-level tests: supertest + mocked deleteMessages ─── */
-
-describe('DELETE /:conversationId/:messageId – route handler', () => {
-  let app;
-  const { deleteMessages } = require('~/models');
-
-  const authenticatedUserId = 'user-owner-123';
-
-  beforeAll(() => {
-    const messagesRouter = require('../messages');
-
-    app = express();
-    app.use(express.json());
-    app.use((req, res, next) => {
-      req.user = { id: authenticatedUserId };
-      next();
-    });
-    app.use('/api/messages', messagesRouter);
-  });
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should pass user and conversationId in the deleteMessages filter', async () => {
-    deleteMessages.mockResolvedValue({ deletedCount: 1 });
-
-    await request(app).delete('/api/messages/convo-1/msg-1');
-
-    expect(deleteMessages).toHaveBeenCalledTimes(1);
-    expect(deleteMessages).toHaveBeenCalledWith({
-      messageId: 'msg-1',
-      conversationId: 'convo-1',
-      user: authenticatedUserId,
-    });
-  });
-
-  it('should return 204 on successful deletion', async () => {
-    deleteMessages.mockResolvedValue({ deletedCount: 1 });
-
-    const response = await request(app).delete('/api/messages/convo-1/msg-owned');
-
-    expect(response.status).toBe(204);
-    expect(deleteMessages).toHaveBeenCalledWith({
-      messageId: 'msg-owned',
-      conversationId: 'convo-1',
-      user: authenticatedUserId,
-    });
-  });
-
-  it('should return 500 when deleteMessages throws', async () => {
-    deleteMessages.mockRejectedValue(new Error('DB failure'));
-
-    const response = await request(app).delete('/api/messages/convo-1/msg-1');
-
-    expect(response.status).toBe(500);
-    expect(response.body).toEqual({ error: 'Internal server error' });
-  });
-});

api/server/routes/auth.js

@@ -63,7 +63,7 @@ router.post(
   resetPasswordController,
 );
 
-router.post('/2fa/enable', middleware.requireJwtAuth, enable2FA);
+router.get('/2fa/enable', middleware.requireJwtAuth, enable2FA);
 router.post('/2fa/verify', middleware.requireJwtAuth, verify2FA);
 router.post('/2fa/verify-temp', middleware.checkBan, verify2FAWithTempToken);
 router.post('/2fa/confirm', middleware.requireJwtAuth, confirm2FA);

api/server/routes/config.js

@@ -16,7 +16,9 @@ const sharedLinksEnabled =
   process.env.ALLOW_SHARED_LINKS === undefined || isEnabled(process.env.ALLOW_SHARED_LINKS);
 
 const publicSharedLinksEnabled =
-  sharedLinksEnabled && isEnabled(process.env.ALLOW_SHARED_LINKS_PUBLIC);
+  sharedLinksEnabled &&
+  (process.env.ALLOW_SHARED_LINKS_PUBLIC === undefined ||
+    isEnabled(process.env.ALLOW_SHARED_LINKS_PUBLIC));
 
 const sharePointFilePickerEnabled = isEnabled(process.env.ENABLE_SHAREPOINT_FILEPICKER);
 const openidReuseTokens = isEnabled(process.env.OPENID_REUSE_TOKENS);

api/server/routes/convos.js

@@ -1,7 +1,7 @@
 const multer = require('multer');
 const express = require('express');
 const { sleep } = require('@librechat/agents');
-const { isEnabled, resolveImportMaxFileSize } = require('@librechat/api');
+const { isEnabled } = require('@librechat/api');
 const { logger } = require('@librechat/data-schemas');
 const { CacheKeys, EModelEndpoint } = require('librechat-data-provider');
 const {
@@ -224,27 +224,8 @@ router.post('/update', validateConvoAccess, async (req, res) => {
 });
 
 const { importIpLimiter, importUserLimiter } = createImportLimiters();
-/** Fork and duplicate share one rate-limit budget (same "clone" operation class) */
 const { forkIpLimiter, forkUserLimiter } = createForkLimiters();
-const importMaxFileSize = resolveImportMaxFileSize();
-const upload = multer({
-  storage,
-  fileFilter: importFileFilter,
-  limits: { fileSize: importMaxFileSize },
-});
-const uploadSingle = upload.single('file');
-
-function handleUpload(req, res, next) {
-  uploadSingle(req, res, (err) => {
-    if (err && err.code === 'LIMIT_FILE_SIZE') {
-      return res.status(413).json({ message: 'File exceeds the maximum allowed size' });
-    }
-    if (err) {
-      return next(err);
-    }
-    next();
-  });
-}
+const upload = multer({ storage: storage, fileFilter: importFileFilter });
 
 /**
  * Imports a conversation from a JSON file and saves it to the database.
@@ -257,7 +238,7 @@ router.post(
   importIpLimiter,
   importUserLimiter,
   configMiddleware,
-  handleUpload,
+  upload.single('file'),
   async (req, res) => {
     try {
       /* TODO: optimize to return imported conversations and add manually */
@@ -299,7 +280,7 @@ router.post('/fork', forkIpLimiter, forkUserLimiter, async (req, res) => {
   }
 });
 
-router.post('/duplicate', forkIpLimiter, forkUserLimiter, async (req, res) => {
+router.post('/duplicate', async (req, res) => {
   const { conversationId, title } = req.body;
 
   try {

api/server/routes/files/files.js

@@ -2,12 +2,12 @@ const fs = require('fs').promises;
 const express = require('express');
 const { EnvVar } = require('@librechat/agents');
 const { logger } = require('@librechat/data-schemas');
-const { verifyAgentUploadPermission } = require('@librechat/api');
 const {
   Time,
   isUUID,
   CacheKeys,
   FileSources,
+  SystemRoles,
   ResourceType,
   EModelEndpoint,
   PermissionBits,
@@ -381,15 +381,48 @@ router.post('/', async (req, res) => {
       return await processFileUpload({ req, res, metadata });
     }
 
-    const denied = await verifyAgentUploadPermission({
-      req,
-      res,
-      metadata,
-      getAgent,
-      checkPermission,
-    });
-    if (denied) {
-      return;
+    /**
+     * Check agent permissions for permanent agent file uploads (not message attachments).
+     * Message attachments (message_file=true) are temporary files for a single conversation
+     * and should be allowed for users who can chat with the agent.
+     * Permanent file uploads to tool_resources require EDIT permission.
+     */
+    const isMessageAttachment = metadata.message_file === true || metadata.message_file === 'true';
+    if (metadata.agent_id && metadata.tool_resource && !isMessageAttachment) {
+      const userId = req.user.id;
+
+      /** Admin users bypass permission checks */
+      if (req.user.role !== SystemRoles.ADMIN) {
+        const agent = await getAgent({ id: metadata.agent_id });
+
+        if (!agent) {
+          return res.status(404).json({
+            error: 'Not Found',
+            message: 'Agent not found',
+          });
+        }
+
+        /** Check if user is the author or has edit permission */
+        if (agent.author.toString() !== userId) {
+          const hasEditPermission = await checkPermission({
+            userId,
+            role: req.user.role,
+            resourceType: ResourceType.AGENT,
+            resourceId: agent._id,
+            requiredPermission: PermissionBits.EDIT,
+          });
+
+          if (!hasEditPermission) {
+            logger.warn(
+              `[/files] User ${userId} denied upload to agent ${metadata.agent_id} (insufficient permissions)`,
+            );
+            return res.status(403).json({
+              error: 'Forbidden',
+              message: 'Insufficient permissions to upload files to this agent',
+            });
+          }
+        }
+      }
     }
 
     return await processAgentFileUpload({ req, res, metadata });

api/server/routes/files/images.agents.test.js

@@ -1,376 +0,0 @@
-const express = require('express');
-const request = require('supertest');
-const mongoose = require('mongoose');
-const { v4: uuidv4 } = require('uuid');
-const { createMethods } = require('@librechat/data-schemas');
-const { MongoMemoryServer } = require('mongodb-memory-server');
-const {
-  SystemRoles,
-  AccessRoleIds,
-  ResourceType,
-  PrincipalType,
-} = require('librechat-data-provider');
-const { createAgent } = require('~/models/Agent');
-
-jest.mock('~/server/services/Files/process', () => ({
-  processAgentFileUpload: jest.fn().mockImplementation(async ({ res }) => {
-    return res.status(200).json({ message: 'Agent file uploaded', file_id: 'test-file-id' });
-  }),
-  processImageFile: jest.fn().mockImplementation(async ({ res }) => {
-    return res.status(200).json({ message: 'Image processed' });
-  }),
-  filterFile: jest.fn(),
-}));
-
-jest.mock('fs', () => {
-  const actualFs = jest.requireActual('fs');
-  return {
-    ...actualFs,
-    promises: {
-      ...actualFs.promises,
-      unlink: jest.fn().mockResolvedValue(undefined),
-    },
-  };
-});
-
-const fs = require('fs');
-const { processAgentFileUpload } = require('~/server/services/Files/process');
-
-const router = require('~/server/routes/files/images');
-
-describe('POST /images - Agent Upload Permission Check (Integration)', () => {
-  let mongoServer;
-  let authorId;
-  let otherUserId;
-  let agentCustomId;
-  let User;
-  let Agent;
-  let AclEntry;
-  let methods;
-  let modelsToCleanup = [];
-
-  beforeAll(async () => {
-    mongoServer = await MongoMemoryServer.create();
-    const mongoUri = mongoServer.getUri();
-    await mongoose.connect(mongoUri);
-
-    const { createModels } = require('@librechat/data-schemas');
-    const models = createModels(mongoose);
-    modelsToCleanup = Object.keys(models);
-    Object.assign(mongoose.models, models);
-    methods = createMethods(mongoose);
-
-    User = models.User;
-    Agent = models.Agent;
-    AclEntry = models.AclEntry;
-
-    await methods.seedDefaultRoles();
-  });
-
-  afterAll(async () => {
-    const collections = mongoose.connection.collections;
-    for (const key in collections) {
-      await collections[key].deleteMany({});
-    }
-    for (const modelName of modelsToCleanup) {
-      if (mongoose.models[modelName]) {
-        delete mongoose.models[modelName];
-      }
-    }
-    await mongoose.disconnect();
-    await mongoServer.stop();
-  });
-
-  beforeEach(async () => {
-    await Agent.deleteMany({});
-    await User.deleteMany({});
-    await AclEntry.deleteMany({});
-
-    authorId = new mongoose.Types.ObjectId();
-    otherUserId = new mongoose.Types.ObjectId();
-    agentCustomId = `agent_${uuidv4().replace(/-/g, '').substring(0, 21)}`;
-
-    await User.create({ _id: authorId, username: 'author', email: 'author@test.com' });
-    await User.create({ _id: otherUserId, username: 'other', email: 'other@test.com' });
-
-    jest.clearAllMocks();
-  });
-
-  const createAppWithUser = (userId, userRole = SystemRoles.USER) => {
-    const app = express();
-    app.use(express.json());
-    app.use((req, _res, next) => {
-      if (req.method === 'POST') {
-        req.file = {
-          originalname: 'test.png',
-          mimetype: 'image/png',
-          size: 100,
-          path: '/tmp/t.png',
-          filename: 'test.png',
-        };
-        req.file_id = uuidv4();
-      }
-      next();
-    });
-    app.use((req, _res, next) => {
-      req.user = { id: userId.toString(), role: userRole };
-      req.app = { locals: {} };
-      req.config = { fileStrategy: 'local', paths: { imageOutput: '/tmp/images' } };
-      next();
-    });
-    app.use('/images', router);
-    return app;
-  };
-
-  it('should return 403 when user has no permission on agent', async () => {
-    await createAgent({
-      id: agentCustomId,
-      name: 'Test Agent',
-      provider: 'openai',
-      model: 'gpt-4',
-      author: authorId,
-    });
-
-    const app = createAppWithUser(otherUserId);
-    const response = await request(app).post('/images').send({
-      endpoint: 'agents',
-      agent_id: agentCustomId,
-      tool_resource: 'context',
-      file_id: uuidv4(),
-    });
-
-    expect(response.status).toBe(403);
-    expect(response.body.error).toBe('Forbidden');
-    expect(processAgentFileUpload).not.toHaveBeenCalled();
-    expect(fs.promises.unlink).toHaveBeenCalledWith('/tmp/t.png');
-  });
-
-  it('should allow upload for agent owner', async () => {
-    await createAgent({
-      id: agentCustomId,
-      name: 'Test Agent',
-      provider: 'openai',
-      model: 'gpt-4',
-      author: authorId,
-    });
-
-    const app = createAppWithUser(authorId);
-    const response = await request(app).post('/images').send({
-      endpoint: 'agents',
-      agent_id: agentCustomId,
-      tool_resource: 'context',
-      file_id: uuidv4(),
-    });
-
-    expect(response.status).toBe(200);
-    expect(processAgentFileUpload).toHaveBeenCalled();
-  });
-
-  it('should allow upload for admin regardless of ownership', async () => {
-    await createAgent({
-      id: agentCustomId,
-      name: 'Test Agent',
-      provider: 'openai',
-      model: 'gpt-4',
-      author: authorId,
-    });
-
-    const app = createAppWithUser(otherUserId, SystemRoles.ADMIN);
-    const response = await request(app).post('/images').send({
-      endpoint: 'agents',
-      agent_id: agentCustomId,
-      tool_resource: 'context',
-      file_id: uuidv4(),
-    });
-
-    expect(response.status).toBe(200);
-    expect(processAgentFileUpload).toHaveBeenCalled();
-  });
-
-  it('should allow upload for user with EDIT permission', async () => {
-    const agent = await createAgent({
-      id: agentCustomId,
-      name: 'Test Agent',
-      provider: 'openai',
-      model: 'gpt-4',
-      author: authorId,
-    });
-
-    const { grantPermission } = require('~/server/services/PermissionService');
-    await grantPermission({
-      principalType: PrincipalType.USER,
-      principalId: otherUserId,
-      resourceType: ResourceType.AGENT,
-      resourceId: agent._id,
-      accessRoleId: AccessRoleIds.AGENT_EDITOR,
-      grantedBy: authorId,
-    });
-
-    const app = createAppWithUser(otherUserId);
-    const response = await request(app).post('/images').send({
-      endpoint: 'agents',
-      agent_id: agentCustomId,
-      tool_resource: 'context',
-      file_id: uuidv4(),
-    });
-
-    expect(response.status).toBe(200);
-    expect(processAgentFileUpload).toHaveBeenCalled();
-  });
-
-  it('should deny upload for user with only VIEW permission', async () => {
-    const agent = await createAgent({
-      id: agentCustomId,
-      name: 'Test Agent',
-      provider: 'openai',
-      model: 'gpt-4',
-      author: authorId,
-    });
-
-    const { grantPermission } = require('~/server/services/PermissionService');
-    await grantPermission({
-      principalType: PrincipalType.USER,
-      principalId: otherUserId,
-      resourceType: ResourceType.AGENT,
-      resourceId: agent._id,
-      accessRoleId: AccessRoleIds.AGENT_VIEWER,
-      grantedBy: authorId,
-    });
-
-    const app = createAppWithUser(otherUserId);
-    const response = await request(app).post('/images').send({
-      endpoint: 'agents',
-      agent_id: agentCustomId,
-      tool_resource: 'context',
-      file_id: uuidv4(),
-    });
-
-    expect(response.status).toBe(403);
-    expect(response.body.error).toBe('Forbidden');
-    expect(processAgentFileUpload).not.toHaveBeenCalled();
-    expect(fs.promises.unlink).toHaveBeenCalledWith('/tmp/t.png');
-  });
-
-  it('should skip permission check for regular image uploads without agent_id/tool_resource', async () => {
-    const app = createAppWithUser(otherUserId);
-    const response = await request(app).post('/images').send({
-      endpoint: 'agents',
-      file_id: uuidv4(),
-    });
-
-    expect(response.status).toBe(200);
-  });
-
-  it('should return 404 for non-existent agent', async () => {
-    const app = createAppWithUser(otherUserId);
-    const response = await request(app).post('/images').send({
-      endpoint: 'agents',
-      agent_id: 'agent_nonexistent123456789',
-      tool_resource: 'context',
-      file_id: uuidv4(),
-    });
-
-    expect(response.status).toBe(404);
-    expect(response.body.error).toBe('Not Found');
-    expect(processAgentFileUpload).not.toHaveBeenCalled();
-    expect(fs.promises.unlink).toHaveBeenCalledWith('/tmp/t.png');
-  });
-
-  it('should allow message_file attachment (boolean true) without EDIT permission', async () => {
-    const agent = await createAgent({
-      id: agentCustomId,
-      name: 'Test Agent',
-      provider: 'openai',
-      model: 'gpt-4',
-      author: authorId,
-    });
-
-    const { grantPermission } = require('~/server/services/PermissionService');
-    await grantPermission({
-      principalType: PrincipalType.USER,
-      principalId: otherUserId,
-      resourceType: ResourceType.AGENT,
-      resourceId: agent._id,
-      accessRoleId: AccessRoleIds.AGENT_VIEWER,
-      grantedBy: authorId,
-    });
-
-    const app = createAppWithUser(otherUserId);
-    const response = await request(app).post('/images').send({
-      endpoint: 'agents',
-      agent_id: agentCustomId,
-      tool_resource: 'context',
-      message_file: true,
-      file_id: uuidv4(),
-    });
-
-    expect(response.status).toBe(200);
-    expect(processAgentFileUpload).toHaveBeenCalled();
-  });
-
-  it('should allow message_file attachment (string "true") without EDIT permission', async () => {
-    const agent = await createAgent({
-      id: agentCustomId,
-      name: 'Test Agent',
-      provider: 'openai',
-      model: 'gpt-4',
-      author: authorId,
-    });
-
-    const { grantPermission } = require('~/server/services/PermissionService');
-    await grantPermission({
-      principalType: PrincipalType.USER,
-      principalId: otherUserId,
-      resourceType: ResourceType.AGENT,
-      resourceId: agent._id,
-      accessRoleId: AccessRoleIds.AGENT_VIEWER,
-      grantedBy: authorId,
-    });
-
-    const app = createAppWithUser(otherUserId);
-    const response = await request(app).post('/images').send({
-      endpoint: 'agents',
-      agent_id: agentCustomId,
-      tool_resource: 'context',
-      message_file: 'true',
-      file_id: uuidv4(),
-    });
-
-    expect(response.status).toBe(200);
-    expect(processAgentFileUpload).toHaveBeenCalled();
-  });
-
-  it('should deny upload when message_file is false (not a message attachment)', async () => {
-    const agent = await createAgent({
-      id: agentCustomId,
-      name: 'Test Agent',
-      provider: 'openai',
-      model: 'gpt-4',
-      author: authorId,
-    });
-
-    const { grantPermission } = require('~/server/services/PermissionService');
-    await grantPermission({
-      principalType: PrincipalType.USER,
-      principalId: otherUserId,
-      resourceType: ResourceType.AGENT,
-      resourceId: agent._id,
-      accessRoleId: AccessRoleIds.AGENT_VIEWER,
-      grantedBy: authorId,
-    });
-
-    const app = createAppWithUser(otherUserId);
-    const response = await request(app).post('/images').send({
-      endpoint: 'agents',
-      agent_id: agentCustomId,
-      tool_resource: 'context',
-      message_file: false,
-      file_id: uuidv4(),
-    });
-
-    expect(response.status).toBe(403);
-    expect(response.body.error).toBe('Forbidden');
-    expect(processAgentFileUpload).not.toHaveBeenCalled();
-    expect(fs.promises.unlink).toHaveBeenCalledWith('/tmp/t.png');
-  });
-});

api/server/routes/files/images.js

@@ -2,15 +2,12 @@ const path = require('path');
 const fs = require('fs').promises;
 const express = require('express');
 const { logger } = require('@librechat/data-schemas');
-const { verifyAgentUploadPermission } = require('@librechat/api');
 const { isAssistantsEndpoint } = require('librechat-data-provider');
 const {
   processAgentFileUpload,
   processImageFile,
   filterFile,
 } = require('~/server/services/Files/process');
-const { checkPermission } = require('~/server/services/PermissionService');
-const { getAgent } = require('~/models/Agent');
 
 const router = express.Router();
 
@@ -25,16 +22,6 @@ router.post('/', async (req, res) => {
     metadata.file_id = req.file_id;
 
     if (!isAssistantsEndpoint(metadata.endpoint) && metadata.tool_resource != null) {
-      const denied = await verifyAgentUploadPermission({
-        req,
-        res,
-        metadata,
-        getAgent,
-        checkPermission,
-      });
-      if (denied) {
-        return;
-      }
       return await processAgentFileUpload({ req, res, metadata });
     }
 

api/server/routes/mcp.js

@@ -13,7 +13,6 @@ const {
   MCPOAuthHandler,
   MCPTokenStorage,
   setOAuthSession,
-  PENDING_STALE_MS,
   getUserMCPAuthMap,
   validateOAuthCsrf,
   OAUTH_CSRF_COOKIE,
@@ -50,18 +49,6 @@ const router = Router();
 
 const OAUTH_CSRF_COOKIE_PATH = '/api/mcp';
 
-const checkMCPUsePermissions = generateCheckAccess({
-  permissionType: PermissionTypes.MCP_SERVERS,
-  permissions: [Permissions.USE],
-  getRoleByName,
-});
-
-const checkMCPCreate = generateCheckAccess({
-  permissionType: PermissionTypes.MCP_SERVERS,
-  permissions: [Permissions.USE, Permissions.CREATE],
-  getRoleByName,
-});
-
 /**
  * Get all MCP tools available to the user
  * Returns only MCP tools, completely decoupled from regular LibreChat tools
@@ -104,11 +91,7 @@ router.get('/:serverName/oauth/initiate', requireJwtAuth, setOAuthSession, async
     }
 
     const oauthHeaders = await getOAuthHeaders(serverName, userId);
-    const {
-      authorizationUrl,
-      flowId: oauthFlowId,
-      flowMetadata,
-    } = await MCPOAuthHandler.initiateOAuthFlow(
+    const { authorizationUrl, flowId: oauthFlowId } = await MCPOAuthHandler.initiateOAuthFlow(
       serverName,
       serverUrl,
       userId,
@@ -118,7 +101,6 @@ router.get('/:serverName/oauth/initiate', requireJwtAuth, setOAuthSession, async
 
     logger.debug('[MCP OAuth] OAuth flow initiated', { oauthFlowId, authorizationUrl });
 
-    await MCPOAuthHandler.storeStateMapping(flowMetadata.state, oauthFlowId, flowManager);
     setOAuthCsrfCookie(res, oauthFlowId, OAUTH_CSRF_COOKIE_PATH);
     res.redirect(authorizationUrl);
   } catch (error) {
@@ -161,53 +143,31 @@ router.get('/:serverName/oauth/callback', async (req, res) => {
       return res.redirect(`${basePath}/oauth/error?error=missing_state`);
     }
 
-    const flowsCache = getLogStores(CacheKeys.FLOWS);
-    const flowManager = getFlowStateManager(flowsCache);
-
-    const flowId = await MCPOAuthHandler.resolveStateToFlowId(state, flowManager);
-    if (!flowId) {
-      logger.error('[MCP OAuth] Could not resolve state to flow ID', { state });
-      return res.redirect(`${basePath}/oauth/error?error=invalid_state`);
-    }
-    logger.debug('[MCP OAuth] Resolved flow ID from state', { flowId });
+    const flowId = state;
+    logger.debug('[MCP OAuth] Using flow ID from state', { flowId });
 
     const flowParts = flowId.split(':');
     if (flowParts.length < 2 || !flowParts[0] || !flowParts[1]) {
-      logger.error('[MCP OAuth] Invalid flow ID format', { flowId });
+      logger.error('[MCP OAuth] Invalid flow ID format in state', { flowId });
       return res.redirect(`${basePath}/oauth/error?error=invalid_state`);
     }
 
     const [flowUserId] = flowParts;
-
-    const hasCsrf = validateOAuthCsrf(req, res, flowId, OAUTH_CSRF_COOKIE_PATH);
-    const hasSession = !hasCsrf && validateOAuthSession(req, flowUserId);
-    let hasActiveFlow = false;
-    if (!hasCsrf && !hasSession) {
-      const pendingFlow = await flowManager.getFlowState(flowId, 'mcp_oauth');
-      const pendingAge = pendingFlow?.createdAt ? Date.now() - pendingFlow.createdAt : Infinity;
-      hasActiveFlow = pendingFlow?.status === 'PENDING' && pendingAge < PENDING_STALE_MS;
-      if (hasActiveFlow) {
-        logger.debug(
-          '[MCP OAuth] CSRF/session cookies absent, validating via active PENDING flow',
-          {
-            flowId,
-          },
-        );
-      }
-    }
-
-    if (!hasCsrf && !hasSession && !hasActiveFlow) {
-      logger.error(
-        '[MCP OAuth] CSRF validation failed: no valid CSRF cookie, session cookie, or active flow',
-        {
-          flowId,
-          hasCsrfCookie: !!req.cookies?.[OAUTH_CSRF_COOKIE],
-          hasSessionCookie: !!req.cookies?.[OAUTH_SESSION_COOKIE],
-        },
-      );
+    if (
+      !validateOAuthCsrf(req, res, flowId, OAUTH_CSRF_COOKIE_PATH) &&
+      !validateOAuthSession(req, flowUserId)
+    ) {
+      logger.error('[MCP OAuth] CSRF validation failed: no valid CSRF or session cookie', {
+        flowId,
+        hasCsrfCookie: !!req.cookies?.[OAUTH_CSRF_COOKIE],
+        hasSessionCookie: !!req.cookies?.[OAUTH_SESSION_COOKIE],
+      });
       return res.redirect(`${basePath}/oauth/error?error=csrf_validation_failed`);
     }
 
+    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);
 
@@ -321,13 +281,7 @@ router.get('/:serverName/oauth/callback', async (req, res) => {
     const toolFlowId = flowState.metadata?.toolFlowId;
     if (toolFlowId) {
       logger.debug('[MCP OAuth] Completing tool flow', { toolFlowId });
-      const completed = await flowManager.completeFlow(toolFlowId, 'mcp_oauth', tokens);
-      if (!completed) {
-        logger.warn(
-          '[MCP OAuth] Tool flow state not found during completion — waiter will time out',
-          { toolFlowId },
-        );
-      }
+      await flowManager.completeFlow(toolFlowId, 'mcp_oauth', tokens);
     }
 
     /** Redirect to success page with flowId and serverName */
@@ -482,75 +436,69 @@ router.post('/oauth/cancel/:serverName', requireJwtAuth, async (req, res) => {
  * Reinitialize MCP server
  * This endpoint allows reinitializing a specific MCP server
  */
-router.post(
-  '/:serverName/reinitialize',
-  requireJwtAuth,
-  checkMCPUsePermissions,
-  setOAuthSession,
-  async (req, res) => {
-    try {
-      const { serverName } = req.params;
-      const user = createSafeUser(req.user);
+router.post('/:serverName/reinitialize', requireJwtAuth, setOAuthSession, async (req, res) => {
+  try {
+    const { serverName } = req.params;
+    const user = createSafeUser(req.user);
 
-      if (!user.id) {
-        return res.status(401).json({ error: 'User not authenticated' });
-      }
-
-      logger.info(`[MCP Reinitialize] Reinitializing server: ${serverName}`);
-
-      const mcpManager = getMCPManager();
-      const serverConfig = await getMCPServersRegistry().getServerConfig(serverName, user.id);
-      if (!serverConfig) {
-        return res.status(404).json({
-          error: `MCP server '${serverName}' not found in configuration`,
-        });
-      }
-
-      await mcpManager.disconnectUserConnection(user.id, serverName);
-      logger.info(
-        `[MCP Reinitialize] Disconnected existing user connection for server: ${serverName}`,
-      );
-
-      /** @type {Record<string, Record<string, string>> | undefined} */
-      let userMCPAuthMap;
-      if (serverConfig.customUserVars && typeof serverConfig.customUserVars === 'object') {
-        userMCPAuthMap = await getUserMCPAuthMap({
-          userId: user.id,
-          servers: [serverName],
-          findPluginAuthsByKeys,
-        });
-      }
-
-      const result = await reinitMCPServer({
-        user,
-        serverName,
-        userMCPAuthMap,
-      });
-
-      if (!result) {
-        return res.status(500).json({ error: 'Failed to reinitialize MCP server for user' });
-      }
-
-      const { success, message, oauthRequired, oauthUrl } = result;
-
-      if (oauthRequired) {
-        const flowId = MCPOAuthHandler.generateFlowId(user.id, serverName);
-        setOAuthCsrfCookie(res, flowId, OAUTH_CSRF_COOKIE_PATH);
-      }
-
-      res.json({
-        success,
-        message,
-        oauthUrl,
-        serverName,
-        oauthRequired,
-      });
-    } catch (error) {
-      logger.error('[MCP Reinitialize] Unexpected error', error);
-      res.status(500).json({ error: 'Internal server error' });
+    if (!user.id) {
+      return res.status(401).json({ error: 'User not authenticated' });
     }
-  },
-);
+
+    logger.info(`[MCP Reinitialize] Reinitializing server: ${serverName}`);
+
+    const mcpManager = getMCPManager();
+    const serverConfig = await getMCPServersRegistry().getServerConfig(serverName, user.id);
+    if (!serverConfig) {
+      return res.status(404).json({
+        error: `MCP server '${serverName}' not found in configuration`,
+      });
+    }
+
+    await mcpManager.disconnectUserConnection(user.id, serverName);
+    logger.info(
+      `[MCP Reinitialize] Disconnected existing user connection for server: ${serverName}`,
+    );
+
+    /** @type {Record<string, Record<string, string>> | undefined} */
+    let userMCPAuthMap;
+    if (serverConfig.customUserVars && typeof serverConfig.customUserVars === 'object') {
+      userMCPAuthMap = await getUserMCPAuthMap({
+        userId: user.id,
+        servers: [serverName],
+        findPluginAuthsByKeys,
+      });
+    }
+
+    const result = await reinitMCPServer({
+      user,
+      serverName,
+      userMCPAuthMap,
+    });
+
+    if (!result) {
+      return res.status(500).json({ error: 'Failed to reinitialize MCP server for user' });
+    }
+
+    const { success, message, oauthRequired, oauthUrl } = result;
+
+    if (oauthRequired) {
+      const flowId = MCPOAuthHandler.generateFlowId(user.id, serverName);
+      setOAuthCsrfCookie(res, flowId, OAUTH_CSRF_COOKIE_PATH);
+    }
+
+    res.json({
+      success,
+      message,
+      oauthUrl,
+      serverName,
+      oauthRequired,
+    });
+  } catch (error) {
+    logger.error('[MCP Reinitialize] Unexpected error', error);
+    res.status(500).json({ error: 'Internal server error' });
+  }
+});
 
 /**
  * Get connection status for all MCP servers
@@ -657,7 +605,7 @@ router.get('/connection/status/:serverName', requireJwtAuth, async (req, res) =>
  * Check which authentication values exist for a specific MCP server
  * This endpoint returns only boolean flags indicating if values are set, not the actual values
  */
-router.get('/:serverName/auth-values', requireJwtAuth, checkMCPUsePermissions, async (req, res) => {
+router.get('/:serverName/auth-values', requireJwtAuth, async (req, res) => {
   try {
     const { serverName } = req.params;
     const user = req.user;
@@ -714,6 +662,19 @@ async function getOAuthHeaders(serverName, userId) {
 MCP Server CRUD Routes (User-Managed MCP Servers)
 */
 
+// Permission checkers for MCP server management
+const checkMCPUsePermissions = generateCheckAccess({
+  permissionType: PermissionTypes.MCP_SERVERS,
+  permissions: [Permissions.USE],
+  getRoleByName,
+});
+
+const checkMCPCreate = generateCheckAccess({
+  permissionType: PermissionTypes.MCP_SERVERS,
+  permissions: [Permissions.USE, Permissions.CREATE],
+  getRoleByName,
+});
+
 /**
  * Get list of accessible MCP servers
  * @route GET /api/mcp/servers

api/server/routes/messages.js

@@ -404,8 +404,8 @@ router.put('/:conversationId/:messageId/feedback', validateMessageReq, async (re
 
 router.delete('/:conversationId/:messageId', validateMessageReq, async (req, res) => {
   try {
-    const { conversationId, messageId } = req.params;
-    await deleteMessages({ messageId, conversationId, user: req.user.id });
+    const { messageId } = req.params;
+    await deleteMessages({ messageId });
     res.status(204).send();
   } catch (error) {
     logger.error('Error deleting message:', error);

api/server/routes/share.js

@@ -19,7 +19,9 @@ const allowSharedLinks =
   process.env.ALLOW_SHARED_LINKS === undefined || isEnabled(process.env.ALLOW_SHARED_LINKS);
 
 if (allowSharedLinks) {
-  const allowSharedLinksPublic = isEnabled(process.env.ALLOW_SHARED_LINKS_PUBLIC);
+  const allowSharedLinksPublic =
+    process.env.ALLOW_SHARED_LINKS_PUBLIC === undefined ||
+    isEnabled(process.env.ALLOW_SHARED_LINKS_PUBLIC);
   router.get(
     '/:shareId',
     allowSharedLinksPublic ? (req, res, next) => next() : requireJwtAuth,

api/server/services/Files/Code/__tests__/process-traversal.spec.js

@@ -1,124 +0,0 @@
-jest.mock('uuid', () => ({ v4: jest.fn(() => 'mock-uuid') }));
-
-jest.mock('@librechat/data-schemas', () => ({
-  logger: { warn: jest.fn(), debug: jest.fn(), error: jest.fn() },
-}));
-
-jest.mock('@librechat/agents', () => ({
-  getCodeBaseURL: jest.fn(() => 'http://localhost:8000'),
-}));
-
-const mockSanitizeFilename = jest.fn();
-
-jest.mock('@librechat/api', () => ({
-  logAxiosError: jest.fn(),
-  getBasePath: jest.fn(() => ''),
-  sanitizeFilename: mockSanitizeFilename,
-}));
-
-jest.mock('librechat-data-provider', () => ({
-  ...jest.requireActual('librechat-data-provider'),
-  mergeFileConfig: jest.fn(() => ({ serverFileSizeLimit: 100 * 1024 * 1024 })),
-  getEndpointFileConfig: jest.fn(() => ({
-    fileSizeLimit: 100 * 1024 * 1024,
-    supportedMimeTypes: ['*/*'],
-  })),
-  fileConfig: { checkType: jest.fn(() => true) },
-}));
-
-jest.mock('~/models', () => ({
-  createFile: jest.fn().mockResolvedValue({}),
-  getFiles: jest.fn().mockResolvedValue([]),
-  updateFile: jest.fn(),
-  claimCodeFile: jest.fn().mockResolvedValue({ file_id: 'mock-uuid', usage: 0 }),
-}));
-
-const mockSaveBuffer = jest.fn().mockResolvedValue('/uploads/user123/mock-uuid__output.csv');
-
-jest.mock('~/server/services/Files/strategies', () => ({
-  getStrategyFunctions: jest.fn(() => ({
-    saveBuffer: mockSaveBuffer,
-  })),
-}));
-
-jest.mock('~/server/services/Files/permissions', () => ({
-  filterFilesByAgentAccess: jest.fn().mockResolvedValue([]),
-}));
-
-jest.mock('~/server/services/Files/images/convert', () => ({
-  convertImage: jest.fn(),
-}));
-
-jest.mock('~/server/utils', () => ({
-  determineFileType: jest.fn().mockResolvedValue({ mime: 'text/csv' }),
-}));
-
-jest.mock('axios', () =>
-  jest.fn().mockResolvedValue({
-    data: Buffer.from('file-content'),
-  }),
-);
-
-const { createFile } = require('~/models');
-const { processCodeOutput } = require('../process');
-
-const baseParams = {
-  req: {
-    user: { id: 'user123' },
-    config: {
-      fileStrategy: 'local',
-      imageOutputType: 'webp',
-      fileConfig: {},
-    },
-  },
-  id: 'code-file-id',
-  apiKey: 'test-key',
-  toolCallId: 'tool-1',
-  conversationId: 'conv-1',
-  messageId: 'msg-1',
-  session_id: 'session-1',
-};
-
-describe('processCodeOutput path traversal protection', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test('sanitizeFilename is called with the raw artifact name', async () => {
-    mockSanitizeFilename.mockReturnValueOnce('output.csv');
-    await processCodeOutput({ ...baseParams, name: 'output.csv' });
-    expect(mockSanitizeFilename).toHaveBeenCalledWith('output.csv');
-  });
-
-  test('sanitized name is used in saveBuffer fileName', async () => {
-    mockSanitizeFilename.mockReturnValueOnce('sanitized-name.txt');
-    await processCodeOutput({ ...baseParams, name: '../../../tmp/poc.txt' });
-
-    expect(mockSanitizeFilename).toHaveBeenCalledWith('../../../tmp/poc.txt');
-    const call = mockSaveBuffer.mock.calls[0][0];
-    expect(call.fileName).toBe('mock-uuid__sanitized-name.txt');
-  });
-
-  test('sanitized name is stored as filename in the file record', async () => {
-    mockSanitizeFilename.mockReturnValueOnce('safe-output.csv');
-    await processCodeOutput({ ...baseParams, name: 'unsafe/../../output.csv' });
-
-    const fileArg = createFile.mock.calls[0][0];
-    expect(fileArg.filename).toBe('safe-output.csv');
-  });
-
-  test('sanitized name is used for image file records', async () => {
-    const { convertImage } = require('~/server/services/Files/images/convert');
-    convertImage.mockResolvedValueOnce({
-      filepath: '/images/user123/mock-uuid.webp',
-      bytes: 100,
-    });
-
-    mockSanitizeFilename.mockReturnValueOnce('safe-chart.png');
-    await processCodeOutput({ ...baseParams, name: '../../../chart.png' });
-
-    expect(mockSanitizeFilename).toHaveBeenCalledWith('../../../chart.png');
-    const fileArg = createFile.mock.calls[0][0];
-    expect(fileArg.filename).toBe('safe-chart.png');
-  });
-});

api/server/services/Files/Code/process.js

@@ -3,7 +3,7 @@ const { v4 } = require('uuid');
 const axios = require('axios');
 const { logger } = require('@librechat/data-schemas');
 const { getCodeBaseURL } = require('@librechat/agents');
-const { logAxiosError, getBasePath, sanitizeFilename } = require('@librechat/api');
+const { logAxiosError, getBasePath } = require('@librechat/api');
 const {
   Tools,
   megabyte,
@@ -146,13 +146,6 @@ const processCodeOutput = async ({
       );
     }
 
-    const safeName = sanitizeFilename(name);
-    if (safeName !== name) {
-      logger.warn(
-        `[processCodeOutput] Filename sanitized: "${name}" -> "${safeName}" | conv=${conversationId}`,
-      );
-    }
-
     if (isImage) {
       const usage = isUpdate ? (claimed.usage ?? 0) + 1 : 1;
       const _file = await convertImage(req, buffer, 'high', `${file_id}${fileExt}`);
@@ -163,7 +156,7 @@ const processCodeOutput = async ({
         file_id,
         messageId,
         usage,
-        filename: safeName,
+        filename: name,
         conversationId,
         user: req.user.id,
         type: `image/${appConfig.imageOutputType}`,
@@ -207,7 +200,7 @@ const processCodeOutput = async ({
       );
     }
 
-    const fileName = `${file_id}__${safeName}`;
+    const fileName = `${file_id}__${name}`;
     const filepath = await saveBuffer({
       userId: req.user.id,
       buffer,
@@ -220,7 +213,7 @@ const processCodeOutput = async ({
       filepath,
       messageId,
       object: 'file',
-      filename: safeName,
+      filename: name,
       type: mimeType,
       conversationId,
       user: req.user.id,
@@ -236,11 +229,6 @@ const processCodeOutput = async ({
     await createFile(file, true);
     return Object.assign(file, { messageId, toolCallId });
   } catch (error) {
-    if (error?.message === 'Path traversal detected in filename') {
-      logger.warn(
-        `[processCodeOutput] Path traversal blocked for file "${name}" | conv=${conversationId}`,
-      );
-    }
     logAxiosError({
       message: 'Error downloading/processing code environment file',
       error,

api/server/services/Files/Code/process.spec.js

@@ -58,7 +58,6 @@ jest.mock('@librechat/agents', () => ({
 jest.mock('@librechat/api', () => ({
   logAxiosError: jest.fn(),
   getBasePath: jest.fn(() => ''),
-  sanitizeFilename: jest.fn((name) => name),
 }));
 
 // Mock models

api/server/services/Files/Local/__tests__/crud-traversal.spec.js

@@ -1,69 +0,0 @@
-jest.mock('@librechat/api', () => ({ deleteRagFile: jest.fn() }));
-jest.mock('@librechat/data-schemas', () => ({
-  logger: { warn: jest.fn(), error: jest.fn() },
-}));
-
-const mockTmpBase = require('fs').mkdtempSync(
-  require('path').join(require('os').tmpdir(), 'crud-traversal-'),
-);
-
-jest.mock('~/config/paths', () => {
-  const path = require('path');
-  return {
-    publicPath: path.join(mockTmpBase, 'public'),
-    uploads: path.join(mockTmpBase, 'uploads'),
-  };
-});
-
-const fs = require('fs');
-const path = require('path');
-const { saveLocalBuffer } = require('../crud');
-
-describe('saveLocalBuffer path containment', () => {
-  beforeAll(() => {
-    fs.mkdirSync(path.join(mockTmpBase, 'public', 'images'), { recursive: true });
-    fs.mkdirSync(path.join(mockTmpBase, 'uploads'), { recursive: true });
-  });
-
-  afterAll(() => {
-    fs.rmSync(mockTmpBase, { recursive: true, force: true });
-  });
-
-  test('rejects filenames with path traversal sequences', async () => {
-    await expect(
-      saveLocalBuffer({
-        userId: 'user1',
-        buffer: Buffer.from('malicious'),
-        fileName: '../../../etc/passwd',
-        basePath: 'uploads',
-      }),
-    ).rejects.toThrow('Path traversal detected in filename');
-  });
-
-  test('rejects prefix-collision traversal (startsWith bypass)', async () => {
-    fs.mkdirSync(path.join(mockTmpBase, 'uploads', 'user10'), { recursive: true });
-    await expect(
-      saveLocalBuffer({
-        userId: 'user1',
-        buffer: Buffer.from('malicious'),
-        fileName: '../user10/evil',
-        basePath: 'uploads',
-      }),
-    ).rejects.toThrow('Path traversal detected in filename');
-  });
-
-  test('allows normal filenames', async () => {
-    const result = await saveLocalBuffer({
-      userId: 'user1',
-      buffer: Buffer.from('safe content'),
-      fileName: 'file-id__output.csv',
-      basePath: 'uploads',
-    });
-
-    expect(result).toBe('/uploads/user1/file-id__output.csv');
-
-    const filePath = path.join(mockTmpBase, 'uploads', 'user1', 'file-id__output.csv');
-    expect(fs.existsSync(filePath)).toBe(true);
-    fs.unlinkSync(filePath);
-  });
-});

api/server/services/Files/Local/crud.js

@@ -78,13 +78,7 @@ async function saveLocalBuffer({ userId, buffer, fileName, basePath = 'images' }
       fs.mkdirSync(directoryPath, { recursive: true });
     }
 
-    const resolvedDir = path.resolve(directoryPath);
-    const resolvedPath = path.resolve(resolvedDir, fileName);
-    const rel = path.relative(resolvedDir, resolvedPath);
-    if (rel.startsWith('..') || path.isAbsolute(rel) || rel.includes(`..${path.sep}`)) {
-      throw new Error('Path traversal detected in filename');
-    }
-    fs.writeFileSync(resolvedPath, buffer);
+    fs.writeFileSync(path.join(directoryPath, fileName), buffer);
 
     const filePath = path.posix.join('/', basePath, userId, fileName);
 
@@ -171,8 +165,9 @@ async function getLocalFileURL({ fileName, basePath = 'images' }) {
 }
 
 /**
- * Validates that a filepath is strictly contained within a subdirectory under a base path,
- * using path.relative to prevent prefix-collision bypasses.
+ * Validates if a given filepath is within a specified subdirectory under a base path. This function constructs
+ * the expected base path using the base, subfolder, and user id from the request, and then checks if the
+ * provided filepath starts with this constructed base path.
  *
  * @param {ServerRequest} req - The request object from Express. It should contain a `user` property with an `id`.
  * @param {string} base - The base directory path.
@@ -185,8 +180,7 @@ async function getLocalFileURL({ fileName, basePath = 'images' }) {
 const isValidPath = (req, base, subfolder, filepath) => {
   const normalizedBase = path.resolve(base, subfolder, req.user.id);
   const normalizedFilepath = path.resolve(filepath);
-  const rel = path.relative(normalizedBase, normalizedFilepath);
-  return !rel.startsWith('..') && !path.isAbsolute(rel) && !rel.includes(`..${path.sep}`);
+  return normalizedFilepath.startsWith(normalizedBase);
 };
 
 /**

api/server/services/MCP.js

@@ -34,55 +34,6 @@ const { reinitMCPServer } = require('./Tools/mcp');
 const { getAppConfig } = require('./Config');
 const { getLogStores } = require('~/cache');
 
-const MAX_CACHE_SIZE = 1000;
-const lastReconnectAttempts = new Map();
-const RECONNECT_THROTTLE_MS = 10_000;
-
-const missingToolCache = new Map();
-const MISSING_TOOL_TTL_MS = 10_000;
-
-function evictStale(map, ttl) {
-  if (map.size <= MAX_CACHE_SIZE) {
-    return;
-  }
-  const now = Date.now();
-  for (const [key, timestamp] of map) {
-    if (now - timestamp >= ttl) {
-      map.delete(key);
-    }
-    if (map.size <= MAX_CACHE_SIZE) {
-      return;
-    }
-  }
-}
-
-const unavailableMsg =
-  "This tool's MCP server is temporarily unavailable. Please try again shortly.";
-
-/**
- * @param {string} toolName
- * @param {string} serverName
- */
-function createUnavailableToolStub(toolName, serverName) {
-  const normalizedToolKey = `${toolName}${Constants.mcp_delimiter}${normalizeServerName(serverName)}`;
-  const _call = async () => [unavailableMsg, null];
-  const toolInstance = tool(_call, {
-    schema: {
-      type: 'object',
-      properties: {
-        input: { type: 'string', description: 'Input for the tool' },
-      },
-      required: [],
-    },
-    name: normalizedToolKey,
-    description: unavailableMsg,
-    responseFormat: AgentConstants.CONTENT_AND_ARTIFACT,
-  });
-  toolInstance.mcp = true;
-  toolInstance.mcpRawServerName = serverName;
-  return toolInstance;
-}
-
 function isEmptyObjectSchema(jsonSchema) {
   return (
     jsonSchema != null &&
@@ -260,17 +211,6 @@ async function reconnectServer({
   logger.debug(
     `[MCP][reconnectServer] serverName: ${serverName}, user: ${user?.id}, hasUserMCPAuthMap: ${!!userMCPAuthMap}`,
   );
-
-  const throttleKey = `${user.id}:${serverName}`;
-  const now = Date.now();
-  const lastAttempt = lastReconnectAttempts.get(throttleKey) ?? 0;
-  if (now - lastAttempt < RECONNECT_THROTTLE_MS) {
-    logger.debug(`[MCP][reconnectServer] Throttled reconnect for ${serverName}`);
-    return null;
-  }
-  lastReconnectAttempts.set(throttleKey, now);
-  evictStale(lastReconnectAttempts, RECONNECT_THROTTLE_MS);
-
   const runId = Constants.USE_PRELIM_RESPONSE_MESSAGE_ID;
   const flowId = `${user.id}:${serverName}:${Date.now()}`;
   const flowManager = getFlowStateManager(getLogStores(CacheKeys.FLOWS));
@@ -327,7 +267,7 @@ async function reconnectServer({
       userMCPAuthMap,
       forceNew: true,
       returnOnOAuth: false,
-      connectionTimeout: Time.THIRTY_SECONDS,
+      connectionTimeout: Time.TWO_MINUTES,
     });
   } finally {
     // Clean up abort handler to prevent memory leaks
@@ -390,13 +330,9 @@ async function createMCPTools({
     userMCPAuthMap,
     streamId,
   });
-  if (result === null) {
-    logger.debug(`[MCP][${serverName}] Reconnect throttled, skipping tool creation.`);
-    return [];
-  }
   if (!result || !result.tools) {
     logger.warn(`[MCP][${serverName}] Failed to reinitialize MCP server.`);
-    return [];
+    return;
   }
 
   const serverTools = [];
@@ -466,14 +402,6 @@ async function createMCPTool({
   /** @type {LCTool | undefined} */
   let toolDefinition = availableTools?.[toolKey]?.function;
   if (!toolDefinition) {
-    const cachedAt = missingToolCache.get(toolKey);
-    if (cachedAt && Date.now() - cachedAt < MISSING_TOOL_TTL_MS) {
-      logger.debug(
-        `[MCP][${serverName}][${toolName}] Tool in negative cache, returning unavailable stub.`,
-      );
-      return createUnavailableToolStub(toolName, serverName);
-    }
-
     logger.warn(
       `[MCP][${serverName}][${toolName}] Requested tool not found in available tools, re-initializing MCP server.`,
     );
@@ -487,18 +415,11 @@ async function createMCPTool({
       streamId,
     });
     toolDefinition = result?.availableTools?.[toolKey]?.function;
-
-    if (!toolDefinition) {
-      missingToolCache.set(toolKey, Date.now());
-      evictStale(missingToolCache, MISSING_TOOL_TTL_MS);
-    }
   }
 
   if (!toolDefinition) {
-    logger.warn(
-      `[MCP][${serverName}][${toolName}] Tool definition not found, returning unavailable stub.`,
-    );
-    return createUnavailableToolStub(toolName, serverName);
+    logger.warn(`[MCP][${serverName}][${toolName}] Tool definition not found, cannot create tool.`);
+    return;
   }
 
   return createToolInstance({
@@ -799,5 +720,4 @@ module.exports = {
   getMCPSetupData,
   checkOAuthFlowStatus,
   getServerConnectionStatus,
-  createUnavailableToolStub,
 };

api/server/services/MCP.spec.js

@@ -45,7 +45,6 @@ const {
   getMCPSetupData,
   checkOAuthFlowStatus,
   getServerConnectionStatus,
-  createUnavailableToolStub,
 } = require('./MCP');
 
 jest.mock('./Config', () => ({
@@ -1099,188 +1098,6 @@ describe('User parameter passing tests', () => {
     });
   });
 
-  describe('createUnavailableToolStub', () => {
-    it('should return a tool whose _call returns a valid CONTENT_AND_ARTIFACT two-tuple', async () => {
-      const stub = createUnavailableToolStub('myTool', 'myServer');
-      // invoke() goes through langchain's base tool, which checks responseFormat.
-      // CONTENT_AND_ARTIFACT requires [content, artifact] — a bare string would throw:
-      //   "Tool response format is "content_and_artifact" but the output was not a two-tuple"
-      const result = await stub.invoke({});
-      // If we reach here without throwing, the two-tuple format is correct.
-      // invoke() returns the content portion of [content, artifact] as a string.
-      expect(result).toContain('temporarily unavailable');
-    });
-  });
-
-  describe('negative tool cache and throttle interaction', () => {
-    it('should cache tool as missing even when throttled (cross-user dedup)', async () => {
-      const mockUser = { id: 'throttle-test-user' };
-      const mockRes = { write: jest.fn(), flush: jest.fn() };
-
-      // First call: reconnect succeeds but tool not found
-      mockReinitMCPServer.mockResolvedValueOnce({
-        availableTools: {},
-      });
-
-      await createMCPTool({
-        res: mockRes,
-        user: mockUser,
-        toolKey: `missing-tool${D}cache-dedup-server`,
-        provider: 'openai',
-        userMCPAuthMap: {},
-        availableTools: undefined,
-      });
-
-      // Second call within 10s for DIFFERENT tool on same server:
-      // reconnect is throttled (returns null), tool is still cached as missing.
-      // This is intentional: the cache acts as cross-user dedup since the
-      // throttle is per-user-per-server and can't prevent N different users
-      // from each triggering their own reconnect.
-      const result2 = await createMCPTool({
-        res: mockRes,
-        user: mockUser,
-        toolKey: `other-tool${D}cache-dedup-server`,
-        provider: 'openai',
-        userMCPAuthMap: {},
-        availableTools: undefined,
-      });
-
-      expect(result2).toBeDefined();
-      expect(result2.name).toContain('other-tool');
-      expect(mockReinitMCPServer).toHaveBeenCalledTimes(1);
-    });
-
-    it('should prevent user B from triggering reconnect when user A already cached the tool', async () => {
-      const userA = { id: 'cache-user-A' };
-      const userB = { id: 'cache-user-B' };
-      const mockRes = { write: jest.fn(), flush: jest.fn() };
-
-      // User A: real reconnect, tool not found → cached
-      mockReinitMCPServer.mockResolvedValueOnce({
-        availableTools: {},
-      });
-
-      await createMCPTool({
-        res: mockRes,
-        user: userA,
-        toolKey: `shared-tool${D}cross-user-server`,
-        provider: 'openai',
-        userMCPAuthMap: {},
-        availableTools: undefined,
-      });
-
-      expect(mockReinitMCPServer).toHaveBeenCalledTimes(1);
-
-      // User B requests the SAME tool within 10s.
-      // The negative cache is keyed by toolKey (no user prefix), so user B
-      // gets a cache hit and no reconnect fires. This is the cross-user
-      // storm protection: without this, user B's unthrottled first request
-      // would trigger a second reconnect to the same server.
-      const result = await createMCPTool({
-        res: mockRes,
-        user: userB,
-        toolKey: `shared-tool${D}cross-user-server`,
-        provider: 'openai',
-        userMCPAuthMap: {},
-        availableTools: undefined,
-      });
-
-      expect(result).toBeDefined();
-      expect(result.name).toContain('shared-tool');
-      // reinitMCPServer still called only once — user B hit the cache
-      expect(mockReinitMCPServer).toHaveBeenCalledTimes(1);
-    });
-
-    it('should prevent user B from triggering reconnect for throttle-cached tools', async () => {
-      const userA = { id: 'storm-user-A' };
-      const userB = { id: 'storm-user-B' };
-      const mockRes = { write: jest.fn(), flush: jest.fn() };
-
-      // User A: real reconnect for tool-1, tool not found → cached
-      mockReinitMCPServer.mockResolvedValueOnce({
-        availableTools: {},
-      });
-
-      await createMCPTool({
-        res: mockRes,
-        user: userA,
-        toolKey: `tool-1${D}storm-server`,
-        provider: 'openai',
-        userMCPAuthMap: {},
-        availableTools: undefined,
-      });
-
-      // User A: tool-2 on same server within 10s → throttled → cached from throttle
-      await createMCPTool({
-        res: mockRes,
-        user: userA,
-        toolKey: `tool-2${D}storm-server`,
-        provider: 'openai',
-        userMCPAuthMap: {},
-        availableTools: undefined,
-      });
-
-      expect(mockReinitMCPServer).toHaveBeenCalledTimes(1);
-
-      // User B requests tool-2 — gets cache hit from the throttle-cached entry.
-      // Without this caching, user B would trigger a real reconnect since
-      // user B has their own throttle key and hasn't reconnected yet.
-      const result = await createMCPTool({
-        res: mockRes,
-        user: userB,
-        toolKey: `tool-2${D}storm-server`,
-        provider: 'openai',
-        userMCPAuthMap: {},
-        availableTools: undefined,
-      });
-
-      expect(result).toBeDefined();
-      expect(result.name).toContain('tool-2');
-      // Still only 1 real reconnect — user B was protected by the cache
-      expect(mockReinitMCPServer).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe('createMCPTools throttle handling', () => {
-    it('should return empty array with debug log when reconnect is throttled', async () => {
-      const mockUser = { id: 'throttle-tools-user' };
-      const mockRes = { write: jest.fn(), flush: jest.fn() };
-
-      // First call: real reconnect
-      mockReinitMCPServer.mockResolvedValueOnce({
-        tools: [{ name: 'tool1' }],
-        availableTools: {
-          [`tool1${D}throttle-tools-server`]: {
-            function: { description: 'Tool 1', parameters: {} },
-          },
-        },
-      });
-
-      await createMCPTools({
-        res: mockRes,
-        user: mockUser,
-        serverName: 'throttle-tools-server',
-        provider: 'openai',
-        userMCPAuthMap: {},
-      });
-
-      // Second call within 10s — throttled
-      const result = await createMCPTools({
-        res: mockRes,
-        user: mockUser,
-        serverName: 'throttle-tools-server',
-        provider: 'openai',
-        userMCPAuthMap: {},
-      });
-
-      expect(result).toEqual([]);
-      // reinitMCPServer called only once — second was throttled
-      expect(mockReinitMCPServer).toHaveBeenCalledTimes(1);
-      // Should log at debug level (not warn) for throttled case
-      expect(logger.debug).toHaveBeenCalledWith(expect.stringContaining('Reconnect throttled'));
-    });
-  });
-
   describe('User parameter integrity', () => {
     it('should preserve user object properties through the call chain', async () => {
       const complexUser = {

api/server/services/Tools/mcp.js

@@ -1,8 +1,8 @@
 const { logger } = require('@librechat/data-schemas');
 const { CacheKeys, Constants } = require('librechat-data-provider');
-const { getMCPManager, getMCPServersRegistry, getFlowStateManager } = require('~/config');
 const { findToken, createToken, updateToken, deleteTokens } = require('~/models');
 const { updateMCPServerTools } = require('~/server/services/Config');
+const { getMCPManager, getFlowStateManager } = require('~/config');
 const { getLogStores } = require('~/cache');
 
 /**
@@ -41,33 +41,6 @@ async function reinitMCPServer({
   let oauthUrl = null;
 
   try {
-    const registry = getMCPServersRegistry();
-    const serverConfig = await registry.getServerConfig(serverName, user?.id);
-    if (serverConfig?.inspectionFailed) {
-      logger.info(
-        `[MCP Reinitialize] Server ${serverName} had failed inspection, attempting reinspection`,
-      );
-      try {
-        const storageLocation = serverConfig.dbId ? 'DB' : 'CACHE';
-        await registry.reinspectServer(serverName, storageLocation, user?.id);
-        logger.info(`[MCP Reinitialize] Reinspection succeeded for server: ${serverName}`);
-      } catch (reinspectError) {
-        logger.error(
-          `[MCP Reinitialize] Reinspection failed for server ${serverName}:`,
-          reinspectError,
-        );
-        return {
-          availableTools: null,
-          success: false,
-          message: `MCP server '${serverName}' is still unreachable`,
-          oauthRequired: false,
-          serverName,
-          oauthUrl: null,
-          tools: null,
-        };
-      }
-    }
-
     const customUserVars = userMCPAuthMap?.[`${Constants.mcp_prefix}${serverName}`];
     const flowManager = _flowManager ?? getFlowStateManager(getLogStores(CacheKeys.FLOWS));
     const mcpManager = getMCPManager();

api/server/services/twoFactorService.js

@@ -153,11 +153,9 @@ const generateBackupCodes = async (count = 10) => {
  * @param {Object} params
  * @param {Object} params.user
  * @param {string} params.backupCode
- * @param {boolean} [params.persist=true] - Whether to persist the used-mark to the database.
- *   Pass `false` when the caller will immediately overwrite `backupCodes` (e.g. re-enrollment).
  * @returns {Promise<boolean>}
  */
-const verifyBackupCode = async ({ user, backupCode, persist = true }) => {
+const verifyBackupCode = async ({ user, backupCode }) => {
   if (!backupCode || !user || !Array.isArray(user.backupCodes)) {
     return false;
   }
@@ -167,50 +165,17 @@ const verifyBackupCode = async ({ user, backupCode, persist = true }) => {
     (codeObj) => codeObj.codeHash === hashedInput && !codeObj.used,
   );
 
-  if (!matchingCode) {
-    return false;
-  }
-
-  if (persist) {
+  if (matchingCode) {
     const updatedBackupCodes = user.backupCodes.map((codeObj) =>
       codeObj.codeHash === hashedInput && !codeObj.used
         ? { ...codeObj, used: true, usedAt: new Date() }
         : codeObj,
     );
+    // Update the user record with the marked backup code.
     await updateUser(user._id, { backupCodes: updatedBackupCodes });
+    return true;
   }
-  return true;
-};
-
-/**
- * Verifies a user's identity via TOTP token or backup code.
- * @param {Object} params
- * @param {Object} params.user - The user document (must include totpSecret and backupCodes).
- * @param {string} [params.token] - A 6-digit TOTP token.
- * @param {string} [params.backupCode] - An 8-character backup code.
- * @param {boolean} [params.persistBackupUse=true] - Whether to mark the backup code as used in the DB.
- * @returns {Promise<{ verified: boolean, status?: number, message?: string }>}
- */
-const verifyOTPOrBackupCode = async ({ user, token, backupCode, persistBackupUse = true }) => {
-  if (!token && !backupCode) {
-    return { verified: false, status: 400 };
-  }
-
-  if (token) {
-    const secret = await getTOTPSecret(user.totpSecret);
-    if (!secret) {
-      return { verified: false, status: 400, message: '2FA secret is missing or corrupted' };
-    }
-    const ok = await verifyTOTP(secret, token);
-    return ok
-      ? { verified: true }
-      : { verified: false, status: 401, message: 'Invalid token or backup code' };
-  }
-
-  const ok = await verifyBackupCode({ user, backupCode, persist: persistBackupUse });
-  return ok
-    ? { verified: true }
-    : { verified: false, status: 401, message: 'Invalid token or backup code' };
+  return false;
 };
 
 /**
@@ -248,12 +213,11 @@ const generate2FATempToken = (userId) => {
 };
 
 module.exports = {
-  verifyOTPOrBackupCode,
-  generate2FATempToken,
-  generateBackupCodes,
   generateTOTPSecret,
-  verifyBackupCode,
-  getTOTPSecret,
   generateTOTP,
   verifyTOTP,
+  generateBackupCodes,
+  verifyBackupCode,
+  getTOTPSecret,
+  generate2FATempToken,
 };

api/server/utils/import/fork.js

@@ -358,15 +358,16 @@ function splitAtTargetLevel(messages, targetMessageId) {
  * @param {object} params - The parameters for duplicating the conversation.
  * @param {string} params.userId - The ID of the user duplicating the conversation.
  * @param {string} params.conversationId - The ID of the conversation to duplicate.
- * @param {string} [params.title] - Optional title override for the duplicate.
  * @returns {Promise<{ conversation: TConversation, messages: TMessage[] }>} The duplicated conversation and messages.
  */
-async function duplicateConversation({ userId, conversationId, title }) {
+async function duplicateConversation({ userId, conversationId }) {
+  // Get original conversation
   const originalConvo = await getConvo(userId, conversationId);
   if (!originalConvo) {
     throw new Error('Conversation not found');
   }
 
+  // Get original messages
   const originalMessages = await getMessages({
     user: userId,
     conversationId,
@@ -382,11 +383,14 @@ async function duplicateConversation({ userId, conversationId, title }) {
 
   cloneMessagesWithTimestamps(messagesToClone, importBatchBuilder);
 
-  const duplicateTitle = title || originalConvo.title;
-  const result = importBatchBuilder.finishConversation(duplicateTitle, new Date(), originalConvo);
+  const result = importBatchBuilder.finishConversation(
+    originalConvo.title,
+    new Date(),
+    originalConvo,
+  );
   await importBatchBuilder.saveBatch();
   logger.debug(
-    `user: ${userId} | New conversation "${duplicateTitle}" duplicated from conversation ID ${conversationId}`,
+    `user: ${userId} | New conversation "${originalConvo.title}" duplicated from conversation ID ${conversationId}`,
   );
 
   const conversation = await getConvo(userId, result.conversation.conversationId);

api/server/utils/import/importConversations.js

@@ -1,10 +1,7 @@
 const fs = require('fs').promises;
-const { resolveImportMaxFileSize } = require('@librechat/api');
 const { logger } = require('@librechat/data-schemas');
 const { getImporter } = require('./importers');
 
-const maxFileSize = resolveImportMaxFileSize();
-
 /**
  * Job definition for importing a conversation.
  * @param {{ filepath, requestUserId }} job - The job object.
@@ -14,10 +11,11 @@ const importConversations = async (job) => {
   try {
     logger.debug(`user: ${requestUserId} | Importing conversation(s) from file...`);
 
+    /* error if file is too large */
     const fileInfo = await fs.stat(filepath);
-    if (fileInfo.size > maxFileSize) {
+    if (fileInfo.size > process.env.CONVERSATION_IMPORT_MAX_FILE_SIZE_BYTES) {
       throw new Error(
-        `File size is ${fileInfo.size} bytes. It exceeds the maximum limit of ${maxFileSize} bytes.`,
+        `File size is ${fileInfo.size} bytes.  It exceeds the maximum limit of ${process.env.CONVERSATION_IMPORT_MAX_FILE_SIZE_BYTES} bytes.`,
       );
     }
 

api/strategies/samlStrategy.spec.js

@@ -1,4 +1,5 @@
 // --- Mocks ---
+jest.mock('tiktoken');
 jest.mock('fs');
 jest.mock('path');
 jest.mock('node-fetch');

api/utils/tokens.spec.js

@@ -214,25 +214,6 @@ describe('getModelMaxTokens', () => {
     );
   });
 
-  test('should return correct tokens for gpt-5.4 matches', () => {
-    expect(getModelMaxTokens('gpt-5.4')).toBe(maxTokensMap[EModelEndpoint.openAI]['gpt-5.4']);
-    expect(getModelMaxTokens('gpt-5.4-thinking')).toBe(
-      maxTokensMap[EModelEndpoint.openAI]['gpt-5.4'],
-    );
-    expect(getModelMaxTokens('openai/gpt-5.4')).toBe(
-      maxTokensMap[EModelEndpoint.openAI]['gpt-5.4'],
-    );
-  });
-
-  test('should return correct tokens for gpt-5.4-pro matches', () => {
-    expect(getModelMaxTokens('gpt-5.4-pro')).toBe(
-      maxTokensMap[EModelEndpoint.openAI]['gpt-5.4-pro'],
-    );
-    expect(getModelMaxTokens('openai/gpt-5.4-pro')).toBe(
-      maxTokensMap[EModelEndpoint.openAI]['gpt-5.4-pro'],
-    );
-  });
-
   test('should return correct tokens for Anthropic models', () => {
     const models = [
       'claude-2.1',
@@ -270,6 +251,16 @@ describe('getModelMaxTokens', () => {
     });
   });
 
+  // Tests for Google models
+  test('should return correct tokens for exact match - Google models', () => {
+    expect(getModelMaxTokens('text-bison-32k', EModelEndpoint.google)).toBe(
+      maxTokensMap[EModelEndpoint.google]['text-bison-32k'],
+    );
+    expect(getModelMaxTokens('codechat-bison-32k', EModelEndpoint.google)).toBe(
+      maxTokensMap[EModelEndpoint.google]['codechat-bison-32k'],
+    );
+  });
+
   test('should return undefined for no match - Google models', () => {
     expect(getModelMaxTokens('unknown-google-model', EModelEndpoint.google)).toBeUndefined();
   });
@@ -326,6 +317,12 @@ describe('getModelMaxTokens', () => {
     expect(getModelMaxTokens('gemini-pro', EModelEndpoint.google)).toBe(
       maxTokensMap[EModelEndpoint.google]['gemini'],
     );
+    expect(getModelMaxTokens('code-', EModelEndpoint.google)).toBe(
+      maxTokensMap[EModelEndpoint.google]['code-'],
+    );
+    expect(getModelMaxTokens('chat-', EModelEndpoint.google)).toBe(
+      maxTokensMap[EModelEndpoint.google]['chat-'],
+    );
   });
 
   test('should return correct tokens for partial match - Cohere models', () => {
@@ -514,8 +511,6 @@ describe('getModelMaxTokens', () => {
       'gpt-5.1',
       'gpt-5.2',
       'gpt-5.3',
-      'gpt-5.4',
-      'gpt-5.4-pro',
       'gpt-5-mini',
       'gpt-5-nano',
       'gpt-5-pro',
@@ -546,184 +541,6 @@ describe('getModelMaxTokens', () => {
   });
 });
 
-describe('findMatchingPattern - longest match wins', () => {
-  test('should prefer longer matching key over shorter cross-provider pattern', () => {
-    const result = findMatchingPattern(
-      'gpt-5.2-chat-2025-12-11',
-      maxTokensMap[EModelEndpoint.openAI],
-    );
-    expect(result).toBe('gpt-5.2');
-  });
-
-  test('should match gpt-5.2 tokens for date-suffixed chat variant', () => {
-    expect(getModelMaxTokens('gpt-5.2-chat-2025-12-11')).toBe(
-      maxTokensMap[EModelEndpoint.openAI]['gpt-5.2'],
-    );
-  });
-
-  test('should match gpt-5.2-pro over shorter patterns', () => {
-    expect(getModelMaxTokens('gpt-5.2-pro-chat-2025-12-11')).toBe(
-      maxTokensMap[EModelEndpoint.openAI]['gpt-5.2-pro'],
-    );
-  });
-
-  test('should match gpt-5-mini over gpt-5 for mini variants', () => {
-    expect(getModelMaxTokens('gpt-5-mini-chat-2025-01-01')).toBe(
-      maxTokensMap[EModelEndpoint.openAI]['gpt-5-mini'],
-    );
-  });
-
-  test('should prefer gpt-4-1106 over gpt-4 for versioned model names', () => {
-    const result = findMatchingPattern('gpt-4-1106-preview', maxTokensMap[EModelEndpoint.openAI]);
-    expect(result).toBe('gpt-4-1106');
-  });
-
-  test('should prefer gpt-4-32k-0613 over gpt-4-32k for exact versioned names', () => {
-    const result = findMatchingPattern('gpt-4-32k-0613', maxTokensMap[EModelEndpoint.openAI]);
-    expect(result).toBe('gpt-4-32k-0613');
-  });
-
-  test('should prefer claude-3-5-sonnet over claude-3', () => {
-    const result = findMatchingPattern(
-      'claude-3-5-sonnet-20241022',
-      maxTokensMap[EModelEndpoint.anthropic],
-    );
-    expect(result).toBe('claude-3-5-sonnet');
-  });
-
-  test('should prefer gemini-2.0-flash-lite over gemini-2.0-flash', () => {
-    const result = findMatchingPattern(
-      'gemini-2.0-flash-lite-preview',
-      maxTokensMap[EModelEndpoint.google],
-    );
-    expect(result).toBe('gemini-2.0-flash-lite');
-  });
-});
-
-describe('findMatchingPattern - bestLength selection', () => {
-  test('should return the longest matching key when multiple keys match', () => {
-    const tokensMap = { short: 100, 'short-med': 200, 'short-med-long': 300 };
-    expect(findMatchingPattern('short-med-long-extra', tokensMap)).toBe('short-med-long');
-  });
-
-  test('should return the longest match regardless of key insertion order', () => {
-    const tokensMap = { 'a-b-c': 300, a: 100, 'a-b': 200 };
-    expect(findMatchingPattern('a-b-c-d', tokensMap)).toBe('a-b-c');
-  });
-
-  test('should return null when no key matches', () => {
-    const tokensMap = { alpha: 100, beta: 200 };
-    expect(findMatchingPattern('gamma-delta', tokensMap)).toBeNull();
-  });
-
-  test('should return the single matching key when only one matches', () => {
-    const tokensMap = { alpha: 100, beta: 200, gamma: 300 };
-    expect(findMatchingPattern('beta-extended', tokensMap)).toBe('beta');
-  });
-
-  test('should match case-insensitively against model name', () => {
-    const tokensMap = { 'gpt-5': 400000 };
-    expect(findMatchingPattern('GPT-5-turbo', tokensMap)).toBe('gpt-5');
-  });
-
-  test('should select the longest key among overlapping substring matches', () => {
-    const tokensMap = { 'gpt-': 100, 'gpt-5': 200, 'gpt-5.2': 300, 'gpt-5.2-pro': 400 };
-    expect(findMatchingPattern('gpt-5.2-pro-2025-01-01', tokensMap)).toBe('gpt-5.2-pro');
-    expect(findMatchingPattern('gpt-5.2-chat-2025-01-01', tokensMap)).toBe('gpt-5.2');
-    expect(findMatchingPattern('gpt-5.1-preview', tokensMap)).toBe('gpt-5');
-    expect(findMatchingPattern('gpt-unknown', tokensMap)).toBe('gpt-');
-  });
-
-  test('should not be confused by a short key that appears later in the model name', () => {
-    const tokensMap = { 'model-v2': 200, v2: 100 };
-    expect(findMatchingPattern('model-v2-extended', tokensMap)).toBe('model-v2');
-  });
-
-  test('should handle exact-length match as the best match', () => {
-    const tokensMap = { 'exact-model': 500, exact: 100 };
-    expect(findMatchingPattern('exact-model', tokensMap)).toBe('exact-model');
-  });
-
-  test('should return null for empty model name', () => {
-    expect(findMatchingPattern('', { 'gpt-5': 400000 })).toBeNull();
-  });
-
-  test('should prefer last-defined key on same-length ties', () => {
-    const tokensMap = { 'aa-bb': 100, 'cc-dd': 200 };
-    // model name contains both 5-char keys; last-defined wins in reverse iteration
-    expect(findMatchingPattern('aa-bb-cc-dd', tokensMap)).toBe('cc-dd');
-  });
-
-  test('longest match beats short cross-provider pattern even when both present', () => {
-    const tokensMap = { 'gpt-5.2': 400000, 'chat-': 8187 };
-    expect(findMatchingPattern('gpt-5.2-chat-2025-12-11', tokensMap)).toBe('gpt-5.2');
-  });
-
-  test('should match case-insensitively against keys', () => {
-    const tokensMap = { 'GPT-5': 400000 };
-    expect(findMatchingPattern('gpt-5-turbo', tokensMap)).toBe('GPT-5');
-  });
-});
-
-describe('findMatchingPattern - iteration performance', () => {
-  let includesSpy;
-
-  beforeEach(() => {
-    includesSpy = jest.spyOn(String.prototype, 'includes');
-  });
-
-  afterEach(() => {
-    includesSpy.mockRestore();
-  });
-
-  test('exact match early-exits with minimal includes() checks', () => {
-    const openAIMap = maxTokensMap[EModelEndpoint.openAI];
-    const keys = Object.keys(openAIMap);
-    const lastKey = keys[keys.length - 1];
-    includesSpy.mockClear();
-    const result = findMatchingPattern(lastKey, openAIMap);
-    const exactCalls = includesSpy.mock.calls.length;
-
-    expect(result).toBe(lastKey);
-    expect(exactCalls).toBe(1);
-  });
-
-  test('bestLength check skips includes() for shorter keys after a long match', () => {
-    const openAIMap = maxTokensMap[EModelEndpoint.openAI];
-    includesSpy.mockClear();
-    findMatchingPattern('gpt-3.5-turbo-0301-test', openAIMap);
-    const longKeyCalls = includesSpy.mock.calls.length;
-
-    includesSpy.mockClear();
-    findMatchingPattern('gpt-5.3-chat-latest', openAIMap);
-    const shortKeyCalls = includesSpy.mock.calls.length;
-
-    // gpt-3.5-turbo-0301 (20 chars) matches early, then bestLength prunes most keys
-    // gpt-5.3 (7 chars) is short, so fewer keys are pruned by the length check
-    expect(longKeyCalls).toBeLessThan(shortKeyCalls);
-  });
-
-  test('last-defined keys are checked first in reverse iteration', () => {
-    const tokensMap = { first: 100, second: 200, third: 300 };
-    includesSpy.mockClear();
-    const result = findMatchingPattern('third', tokensMap);
-    const calls = includesSpy.mock.calls.length;
-
-    // 'third' is last key, found on first reverse check, exact match exits immediately
-    expect(result).toBe('third');
-    expect(calls).toBe(1);
-  });
-});
-
-describe('deprecated PaLM2/Codey model removal', () => {
-  test('deprecated PaLM2/Codey models no longer have token entries', () => {
-    expect(getModelMaxTokens('text-bison-32k', EModelEndpoint.google)).toBeUndefined();
-    expect(getModelMaxTokens('codechat-bison-32k', EModelEndpoint.google)).toBeUndefined();
-    expect(getModelMaxTokens('code-bison', EModelEndpoint.google)).toBeUndefined();
-    expect(getModelMaxTokens('chat-bison', EModelEndpoint.google)).toBeUndefined();
-  });
-});
-
 describe('matchModelName', () => {
   it('should return the exact model name if it exists in maxTokensMap', () => {
     expect(matchModelName('gpt-4-32k-0613')).toBe('gpt-4-32k-0613');
@@ -825,10 +642,10 @@ describe('matchModelName', () => {
     expect(matchModelName('gpt-5.3-2025-03-01')).toBe('gpt-5.3');
   });
 
-  it('should return the closest matching key for gpt-5.4 matches', () => {
-    expect(matchModelName('openai/gpt-5.4')).toBe('gpt-5.4');
-    expect(matchModelName('gpt-5.4-thinking')).toBe('gpt-5.4');
-    expect(matchModelName('gpt-5.4-pro')).toBe('gpt-5.4-pro');
+  // Tests for Google models
+  it('should return the exact model name if it exists in maxTokensMap - Google models', () => {
+    expect(matchModelName('text-bison-32k', EModelEndpoint.google)).toBe('text-bison-32k');
+    expect(matchModelName('codechat-bison-32k', EModelEndpoint.google)).toBe('codechat-bison-32k');
   });
 
   it('should return the input model name if no match is found - Google models', () => {
@@ -836,6 +653,11 @@ describe('matchModelName', () => {
       'unknown-google-model',
     );
   });
+
+  it('should return the closest matching key for partial matches - Google models', () => {
+    expect(matchModelName('code-', EModelEndpoint.google)).toBe('code-');
+    expect(matchModelName('chat-', EModelEndpoint.google)).toBe('chat-');
+  });
 });
 
 describe('Meta Models Tests', () => {

client/jest.config.cjs

@@ -1,4 +1,4 @@
-/** v0.8.3 */
+/** v0.8.3-rc2 */
 module.exports = {
   roots: ['<rootDir>/src'],
   testEnvironment: 'jsdom',
@@ -32,7 +32,6 @@ module.exports = {
     '^librechat-data-provider/react-query$':
       '<rootDir>/../node_modules/librechat-data-provider/src/react-query',
   },
-  maxWorkers: '50%',
   restoreMocks: true,
   testResultsProcessor: 'jest-junit',
   coverageReporters: ['text', 'cobertura', 'lcov'],

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@librechat/frontend",
-  "version": "v0.8.3",
+  "version": "v0.8.3-rc2",
   "description": "",
   "type": "module",
   "scripts": {
@@ -38,7 +38,6 @@
     "@librechat/client": "*",
     "@marsidev/react-turnstile": "^1.1.0",
     "@mcp-ui/client": "^5.7.0",
-    "@monaco-editor/react": "^4.7.0",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-alert-dialog": "1.0.2",
     "@radix-ui/react-checkbox": "^1.0.3",
@@ -81,7 +80,7 @@
     "lodash": "^4.17.23",
     "lucide-react": "^0.394.0",
     "match-sorter": "^8.1.0",
-    "mermaid": "^11.13.0",
+    "mermaid": "^11.12.3",
     "micromark-extension-llm-math": "^3.1.0",
     "qrcode.react": "^4.2.0",
     "rc-input-number": "^7.4.2",
@@ -94,6 +93,7 @@
     "react-gtm-module": "^2.0.11",
     "react-hook-form": "^7.43.9",
     "react-i18next": "^15.4.0",
+    "react-lazy-load-image-component": "^1.6.0",
     "react-markdown": "^9.0.1",
     "react-resizable-panels": "^3.0.6",
     "react-router-dom": "^6.30.3",
@@ -122,7 +122,6 @@
     "@babel/preset-env": "^7.22.15",
     "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.22.15",
-    "@happy-dom/jest-environment": "^20.8.3",
     "@tanstack/react-query-devtools": "^4.29.0",
     "@testing-library/dom": "^9.3.0",
     "@testing-library/jest-dom": "^5.16.5",
@@ -145,10 +144,9 @@
     "identity-obj-proxy": "^3.0.0",
     "jest": "^30.2.0",
     "jest-canvas-mock": "^2.5.2",
-    "jest-environment-jsdom": "^30.2.0",
+    "jest-environment-jsdom": "^29.7.0",
     "jest-file-loader": "^1.0.3",
     "jest-junit": "^16.0.0",
-    "monaco-editor": "^0.55.1",
     "postcss": "^8.4.31",
     "postcss-preset-env": "^11.2.0",
     "tailwindcss": "^3.4.1",

client/src/Providers/ArtifactsContext.tsx

@@ -1,8 +1,7 @@
 import React, { createContext, useContext, useMemo } from 'react';
-import { useRecoilValue } from 'recoil';
 import type { TMessage } from 'librechat-data-provider';
+import { useChatContext } from './ChatContext';
 import { getLatestText } from '~/utils';
-import store from '~/store';
 
 export interface ArtifactsContextValue {
   isSubmitting: boolean;
@@ -19,28 +18,27 @@ interface ArtifactsProviderProps {
 }
 
 export function ArtifactsProvider({ children, value }: ArtifactsProviderProps) {
-  const isSubmitting = useRecoilValue(store.isSubmittingFamily(0));
-  const latestMessage = useRecoilValue(store.latestMessageFamily(0));
-  const conversationId = useRecoilValue(store.conversationIdByIndex(0));
+  const { isSubmitting, latestMessage, conversation } = useChatContext();
 
   const chatLatestMessageText = useMemo(() => {
     return getLatestText({
+      messageId: latestMessage?.messageId ?? null,
       text: latestMessage?.text ?? null,
       content: latestMessage?.content ?? null,
-      messageId: latestMessage?.messageId ?? null,
     } as TMessage);
   }, [latestMessage?.messageId, latestMessage?.text, latestMessage?.content]);
 
   const defaultContextValue = useMemo<ArtifactsContextValue>(
     () => ({
       isSubmitting,
-      conversationId: conversationId ?? null,
       latestMessageText: chatLatestMessageText,
       latestMessageId: latestMessage?.messageId ?? null,
+      conversationId: conversation?.conversationId ?? null,
     }),
-    [isSubmitting, chatLatestMessageText, latestMessage?.messageId, conversationId],
+    [isSubmitting, chatLatestMessageText, latestMessage?.messageId, conversation?.conversationId],
   );
 
+  /** Context value only created when relevant values change */
   const contextValue = useMemo<ArtifactsContextValue>(
     () => (value ? { ...defaultContextValue, ...value } : defaultContextValue),
     [defaultContextValue, value],

client/src/Providers/DragDropContext.tsx

@@ -1,5 +1,5 @@
 import React, { createContext, useContext, useMemo } from 'react';
-import { isAgentsEndpoint, resolveEndpointType } from 'librechat-data-provider';
+import { getEndpointField, isAgentsEndpoint } from 'librechat-data-provider';
 import type { EModelEndpoint } from 'librechat-data-provider';
 import { useGetEndpointsQuery, useGetAgentByIdQuery } from '~/data-provider';
 import { useAgentsMapContext } from './AgentsMapContext';
@@ -9,7 +9,7 @@ interface DragDropContextValue {
   conversationId: string | null | undefined;
   agentId: string | null | undefined;
   endpoint: string | null | undefined;
-  endpointType?: EModelEndpoint | string | undefined;
+  endpointType?: EModelEndpoint | undefined;
   useResponsesApi?: boolean;
 }
 
@@ -20,6 +20,13 @@ export function DragDropProvider({ children }: { children: React.ReactNode }) {
   const { data: endpointsConfig } = useGetEndpointsQuery();
   const agentsMap = useAgentsMapContext();
 
+  const endpointType = useMemo(() => {
+    return (
+      getEndpointField(endpointsConfig, conversation?.endpoint, 'type') ||
+      (conversation?.endpoint as EModelEndpoint | undefined)
+    );
+  }, [conversation?.endpoint, endpointsConfig]);
+
   const needsAgentFetch = useMemo(() => {
     const isAgents = isAgentsEndpoint(conversation?.endpoint);
     if (!isAgents || !conversation?.agent_id) {
@@ -33,20 +40,6 @@ export function DragDropProvider({ children }: { children: React.ReactNode }) {
     enabled: needsAgentFetch,
   });
 
-  const agentProvider = useMemo(() => {
-    const isAgents = isAgentsEndpoint(conversation?.endpoint);
-    if (!isAgents || !conversation?.agent_id) {
-      return undefined;
-    }
-    const agent = agentData || agentsMap?.[conversation.agent_id];
-    return agent?.provider;
-  }, [conversation?.endpoint, conversation?.agent_id, agentData, agentsMap]);
-
-  const endpointType = useMemo(
-    () => resolveEndpointType(endpointsConfig, conversation?.endpoint, agentProvider),
-    [endpointsConfig, conversation?.endpoint, agentProvider],
-  );
-
   const useResponsesApi = useMemo(() => {
     const isAgents = isAgentsEndpoint(conversation?.endpoint);
     if (!isAgents || !conversation?.agent_id || conversation?.useResponsesApi) {

client/src/Providers/MessagesViewContext.tsx

@@ -18,8 +18,7 @@ interface MessagesViewContextValue {
 
   /** Message state management */
   index: ReturnType<typeof useChatContext>['index'];
-  latestMessageId: ReturnType<typeof useChatContext>['latestMessageId'];
-  latestMessageDepth: ReturnType<typeof useChatContext>['latestMessageDepth'];
+  latestMessage: ReturnType<typeof useChatContext>['latestMessage'];
   setLatestMessage: ReturnType<typeof useChatContext>['setLatestMessage'];
   getMessages: ReturnType<typeof useChatContext>['getMessages'];
   setMessages: ReturnType<typeof useChatContext>['setMessages'];
@@ -40,8 +39,7 @@ export function MessagesViewProvider({ children }: { children: React.ReactNode }
     regenerate,
     isSubmitting,
     conversation,
-    latestMessageId,
-    latestMessageDepth,
+    latestMessage,
     setAbortScroll,
     handleContinue,
     setLatestMessage,
@@ -85,11 +83,10 @@ export function MessagesViewProvider({ children }: { children: React.ReactNode }
   const messageState = useMemo(
     () => ({
       index,
-      latestMessageId,
-      latestMessageDepth,
+      latestMessage,
       setLatestMessage,
     }),
-    [index, latestMessageId, latestMessageDepth, setLatestMessage],
+    [index, latestMessage, setLatestMessage],
   );
 
   /** Combine all values into final context value */
@@ -142,9 +139,9 @@ export function useMessagesOperations() {
 
 /** Hook for components that only need message state */
 export function useMessagesState() {
-  const { index, latestMessageId, latestMessageDepth, setLatestMessage } = useMessagesViewContext();
+  const { index, latestMessage, setLatestMessage } = useMessagesViewContext();
   return useMemo(
-    () => ({ index, latestMessageId, latestMessageDepth, setLatestMessage }),
-    [index, latestMessageId, latestMessageDepth, setLatestMessage],
+    () => ({ index, latestMessage, setLatestMessage }),
+    [index, latestMessage, setLatestMessage],
   );
 }

client/src/Providers/__tests__/DragDropContext.spec.tsx

@@ -1,134 +0,0 @@
-import React from 'react';
-import { renderHook } from '@testing-library/react';
-import { EModelEndpoint } from 'librechat-data-provider';
-import type { TEndpointsConfig, Agent } from 'librechat-data-provider';
-import { DragDropProvider, useDragDropContext } from '../DragDropContext';
-
-const mockEndpointsConfig: TEndpointsConfig = {
-  [EModelEndpoint.openAI]: { userProvide: false, order: 0 },
-  [EModelEndpoint.agents]: { userProvide: false, order: 1 },
-  [EModelEndpoint.anthropic]: { userProvide: false, order: 6 },
-  Moonshot: { type: EModelEndpoint.custom, userProvide: false, order: 9999 },
-  'Some Endpoint': { type: EModelEndpoint.custom, userProvide: false, order: 9999 },
-};
-
-let mockConversation: Record<string, unknown> | null = null;
-let mockAgentsMap: Record<string, Partial<Agent>> = {};
-let mockAgentQueryData: Partial<Agent> | undefined;
-
-jest.mock('~/data-provider', () => ({
-  useGetEndpointsQuery: () => ({ data: mockEndpointsConfig }),
-  useGetAgentByIdQuery: () => ({ data: mockAgentQueryData }),
-}));
-
-jest.mock('../AgentsMapContext', () => ({
-  useAgentsMapContext: () => mockAgentsMap,
-}));
-
-jest.mock('../ChatContext', () => ({
-  useChatContext: () => ({ conversation: mockConversation }),
-}));
-
-function wrapper({ children }: { children: React.ReactNode }) {
-  return <DragDropProvider>{children}</DragDropProvider>;
-}
-
-describe('DragDropContext endpointType resolution', () => {
-  beforeEach(() => {
-    mockConversation = null;
-    mockAgentsMap = {};
-    mockAgentQueryData = undefined;
-  });
-
-  describe('non-agents endpoints', () => {
-    it('resolves custom endpoint type for a custom endpoint', () => {
-      mockConversation = { endpoint: 'Moonshot' };
-      const { result } = renderHook(() => useDragDropContext(), { wrapper });
-      expect(result.current.endpointType).toBe(EModelEndpoint.custom);
-    });
-
-    it('resolves endpoint name for a standard endpoint', () => {
-      mockConversation = { endpoint: EModelEndpoint.openAI };
-      const { result } = renderHook(() => useDragDropContext(), { wrapper });
-      expect(result.current.endpointType).toBe(EModelEndpoint.openAI);
-    });
-  });
-
-  describe('agents endpoint with provider from agentsMap', () => {
-    it('resolves to custom for agent with Moonshot provider', () => {
-      mockConversation = { endpoint: EModelEndpoint.agents, agent_id: 'agent-1' };
-      mockAgentsMap = {
-        'agent-1': { provider: 'Moonshot', model_parameters: {} } as Partial<Agent>,
-      };
-      const { result } = renderHook(() => useDragDropContext(), { wrapper });
-      expect(result.current.endpointType).toBe(EModelEndpoint.custom);
-    });
-
-    it('resolves to custom for agent with custom provider with spaces', () => {
-      mockConversation = { endpoint: EModelEndpoint.agents, agent_id: 'agent-1' };
-      mockAgentsMap = {
-        'agent-1': { provider: 'Some Endpoint', model_parameters: {} } as Partial<Agent>,
-      };
-      const { result } = renderHook(() => useDragDropContext(), { wrapper });
-      expect(result.current.endpointType).toBe(EModelEndpoint.custom);
-    });
-
-    it('resolves to openAI for agent with openAI provider', () => {
-      mockConversation = { endpoint: EModelEndpoint.agents, agent_id: 'agent-1' };
-      mockAgentsMap = {
-        'agent-1': { provider: EModelEndpoint.openAI, model_parameters: {} } as Partial<Agent>,
-      };
-      const { result } = renderHook(() => useDragDropContext(), { wrapper });
-      expect(result.current.endpointType).toBe(EModelEndpoint.openAI);
-    });
-
-    it('resolves to anthropic for agent with anthropic provider', () => {
-      mockConversation = { endpoint: EModelEndpoint.agents, agent_id: 'agent-1' };
-      mockAgentsMap = {
-        'agent-1': { provider: EModelEndpoint.anthropic, model_parameters: {} } as Partial<Agent>,
-      };
-      const { result } = renderHook(() => useDragDropContext(), { wrapper });
-      expect(result.current.endpointType).toBe(EModelEndpoint.anthropic);
-    });
-  });
-
-  describe('agents endpoint with provider from agentData query', () => {
-    it('uses agentData when agent is not in agentsMap', () => {
-      mockConversation = { endpoint: EModelEndpoint.agents, agent_id: 'agent-2' };
-      mockAgentsMap = {};
-      mockAgentQueryData = { provider: 'Moonshot' } as Partial<Agent>;
-      const { result } = renderHook(() => useDragDropContext(), { wrapper });
-      expect(result.current.endpointType).toBe(EModelEndpoint.custom);
-    });
-  });
-
-  describe('agents endpoint without provider', () => {
-    it('falls back to agents when no agent_id', () => {
-      mockConversation = { endpoint: EModelEndpoint.agents };
-      const { result } = renderHook(() => useDragDropContext(), { wrapper });
-      expect(result.current.endpointType).toBe(EModelEndpoint.agents);
-    });
-
-    it('falls back to agents when agent has no provider', () => {
-      mockConversation = { endpoint: EModelEndpoint.agents, agent_id: 'agent-1' };
-      mockAgentsMap = { 'agent-1': { model_parameters: {} } as Partial<Agent> };
-      const { result } = renderHook(() => useDragDropContext(), { wrapper });
-      expect(result.current.endpointType).toBe(EModelEndpoint.agents);
-    });
-  });
-
-  describe('consistency: same endpoint type whether used directly or through agents', () => {
-    it('Moonshot resolves to the same type as direct endpoint and as agent provider', () => {
-      mockConversation = { endpoint: 'Moonshot' };
-      const { result: directResult } = renderHook(() => useDragDropContext(), { wrapper });
-
-      mockConversation = { endpoint: EModelEndpoint.agents, agent_id: 'agent-1' };
-      mockAgentsMap = {
-        'agent-1': { provider: 'Moonshot', model_parameters: {} } as Partial<Agent>,
-      };
-      const { result: agentResult } = renderHook(() => useDragDropContext(), { wrapper });
-
-      expect(directResult.current.endpointType).toBe(agentResult.current.endpointType);
-    });
-  });
-});

client/src/a11y/LiveAnnouncer.tsx

@@ -56,13 +56,10 @@ const LiveAnnouncer: React.FC<LiveAnnouncerProps> = ({ children }) => {
 
   const announceAssertive = announcePolite;
 
-  const contextValue = useMemo(
-    () => ({
-      announcePolite,
-      announceAssertive,
-    }),
-    [announcePolite, announceAssertive],
-  );
+  const contextValue = {
+    announcePolite,
+    announceAssertive,
+  };
 
   useEffect(() => {
     return () => {

client/src/components/Artifacts/ArtifactCodeEditor.tsx

@@ -1,326 +1,206 @@
-import React, { useMemo, useState, useEffect, useRef, useCallback } from 'react';
+import React, { useMemo, useState, useEffect, useRef, memo } from 'react';
 import debounce from 'lodash/debounce';
-import MonacoEditor from '@monaco-editor/react';
-import type { Monaco } from '@monaco-editor/react';
-import type { editor } from 'monaco-editor';
-import type { Artifact } from '~/common';
+import { KeyBinding } from '@codemirror/view';
+import { autocompletion, completionKeymap } from '@codemirror/autocomplete';
+import {
+  useSandpack,
+  SandpackCodeEditor,
+  SandpackProvider as StyledProvider,
+} from '@codesandbox/sandpack-react';
+import type { SandpackProviderProps } from '@codesandbox/sandpack-react/unstyled';
+import type { SandpackBundlerFile } from '@codesandbox/sandpack-client';
+import type { CodeEditorRef } from '@codesandbox/sandpack-react';
+import type { ArtifactFiles, Artifact } from '~/common';
+import { useEditArtifact, useGetStartupConfig } from '~/data-provider';
 import { useMutationState, useCodeState } from '~/Providers/EditorContext';
 import { useArtifactsContext } from '~/Providers';
-import { useEditArtifact } from '~/data-provider';
+import { sharedFiles, sharedOptions } from '~/utils/artifacts';
 
-const LANG_MAP: Record<string, string> = {
-  javascript: 'javascript',
-  typescript: 'typescript',
-  python: 'python',
-  css: 'css',
-  json: 'json',
-  markdown: 'markdown',
-  html: 'html',
-  xml: 'xml',
-  sql: 'sql',
-  yaml: 'yaml',
-  shell: 'shell',
-  bash: 'shell',
-  tsx: 'typescript',
-  jsx: 'javascript',
-  c: 'c',
-  cpp: 'cpp',
-  java: 'java',
-  go: 'go',
-  rust: 'rust',
-  kotlin: 'kotlin',
-  swift: 'swift',
-  php: 'php',
-  ruby: 'ruby',
-  r: 'r',
-  lua: 'lua',
-  scala: 'scala',
-  perl: 'perl',
-};
+const CodeEditor = memo(
+  ({
+    fileKey,
+    readOnly,
+    artifact,
+    editorRef,
+  }: {
+    fileKey: string;
+    readOnly?: boolean;
+    artifact: Artifact;
+    editorRef: React.MutableRefObject<CodeEditorRef>;
+  }) => {
+    const { sandpack } = useSandpack();
+    const [currentUpdate, setCurrentUpdate] = useState<string | null>(null);
+    const { isMutating, setIsMutating } = useMutationState();
+    const { setCurrentCode } = useCodeState();
+    const editArtifact = useEditArtifact({
+      onMutate: (vars) => {
+        setIsMutating(true);
+        setCurrentUpdate(vars.updated);
+      },
+      onSuccess: () => {
+        setIsMutating(false);
+        setCurrentUpdate(null);
+      },
+      onError: () => {
+        setIsMutating(false);
+      },
+    });
 
-const TYPE_MAP: Record<string, string> = {
-  'text/html': 'html',
-  'application/vnd.code-html': 'html',
-  'application/vnd.react': 'typescript',
-  'application/vnd.ant.react': 'typescript',
-  'text/markdown': 'markdown',
-  'text/md': 'markdown',
-  'text/plain': 'plaintext',
-  'application/vnd.mermaid': 'markdown',
-};
+    /**
+     * Create stable debounced mutation that doesn't depend on changing callbacks
+     * Use refs to always access the latest values without recreating the debounce
+     */
+    const artifactRef = useRef(artifact);
+    const isMutatingRef = useRef(isMutating);
+    const currentUpdateRef = useRef(currentUpdate);
+    const editArtifactRef = useRef(editArtifact);
+    const setCurrentCodeRef = useRef(setCurrentCode);
 
-function getMonacoLanguage(type?: string, language?: string): string {
-  if (language && LANG_MAP[language]) {
-    return LANG_MAP[language];
-  }
-  return TYPE_MAP[type ?? ''] ?? 'plaintext';
-}
+    useEffect(() => {
+      artifactRef.current = artifact;
+    }, [artifact]);
 
-export const ArtifactCodeEditor = function ArtifactCodeEditor({
+    useEffect(() => {
+      isMutatingRef.current = isMutating;
+    }, [isMutating]);
+
+    useEffect(() => {
+      currentUpdateRef.current = currentUpdate;
+    }, [currentUpdate]);
+
+    useEffect(() => {
+      editArtifactRef.current = editArtifact;
+    }, [editArtifact]);
+
+    useEffect(() => {
+      setCurrentCodeRef.current = setCurrentCode;
+    }, [setCurrentCode]);
+
+    /**
+     * Create debounced mutation once - never recreate it
+     * All values are accessed via refs so they're always current
+     */
+    const debouncedMutation = useMemo(
+      () =>
+        debounce((code: string) => {
+          if (readOnly) {
+            return;
+          }
+          if (isMutatingRef.current) {
+            return;
+          }
+          if (artifactRef.current.index == null) {
+            return;
+          }
+
+          const artifact = artifactRef.current;
+          const artifactIndex = artifact.index;
+          const isNotOriginal =
+            code && artifact.content != null && code.trim() !== artifact.content.trim();
+          const isNotRepeated =
+            currentUpdateRef.current == null
+              ? true
+              : code != null && code.trim() !== currentUpdateRef.current.trim();
+
+          if (artifact.content && isNotOriginal && isNotRepeated && artifactIndex != null) {
+            setCurrentCodeRef.current(code);
+            editArtifactRef.current.mutate({
+              index: artifactIndex,
+              messageId: artifact.messageId ?? '',
+              original: artifact.content,
+              updated: code,
+            });
+          }
+        }, 500),
+      [readOnly],
+    );
+
+    /**
+     * Listen to Sandpack file changes and trigger debounced mutation
+     */
+    useEffect(() => {
+      const currentCode = (sandpack.files['/' + fileKey] as SandpackBundlerFile | undefined)?.code;
+      if (currentCode) {
+        debouncedMutation(currentCode);
+      }
+    }, [sandpack.files, fileKey, debouncedMutation]);
+
+    /**
+     * Cleanup: cancel pending mutations when component unmounts or artifact changes
+     */
+    useEffect(() => {
+      return () => {
+        debouncedMutation.cancel();
+      };
+    }, [artifact.id, debouncedMutation]);
+
+    return (
+      <SandpackCodeEditor
+        ref={editorRef}
+        showTabs={false}
+        showRunButton={false}
+        showLineNumbers={true}
+        showInlineErrors={true}
+        readOnly={readOnly === true}
+        extensions={[autocompletion()]}
+        extensionsKeymap={Array.from<KeyBinding>(completionKeymap)}
+        className="hljs language-javascript bg-black"
+      />
+    );
+  },
+);
+
+export const ArtifactCodeEditor = function ({
+  files,
+  fileKey,
+  template,
   artifact,
-  monacoRef,
+  editorRef,
+  sharedProps,
   readOnly: externalReadOnly,
 }: {
+  fileKey: string;
   artifact: Artifact;
-  monacoRef: React.MutableRefObject<editor.IStandaloneCodeEditor | null>;
+  files: ArtifactFiles;
+  template: SandpackProviderProps['template'];
+  sharedProps: Partial<SandpackProviderProps>;
+  editorRef: React.MutableRefObject<CodeEditorRef>;
   readOnly?: boolean;
 }) {
+  const { data: config } = useGetStartupConfig();
   const { isSubmitting } = useArtifactsContext();
-  const readOnly = (externalReadOnly ?? false) || isSubmitting;
-  const { setCurrentCode } = useCodeState();
-  const [currentUpdate, setCurrentUpdate] = useState<string | null>(null);
-  const { isMutating, setIsMutating } = useMutationState();
-  const editArtifact = useEditArtifact({
-    onMutate: (vars) => {
-      setIsMutating(true);
-      setCurrentUpdate(vars.updated);
-    },
-    onSuccess: () => {
-      setIsMutating(false);
-      setCurrentUpdate(null);
-    },
-    onError: () => {
-      setIsMutating(false);
-    },
-  });
-
-  const artifactRef = useRef(artifact);
-  const isMutatingRef = useRef(isMutating);
-  const currentUpdateRef = useRef(currentUpdate);
-  const editArtifactRef = useRef(editArtifact);
-  const setCurrentCodeRef = useRef(setCurrentCode);
-  const prevContentRef = useRef(artifact.content ?? '');
-  const prevArtifactId = useRef(artifact.id);
-  const prevReadOnly = useRef(readOnly);
-
-  artifactRef.current = artifact;
-  isMutatingRef.current = isMutating;
-  currentUpdateRef.current = currentUpdate;
-  editArtifactRef.current = editArtifact;
-  setCurrentCodeRef.current = setCurrentCode;
-
-  const debouncedMutation = useMemo(
-    () =>
-      debounce((code: string) => {
-        if (readOnly || isMutatingRef.current || artifactRef.current.index == null) {
-          return;
-        }
-        const art = artifactRef.current;
-        const isNotOriginal = art.content != null && code.trim() !== art.content.trim();
-        const isNotRepeated =
-          currentUpdateRef.current == null ? true : code.trim() !== currentUpdateRef.current.trim();
-
-        if (art.content != null && isNotOriginal && isNotRepeated && art.index != null) {
-          setCurrentCodeRef.current(code);
-          editArtifactRef.current.mutate({
-            index: art.index,
-            messageId: art.messageId ?? '',
-            original: art.content,
-            updated: code,
-          });
-        }
-      }, 500),
-    [readOnly],
-  );
-
-  useEffect(() => {
-    return () => debouncedMutation.cancel();
-  }, [artifact.id, debouncedMutation]);
-
-  /**
-   * Streaming: use model.applyEdits() to append new content.
-   * Unlike setValue/pushEditOperations, applyEdits preserves existing
-   * tokens so syntax highlighting doesn't flash during updates.
-   */
-  useEffect(() => {
-    const ed = monacoRef.current;
-    if (!ed || !readOnly) {
-      return;
+  const options: typeof sharedOptions = useMemo(() => {
+    if (!config) {
+      return sharedOptions;
     }
-    const newContent = artifact.content ?? '';
-    const prev = prevContentRef.current;
-
-    if (newContent === prev) {
-      return;
-    }
-
-    const model = ed.getModel();
-    if (!model) {
-      return;
-    }
-
-    if (newContent.startsWith(prev) && prev.length > 0) {
-      const appended = newContent.slice(prev.length);
-      const endPos = model.getPositionAt(model.getValueLength());
-      model.applyEdits([
-        {
-          range: {
-            startLineNumber: endPos.lineNumber,
-            startColumn: endPos.column,
-            endLineNumber: endPos.lineNumber,
-            endColumn: endPos.column,
-          },
-          text: appended,
-        },
-      ]);
-    } else {
-      model.setValue(newContent);
-    }
-
-    prevContentRef.current = newContent;
-    ed.revealLine(model.getLineCount());
-  }, [artifact.content, readOnly, monacoRef]);
-
-  useEffect(() => {
-    if (artifact.id === prevArtifactId.current) {
-      return;
-    }
-    prevArtifactId.current = artifact.id;
-    prevContentRef.current = artifact.content ?? '';
-    const ed = monacoRef.current;
-    if (ed && artifact.content != null) {
-      ed.getModel()?.setValue(artifact.content);
-    }
-  }, [artifact.id, artifact.content, monacoRef]);
-
-  useEffect(() => {
-    if (prevReadOnly.current && !readOnly && artifact.content != null) {
-      const ed = monacoRef.current;
-      if (ed) {
-        ed.getModel()?.setValue(artifact.content);
-        prevContentRef.current = artifact.content;
-      }
-    }
-    prevReadOnly.current = readOnly;
-  }, [readOnly, artifact.content, monacoRef]);
-
-  const handleChange = useCallback(
-    (value: string | undefined) => {
-      if (value === undefined || readOnly) {
-        return;
-      }
-      prevContentRef.current = value;
-      setCurrentCode(value);
-      if (value.length > 0) {
-        debouncedMutation(value);
-      }
-    },
-    [readOnly, debouncedMutation, setCurrentCode],
-  );
-
-  /**
-   * Disable all validation — this is an artifact viewer/editor, not an IDE.
-   * Note: these are global Monaco settings that affect all editor instances on the page.
-   * The `as unknown` cast is required because monaco-editor v0.55 types `.languages.typescript`
-   * as `{ deprecated: true }` while the runtime API is fully functional.
-   */
-  const handleBeforeMount = useCallback((monaco: Monaco) => {
-    const { typescriptDefaults, javascriptDefaults, JsxEmit } = monaco.languages
-      .typescript as unknown as {
-      typescriptDefaults: {
-        setDiagnosticsOptions: (o: {
-          noSemanticValidation: boolean;
-          noSyntaxValidation: boolean;
-        }) => void;
-        setCompilerOptions: (o: {
-          allowNonTsExtensions: boolean;
-          allowJs: boolean;
-          jsx: number;
-        }) => void;
-      };
-      javascriptDefaults: {
-        setDiagnosticsOptions: (o: {
-          noSemanticValidation: boolean;
-          noSyntaxValidation: boolean;
-        }) => void;
-        setCompilerOptions: (o: {
-          allowNonTsExtensions: boolean;
-          allowJs: boolean;
-          jsx: number;
-        }) => void;
-      };
-      JsxEmit: { React: number };
+    return {
+      ...sharedOptions,
+      activeFile: '/' + fileKey,
+      bundlerURL: template === 'static' ? config.staticBundlerURL : config.bundlerURL,
     };
-    const diagnosticsOff = { noSemanticValidation: true, noSyntaxValidation: true };
-    const compilerBase = { allowNonTsExtensions: true, allowJs: true, jsx: JsxEmit.React };
-    typescriptDefaults.setDiagnosticsOptions(diagnosticsOff);
-    javascriptDefaults.setDiagnosticsOptions(diagnosticsOff);
-    typescriptDefaults.setCompilerOptions(compilerBase);
-    javascriptDefaults.setCompilerOptions(compilerBase);
-  }, []);
+  }, [config, template, fileKey]);
+  const initialReadOnly = (externalReadOnly ?? false) || (isSubmitting ?? false);
+  const [readOnly, setReadOnly] = useState(initialReadOnly);
+  useEffect(() => {
+    setReadOnly((externalReadOnly ?? false) || (isSubmitting ?? false));
+  }, [isSubmitting, externalReadOnly]);
 
-  const handleMount = useCallback(
-    (ed: editor.IStandaloneCodeEditor) => {
-      monacoRef.current = ed;
-      prevContentRef.current = ed.getModel()?.getValue() ?? artifact.content ?? '';
-      if (readOnly) {
-        const model = ed.getModel();
-        if (model) {
-          ed.revealLine(model.getLineCount());
-        }
-      }
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [monacoRef],
-  );
-
-  const language = getMonacoLanguage(artifact.type, artifact.language);
-
-  const editorOptions = useMemo<editor.IStandaloneEditorConstructionOptions>(
-    () => ({
-      readOnly,
-      minimap: { enabled: false },
-      lineNumbers: 'on',
-      scrollBeyondLastLine: false,
-      fontSize: 13,
-      tabSize: 2,
-      wordWrap: 'on',
-      automaticLayout: true,
-      padding: { top: 8 },
-      renderLineHighlight: readOnly ? 'none' : 'line',
-      cursorStyle: readOnly ? 'underline-thin' : 'line',
-      scrollbar: {
-        vertical: 'visible',
-        horizontal: 'auto',
-        verticalScrollbarSize: 8,
-        horizontalScrollbarSize: 8,
-        useShadows: false,
-        alwaysConsumeMouseWheel: false,
-      },
-      overviewRulerLanes: 0,
-      hideCursorInOverviewRuler: true,
-      overviewRulerBorder: false,
-      folding: false,
-      glyphMargin: false,
-      colorDecorators: !readOnly,
-      occurrencesHighlight: readOnly ? 'off' : 'singleFile',
-      selectionHighlight: !readOnly,
-      renderValidationDecorations: readOnly ? 'off' : 'editable',
-      quickSuggestions: !readOnly,
-      suggestOnTriggerCharacters: !readOnly,
-      parameterHints: { enabled: !readOnly },
-      hover: { enabled: !readOnly },
-      matchBrackets: readOnly ? 'never' : 'always',
-    }),
-    [readOnly],
-  );
-
-  if (!artifact.content) {
+  if (Object.keys(files).length === 0) {
     return null;
   }
 
   return (
-    <div className="h-full w-full bg-[#1e1e1e]">
-      <MonacoEditor
-        height="100%"
-        language={readOnly ? 'plaintext' : language}
-        theme="vs-dark"
-        defaultValue={artifact.content}
-        onChange={handleChange}
-        beforeMount={handleBeforeMount}
-        onMount={handleMount}
-        options={editorOptions}
-      />
-    </div>
+    <StyledProvider
+      theme="dark"
+      files={{
+        ...files,
+        ...sharedFiles,
+      }}
+      options={options}
+      {...sharedProps}
+      template={template}
+    >
+      <CodeEditor fileKey={fileKey} artifact={artifact} editorRef={editorRef} readOnly={readOnly} />
+    </StyledProvider>
   );
 };

client/src/components/Artifacts/ArtifactTabs.tsx

@@ -1,26 +1,30 @@
 import { useRef, useEffect } from 'react';
 import * as Tabs from '@radix-ui/react-tabs';
 import type { SandpackPreviewRef } from '@codesandbox/sandpack-react/unstyled';
-import type { editor } from 'monaco-editor';
+import type { CodeEditorRef } from '@codesandbox/sandpack-react';
 import type { Artifact } from '~/common';
 import { useCodeState } from '~/Providers/EditorContext';
+import { useArtifactsContext } from '~/Providers';
 import useArtifactProps from '~/hooks/Artifacts/useArtifactProps';
+import { useAutoScroll } from '~/hooks/Artifacts/useAutoScroll';
 import { ArtifactCodeEditor } from './ArtifactCodeEditor';
 import { useGetStartupConfig } from '~/data-provider';
 import { ArtifactPreview } from './ArtifactPreview';
 
 export default function ArtifactTabs({
   artifact,
+  editorRef,
   previewRef,
   isSharedConvo,
 }: {
   artifact: Artifact;
+  editorRef: React.MutableRefObject<CodeEditorRef>;
   previewRef: React.MutableRefObject<SandpackPreviewRef>;
   isSharedConvo?: boolean;
 }) {
+  const { isSubmitting } = useArtifactsContext();
   const { currentCode, setCurrentCode } = useCodeState();
   const { data: startupConfig } = useGetStartupConfig();
-  const monacoRef = useRef<editor.IStandaloneCodeEditor | null>(null);
   const lastIdRef = useRef<string | null>(null);
 
   useEffect(() => {
@@ -30,24 +34,33 @@ export default function ArtifactTabs({
     lastIdRef.current = artifact.id;
   }, [setCurrentCode, artifact.id]);
 
+  const content = artifact.content ?? '';
+  const contentRef = useRef<HTMLDivElement>(null);
+  useAutoScroll({ ref: contentRef, content, isSubmitting });
+
   const { files, fileKey, template, sharedProps } = useArtifactProps({ artifact });
 
   return (
     <div className="flex h-full w-full flex-col">
       <Tabs.Content
+        ref={contentRef}
         value="code"
         id="artifacts-code"
         className="h-full w-full flex-grow overflow-auto"
         tabIndex={-1}
       >
-        <ArtifactCodeEditor artifact={artifact} monacoRef={monacoRef} readOnly={isSharedConvo} />
+        <ArtifactCodeEditor
+          files={files}
+          fileKey={fileKey}
+          template={template}
+          artifact={artifact}
+          editorRef={editorRef}
+          sharedProps={sharedProps}
+          readOnly={isSharedConvo}
+        />
       </Tabs.Content>
 
-      <Tabs.Content
-        value="preview"
-        className="h-full w-full flex-grow overflow-hidden"
-        tabIndex={-1}
-      >
+      <Tabs.Content value="preview" className="h-full w-full flex-grow overflow-auto" tabIndex={-1}>
         <ArtifactPreview
           files={files}
           fileKey={fileKey}

client/src/components/Artifacts/Artifacts.tsx

@@ -3,7 +3,7 @@ import * as Tabs from '@radix-ui/react-tabs';
 import { Code, Play, RefreshCw, X } from 'lucide-react';
 import { useSetRecoilState, useResetRecoilState } from 'recoil';
 import { Button, Spinner, useMediaQuery, Radio } from '@librechat/client';
-import type { SandpackPreviewRef } from '@codesandbox/sandpack-react';
+import type { SandpackPreviewRef, CodeEditorRef } from '@codesandbox/sandpack-react';
 import { useShareContext, useMutationState } from '~/Providers';
 import useArtifacts from '~/hooks/Artifacts/useArtifacts';
 import DownloadArtifact from './DownloadArtifact';
@@ -22,6 +22,7 @@ export default function Artifacts() {
   const { isMutating } = useMutationState();
   const { isSharedConvo } = useShareContext();
   const isMobile = useMediaQuery('(max-width: 868px)');
+  const editorRef = useRef<CodeEditorRef>();
   const previewRef = useRef<SandpackPreviewRef>();
   const [isVisible, setIsVisible] = useState(false);
   const [isClosing, setIsClosing] = useState(false);
@@ -296,6 +297,7 @@ export default function Artifacts() {
             <div className="absolute inset-0 flex flex-col">
               <ArtifactTabs
                 artifact={currentArtifact}
+                editorRef={editorRef as React.MutableRefObject<CodeEditorRef>}
                 previewRef={previewRef as React.MutableRefObject<SandpackPreviewRef>}
                 isSharedConvo={isSharedConvo}
               />

client/src/components/Artifacts/Code.tsx

@@ -1,8 +1,11 @@
-import React, { memo, useState } from 'react';
+import React, { memo, useEffect, useRef, useState } from 'react';
 import copy from 'copy-to-clipboard';
+import rehypeKatex from 'rehype-katex';
+import ReactMarkdown from 'react-markdown';
 import { Button } from '@librechat/client';
+import rehypeHighlight from 'rehype-highlight';
 import { Copy, CircleCheckBig } from 'lucide-react';
-import { handleDoubleClick } from '~/utils';
+import { handleDoubleClick, langSubset } from '~/utils';
 import { useLocalize } from '~/hooks';
 
 type TCodeProps = {
@@ -26,6 +29,74 @@ export const code: React.ElementType = memo(({ inline, className, children }: TC
   return <code className={`hljs language-${lang} !whitespace-pre`}>{children}</code>;
 });
 
+export const CodeMarkdown = memo(
+  ({ content = '', isSubmitting }: { content: string; isSubmitting: boolean }) => {
+    const scrollRef = useRef<HTMLDivElement>(null);
+    const [userScrolled, setUserScrolled] = useState(false);
+    const currentContent = content;
+    const rehypePlugins = [
+      [rehypeKatex],
+      [
+        rehypeHighlight,
+        {
+          detect: true,
+          ignoreMissing: true,
+          subset: langSubset,
+        },
+      ],
+    ];
+
+    useEffect(() => {
+      const scrollContainer = scrollRef.current;
+      if (!scrollContainer) {
+        return;
+      }
+
+      const handleScroll = () => {
+        const { scrollTop, scrollHeight, clientHeight } = scrollContainer;
+        const isNearBottom = scrollHeight - scrollTop - clientHeight < 50;
+
+        if (!isNearBottom) {
+          setUserScrolled(true);
+        } else {
+          setUserScrolled(false);
+        }
+      };
+
+      scrollContainer.addEventListener('scroll', handleScroll);
+
+      return () => {
+        scrollContainer.removeEventListener('scroll', handleScroll);
+      };
+    }, []);
+
+    useEffect(() => {
+      const scrollContainer = scrollRef.current;
+      if (!scrollContainer || !isSubmitting || userScrolled) {
+        return;
+      }
+
+      scrollContainer.scrollTop = scrollContainer.scrollHeight;
+    }, [content, isSubmitting, userScrolled]);
+
+    return (
+      <div ref={scrollRef} className="max-h-full overflow-y-auto">
+        <ReactMarkdown
+          /* @ts-ignore */
+          rehypePlugins={rehypePlugins}
+          components={
+            { code } as {
+              [key: string]: React.ElementType;
+            }
+          }
+        >
+          {currentContent}
+        </ReactMarkdown>
+      </div>
+    );
+  },
+);
+
 export const CopyCodeButton: React.FC<{ content: string }> = ({ content }) => {
   const localize = useLocalize();
   const [isCopied, setIsCopied] = useState(false);

client/src/components/Chat/AddMultiConvo.tsx

@@ -1,21 +1,17 @@
-import { useCallback } from 'react';
-import { useSetRecoilState, useRecoilValue } from 'recoil';
 import { PlusCircle } from 'lucide-react';
 import { TooltipAnchor } from '@librechat/client';
 import { isAssistantsEndpoint } from 'librechat-data-provider';
 import type { TConversation } from 'librechat-data-provider';
-import { useGetConversation, useLocalize } from '~/hooks';
+import { useChatContext, useAddedChatContext } from '~/Providers';
 import { mainTextareaId } from '~/common';
-import store from '~/store';
+import { useLocalize } from '~/hooks';
 
 function AddMultiConvo() {
+  const { conversation } = useChatContext();
+  const { setConversation: setAddedConvo } = useAddedChatContext();
   const localize = useLocalize();
-  const getConversation = useGetConversation(0);
-  const endpoint = useRecoilValue(store.conversationEndpointByIndex(0));
-  const setAddedConvo = useSetRecoilState(store.conversationByIndex(1));
 
-  const clickHandler = useCallback(() => {
-    const conversation = getConversation();
+  const clickHandler = () => {
     const { title: _t, ...convo } = conversation ?? ({} as TConversation);
     setAddedConvo({
       ...convo,
@@ -26,13 +22,13 @@ function AddMultiConvo() {
     if (textarea) {
       textarea.focus();
     }
-  }, [getConversation, setAddedConvo]);
+  };
 
-  if (!endpoint) {
+  if (!conversation) {
     return null;
   }
 
-  if (isAssistantsEndpoint(endpoint)) {
+  if (isAssistantsEndpoint(conversation.endpoint)) {
     return null;
   }
 

client/src/components/Chat/Footer.tsx

@@ -1,11 +1,11 @@
-import React, { useEffect, memo } from 'react';
-import TagManager from 'react-gtm-module';
+import React, { useEffect } from 'react';
 import ReactMarkdown from 'react-markdown';
+import TagManager from 'react-gtm-module';
 import { Constants } from 'librechat-data-provider';
 import { useGetStartupConfig } from '~/data-provider';
 import { useLocalize } from '~/hooks';
 
-function Footer({ className }: { className?: string }) {
+export default function Footer({ className }: { className?: string }) {
   const { data: config } = useGetStartupConfig();
   const localize = useLocalize();
 
@@ -98,8 +98,3 @@ function Footer({ className }: { className?: string }) {
     </div>
   );
 }
-
-const MemoizedFooter = memo(Footer);
-MemoizedFooter.displayName = 'Footer';
-
-export default MemoizedFooter;

client/src/components/Chat/Header.tsx

@@ -1,4 +1,4 @@
-import { memo, useMemo } from 'react';
+import { useMemo } from 'react';
 import { useMediaQuery } from '@librechat/client';
 import { useOutletContext } from 'react-router-dom';
 import { AnimatePresence, motion } from 'framer-motion';
@@ -16,7 +16,7 @@ import { cn } from '~/utils';
 
 const defaultInterface = getConfigDefaults().interface;
 
-function Header() {
+export default function Header() {
   const { data: startupConfig } = useGetStartupConfig();
   const { navVisible, setNavVisible } = useOutletContext<ContextType>();
 
@@ -35,11 +35,6 @@ function Header() {
     permission: Permissions.USE,
   });
 
-  const hasAccessToTemporaryChat = useHasAccess({
-    permissionType: PermissionTypes.TEMPORARY_CHAT,
-    permission: Permissions.USE,
-  });
-
   const isSmallScreen = useMediaQuery('(max-width: 768px)');
 
   return (
@@ -78,7 +73,7 @@ function Header() {
                   <ExportAndShareMenu
                     isSharedButtonEnabled={startupConfig?.sharedLinksEnabled ?? false}
                   />
-                  {hasAccessToTemporaryChat === true && <TemporaryChat />}
+                  <TemporaryChat />
                 </>
               )}
             </div>
@@ -90,7 +85,7 @@ function Header() {
             <ExportAndShareMenu
               isSharedButtonEnabled={startupConfig?.sharedLinksEnabled ?? false}
             />
-            {hasAccessToTemporaryChat === true && <TemporaryChat />}
+            <TemporaryChat />
           </div>
         )}
       </div>
@@ -99,8 +94,3 @@ function Header() {
     </div>
   );
 }
-
-const MemoizedHeader = memo(Header);
-MemoizedHeader.displayName = 'Header';
-
-export default MemoizedHeader;

client/src/components/Chat/Input/ChatForm.tsx

@@ -219,6 +219,7 @@ const ChatForm = memo(({ index = 0 }: { index?: number }) => {
         <div className={cn('flex w-full items-center', isRTL && 'flex-row-reverse')}>
           {showPlusPopover && !isAssistantsEndpoint(endpoint) && (
             <Mention
+              conversation={conversation}
               setShowMentionPopover={setShowPlusPopover}
               newConversation={generateConversation}
               textAreaRef={textAreaRef}
@@ -229,6 +230,7 @@ const ChatForm = memo(({ index = 0 }: { index?: number }) => {
           )}
           {showMentionPopover && (
             <Mention
+              conversation={conversation}
               setShowMentionPopover={setShowMentionPopover}
               newConversation={newConversation}
               textAreaRef={textAreaRef}

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

@@ -2,9 +2,10 @@ import { memo, useMemo } from 'react';
 import {
   Constants,
   supportsFiles,
+  EModelEndpoint,
   mergeFileConfig,
   isAgentsEndpoint,
-  resolveEndpointType,
+  getEndpointField,
   isAssistantsEndpoint,
   getEndpointFileConfig,
 } from 'librechat-data-provider';
@@ -54,31 +55,21 @@ function AttachFileChat({
 
   const { data: endpointsConfig } = useGetEndpointsQuery();
 
-  const agentProvider = useMemo(() => {
-    if (!isAgents || !conversation?.agent_id) {
-      return undefined;
-    }
-    const agent = agentData || agentsMap?.[conversation.agent_id];
-    return agent?.provider;
-  }, [isAgents, conversation?.agent_id, agentData, agentsMap]);
+  const endpointType = useMemo(() => {
+    return (
+      getEndpointField(endpointsConfig, endpoint, 'type') ||
+      (endpoint as EModelEndpoint | undefined)
+    );
+  }, [endpoint, endpointsConfig]);
 
-  const endpointType = useMemo(
-    () => resolveEndpointType(endpointsConfig, endpoint, agentProvider),
-    [endpointsConfig, endpoint, agentProvider],
-  );
-
-  const fileConfigEndpoint = useMemo(
-    () => (isAgents && agentProvider ? agentProvider : endpoint),
-    [isAgents, agentProvider, endpoint],
-  );
   const endpointFileConfig = useMemo(
     () =>
       getEndpointFileConfig({
+        endpoint,
         fileConfig,
         endpointType,
-        endpoint: fileConfigEndpoint,
       }),
-    [fileConfigEndpoint, fileConfig, endpointType],
+    [endpoint, fileConfig, endpointType],
   );
   const endpointSupportsFiles: boolean = useMemo(
     () => supportsFiles[endpointType ?? endpoint ?? ''] ?? false,

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

@@ -50,7 +50,7 @@ interface AttachFileMenuProps {
   endpoint?: string | null;
   disabled?: boolean | null;
   conversationId: string;
-  endpointType?: EModelEndpoint | string;
+  endpointType?: EModelEndpoint;
   endpointFileConfig?: EndpointFileConfig;
   useResponsesApi?: boolean;
 }

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

@@ -3,10 +3,10 @@ import { useToastContext } from '@librechat/client';
 import { EToolResources } from 'librechat-data-provider';
 import type { ExtendedFile } from '~/common';
 import { useDeleteFilesMutation } from '~/data-provider';
-import { logger, getCachedPreview } from '~/utils';
 import { useFileDeletion } from '~/hooks/Files';
 import FileContainer from './FileContainer';
 import { useLocalize } from '~/hooks';
+import { logger } from '~/utils';
 import Image from './Image';
 
 export default function FileRow({
@@ -24,7 +24,7 @@ export default function FileRow({
   files: Map<string, ExtendedFile> | undefined;
   abortUpload?: () => void;
   setFiles: React.Dispatch<React.SetStateAction<Map<string, ExtendedFile>>>;
-  setFilesLoading?: React.Dispatch<React.SetStateAction<boolean>>;
+  setFilesLoading: React.Dispatch<React.SetStateAction<boolean>>;
   fileFilter?: (file: ExtendedFile) => boolean;
   assistant_id?: string;
   agent_id?: string;
@@ -58,7 +58,6 @@ export default function FileRow({
   const { deleteFile } = useFileDeletion({ mutateAsync, agent_id, assistant_id, tool_resource });
 
   useEffect(() => {
-    if (!setFilesLoading) return;
     if (files.length === 0) {
       setFilesLoading(false);
       return;
@@ -112,15 +111,13 @@ export default function FileRow({
           )
           .uniqueFiles.map((file: ExtendedFile, index: number) => {
             const handleDelete = () => {
+              showToast({
+                message: localize('com_ui_deleting_file'),
+                status: 'info',
+              });
               if (abortUpload && file.progress < 1) {
                 abortUpload();
               }
-              if (file.progress >= 1) {
-                showToast({
-                  message: localize('com_ui_deleting_file'),
-                  status: 'info',
-                });
-              }
               deleteFile({ file, setFiles });
             };
             const isImage = file.type?.startsWith('image') ?? false;
@@ -136,7 +133,7 @@ export default function FileRow({
               >
                 {isImage ? (
                   <Image
-                    url={getCachedPreview(file.file_id) ?? file.preview ?? file.filepath}
+                    url={file.progress === 1 ? file.filepath : (file.preview ?? file.filepath)}
                     onDelete={handleDelete}
                     progress={file.progress}
                     source={file.source}

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

@@ -1,176 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import { RecoilRoot } from 'recoil';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { EModelEndpoint, mergeFileConfig } from 'librechat-data-provider';
-import type { TEndpointsConfig, Agent } from 'librechat-data-provider';
-import AttachFileChat from '../AttachFileChat';
-
-const mockEndpointsConfig: TEndpointsConfig = {
-  [EModelEndpoint.openAI]: { userProvide: false, order: 0 },
-  [EModelEndpoint.agents]: { userProvide: false, order: 1 },
-  [EModelEndpoint.assistants]: { userProvide: false, order: 2 },
-  Moonshot: { type: EModelEndpoint.custom, userProvide: false, order: 9999 },
-};
-
-const mockFileConfig = mergeFileConfig({
-  endpoints: {
-    Moonshot: { fileLimit: 5 },
-    [EModelEndpoint.agents]: { fileLimit: 20 },
-    default: { fileLimit: 10 },
-  },
-});
-
-let mockAgentsMap: Record<string, Partial<Agent>> = {};
-let mockAgentQueryData: Partial<Agent> | undefined;
-
-jest.mock('~/data-provider', () => ({
-  useGetEndpointsQuery: () => ({ data: mockEndpointsConfig }),
-  useGetFileConfig: ({ select }: { select?: (data: unknown) => unknown }) => ({
-    data: select != null ? select(mockFileConfig) : mockFileConfig,
-  }),
-  useGetAgentByIdQuery: () => ({ data: mockAgentQueryData }),
-}));
-
-jest.mock('~/Providers', () => ({
-  useAgentsMapContext: () => mockAgentsMap,
-}));
-
-/** Capture the props passed to AttachFileMenu */
-let mockAttachFileMenuProps: Record<string, unknown> = {};
-jest.mock('../AttachFileMenu', () => {
-  return function MockAttachFileMenu(props: Record<string, unknown>) {
-    mockAttachFileMenuProps = props;
-    return <div data-testid="attach-file-menu" data-endpoint-type={String(props.endpointType)} />;
-  };
-});
-
-jest.mock('../AttachFile', () => {
-  return function MockAttachFile() {
-    return <div data-testid="attach-file" />;
-  };
-});
-
-const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });
-
-function renderComponent(conversation: Record<string, unknown> | null, disableInputs = false) {
-  return render(
-    <QueryClientProvider client={queryClient}>
-      <RecoilRoot>
-        <AttachFileChat conversation={conversation as never} disableInputs={disableInputs} />
-      </RecoilRoot>
-    </QueryClientProvider>,
-  );
-}
-
-describe('AttachFileChat', () => {
-  beforeEach(() => {
-    mockAgentsMap = {};
-    mockAgentQueryData = undefined;
-    mockAttachFileMenuProps = {};
-  });
-
-  describe('rendering decisions', () => {
-    it('renders AttachFileMenu for agents endpoint', () => {
-      renderComponent({ endpoint: EModelEndpoint.agents, agent_id: 'agent-1' });
-      expect(screen.getByTestId('attach-file-menu')).toBeInTheDocument();
-    });
-
-    it('renders AttachFileMenu for custom endpoint with file support', () => {
-      renderComponent({ endpoint: 'Moonshot' });
-      expect(screen.getByTestId('attach-file-menu')).toBeInTheDocument();
-    });
-
-    it('renders null for null conversation', () => {
-      const { container } = renderComponent(null);
-      expect(container.innerHTML).toBe('');
-    });
-  });
-
-  describe('endpointType resolution for agents', () => {
-    it('passes custom endpointType when agent provider is a custom endpoint', () => {
-      mockAgentsMap = {
-        'agent-1': { provider: 'Moonshot', model_parameters: {} } as Partial<Agent>,
-      };
-      renderComponent({ endpoint: EModelEndpoint.agents, agent_id: 'agent-1' });
-      expect(mockAttachFileMenuProps.endpointType).toBe(EModelEndpoint.custom);
-    });
-
-    it('passes openAI endpointType when agent provider is openAI', () => {
-      mockAgentsMap = {
-        'agent-1': { provider: EModelEndpoint.openAI, model_parameters: {} } as Partial<Agent>,
-      };
-      renderComponent({ endpoint: EModelEndpoint.agents, agent_id: 'agent-1' });
-      expect(mockAttachFileMenuProps.endpointType).toBe(EModelEndpoint.openAI);
-    });
-
-    it('passes agents endpointType when no agent provider', () => {
-      renderComponent({ endpoint: EModelEndpoint.agents, agent_id: 'agent-1' });
-      expect(mockAttachFileMenuProps.endpointType).toBe(EModelEndpoint.agents);
-    });
-
-    it('passes agents endpointType when no agent_id', () => {
-      renderComponent({ endpoint: EModelEndpoint.agents });
-      expect(mockAttachFileMenuProps.endpointType).toBe(EModelEndpoint.agents);
-    });
-
-    it('uses agentData query when agent not in agentsMap', () => {
-      mockAgentQueryData = { provider: 'Moonshot' } as Partial<Agent>;
-      renderComponent({ endpoint: EModelEndpoint.agents, agent_id: 'agent-2' });
-      expect(mockAttachFileMenuProps.endpointType).toBe(EModelEndpoint.custom);
-    });
-  });
-
-  describe('endpointType resolution for non-agents', () => {
-    it('passes custom endpointType for a custom endpoint', () => {
-      renderComponent({ endpoint: 'Moonshot' });
-      expect(mockAttachFileMenuProps.endpointType).toBe(EModelEndpoint.custom);
-    });
-
-    it('passes openAI endpointType for openAI endpoint', () => {
-      renderComponent({ endpoint: EModelEndpoint.openAI });
-      expect(mockAttachFileMenuProps.endpointType).toBe(EModelEndpoint.openAI);
-    });
-  });
-
-  describe('consistency: same endpoint type for direct vs agent usage', () => {
-    it('resolves Moonshot the same way whether used directly or through an agent', () => {
-      renderComponent({ endpoint: 'Moonshot' });
-      const directType = mockAttachFileMenuProps.endpointType;
-
-      mockAgentsMap = {
-        'agent-1': { provider: 'Moonshot', model_parameters: {} } as Partial<Agent>,
-      };
-      renderComponent({ endpoint: EModelEndpoint.agents, agent_id: 'agent-1' });
-      const agentType = mockAttachFileMenuProps.endpointType;
-
-      expect(directType).toBe(agentType);
-    });
-  });
-
-  describe('endpointFileConfig resolution', () => {
-    it('passes Moonshot-specific file config for agent with Moonshot provider', () => {
-      mockAgentsMap = {
-        'agent-1': { provider: 'Moonshot', model_parameters: {} } as Partial<Agent>,
-      };
-      renderComponent({ endpoint: EModelEndpoint.agents, agent_id: 'agent-1' });
-      const config = mockAttachFileMenuProps.endpointFileConfig as { fileLimit?: number };
-      expect(config?.fileLimit).toBe(5);
-    });
-
-    it('passes agents file config when agent has no specific provider config', () => {
-      mockAgentsMap = {
-        'agent-1': { provider: EModelEndpoint.openAI, model_parameters: {} } as Partial<Agent>,
-      };
-      renderComponent({ endpoint: EModelEndpoint.agents, agent_id: 'agent-1' });
-      const config = mockAttachFileMenuProps.endpointFileConfig as { fileLimit?: number };
-      expect(config?.fileLimit).toBe(10);
-    });
-
-    it('passes agents file config when no agent provider', () => {
-      renderComponent({ endpoint: EModelEndpoint.agents });
-      const config = mockAttachFileMenuProps.endpointFileConfig as { fileLimit?: number };
-      expect(config?.fileLimit).toBe(20);
-    });
-  });
-});

client/src/components/Chat/Input/Files/__tests__/AttachFileMenu.spec.tsx

@@ -1,10 +1,12 @@
 import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
 import { RecoilRoot } from 'recoil';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { EModelEndpoint, Providers } from 'librechat-data-provider';
+import { EModelEndpoint } from 'librechat-data-provider';
 import AttachFileMenu from '../AttachFileMenu';
 
+// Mock all the hooks
 jest.mock('~/hooks', () => ({
   useAgentToolPermissions: jest.fn(),
   useAgentCapabilities: jest.fn(),
@@ -23,45 +25,53 @@ jest.mock('~/data-provider', () => ({
 }));
 
 jest.mock('~/components/SharePoint', () => ({
-  SharePointPickerDialog: () => null,
+  SharePointPickerDialog: jest.fn(() => null),
 }));
 
 jest.mock('@librechat/client', () => {
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
-  const R = require('react');
+  const React = jest.requireActual('react');
   return {
-    FileUpload: (props) => R.createElement('div', { 'data-testid': 'file-upload' }, props.children),
-    TooltipAnchor: (props) => props.render,
-    DropdownPopup: (props) =>
-      R.createElement(
-        'div',
-        null,
-        R.createElement('div', { onClick: () => props.setIsOpen(!props.isOpen) }, props.trigger),
-        props.isOpen &&
-          R.createElement(
-            'div',
-            { 'data-testid': 'dropdown-menu' },
-            props.items.map((item, idx) =>
-              R.createElement(
-                'button',
-                { key: idx, onClick: item.onClick, 'data-testid': `menu-item-${idx}` },
-                item.label,
-              ),
-            ),
-          ),
-      ),
-    AttachmentIcon: () => R.createElement('span', { 'data-testid': 'attachment-icon' }),
-    SharePointIcon: () => R.createElement('span', { 'data-testid': 'sharepoint-icon' }),
+    FileUpload: React.forwardRef(({ children, handleFileChange }: any, ref: any) => (
+      <div data-testid="file-upload">
+        <input ref={ref} type="file" onChange={handleFileChange} data-testid="file-input" />
+        {children}
+      </div>
+    )),
+    TooltipAnchor: ({ render }: any) => render,
+    DropdownPopup: ({ trigger, items, isOpen, setIsOpen }: any) => {
+      const handleTriggerClick = () => {
+        if (setIsOpen) {
+          setIsOpen(!isOpen);
+        }
+      };
+
+      return (
+        <div>
+          <div onClick={handleTriggerClick}>{trigger}</div>
+          {isOpen && (
+            <div data-testid="dropdown-menu">
+              {items.map((item: any, idx: number) => (
+                <button key={idx} onClick={item.onClick} data-testid={`menu-item-${idx}`}>
+                  {item.label}
+                </button>
+              ))}
+            </div>
+          )}
+        </div>
+      );
+    },
+    AttachmentIcon: () => <span data-testid="attachment-icon">📎</span>,
+    SharePointIcon: () => <span data-testid="sharepoint-icon">SP</span>,
   };
 });
 
-jest.mock('@ariakit/react', () => {
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
-  const R = require('react');
-  return {
-    MenuButton: (props) => R.createElement('button', props, props.children),
-  };
-});
+jest.mock('@ariakit/react', () => ({
+  MenuButton: ({ children, onClick, disabled, ...props }: any) => (
+    <button onClick={onClick} disabled={disabled} {...props}>
+      {children}
+    </button>
+  ),
+}));
 
 const mockUseAgentToolPermissions = jest.requireMock('~/hooks').useAgentToolPermissions;
 const mockUseAgentCapabilities = jest.requireMock('~/hooks').useAgentCapabilities;
@@ -73,283 +83,558 @@ const mockUseSharePointFileHandling = jest.requireMock(
 ).default;
 const mockUseGetStartupConfig = jest.requireMock('~/data-provider').useGetStartupConfig;
 
-const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });
-
-function setupMocks(overrides: { provider?: string } = {}) {
-  const translations: Record<string, string> = {
-    com_ui_upload_provider: 'Upload to Provider',
-    com_ui_upload_image_input: 'Upload Image',
-    com_ui_upload_ocr_text: 'Upload as Text',
-    com_ui_upload_file_search: 'Upload for File Search',
-    com_ui_upload_code_files: 'Upload Code Files',
-    com_sidepanel_attach_files: 'Attach Files',
-    com_files_upload_sharepoint: 'Upload from SharePoint',
-  };
-  mockUseLocalize.mockReturnValue((key: string) => translations[key] || key);
-  mockUseAgentCapabilities.mockReturnValue({
-    contextEnabled: false,
-    fileSearchEnabled: false,
-    codeEnabled: false,
-  });
-  mockUseGetAgentsConfig.mockReturnValue({ agentsConfig: {} });
-  mockUseFileHandling.mockReturnValue({ handleFileChange: jest.fn() });
-  mockUseSharePointFileHandling.mockReturnValue({
-    handleSharePointFiles: jest.fn(),
-    isProcessing: false,
-    downloadProgress: 0,
-  });
-  mockUseGetStartupConfig.mockReturnValue({ data: { sharePointFilePickerEnabled: false } });
-  mockUseAgentToolPermissions.mockReturnValue({
-    fileSearchAllowedByAgent: false,
-    codeAllowedByAgent: false,
-    provider: overrides.provider ?? undefined,
-  });
-}
-
-function renderMenu(props: Record<string, unknown> = {}) {
-  return render(
-    <QueryClientProvider client={queryClient}>
-      <RecoilRoot>
-        <AttachFileMenu conversationId="test-convo" {...props} />
-      </RecoilRoot>
-    </QueryClientProvider>,
-  );
-}
-
-function openMenu() {
-  fireEvent.click(screen.getByRole('button', { name: /attach file options/i }));
-}
-
 describe('AttachFileMenu', () => {
-  beforeEach(jest.clearAllMocks);
+  const queryClient = new QueryClient({
+    defaultOptions: {
+      queries: { retry: false },
+    },
+  });
 
-  describe('Upload to Provider vs Upload Image', () => {
-    it('shows "Upload to Provider" when endpointType is custom (resolved from agent provider)', () => {
-      setupMocks({ provider: 'Moonshot' });
-      renderMenu({ endpointType: EModelEndpoint.custom });
-      openMenu();
+  const mockHandleFileChange = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    // Default mock implementations
+    mockUseLocalize.mockReturnValue((key: string) => {
+      const translations: Record<string, string> = {
+        com_ui_upload_provider: 'Upload to Provider',
+        com_ui_upload_image_input: 'Upload Image',
+        com_ui_upload_ocr_text: 'Upload OCR Text',
+        com_ui_upload_file_search: 'Upload for File Search',
+        com_ui_upload_code_files: 'Upload Code Files',
+        com_sidepanel_attach_files: 'Attach Files',
+        com_files_upload_sharepoint: 'Upload from SharePoint',
+      };
+      return translations[key] || key;
+    });
+
+    mockUseAgentCapabilities.mockReturnValue({
+      contextEnabled: false,
+      fileSearchEnabled: false,
+      codeEnabled: false,
+    });
+
+    mockUseGetAgentsConfig.mockReturnValue({
+      agentsConfig: {
+        capabilities: {
+          contextEnabled: false,
+          fileSearchEnabled: false,
+          codeEnabled: false,
+        },
+      },
+    });
+
+    mockUseFileHandling.mockReturnValue({
+      handleFileChange: mockHandleFileChange,
+    });
+
+    mockUseSharePointFileHandling.mockReturnValue({
+      handleSharePointFiles: jest.fn(),
+      isProcessing: false,
+      downloadProgress: 0,
+    });
+
+    mockUseGetStartupConfig.mockReturnValue({
+      data: {
+        sharePointFilePickerEnabled: false,
+      },
+    });
+
+    mockUseAgentToolPermissions.mockReturnValue({
+      fileSearchAllowedByAgent: false,
+      codeAllowedByAgent: false,
+      provider: undefined,
+    });
+  });
+
+  const renderAttachFileMenu = (props: any = {}) => {
+    return render(
+      <QueryClientProvider client={queryClient}>
+        <RecoilRoot>
+          <AttachFileMenu conversationId="test-conversation" {...props} />
+        </RecoilRoot>
+      </QueryClientProvider>,
+    );
+  };
+
+  describe('Basic Rendering', () => {
+    it('should render the attachment button', () => {
+      renderAttachFileMenu();
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      expect(button).toBeInTheDocument();
+    });
+
+    it('should be disabled when disabled prop is true', () => {
+      renderAttachFileMenu({ disabled: true });
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      expect(button).toBeDisabled();
+    });
+
+    it('should not be disabled when disabled prop is false', () => {
+      renderAttachFileMenu({ disabled: false });
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      expect(button).not.toBeDisabled();
+    });
+  });
+
+  describe('Provider Detection Fix - endpointType Priority', () => {
+    it('should prioritize endpointType over currentProvider for LiteLLM gateway', () => {
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: 'litellm', // Custom gateway name NOT in documentSupportedProviders
+      });
+
+      renderAttachFileMenu({
+        endpoint: 'litellm',
+        endpointType: EModelEndpoint.openAI, // Backend override IS in documentSupportedProviders
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
+      // With the fix, should show "Upload to Provider" because endpointType is checked first
       expect(screen.getByText('Upload to Provider')).toBeInTheDocument();
       expect(screen.queryByText('Upload Image')).not.toBeInTheDocument();
     });
 
-    it('shows "Upload to Provider" when endpointType is openAI', () => {
-      setupMocks({ provider: EModelEndpoint.openAI });
-      renderMenu({ endpointType: EModelEndpoint.openAI });
-      openMenu();
+    it('should show Upload to Provider for custom endpoints with OpenAI endpointType', () => {
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: 'my-custom-gateway',
+      });
+
+      renderAttachFileMenu({
+        endpoint: 'my-custom-gateway',
+        endpointType: EModelEndpoint.openAI,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
       expect(screen.getByText('Upload to Provider')).toBeInTheDocument();
     });
 
-    it('shows "Upload to Provider" when endpointType is anthropic', () => {
-      setupMocks({ provider: EModelEndpoint.anthropic });
-      renderMenu({ endpointType: EModelEndpoint.anthropic });
-      openMenu();
-      expect(screen.getByText('Upload to Provider')).toBeInTheDocument();
-    });
+    it('should show Upload Image when neither endpointType nor provider support documents', () => {
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: 'unsupported-provider',
+      });
 
-    it('shows "Upload to Provider" when endpointType is google', () => {
-      setupMocks({ provider: Providers.GOOGLE });
-      renderMenu({ endpointType: EModelEndpoint.google });
-      openMenu();
-      expect(screen.getByText('Upload to Provider')).toBeInTheDocument();
-    });
+      renderAttachFileMenu({
+        endpoint: 'unsupported-provider',
+        endpointType: 'unsupported-endpoint' as any,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
 
-    it('shows "Upload Image" when endpointType is agents (no provider resolution)', () => {
-      setupMocks();
-      renderMenu({ endpointType: EModelEndpoint.agents });
-      openMenu();
       expect(screen.getByText('Upload Image')).toBeInTheDocument();
       expect(screen.queryByText('Upload to Provider')).not.toBeInTheDocument();
     });
 
-    it('shows "Upload Image" when neither endpointType nor provider supports documents', () => {
-      setupMocks({ provider: 'unknown-provider' });
-      renderMenu({ endpointType: 'unknown-type' });
-      openMenu();
-      expect(screen.getByText('Upload Image')).toBeInTheDocument();
-    });
+    it('should fallback to currentProvider when endpointType is undefined', () => {
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: EModelEndpoint.openAI,
+      });
+
+      renderAttachFileMenu({
+        endpoint: EModelEndpoint.openAI,
+        endpointType: undefined,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
 
-    it('shows "Upload to Provider" for azureOpenAI with useResponsesApi', () => {
-      setupMocks({ provider: EModelEndpoint.azureOpenAI });
-      renderMenu({ endpointType: EModelEndpoint.azureOpenAI, useResponsesApi: true });
-      openMenu();
       expect(screen.getByText('Upload to Provider')).toBeInTheDocument();
     });
 
-    it('shows "Upload Image" for azureOpenAI without useResponsesApi', () => {
-      setupMocks({ provider: EModelEndpoint.azureOpenAI });
-      renderMenu({ endpointType: EModelEndpoint.azureOpenAI, useResponsesApi: false });
-      openMenu();
-      expect(screen.getByText('Upload Image')).toBeInTheDocument();
+    it('should fallback to currentProvider when endpointType is null', () => {
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: EModelEndpoint.anthropic,
+      });
+
+      renderAttachFileMenu({
+        endpoint: EModelEndpoint.anthropic,
+        endpointType: null,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
+      expect(screen.getByText('Upload to Provider')).toBeInTheDocument();
     });
   });
 
-  describe('agent provider resolution scenario', () => {
-    it('shows "Upload to Provider" when agents endpoint has custom endpointType from provider', () => {
-      setupMocks({ provider: 'Moonshot' });
-      renderMenu({
-        endpoint: EModelEndpoint.agents,
-        endpointType: EModelEndpoint.custom,
+  describe('Supported Providers', () => {
+    const supportedProviders = [
+      { name: 'OpenAI', endpoint: EModelEndpoint.openAI },
+      { name: 'Anthropic', endpoint: EModelEndpoint.anthropic },
+      { name: 'Google', endpoint: EModelEndpoint.google },
+      { name: 'Custom', endpoint: EModelEndpoint.custom },
+    ];
+
+    supportedProviders.forEach(({ name, endpoint }) => {
+      it(`should show Upload to Provider for ${name}`, () => {
+        mockUseAgentToolPermissions.mockReturnValue({
+          fileSearchAllowedByAgent: false,
+          codeAllowedByAgent: false,
+          provider: endpoint,
+        });
+
+        renderAttachFileMenu({
+          endpoint,
+          endpointType: endpoint,
+        });
+
+        const button = screen.getByRole('button', { name: /attach file options/i });
+        fireEvent.click(button);
+
+        expect(screen.getByText('Upload to Provider')).toBeInTheDocument();
       });
-      openMenu();
+    });
+
+    it('should show Upload to Provider for Azure OpenAI with useResponsesApi', () => {
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: EModelEndpoint.azureOpenAI,
+      });
+
+      renderAttachFileMenu({
+        endpoint: EModelEndpoint.azureOpenAI,
+        endpointType: EModelEndpoint.azureOpenAI,
+        useResponsesApi: true,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
       expect(screen.getByText('Upload to Provider')).toBeInTheDocument();
     });
 
-    it('shows "Upload Image" when agents endpoint has no resolved provider type', () => {
-      setupMocks();
-      renderMenu({
-        endpoint: EModelEndpoint.agents,
-        endpointType: EModelEndpoint.agents,
+    it('should NOT show Upload to Provider for Azure OpenAI without useResponsesApi', () => {
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: EModelEndpoint.azureOpenAI,
       });
-      openMenu();
+
+      renderAttachFileMenu({
+        endpoint: EModelEndpoint.azureOpenAI,
+        endpointType: EModelEndpoint.azureOpenAI,
+        useResponsesApi: false,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
+      expect(screen.queryByText('Upload to Provider')).not.toBeInTheDocument();
       expect(screen.getByText('Upload Image')).toBeInTheDocument();
     });
   });
 
-  describe('Basic Rendering', () => {
-    it('renders the attachment button', () => {
-      setupMocks();
-      renderMenu();
-      expect(screen.getByRole('button', { name: /attach file options/i })).toBeInTheDocument();
-    });
-
-    it('is disabled when disabled prop is true', () => {
-      setupMocks();
-      renderMenu({ disabled: true });
-      expect(screen.getByRole('button', { name: /attach file options/i })).toBeDisabled();
-    });
-
-    it('is not disabled when disabled prop is false', () => {
-      setupMocks();
-      renderMenu({ disabled: false });
-      expect(screen.getByRole('button', { name: /attach file options/i })).not.toBeDisabled();
-    });
-  });
-
   describe('Agent Capabilities', () => {
-    it('shows OCR Text option when context is enabled', () => {
-      setupMocks();
+    it('should show OCR Text option when context is enabled', () => {
       mockUseAgentCapabilities.mockReturnValue({
         contextEnabled: true,
         fileSearchEnabled: false,
         codeEnabled: false,
       });
-      renderMenu({ endpointType: EModelEndpoint.openAI });
-      openMenu();
-      expect(screen.getByText('Upload as Text')).toBeInTheDocument();
+
+      renderAttachFileMenu({
+        endpointType: EModelEndpoint.openAI,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
+      expect(screen.getByText('Upload OCR Text')).toBeInTheDocument();
     });
 
-    it('shows File Search option when enabled and allowed by agent', () => {
-      setupMocks();
+    it('should show File Search option when enabled and allowed by agent', () => {
       mockUseAgentCapabilities.mockReturnValue({
         contextEnabled: false,
         fileSearchEnabled: true,
         codeEnabled: false,
       });
+
       mockUseAgentToolPermissions.mockReturnValue({
         fileSearchAllowedByAgent: true,
         codeAllowedByAgent: false,
         provider: undefined,
       });
-      renderMenu({ endpointType: EModelEndpoint.openAI });
-      openMenu();
+
+      renderAttachFileMenu({
+        endpointType: EModelEndpoint.openAI,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
       expect(screen.getByText('Upload for File Search')).toBeInTheDocument();
     });
 
-    it('does NOT show File Search when enabled but not allowed by agent', () => {
-      setupMocks();
+    it('should NOT show File Search when enabled but not allowed by agent', () => {
       mockUseAgentCapabilities.mockReturnValue({
         contextEnabled: false,
         fileSearchEnabled: true,
         codeEnabled: false,
       });
-      renderMenu({ endpointType: EModelEndpoint.openAI });
-      openMenu();
+
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: undefined,
+      });
+
+      renderAttachFileMenu({
+        endpointType: EModelEndpoint.openAI,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
       expect(screen.queryByText('Upload for File Search')).not.toBeInTheDocument();
     });
 
-    it('shows Code Files option when enabled and allowed by agent', () => {
-      setupMocks();
+    it('should show Code Files option when enabled and allowed by agent', () => {
       mockUseAgentCapabilities.mockReturnValue({
         contextEnabled: false,
         fileSearchEnabled: false,
         codeEnabled: true,
       });
+
       mockUseAgentToolPermissions.mockReturnValue({
         fileSearchAllowedByAgent: false,
         codeAllowedByAgent: true,
         provider: undefined,
       });
-      renderMenu({ endpointType: EModelEndpoint.openAI });
-      openMenu();
+
+      renderAttachFileMenu({
+        endpointType: EModelEndpoint.openAI,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
       expect(screen.getByText('Upload Code Files')).toBeInTheDocument();
     });
 
-    it('shows all options when all capabilities are enabled', () => {
-      setupMocks();
+    it('should show all options when all capabilities are enabled', () => {
       mockUseAgentCapabilities.mockReturnValue({
         contextEnabled: true,
         fileSearchEnabled: true,
         codeEnabled: true,
       });
+
       mockUseAgentToolPermissions.mockReturnValue({
         fileSearchAllowedByAgent: true,
         codeAllowedByAgent: true,
         provider: undefined,
       });
-      renderMenu({ endpointType: EModelEndpoint.openAI });
-      openMenu();
+
+      renderAttachFileMenu({
+        endpointType: EModelEndpoint.openAI,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
       expect(screen.getByText('Upload to Provider')).toBeInTheDocument();
-      expect(screen.getByText('Upload as Text')).toBeInTheDocument();
+      expect(screen.getByText('Upload OCR Text')).toBeInTheDocument();
       expect(screen.getByText('Upload for File Search')).toBeInTheDocument();
       expect(screen.getByText('Upload Code Files')).toBeInTheDocument();
     });
   });
 
   describe('SharePoint Integration', () => {
-    it('shows SharePoint option when enabled', () => {
-      setupMocks();
+    it('should show SharePoint option when enabled', () => {
       mockUseGetStartupConfig.mockReturnValue({
-        data: { sharePointFilePickerEnabled: true },
+        data: {
+          sharePointFilePickerEnabled: true,
+        },
       });
-      renderMenu({ endpointType: EModelEndpoint.openAI });
-      openMenu();
+
+      renderAttachFileMenu({
+        endpointType: EModelEndpoint.openAI,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
       expect(screen.getByText('Upload from SharePoint')).toBeInTheDocument();
     });
 
-    it('does NOT show SharePoint option when disabled', () => {
-      setupMocks();
-      renderMenu({ endpointType: EModelEndpoint.openAI });
-      openMenu();
+    it('should NOT show SharePoint option when disabled', () => {
+      mockUseGetStartupConfig.mockReturnValue({
+        data: {
+          sharePointFilePickerEnabled: false,
+        },
+      });
+
+      renderAttachFileMenu({
+        endpointType: EModelEndpoint.openAI,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
       expect(screen.queryByText('Upload from SharePoint')).not.toBeInTheDocument();
     });
   });
 
   describe('Edge Cases', () => {
-    it('handles undefined endpoint and provider gracefully', () => {
-      setupMocks();
-      renderMenu({ endpoint: undefined, endpointType: undefined });
+    it('should handle undefined endpoint and provider gracefully', () => {
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: undefined,
+      });
+
+      renderAttachFileMenu({
+        endpoint: undefined,
+        endpointType: undefined,
+      });
+
       const button = screen.getByRole('button', { name: /attach file options/i });
       expect(button).toBeInTheDocument();
       fireEvent.click(button);
+
+      // Should show Upload Image as fallback
       expect(screen.getByText('Upload Image')).toBeInTheDocument();
     });
 
-    it('handles null endpoint and provider gracefully', () => {
-      setupMocks();
-      renderMenu({ endpoint: null, endpointType: null });
-      expect(screen.getByRole('button', { name: /attach file options/i })).toBeInTheDocument();
+    it('should handle null endpoint and provider gracefully', () => {
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: null,
+      });
+
+      renderAttachFileMenu({
+        endpoint: null,
+        endpointType: null,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      expect(button).toBeInTheDocument();
     });
 
-    it('handles missing agentId gracefully', () => {
-      setupMocks();
-      renderMenu({ agentId: undefined, endpointType: EModelEndpoint.openAI });
-      expect(screen.getByRole('button', { name: /attach file options/i })).toBeInTheDocument();
+    it('should handle missing agentId gracefully', () => {
+      renderAttachFileMenu({
+        agentId: undefined,
+        endpointType: EModelEndpoint.openAI,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      expect(button).toBeInTheDocument();
     });
 
-    it('handles empty string agentId', () => {
-      setupMocks();
-      renderMenu({ agentId: '', endpointType: EModelEndpoint.openAI });
-      expect(screen.getByRole('button', { name: /attach file options/i })).toBeInTheDocument();
+    it('should handle empty string agentId', () => {
+      renderAttachFileMenu({
+        agentId: '',
+        endpointType: EModelEndpoint.openAI,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      expect(button).toBeInTheDocument();
+    });
+  });
+
+  describe('Google Provider Special Case', () => {
+    it('should use image_document_video_audio file type for Google provider', () => {
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: EModelEndpoint.google,
+      });
+
+      renderAttachFileMenu({
+        endpoint: EModelEndpoint.google,
+        endpointType: EModelEndpoint.google,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
+      const uploadProviderButton = screen.getByText('Upload to Provider');
+      expect(uploadProviderButton).toBeInTheDocument();
+
+      // Click the upload to provider option
+      fireEvent.click(uploadProviderButton);
+
+      // The file input should have been clicked (indirectly tested through the implementation)
+    });
+
+    it('should use image_document file type for non-Google providers', () => {
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: EModelEndpoint.openAI,
+      });
+
+      renderAttachFileMenu({
+        endpoint: EModelEndpoint.openAI,
+        endpointType: EModelEndpoint.openAI,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
+      const uploadProviderButton = screen.getByText('Upload to Provider');
+      expect(uploadProviderButton).toBeInTheDocument();
+      fireEvent.click(uploadProviderButton);
+
+      // Implementation detail - image_document type is used
+    });
+  });
+
+  describe('Regression Tests', () => {
+    it('should not break the previous behavior for direct provider attachments', () => {
+      // When using a direct supported provider (not through a gateway)
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: EModelEndpoint.anthropic,
+      });
+
+      renderAttachFileMenu({
+        endpoint: EModelEndpoint.anthropic,
+        endpointType: EModelEndpoint.anthropic,
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
+      expect(screen.getByText('Upload to Provider')).toBeInTheDocument();
+    });
+
+    it('should maintain correct priority when both are supported', () => {
+      // Both endpointType and provider are supported, endpointType should be checked first
+      mockUseAgentToolPermissions.mockReturnValue({
+        fileSearchAllowedByAgent: false,
+        codeAllowedByAgent: false,
+        provider: EModelEndpoint.google,
+      });
+
+      renderAttachFileMenu({
+        endpoint: EModelEndpoint.google,
+        endpointType: EModelEndpoint.openAI, // Different but both supported
+      });
+
+      const button = screen.getByRole('button', { name: /attach file options/i });
+      fireEvent.click(button);
+
+      // Should still work because endpointType (openAI) is supported
+      expect(screen.getByText('Upload to Provider')).toBeInTheDocument();
     });
   });
 });

client/src/components/Chat/Input/Files/__tests__/FileRow.spec.tsx

@@ -21,7 +21,6 @@ jest.mock('~/utils', () => ({
   logger: {
     log: jest.fn(),
   },
-  getCachedPreview: jest.fn(() => undefined),
 }));
 
 jest.mock('../Image', () => {
@@ -96,7 +95,7 @@ describe('FileRow', () => {
   };
 
   describe('Image URL Selection Logic', () => {
-    it('should prefer cached preview over filepath when upload is complete', () => {
+    it('should use filepath instead of preview when progress is 1 (upload complete)', () => {
       const file = createMockFile({
         file_id: 'uploaded-file',
         preview: 'blob:http://localhost:3080/temp-preview',
@@ -110,7 +109,8 @@ describe('FileRow', () => {
       renderFileRow(filesMap);
 
       const imageUrl = screen.getByTestId('image-url').textContent;
-      expect(imageUrl).toBe('blob:http://localhost:3080/temp-preview');
+      expect(imageUrl).toBe('/images/user123/uploaded-file__image.png');
+      expect(imageUrl).not.toContain('blob:');
     });
 
     it('should use preview when progress is less than 1 (uploading)', () => {
@@ -147,7 +147,7 @@ describe('FileRow', () => {
       expect(imageUrl).toBe('/images/user123/file-without-preview__image.png');
     });
 
-    it('should prefer preview over filepath when both exist and progress is 1', () => {
+    it('should use filepath when both preview and filepath exist and progress is exactly 1', () => {
       const file = createMockFile({
         file_id: 'complete-file',
         preview: 'blob:http://localhost:3080/old-blob',
@@ -161,7 +161,7 @@ describe('FileRow', () => {
       renderFileRow(filesMap);
 
       const imageUrl = screen.getByTestId('image-url').textContent;
-      expect(imageUrl).toBe('blob:http://localhost:3080/old-blob');
+      expect(imageUrl).toBe('/images/user123/complete-file__image.png');
     });
   });
 
@@ -284,7 +284,7 @@ describe('FileRow', () => {
 
       const urls = screen.getAllByTestId('image-url').map((el) => el.textContent);
       expect(urls).toContain('blob:http://localhost:3080/preview-1');
-      expect(urls).toContain('blob:http://localhost:3080/preview-2');
+      expect(urls).toContain('/images/user123/file-2__image.png');
     });
 
     it('should deduplicate files with the same file_id', () => {
@@ -321,10 +321,10 @@ describe('FileRow', () => {
     });
   });
 
-  describe('Preview Cache Integration', () => {
-    it('should prefer preview blob URL over filepath for zero-flicker rendering', () => {
+  describe('Regression: Blob URL Bug Fix', () => {
+    it('should NOT use revoked blob URL after upload completes', () => {
       const file = createMockFile({
-        file_id: 'cache-test',
+        file_id: 'regression-test',
         preview: 'blob:http://localhost:3080/d25f730c-152d-41f7-8d79-c9fa448f606b',
         filepath:
           '/images/68c98b26901ebe2d87c193a2/c0fe1b93-ba3d-456c-80be-9a492bfd9ed0__image.png',
@@ -337,24 +337,8 @@ describe('FileRow', () => {
       renderFileRow(filesMap);
 
       const imageUrl = screen.getByTestId('image-url').textContent;
-      expect(imageUrl).toBe('blob:http://localhost:3080/d25f730c-152d-41f7-8d79-c9fa448f606b');
-    });
 
-    it('should fall back to filepath when no preview exists', () => {
-      const file = createMockFile({
-        file_id: 'no-preview',
-        preview: undefined,
-        filepath:
-          '/images/68c98b26901ebe2d87c193a2/c0fe1b93-ba3d-456c-80be-9a492bfd9ed0__image.png',
-        progress: 1,
-      });
-
-      const filesMap = new Map<string, ExtendedFile>();
-      filesMap.set(file.file_id, file);
-
-      renderFileRow(filesMap);
-
-      const imageUrl = screen.getByTestId('image-url').textContent;
+      expect(imageUrl).not.toContain('blob:');
       expect(imageUrl).toBe(
         '/images/68c98b26901ebe2d87c193a2/c0fe1b93-ba3d-456c-80be-9a492bfd9ed0__image.png',
       );

client/src/components/Chat/Input/Mention.tsx

@@ -2,10 +2,11 @@ import { useState, useRef, useEffect } from 'react';
 import { useCombobox } from '@librechat/client';
 import { AutoSizer, List } from 'react-virtualized';
 import { EModelEndpoint } from 'librechat-data-provider';
+import type { TConversation } from 'librechat-data-provider';
 import type { MentionOption, ConvoGenerator } from '~/common';
 import type { SetterOrUpdater } from 'recoil';
-import { useGetConversation, useLocalize, TranslationKeys } from '~/hooks';
 import useSelectMention from '~/hooks/Input/useSelectMention';
+import { useLocalize, TranslationKeys } from '~/hooks';
 import { useAssistantsMapContext } from '~/Providers';
 import useMentions from '~/hooks/Input/useMentions';
 import { removeCharIfLast } from '~/utils';
@@ -14,6 +15,7 @@ import MentionItem from './MentionItem';
 const ROW_HEIGHT = 44;
 
 export default function Mention({
+  conversation,
   setShowMentionPopover,
   newConversation,
   textAreaRef,
@@ -21,6 +23,7 @@ export default function Mention({
   placeholder = 'com_ui_mention',
   includeAssistants = true,
 }: {
+  conversation: TConversation | null;
   setShowMentionPopover: SetterOrUpdater<boolean>;
   newConversation: ConvoGenerator;
   textAreaRef: React.MutableRefObject<HTMLTextAreaElement | null>;
@@ -29,7 +32,6 @@ export default function Mention({
   includeAssistants?: boolean;
 }) {
   const localize = useLocalize();
-  const getConversation = useGetConversation(0);
   const assistantsMap = useAssistantsMapContext();
   const {
     options,
@@ -43,9 +45,9 @@ export default function Mention({
   const { onSelectMention } = useSelectMention({
     presets,
     modelSpecs,
+    conversation,
     assistantsMap,
     endpointsConfig,
-    getConversation,
     newConversation,
   });
 

client/src/components/Chat/Menus/Endpoints/ModelSelectorChatContext.tsx

@@ -1,9 +1,6 @@
-import React, { createContext, useCallback, useContext, useMemo, useRef } from 'react';
-import { useRecoilValue } from 'recoil';
+import React, { createContext, useContext, useMemo } from 'react';
 import type { EModelEndpoint, TConversation } from 'librechat-data-provider';
-import type { ConvoGenerator } from '~/common';
-import { useGetConversation, useNewConvo } from '~/hooks';
-import store from '~/store';
+import { useChatContext } from '~/Providers/ChatContext';
 
 interface ModelSelectorChatContextValue {
   endpoint?: EModelEndpoint | null;
@@ -11,8 +8,8 @@ interface ModelSelectorChatContextValue {
   spec?: string | null;
   agent_id?: string | null;
   assistant_id?: string | null;
-  getConversation: () => TConversation | null;
-  newConversation: ConvoGenerator;
+  conversation: TConversation | null;
+  newConversation: ReturnType<typeof useChatContext>['newConversation'];
 }
 
 const ModelSelectorChatContext = createContext<ModelSelectorChatContextValue | undefined>(
@@ -20,34 +17,20 @@ const ModelSelectorChatContext = createContext<ModelSelectorChatContextValue | u
 );
 
 export function ModelSelectorChatProvider({ children }: { children: React.ReactNode }) {
-  const getConversation = useGetConversation(0);
-  const { newConversation: nextNewConversation } = useNewConvo();
-
-  const spec = useRecoilValue(store.conversationSpecByIndex(0));
-  const model = useRecoilValue(store.conversationModelByIndex(0));
-  const agent_id = useRecoilValue(store.conversationAgentIdByIndex(0));
-  const endpoint = useRecoilValue(store.conversationEndpointByIndex(0));
-  const assistant_id = useRecoilValue(store.conversationAssistantIdByIndex(0));
-
-  const newConversationRef = useRef(nextNewConversation);
-  newConversationRef.current = nextNewConversation;
-  const newConversation = useCallback<ConvoGenerator>(
-    (params) => newConversationRef.current(params),
-    [],
-  );
+  const { conversation, newConversation } = useChatContext();
 
   /** Context value only created when relevant conversation properties change */
   const contextValue = useMemo<ModelSelectorChatContextValue>(
     () => ({
-      model,
-      spec,
-      agent_id,
-      endpoint,
-      assistant_id,
-      getConversation,
+      endpoint: conversation?.endpoint,
+      model: conversation?.model,
+      spec: conversation?.spec,
+      agent_id: conversation?.agent_id,
+      assistant_id: conversation?.assistant_id,
+      conversation,
       newConversation,
     }),
-    [endpoint, model, spec, agent_id, assistant_id, getConversation, newConversation],
+    [conversation, newConversation],
   );
 
   return (

client/src/components/Chat/Menus/Endpoints/ModelSelectorContext.tsx

@@ -58,7 +58,7 @@ export function ModelSelectorProvider({ children, startupConfig }: ModelSelector
   const agentsMap = useAgentsMapContext();
   const assistantsMap = useAssistantsMapContext();
   const { data: endpointsConfig } = useGetEndpointsQuery();
-  const { endpoint, model, spec, agent_id, assistant_id, getConversation, newConversation } =
+  const { endpoint, model, spec, agent_id, assistant_id, conversation, newConversation } =
     useModelSelectorChatContext();
   const localize = useLocalize();
   const { announcePolite } = useLiveAnnouncer();
@@ -114,7 +114,7 @@ export function ModelSelectorProvider({ children, startupConfig }: ModelSelector
   const { onSelectEndpoint, onSelectSpec } = useSelectMention({
     // presets,
     modelSpecs,
-    getConversation,
+    conversation,
     assistantsMap,
     endpointsConfig,
     newConversation,
@@ -171,115 +171,90 @@ export function ModelSelectorProvider({ children, startupConfig }: ModelSelector
       }, 200),
     [],
   );
-  const setEndpointSearchValue = useCallback((endpoint: string, value: string) => {
+  const setEndpointSearchValue = (endpoint: string, value: string) => {
     setEndpointSearchValues((prev) => ({
       ...prev,
       [endpoint]: value,
     }));
-  }, []);
+  };
 
-  const handleSelectSpec = useCallback(
-    (spec: t.TModelSpec) => {
-      let model = spec.preset.model ?? null;
-      onSelectSpec?.(spec);
-      if (isAgentsEndpoint(spec.preset.endpoint)) {
-        model = spec.preset.agent_id ?? '';
-      } else if (isAssistantsEndpoint(spec.preset.endpoint)) {
-        model = spec.preset.assistant_id ?? '';
-      }
-      setSelectedValues({
-        endpoint: spec.preset.endpoint,
-        model,
-        modelSpec: spec.name,
-      });
-    },
-    [onSelectSpec],
-  );
+  const handleSelectSpec = (spec: t.TModelSpec) => {
+    let model = spec.preset.model ?? null;
+    onSelectSpec?.(spec);
+    if (isAgentsEndpoint(spec.preset.endpoint)) {
+      model = spec.preset.agent_id ?? '';
+    } else if (isAssistantsEndpoint(spec.preset.endpoint)) {
+      model = spec.preset.assistant_id ?? '';
+    }
+    setSelectedValues({
+      endpoint: spec.preset.endpoint,
+      model,
+      modelSpec: spec.name,
+    });
+  };
 
-  const handleSelectEndpoint = useCallback(
-    (endpoint: Endpoint) => {
-      if (!endpoint.hasModels) {
-        if (endpoint.value) {
-          onSelectEndpoint?.(endpoint.value);
-        }
-        setSelectedValues({
-          endpoint: endpoint.value,
-          model: '',
-          modelSpec: '',
-        });
-      }
-    },
-    [onSelectEndpoint],
-  );
-
-  const handleSelectModel = useCallback(
-    (endpoint: Endpoint, model: string) => {
-      if (isAgentsEndpoint(endpoint.value)) {
-        onSelectEndpoint?.(endpoint.value, {
-          agent_id: model,
-          model: agentsMap?.[model]?.model ?? '',
-        });
-      } else if (isAssistantsEndpoint(endpoint.value)) {
-        onSelectEndpoint?.(endpoint.value, {
-          assistant_id: model,
-          model: assistantsMap?.[endpoint.value]?.[model]?.model ?? '',
-        });
-      } else if (endpoint.value) {
-        onSelectEndpoint?.(endpoint.value, { model });
+  const handleSelectEndpoint = (endpoint: Endpoint) => {
+    if (!endpoint.hasModels) {
+      if (endpoint.value) {
+        onSelectEndpoint?.(endpoint.value);
       }
       setSelectedValues({
         endpoint: endpoint.value,
-        model,
+        model: '',
         modelSpec: '',
       });
+    }
+  };
 
-      const modelDisplayName = getModelDisplayName(endpoint, model);
-      const announcement = localize('com_ui_model_selected', { 0: modelDisplayName });
-      announcePolite({ message: announcement, isStatus: true });
-    },
-    [agentsMap, announcePolite, assistantsMap, getModelDisplayName, localize, onSelectEndpoint],
-  );
+  const handleSelectModel = (endpoint: Endpoint, model: string) => {
+    if (isAgentsEndpoint(endpoint.value)) {
+      onSelectEndpoint?.(endpoint.value, {
+        agent_id: model,
+        model: agentsMap?.[model]?.model ?? '',
+      });
+    } else if (isAssistantsEndpoint(endpoint.value)) {
+      onSelectEndpoint?.(endpoint.value, {
+        assistant_id: model,
+        model: assistantsMap?.[endpoint.value]?.[model]?.model ?? '',
+      });
+    } else if (endpoint.value) {
+      onSelectEndpoint?.(endpoint.value, { model });
+    }
+    setSelectedValues({
+      endpoint: endpoint.value,
+      model,
+      modelSpec: '',
+    });
 
-  const value = useMemo(
-    () => ({
-      searchValue,
-      searchResults,
-      selectedValues,
-      endpointSearchValues,
-      agentsMap,
-      modelSpecs,
-      assistantsMap,
-      mappedEndpoints,
-      endpointsConfig,
-      handleSelectSpec,
-      handleSelectModel,
-      setSelectedValues,
-      handleSelectEndpoint,
-      setEndpointSearchValue,
-      endpointRequiresUserKey,
-      setSearchValue: setDebouncedSearchValue,
-      ...keyProps,
-    }),
-    [
-      searchValue,
-      searchResults,
-      selectedValues,
-      endpointSearchValues,
-      agentsMap,
-      modelSpecs,
-      assistantsMap,
-      mappedEndpoints,
-      endpointsConfig,
-      handleSelectSpec,
-      handleSelectModel,
-      setSelectedValues,
-      handleSelectEndpoint,
-      setEndpointSearchValue,
-      endpointRequiresUserKey,
-      setDebouncedSearchValue,
-      keyProps,
-    ],
-  );
+    const modelDisplayName = getModelDisplayName(endpoint, model);
+    const announcement = localize('com_ui_model_selected', { 0: modelDisplayName });
+    announcePolite({ message: announcement, isStatus: true });
+  };
+
+  const value = {
+    // State
+    searchValue,
+    searchResults,
+    selectedValues,
+    endpointSearchValues,
+    // LibreChat
+    agentsMap,
+    modelSpecs,
+    assistantsMap,
+    mappedEndpoints,
+    endpointsConfig,
+
+    // Functions
+    handleSelectSpec,
+    handleSelectModel,
+    setSelectedValues,
+    handleSelectEndpoint,
+    setEndpointSearchValue,
+    endpointRequiresUserKey,
+    setSearchValue: setDebouncedSearchValue,
+    // Dialog
+    ...keyProps,
+  };
 
   return <ModelSelectorContext.Provider value={value}>{children}</ModelSelectorContext.Provider>;
 }

client/src/components/Chat/Menus/HeaderNewChat.tsx

@@ -1,16 +1,14 @@
 import { QueryKeys } from 'librechat-data-provider';
-import { useRecoilValue } from 'recoil';
 import { useQueryClient } from '@tanstack/react-query';
 import { TooltipAnchor, Button, NewChatIcon } from '@librechat/client';
-import { useNewConvo, useLocalize } from '~/hooks';
+import { useChatContext } from '~/Providers';
 import { clearMessagesCache } from '~/utils';
-import store from '~/store';
+import { useLocalize } from '~/hooks';
 
 export default function HeaderNewChat() {
   const localize = useLocalize();
   const queryClient = useQueryClient();
-  const { newConversation } = useNewConvo();
-  const conversation = useRecoilValue(store.conversationByIndex(0));
+  const { conversation, newConversation } = useChatContext();
 
   const clickHandler: React.MouseEventHandler<HTMLButtonElement> = (e) => {
     if (e.button === 0 && (e.ctrlKey || e.metaKey)) {

client/src/components/Chat/Menus/PresetsMenu.tsx

@@ -1,5 +1,4 @@
 import { useRef } from 'react';
-import { useRecoilValue } from 'recoil';
 import { Trans } from 'react-i18next';
 import { BookCopy } from 'lucide-react';
 import { Content, Portal, Root, Trigger } from '@radix-ui/react-popover';
@@ -14,7 +13,7 @@ import {
 import type { FC } from 'react';
 import { EditPresetDialog, PresetItems } from './Presets';
 import { useLocalize, usePresets } from '~/hooks';
-import store from '~/store';
+import { useChatContext } from '~/Providers';
 
 const PresetsMenu: FC = () => {
   const localize = useLocalize();
@@ -34,7 +33,7 @@ const PresetsMenu: FC = () => {
     presetToDelete,
     confirmDeletePreset,
   } = usePresets();
-  const preset = useRecoilValue(store.presetByIndex(0));
+  const { preset } = useChatContext();
 
   const handleDeleteDialogChange = (open: boolean) => {
     setShowDeleteDialog(open);

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

@@ -15,61 +15,6 @@ import Sources from '~/components/Web/Sources';
 import Container from './Container';
 import Part from './Part';
 
-type PartWithContextProps = {
-  part: TMessageContentParts;
-  idx: number;
-  isLastPart: boolean;
-  messageId: string;
-  conversationId?: string | null;
-  nextType?: string;
-  isSubmitting: boolean;
-  isLatestMessage?: boolean;
-  isCreatedByUser: boolean;
-  isLast: boolean;
-  partAttachments: TAttachment[] | undefined;
-};
-
-const PartWithContext = memo(function PartWithContext({
-  part,
-  idx,
-  isLastPart,
-  messageId,
-  conversationId,
-  nextType,
-  isSubmitting,
-  isLatestMessage,
-  isCreatedByUser,
-  isLast,
-  partAttachments,
-}: PartWithContextProps) {
-  const contextValue = useMemo(
-    () => ({
-      messageId,
-      isExpanded: true as const,
-      conversationId,
-      partIndex: idx,
-      nextType,
-      isSubmitting,
-      isLatestMessage,
-    }),
-    [messageId, conversationId, idx, nextType, isSubmitting, isLatestMessage],
-  );
-
-  return (
-    <MessageContext.Provider value={contextValue}>
-      <Part
-        part={part}
-        attachments={partAttachments}
-        isSubmitting={isSubmitting}
-        key={`part-${messageId}-${idx}`}
-        isCreatedByUser={isCreatedByUser}
-        isLast={isLastPart}
-        showCursor={isLastPart && isLast}
-      />
-    </MessageContext.Provider>
-  );
-});
-
 type ContentPartsProps = {
   content: Array<TMessageContentParts | undefined> | undefined;
   messageId: string;
@@ -113,24 +58,37 @@ const ContentParts = memo(function ContentParts({
   const attachmentMap = useMemo(() => mapAttachments(attachments ?? []), [attachments]);
   const effectiveIsSubmitting = isLatestMessage ? isSubmitting : false;
 
+  /**
+   * Render a single content part with proper context.
+   */
   const renderPart = useCallback(
     (part: TMessageContentParts, idx: number, isLastPart: boolean) => {
       const toolCallId = (part?.[ContentTypes.TOOL_CALL] as Agents.ToolCall | undefined)?.id ?? '';
+      const partAttachments = attachmentMap[toolCallId];
+
       return (
-        <PartWithContext
+        <MessageContext.Provider
           key={`provider-${messageId}-${idx}`}
-          idx={idx}
-          part={part}
-          isLast={isLast}
-          messageId={messageId}
-          isLastPart={isLastPart}
-          conversationId={conversationId}
-          isLatestMessage={isLatestMessage}
-          isCreatedByUser={isCreatedByUser}
-          nextType={content?.[idx + 1]?.type}
-          isSubmitting={effectiveIsSubmitting}
-          partAttachments={attachmentMap[toolCallId]}
-        />
+          value={{
+            messageId,
+            isExpanded: true,
+            conversationId,
+            partIndex: idx,
+            nextType: content?.[idx + 1]?.type,
+            isSubmitting: effectiveIsSubmitting,
+            isLatestMessage,
+          }}
+        >
+          <Part
+            part={part}
+            attachments={partAttachments}
+            isSubmitting={effectiveIsSubmitting}
+            key={`part-${messageId}-${idx}`}
+            isCreatedByUser={isCreatedByUser}
+            isLast={isLastPart}
+            showCursor={isLastPart && isLast}
+          />
+        </MessageContext.Provider>
       );
     },
     [

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

@@ -4,8 +4,6 @@ import { Button, TooltipAnchor } from '@librechat/client';
 import { X, ArrowDownToLine, PanelLeftOpen, PanelLeftClose, RotateCcw } from 'lucide-react';
 import { useLocalize } from '~/hooks';
 
-const imageSizeCache = new Map<string, string>();
-
 const getQualityStyles = (quality: string): string => {
   if (quality === 'high') {
     return 'bg-green-100 text-green-800';
@@ -52,26 +50,18 @@ export default function DialogImage({
   const closeButtonRef = useRef<HTMLButtonElement>(null);
 
   const getImageSize = useCallback(async (url: string) => {
-    const cached = imageSizeCache.get(url);
-    if (cached) {
-      return cached;
-    }
     try {
       const response = await fetch(url, { method: 'HEAD' });
       const contentLength = response.headers.get('Content-Length');
 
       if (contentLength) {
         const bytes = parseInt(contentLength, 10);
-        const result = formatFileSize(bytes);
-        imageSizeCache.set(url, result);
-        return result;
+        return formatFileSize(bytes);
       }
 
       const fullResponse = await fetch(url);
       const blob = await fullResponse.blob();
-      const result = formatFileSize(blob.size);
-      imageSizeCache.set(url, result);
-      return result;
+      return formatFileSize(blob.size);
     } catch (error) {
       console.error('Error getting image size:', error);
       return null;
@@ -365,7 +355,6 @@ export default function DialogImage({
                   ref={imageRef}
                   src={src}
                   alt="Image"
-                  decoding="async"
                   className="block max-h-[85vh] object-contain"
                   style={{
                     maxWidth: getImageMaxWidth(),

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

@@ -1,7 +1,6 @@
 import { useMemo, memo } from 'react';
 import type { TFile, TMessage } from 'librechat-data-provider';
 import FileContainer from '~/components/Chat/Input/Files/FileContainer';
-import { getCachedPreview } from '~/utils';
 import Image from './Image';
 
 const Files = ({ message }: { message?: TMessage }) => {
@@ -18,18 +17,21 @@ const Files = ({ message }: { message?: TMessage }) => {
       {otherFiles.length > 0 &&
         otherFiles.map((file) => <FileContainer key={file.file_id} file={file as TFile} />)}
       {imageFiles.length > 0 &&
-        imageFiles.map((file) => {
-          const cached = file.file_id ? getCachedPreview(file.file_id) : undefined;
-          return (
-            <Image
-              key={file.file_id}
-              width={file.width}
-              height={file.height}
-              altText={file.filename ?? 'Uploaded Image'}
-              imagePath={cached ?? file.preview ?? file.filepath ?? ''}
-            />
-          );
-        })}
+        imageFiles.map((file) => (
+          <Image
+            key={file.file_id}
+            imagePath={file.preview ?? file.filepath ?? ''}
+            height={file.height ?? 1920}
+            width={file.width ?? 1080}
+            altText={file.filename ?? 'Uploaded Image'}
+            placeholderDimensions={{
+              height: `${file.height ?? 1920}px`,
+              width: `${file.height ?? 1080}px`,
+            }}
+            // n={imageFiles.length}
+            // i={i}
+          />
+        ))}
     </>
   );
 };

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

@@ -1,39 +1,27 @@
-import React, { useState, useRef, useMemo, useEffect } from 'react';
+import React, { useState, useRef, useMemo } from 'react';
 import { Skeleton } from '@librechat/client';
+import { LazyLoadImage } from 'react-lazy-load-image-component';
 import { apiBaseUrl } from 'librechat-data-provider';
+import { cn, scaleImage } from '~/utils';
 import DialogImage from './DialogImage';
-import { cn } from '~/utils';
-
-/** Max display height for chat images (Tailwind JIT class) */
-export const IMAGE_MAX_H = 'max-h-[45vh]' as const;
-/** Matches the `max-w-lg` Tailwind class on the wrapper button (32rem = 512px at 16px base) */
-const IMAGE_MAX_W_PX = 512;
-
-/** Caches image dimensions by src so remounts can reserve space */
-const dimensionCache = new Map<string, { width: number; height: number }>();
-/** Tracks URLs that have been fully painted — skip skeleton on remount */
-const paintedUrls = new Set<string>();
-
-/** Test-only: resets module-level caches */
-export function _resetImageCaches(): void {
-  dimensionCache.clear();
-  paintedUrls.clear();
-}
-
-function computeHeightStyle(w: number, h: number): React.CSSProperties {
-  return { height: `min(45vh, ${(h / w) * 100}vw, ${(h / w) * IMAGE_MAX_W_PX}px)` };
-}
 
 const Image = ({
   imagePath,
   altText,
+  height,
+  width,
+  placeholderDimensions,
   className,
   args,
-  width,
-  height,
 }: {
   imagePath: string;
   altText: string;
+  height: number;
+  width: number;
+  placeholderDimensions?: {
+    height?: string;
+    width?: string;
+  };
   className?: string;
   args?: {
     prompt?: string;
@@ -42,15 +30,19 @@ const Image = ({
     style?: string;
     [key: string]: unknown;
   };
-  width?: number;
-  height?: number;
 }) => {
   const [isOpen, setIsOpen] = useState(false);
+  const [isLoaded, setIsLoaded] = useState(false);
+  const containerRef = useRef<HTMLDivElement>(null);
   const triggerRef = useRef<HTMLButtonElement>(null);
 
+  const handleImageLoad = () => setIsLoaded(true);
+
+  // Fix image path to include base path for subdirectory deployments
   const absoluteImageUrl = useMemo(() => {
     if (!imagePath) return imagePath;
 
+    // If it's already an absolute URL or doesn't start with /images/, return as is
     if (
       imagePath.startsWith('http') ||
       imagePath.startsWith('data:') ||
@@ -59,10 +51,21 @@ const Image = ({
       return imagePath;
     }
 
+    // Get the base URL and prepend it to the image path
     const baseURL = apiBaseUrl();
     return `${baseURL}${imagePath}`;
   }, [imagePath]);
 
+  const { width: scaledWidth, height: scaledHeight } = useMemo(
+    () =>
+      scaleImage({
+        originalWidth: Number(placeholderDimensions?.width?.split('px')[0] ?? width),
+        originalHeight: Number(placeholderDimensions?.height?.split('px')[0] ?? height),
+        containerRef,
+      }),
+    [placeholderDimensions, height, width],
+  );
+
   const downloadImage = async () => {
     try {
       const response = await fetch(absoluteImageUrl);
@@ -92,19 +95,8 @@ const Image = ({
     }
   };
 
-  useEffect(() => {
-    if (width && height && absoluteImageUrl) {
-      dimensionCache.set(absoluteImageUrl, { width, height });
-    }
-  }, [absoluteImageUrl, width, height]);
-
-  const dims = width && height ? { width, height } : dimensionCache.get(absoluteImageUrl);
-  const hasDimensions = !!(dims?.width && dims?.height);
-  const heightStyle = hasDimensions ? computeHeightStyle(dims.width, dims.height) : undefined;
-  const showSkeleton = hasDimensions && !paintedUrls.has(absoluteImageUrl);
-
   return (
-    <div>
+    <div ref={containerRef}>
       <button
         ref={triggerRef}
         type="button"
@@ -112,33 +104,45 @@ const Image = ({
         aria-haspopup="dialog"
         onClick={() => setIsOpen(true)}
         className={cn(
-          'relative mt-1 w-full max-w-lg cursor-pointer overflow-hidden rounded-lg border border-border-light text-text-secondary-alt shadow-md transition-shadow',
+          'relative mt-1 flex h-auto w-full max-w-lg cursor-pointer items-center justify-center overflow-hidden rounded-lg border border-border-light text-text-secondary-alt shadow-md transition-shadow',
           'focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-surface-primary',
           className,
         )}
-        style={heightStyle}
       >
-        {showSkeleton && <Skeleton className="absolute inset-0" aria-hidden="true" />}
-        <img
+        <LazyLoadImage
           alt={altText}
-          src={absoluteImageUrl}
-          onLoad={() => paintedUrls.add(absoluteImageUrl)}
+          onLoad={handleImageLoad}
+          visibleByDefault={true}
           className={cn(
-            'relative block text-transparent',
-            hasDimensions
-              ? 'size-full object-contain'
-              : cn('h-auto w-auto max-w-full', IMAGE_MAX_H),
+            'opacity-100 transition-opacity duration-100',
+            isLoaded ? 'opacity-100' : 'opacity-0',
           )}
+          src={absoluteImageUrl}
+          style={{
+            width: `${scaledWidth}`,
+            height: 'auto',
+            color: 'transparent',
+            display: 'block',
+          }}
+          placeholder={
+            <Skeleton
+              className={cn('h-auto w-full', `h-[${scaledHeight}] w-[${scaledWidth}]`)}
+              aria-label="Loading image"
+              aria-busy="true"
+            />
+          }
         />
       </button>
-      <DialogImage
-        isOpen={isOpen}
-        onOpenChange={setIsOpen}
-        src={absoluteImageUrl}
-        downloadImage={downloadImage}
-        args={args}
-        triggerRef={triggerRef}
-      />
+      {isLoaded && (
+        <DialogImage
+          isOpen={isOpen}
+          onOpenChange={setIsOpen}
+          src={absoluteImageUrl}
+          downloadImage={downloadImage}
+          args={args}
+          triggerRef={triggerRef}
+        />
+      )}
     </div>
   );
 };

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

@@ -27,7 +27,7 @@ type TContentProps = {
   isLatestMessage: boolean;
 };
 
-const Markdown = memo(function Markdown({ content = '', isLatestMessage }: TContentProps) {
+const Markdown = memo(({ content = '', isLatestMessage }: TContentProps) => {
   const LaTeXParsing = useRecoilValue<boolean>(store.LaTeXParsing);
   const isInitializing = content === '';
 
@@ -106,6 +106,5 @@ const Markdown = memo(function Markdown({ content = '', isLatestMessage }: TCont
     </MarkdownErrorBoundary>
   );
 });
-Markdown.displayName = 'Markdown';
 
 export default Markdown;

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

@@ -18,10 +18,7 @@ type TCodeProps = {
   children: React.ReactNode;
 };
 
-export const code: React.ElementType = memo(function MarkdownCode({
-  className,
-  children,
-}: TCodeProps) {
+export const code: React.ElementType = memo(({ className, children }: TCodeProps) => {
   const canRunCode = useHasAccess({
     permissionType: PermissionTypes.RUN_CODE,
     permission: Permissions.USE,
@@ -65,12 +62,8 @@ export const code: React.ElementType = memo(function MarkdownCode({
     );
   }
 });
-code.displayName = 'MarkdownCode';
 
-export const codeNoExecution: React.ElementType = memo(function MarkdownCodeNoExecution({
-  className,
-  children,
-}: TCodeProps) {
+export const codeNoExecution: React.ElementType = memo(({ className, children }: TCodeProps) => {
   const match = /language-(\w+)/.exec(className ?? '');
   const lang = match && match[1];
 
@@ -89,14 +82,13 @@ export const codeNoExecution: React.ElementType = memo(function MarkdownCodeNoEx
     return <CodeBlock lang={lang ?? 'text'} codeChildren={children} allowExecution={false} />;
   }
 });
-codeNoExecution.displayName = 'MarkdownCodeNoExecution';
 
 type TAnchorProps = {
   href: string;
   children: React.ReactNode;
 };
 
-export const a: React.ElementType = memo(function MarkdownAnchor({ href, children }: TAnchorProps) {
+export const a: React.ElementType = memo(({ href, children }: TAnchorProps) => {
   const user = useRecoilValue(store.user);
   const { showToast } = useToastContext();
   const localize = useLocalize();
@@ -171,16 +163,14 @@ export const a: React.ElementType = memo(function MarkdownAnchor({ href, childre
     </a>
   );
 });
-a.displayName = 'MarkdownAnchor';
 
 type TParagraphProps = {
   children: React.ReactNode;
 };
 
-export const p: React.ElementType = memo(function MarkdownParagraph({ children }: TParagraphProps) {
+export const p: React.ElementType = memo(({ children }: TParagraphProps) => {
   return <p className="mb-2 whitespace-pre-wrap">{children}</p>;
 });
-p.displayName = 'MarkdownParagraph';
 
 type TImageProps = {
   src?: string;
@@ -190,13 +180,7 @@ type TImageProps = {
   style?: React.CSSProperties;
 };
 
-export const img: React.ElementType = memo(function MarkdownImage({
-  src,
-  alt,
-  title,
-  className,
-  style,
-}: TImageProps) {
+export const img: React.ElementType = memo(({ src, alt, title, className, style }: TImageProps) => {
   // Get the base URL from the API endpoints
   const baseURL = apiBaseUrl();
 
@@ -215,4 +199,3 @@ export const img: React.ElementType = memo(function MarkdownImage({
 
   return <img src={fixedSrc} alt={alt} title={title} className={className} style={style} />;
 });
-img.displayName = 'MarkdownImage';

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

@@ -185,7 +185,4 @@ const MessageContent = ({
   );
 };
 
-const MemoizedMessageContent = memo(MessageContent);
-MemoizedMessageContent.displayName = 'MessageContent';
-
-export default MemoizedMessageContent;
+export default memo(MessageContent);

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

@@ -11,7 +11,6 @@ import type { TMessageContentParts, TAttachment } from 'librechat-data-provider'
 import { OpenAIImageGen, EmptyText, Reasoning, ExecuteCode, AgentUpdate, Text } from './Parts';
 import { ErrorMessage } from './MessageContent';
 import RetrievalCall from './RetrievalCall';
-import { getCachedPreview } from '~/utils';
 import AgentHandoff from './AgentHandoff';
 import CodeAnalyze from './CodeAnalyze';
 import Container from './Container';
@@ -29,213 +28,212 @@ type PartProps = {
   attachments?: TAttachment[];
 };
 
-const Part = memo(function Part({
-  part,
-  isSubmitting,
-  attachments,
-  isLast,
-  showCursor,
-  isCreatedByUser,
-}: PartProps) {
-  if (!part) {
-    return null;
-  }
-
-  if (part.type === ContentTypes.ERROR) {
-    return (
-      <ErrorMessage
-        text={
-          part[ContentTypes.ERROR] ??
-          (typeof part[ContentTypes.TEXT] === 'string'
-            ? part[ContentTypes.TEXT]
-            : part.text?.value) ??
-          ''
-        }
-        className="my-2"
-      />
-    );
-  } else if (part.type === ContentTypes.AGENT_UPDATE) {
-    return (
-      <>
-        <AgentUpdate currentAgentId={part[ContentTypes.AGENT_UPDATE]?.agentId} />
-        {isLast && showCursor && (
-          <Container>
-            <EmptyText />
-          </Container>
-        )}
-      </>
-    );
-  } else if (part.type === ContentTypes.TEXT) {
-    const text = typeof part.text === 'string' ? part.text : part.text?.value;
-
-    if (typeof text !== 'string') {
+const Part = memo(
+  ({ part, isSubmitting, attachments, isLast, showCursor, isCreatedByUser }: PartProps) => {
+    if (!part) {
       return null;
     }
-    if (part.tool_call_ids != null && !text) {
-      return null;
-    }
-    /** Handle whitespace-only text to avoid layout shift */
-    if (text.length > 0 && /^\s*$/.test(text)) {
-      /** Show placeholder for whitespace-only last part during streaming */
-      if (isLast && showCursor) {
-        return (
-          <Container>
-            <EmptyText />
-          </Container>
-        );
-      }
-      /** Skip rendering non-last whitespace-only parts to avoid empty Container */
-      if (!isLast) {
+
+    if (part.type === ContentTypes.ERROR) {
+      return (
+        <ErrorMessage
+          text={
+            part[ContentTypes.ERROR] ??
+            (typeof part[ContentTypes.TEXT] === 'string'
+              ? part[ContentTypes.TEXT]
+              : part.text?.value) ??
+            ''
+          }
+          className="my-2"
+        />
+      );
+    } else if (part.type === ContentTypes.AGENT_UPDATE) {
+      return (
+        <>
+          <AgentUpdate currentAgentId={part[ContentTypes.AGENT_UPDATE]?.agentId} />
+          {isLast && showCursor && (
+            <Container>
+              <EmptyText />
+            </Container>
+          )}
+        </>
+      );
+    } else if (part.type === ContentTypes.TEXT) {
+      const text = typeof part.text === 'string' ? part.text : part.text?.value;
+
+      if (typeof text !== 'string') {
         return null;
       }
-    }
-    return (
-      <Container>
-        <Text text={text} isCreatedByUser={isCreatedByUser} showCursor={showCursor} />
-      </Container>
-    );
-  } else if (part.type === ContentTypes.THINK) {
-    const reasoning = typeof part.think === 'string' ? part.think : part.think?.value;
-    if (typeof reasoning !== 'string') {
-      return null;
-    }
-    return <Reasoning reasoning={reasoning} isLast={isLast ?? false} />;
-  } else if (part.type === ContentTypes.TOOL_CALL) {
-    const toolCall = part[ContentTypes.TOOL_CALL];
-
-    if (!toolCall) {
-      return null;
-    }
-
-    const isToolCall =
-      'args' in toolCall && (!toolCall.type || toolCall.type === ToolCallTypes.TOOL_CALL);
-    if (
-      isToolCall &&
-      (toolCall.name === Tools.execute_code ||
-        toolCall.name === Constants.PROGRAMMATIC_TOOL_CALLING)
-    ) {
-      return (
-        <ExecuteCode
-          attachments={attachments}
-          isSubmitting={isSubmitting}
-          output={toolCall.output ?? ''}
-          initialProgress={toolCall.progress ?? 0.1}
-          args={typeof toolCall.args === 'string' ? toolCall.args : ''}
-        />
-      );
-    } else if (
-      isToolCall &&
-      (toolCall.name === 'image_gen_oai' ||
-        toolCall.name === 'image_edit_oai' ||
-        toolCall.name === 'gemini_image_gen')
-    ) {
-      return (
-        <OpenAIImageGen
-          initialProgress={toolCall.progress ?? 0.1}
-          isSubmitting={isSubmitting}
-          toolName={toolCall.name}
-          args={typeof toolCall.args === 'string' ? toolCall.args : ''}
-          output={toolCall.output ?? ''}
-          attachments={attachments}
-        />
-      );
-    } else if (isToolCall && toolCall.name === Tools.web_search) {
-      return (
-        <WebSearch
-          output={toolCall.output ?? ''}
-          initialProgress={toolCall.progress ?? 0.1}
-          isSubmitting={isSubmitting}
-          attachments={attachments}
-          isLast={isLast}
-        />
-      );
-    } else if (isToolCall && toolCall.name?.startsWith(Constants.LC_TRANSFER_TO_)) {
-      return (
-        <AgentHandoff
-          args={toolCall.args ?? ''}
-          name={toolCall.name || ''}
-          output={toolCall.output ?? ''}
-        />
-      );
-    } else if (isToolCall) {
-      return (
-        <ToolCall
-          args={toolCall.args ?? ''}
-          name={toolCall.name || ''}
-          output={toolCall.output ?? ''}
-          initialProgress={toolCall.progress ?? 0.1}
-          isSubmitting={isSubmitting}
-          attachments={attachments}
-          auth={toolCall.auth}
-          expires_at={toolCall.expires_at}
-          isLast={isLast}
-        />
-      );
-    } else if (toolCall.type === ToolCallTypes.CODE_INTERPRETER) {
-      const code_interpreter = toolCall[ToolCallTypes.CODE_INTERPRETER];
-      return (
-        <CodeAnalyze
-          initialProgress={toolCall.progress ?? 0.1}
-          code={code_interpreter.input}
-          outputs={code_interpreter.outputs ?? []}
-        />
-      );
-    } else if (
-      toolCall.type === ToolCallTypes.RETRIEVAL ||
-      toolCall.type === ToolCallTypes.FILE_SEARCH
-    ) {
-      return (
-        <RetrievalCall initialProgress={toolCall.progress ?? 0.1} isSubmitting={isSubmitting} />
-      );
-    } else if (
-      toolCall.type === ToolCallTypes.FUNCTION &&
-      ToolCallTypes.FUNCTION in toolCall &&
-      imageGenTools.has(toolCall.function.name)
-    ) {
-      return (
-        <ImageGen
-          initialProgress={toolCall.progress ?? 0.1}
-          args={toolCall.function.arguments as string}
-        />
-      );
-    } else if (toolCall.type === ToolCallTypes.FUNCTION && ToolCallTypes.FUNCTION in toolCall) {
-      if (isImageVisionTool(toolCall)) {
-        if (isSubmitting && showCursor) {
+      if (part.tool_call_ids != null && !text) {
+        return null;
+      }
+      /** Handle whitespace-only text to avoid layout shift */
+      if (text.length > 0 && /^\s*$/.test(text)) {
+        /** Show placeholder for whitespace-only last part during streaming */
+        if (isLast && showCursor) {
           return (
             <Container>
-              <Text text={''} isCreatedByUser={isCreatedByUser} showCursor={showCursor} />
+              <EmptyText />
             </Container>
           );
         }
+        /** Skip rendering non-last whitespace-only parts to avoid empty Container */
+        if (!isLast) {
+          return null;
+        }
+      }
+      return (
+        <Container>
+          <Text text={text} isCreatedByUser={isCreatedByUser} showCursor={showCursor} />
+        </Container>
+      );
+    } else if (part.type === ContentTypes.THINK) {
+      const reasoning = typeof part.think === 'string' ? part.think : part.think?.value;
+      if (typeof reasoning !== 'string') {
+        return null;
+      }
+      return <Reasoning reasoning={reasoning} isLast={isLast ?? false} />;
+    } else if (part.type === ContentTypes.TOOL_CALL) {
+      const toolCall = part[ContentTypes.TOOL_CALL];
+
+      if (!toolCall) {
         return null;
       }
 
+      const isToolCall =
+        'args' in toolCall && (!toolCall.type || toolCall.type === ToolCallTypes.TOOL_CALL);
+      if (
+        isToolCall &&
+        (toolCall.name === Tools.execute_code ||
+          toolCall.name === Constants.PROGRAMMATIC_TOOL_CALLING)
+      ) {
+        return (
+          <ExecuteCode
+            attachments={attachments}
+            isSubmitting={isSubmitting}
+            output={toolCall.output ?? ''}
+            initialProgress={toolCall.progress ?? 0.1}
+            args={typeof toolCall.args === 'string' ? toolCall.args : ''}
+          />
+        );
+      } else if (
+        isToolCall &&
+        (toolCall.name === 'image_gen_oai' ||
+          toolCall.name === 'image_edit_oai' ||
+          toolCall.name === 'gemini_image_gen')
+      ) {
+        return (
+          <OpenAIImageGen
+            initialProgress={toolCall.progress ?? 0.1}
+            isSubmitting={isSubmitting}
+            toolName={toolCall.name}
+            args={typeof toolCall.args === 'string' ? toolCall.args : ''}
+            output={toolCall.output ?? ''}
+            attachments={attachments}
+          />
+        );
+      } else if (isToolCall && toolCall.name === Tools.web_search) {
+        return (
+          <WebSearch
+            output={toolCall.output ?? ''}
+            initialProgress={toolCall.progress ?? 0.1}
+            isSubmitting={isSubmitting}
+            attachments={attachments}
+            isLast={isLast}
+          />
+        );
+      } else if (isToolCall && toolCall.name?.startsWith(Constants.LC_TRANSFER_TO_)) {
+        return (
+          <AgentHandoff
+            args={toolCall.args ?? ''}
+            name={toolCall.name || ''}
+            output={toolCall.output ?? ''}
+          />
+        );
+      } else if (isToolCall) {
+        return (
+          <ToolCall
+            args={toolCall.args ?? ''}
+            name={toolCall.name || ''}
+            output={toolCall.output ?? ''}
+            initialProgress={toolCall.progress ?? 0.1}
+            isSubmitting={isSubmitting}
+            attachments={attachments}
+            auth={toolCall.auth}
+            expires_at={toolCall.expires_at}
+            isLast={isLast}
+          />
+        );
+      } else if (toolCall.type === ToolCallTypes.CODE_INTERPRETER) {
+        const code_interpreter = toolCall[ToolCallTypes.CODE_INTERPRETER];
+        return (
+          <CodeAnalyze
+            initialProgress={toolCall.progress ?? 0.1}
+            code={code_interpreter.input}
+            outputs={code_interpreter.outputs ?? []}
+          />
+        );
+      } else if (
+        toolCall.type === ToolCallTypes.RETRIEVAL ||
+        toolCall.type === ToolCallTypes.FILE_SEARCH
+      ) {
+        return (
+          <RetrievalCall initialProgress={toolCall.progress ?? 0.1} isSubmitting={isSubmitting} />
+        );
+      } else if (
+        toolCall.type === ToolCallTypes.FUNCTION &&
+        ToolCallTypes.FUNCTION in toolCall &&
+        imageGenTools.has(toolCall.function.name)
+      ) {
+        return (
+          <ImageGen
+            initialProgress={toolCall.progress ?? 0.1}
+            args={toolCall.function.arguments as string}
+          />
+        );
+      } else if (toolCall.type === ToolCallTypes.FUNCTION && ToolCallTypes.FUNCTION in toolCall) {
+        if (isImageVisionTool(toolCall)) {
+          if (isSubmitting && showCursor) {
+            return (
+              <Container>
+                <Text text={''} isCreatedByUser={isCreatedByUser} showCursor={showCursor} />
+              </Container>
+            );
+          }
+          return null;
+        }
+
+        return (
+          <ToolCall
+            initialProgress={toolCall.progress ?? 0.1}
+            isSubmitting={isSubmitting}
+            args={toolCall.function.arguments as string}
+            name={toolCall.function.name}
+            output={toolCall.function.output}
+            isLast={isLast}
+          />
+        );
+      }
+    } else if (part.type === ContentTypes.IMAGE_FILE) {
+      const imageFile = part[ContentTypes.IMAGE_FILE];
+      const height = imageFile.height ?? 1920;
+      const width = imageFile.width ?? 1080;
       return (
-        <ToolCall
-          initialProgress={toolCall.progress ?? 0.1}
-          isSubmitting={isSubmitting}
-          args={toolCall.function.arguments as string}
-          name={toolCall.function.name}
-          output={toolCall.function.output}
-          isLast={isLast}
+        <Image
+          imagePath={imageFile.filepath}
+          height={height}
+          width={width}
+          altText={imageFile.filename ?? 'Uploaded Image'}
+          placeholderDimensions={{
+            height: height + 'px',
+            width: width + 'px',
+          }}
         />
       );
     }
-  } else if (part.type === ContentTypes.IMAGE_FILE) {
-    const imageFile = part[ContentTypes.IMAGE_FILE];
-    const cached = imageFile.file_id ? getCachedPreview(imageFile.file_id) : undefined;
-    return (
-      <Image
-        imagePath={cached ?? imageFile.filepath}
-        altText={imageFile.filename ?? 'Uploaded Image'}
-        width={imageFile.width}
-        height={imageFile.height}
-      />
-    );
-  }
 
-  return null;
-});
-Part.displayName = 'Part';
+    return null;
+  },
+);
 
 export default Part;

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

@@ -76,8 +76,8 @@ const ImageAttachment = memo(({ attachment }: { attachment: TAttachment }) => {
       <Image
         altText={attachment.filename || 'attachment image'}
         imagePath={filepath ?? ''}
-        width={width}
-        height={height}
+        height={height ?? 0}
+        width={width ?? 0}
         className="mb-4"
       />
     </div>

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

@@ -1,9 +1,8 @@
 import { memo } from 'react';
 
-/** Streaming cursor placeholder — no bottom margin to match Container's structure and prevent CLS */
 const EmptyTextPart = memo(() => {
   return (
-    <div className="text-message flex min-h-[20px] flex-col items-start gap-3 overflow-visible">
+    <div className="text-message mb-[0.625rem] flex min-h-[20px] flex-col items-start gap-3 overflow-visible">
       <div className="markdown prose dark:prose-invert light w-full break-words dark:text-gray-100">
         <div className="absolute">
           <p className="submitting relative">

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

@@ -12,7 +12,11 @@ interface LogContentProps {
   attachments?: TAttachment[];
 }
 
-type ImageAttachment = TFile & TAttachmentMetadata;
+type ImageAttachment = TFile &
+  TAttachmentMetadata & {
+    height: number;
+    width: number;
+  };
 
 const LogContent: React.FC<LogContentProps> = ({ output = '', renderImages, attachments }) => {
   const localize = useLocalize();
@@ -31,8 +35,12 @@ const LogContent: React.FC<LogContentProps> = ({ output = '', renderImages, atta
     const nonImageAtts: TAttachment[] = [];
 
     attachments?.forEach((attachment) => {
-      const { filepath = null } = attachment as TFile & TAttachmentMetadata;
-      const isImage = imageExtRegex.test(attachment.filename ?? '') && filepath != null;
+      const { width, height, filepath = null } = attachment as TFile & TAttachmentMetadata;
+      const isImage =
+        imageExtRegex.test(attachment.filename ?? '') &&
+        width != null &&
+        height != null &&
+        filepath != null;
       if (isImage) {
         imageAtts.push(attachment as ImageAttachment);
       } else {
@@ -92,15 +100,18 @@ const LogContent: React.FC<LogContentProps> = ({ output = '', renderImages, atta
           ))}
         </div>
       )}
-      {imageAttachments?.map((attachment) => (
-        <Image
-          width={attachment.width}
-          height={attachment.height}
-          key={attachment.filepath}
-          altText={attachment.filename}
-          imagePath={attachment.filepath}
-        />
-      ))}
+      {imageAttachments?.map((attachment, index) => {
+        const { width, height, filepath } = attachment;
+        return (
+          <Image
+            key={index}
+            altText={attachment.filename}
+            imagePath={filepath}
+            height={height}
+            width={width}
+          />
+        );
+      })}
     </>
   );
 };

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

@@ -1,12 +1,9 @@
-import { useState, useEffect, useRef } from 'react';
+import { useState, useEffect, useRef, useCallback } from 'react';
 import { PixelCard } from '@librechat/client';
 import type { TAttachment, TFile, TAttachmentMetadata } from 'librechat-data-provider';
 import Image from '~/components/Chat/Messages/Content/Image';
 import ProgressText from './ProgressText';
-import { cn } from '~/utils';
-
-const IMAGE_MAX_H = 'max-h-[45vh]' as const;
-const IMAGE_FULL_H = 'h-[45vh]' as const;
+import { scaleImage } from '~/utils';
 
 export default function OpenAIImageGen({
   initialProgress = 0.1,
@@ -31,6 +28,8 @@ export default function OpenAIImageGen({
 
   const cancelled = (!isSubmitting && initialProgress < 1) || error === true;
 
+  let width: number | undefined;
+  let height: number | undefined;
   let quality: 'low' | 'medium' | 'high' = 'high';
 
   // Parse args if it's a string
@@ -42,21 +41,62 @@ export default function OpenAIImageGen({
     parsedArgs = {};
   }
 
-  if (parsedArgs && typeof parsedArgs.quality === 'string') {
-    const q = parsedArgs.quality.toLowerCase();
-    if (q === 'low' || q === 'medium' || q === 'high') {
-      quality = q;
+  try {
+    const argsObj = parsedArgs;
+
+    if (argsObj && typeof argsObj.size === 'string') {
+      const [w, h] = argsObj.size.split('x').map((v: string) => parseInt(v, 10));
+      if (!isNaN(w) && !isNaN(h)) {
+        width = w;
+        height = h;
+      }
+    } else if (argsObj && (typeof argsObj.size !== 'string' || !argsObj.size)) {
+      width = undefined;
+      height = undefined;
     }
+
+    if (argsObj && typeof argsObj.quality === 'string') {
+      const q = argsObj.quality.toLowerCase();
+      if (q === 'low' || q === 'medium' || q === 'high') {
+        quality = q;
+      }
+    }
+  } catch (e) {
+    width = undefined;
+    height = undefined;
   }
 
+  // Default to 1024x1024 if width and height are still undefined after parsing args and attachment metadata
   const attachment = attachments?.[0];
   const {
+    width: imageWidth,
+    height: imageHeight,
     filepath = null,
     filename = '',
-    width: imgWidth,
-    height: imgHeight,
   } = (attachment as TFile & TAttachmentMetadata) || {};
 
+  let origWidth = width ?? imageWidth;
+  let origHeight = height ?? imageHeight;
+
+  if (origWidth === undefined || origHeight === undefined) {
+    origWidth = 1024;
+    origHeight = 1024;
+  }
+
+  const [dimensions, setDimensions] = useState({ width: 'auto', height: 'auto' });
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  const updateDimensions = useCallback(() => {
+    if (origWidth && origHeight && containerRef.current) {
+      const scaled = scaleImage({
+        originalWidth: origWidth,
+        originalHeight: origHeight,
+        containerRef,
+      });
+      setDimensions(scaled);
+    }
+  }, [origWidth, origHeight]);
+
   useEffect(() => {
     if (isSubmitting) {
       setProgress(initialProgress);
@@ -116,21 +156,45 @@ export default function OpenAIImageGen({
     }
   }, [initialProgress, cancelled]);
 
+  useEffect(() => {
+    updateDimensions();
+
+    const resizeObserver = new ResizeObserver(() => {
+      updateDimensions();
+    });
+
+    if (containerRef.current) {
+      resizeObserver.observe(containerRef.current);
+    }
+
+    return () => {
+      resizeObserver.disconnect();
+    };
+  }, [updateDimensions]);
+
   return (
     <>
       <div className="relative my-2.5 flex size-5 shrink-0 items-center gap-2.5">
         <ProgressText progress={progress} error={cancelled} toolName={toolName} />
       </div>
-      <div className={cn('relative mb-2 flex w-full max-w-lg justify-start', IMAGE_MAX_H)}>
-        <div className={cn('overflow-hidden', progress < 1 ? [IMAGE_FULL_H, 'w-full'] : 'w-auto')}>
-          {progress < 1 && <PixelCard variant="default" progress={progress} randomness={0.6} />}
+      <div className="relative mb-2 flex w-full justify-start">
+        <div ref={containerRef} className="w-full max-w-lg">
+          {dimensions.width !== 'auto' && progress < 1 && (
+            <PixelCard
+              variant="default"
+              progress={progress}
+              randomness={0.6}
+              width={dimensions.width}
+              height={dimensions.height}
+            />
+          )}
           <Image
-            width={imgWidth}
-            args={parsedArgs}
-            height={imgHeight}
             altText={filename}
             imagePath={filepath ?? ''}
-            className={progress < 1 ? 'invisible absolute' : ''}
+            width={Number(dimensions.width?.split('px')[0])}
+            height={Number(dimensions.height?.split('px')[0])}
+            placeholderDimensions={{ width: dimensions.width, height: dimensions.height }}
+            args={parsedArgs}
           />
         </div>
       </div>

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

@@ -17,7 +17,7 @@ type ContentType =
   | ReactElement<React.ComponentProps<typeof MarkdownLite>>
   | ReactElement;
 
-const TextPart = memo(function TextPart({ text, isCreatedByUser, showCursor }: TextPartProps) {
+const TextPart = memo(({ text, isCreatedByUser, showCursor }: TextPartProps) => {
   const { isSubmitting = false, isLatestMessage = false } = useMessageContext();
   const enableUserMsgMarkdown = useRecoilValue(store.enableUserMsgMarkdown);
   const showCursorState = useMemo(() => showCursor && isSubmitting, [showCursor, isSubmitting]);
@@ -46,6 +46,5 @@ const TextPart = memo(function TextPart({ text, isCreatedByUser, showCursor }: T
     </div>
   );
 });
-TextPart.displayName = 'TextPart';
 
 export default TextPart;

client/src/components/Chat/Messages/Content/__tests__/Image.test.tsx

@@ -1,179 +0,0 @@
-import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
-import Image, { _resetImageCaches } from '../Image';
-
-jest.mock('~/utils', () => ({
-  cn: (...classes: (string | boolean | undefined | null)[]) =>
-    classes
-      .flat(Infinity)
-      .filter((c): c is string => typeof c === 'string' && c.length > 0)
-      .join(' '),
-}));
-
-jest.mock('librechat-data-provider', () => ({
-  apiBaseUrl: () => '',
-}));
-
-jest.mock('@librechat/client', () => ({
-  Skeleton: ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-    <div data-testid="skeleton" className={className} {...props} />
-  ),
-}));
-
-jest.mock('../DialogImage', () => ({
-  __esModule: true,
-  default: ({ isOpen, src }: { isOpen: boolean; src: string }) =>
-    isOpen ? <div data-testid="dialog-image" data-src={src} /> : null,
-}));
-
-describe('Image', () => {
-  const defaultProps = {
-    imagePath: '/images/test.png',
-    altText: 'Test image',
-  };
-
-  beforeEach(() => {
-    _resetImageCaches();
-    jest.clearAllMocks();
-  });
-
-  describe('rendering without dimensions', () => {
-    it('renders with max-h-[45vh] height constraint', () => {
-      render(<Image {...defaultProps} />);
-      const img = screen.getByRole('img');
-      expect(img.className).toContain('max-h-[45vh]');
-    });
-
-    it('renders with max-w-full to prevent landscape clipping', () => {
-      render(<Image {...defaultProps} />);
-      const img = screen.getByRole('img');
-      expect(img.className).toContain('max-w-full');
-    });
-
-    it('renders with w-auto and h-auto for natural aspect ratio', () => {
-      render(<Image {...defaultProps} />);
-      const img = screen.getByRole('img');
-      expect(img.className).toContain('w-auto');
-      expect(img.className).toContain('h-auto');
-    });
-
-    it('does not show skeleton without dimensions', () => {
-      render(<Image {...defaultProps} />);
-      expect(screen.queryByTestId('skeleton')).not.toBeInTheDocument();
-    });
-
-    it('does not apply heightStyle without dimensions', () => {
-      render(<Image {...defaultProps} />);
-      const button = screen.getByRole('button');
-      expect(button.style.height).toBeFalsy();
-    });
-  });
-
-  describe('rendering with dimensions', () => {
-    it('shows skeleton behind image', () => {
-      render(<Image {...defaultProps} width={1024} height={1792} />);
-      expect(screen.getByTestId('skeleton')).toBeInTheDocument();
-    });
-
-    it('applies computed heightStyle to button', () => {
-      render(<Image {...defaultProps} width={1024} height={1792} />);
-      const button = screen.getByRole('button');
-      expect(button.style.height).toBeTruthy();
-      expect(button.style.height).toContain('min(45vh');
-    });
-
-    it('uses size-full object-contain on image when dimensions provided', () => {
-      render(<Image {...defaultProps} width={768} height={916} />);
-      const img = screen.getByRole('img');
-      expect(img.className).toContain('size-full');
-      expect(img.className).toContain('object-contain');
-    });
-
-    it('skeleton is absolute inset-0', () => {
-      render(<Image {...defaultProps} width={512} height={512} />);
-      const skeleton = screen.getByTestId('skeleton');
-      expect(skeleton.className).toContain('absolute');
-      expect(skeleton.className).toContain('inset-0');
-    });
-
-    it('marks URL as painted on load and skips skeleton on rerender', () => {
-      const { rerender } = render(<Image {...defaultProps} width={512} height={512} />);
-      const img = screen.getByRole('img');
-
-      expect(screen.getByTestId('skeleton')).toBeInTheDocument();
-
-      fireEvent.load(img);
-
-      // Rerender same component — skeleton should not show (URL painted)
-      rerender(<Image {...defaultProps} width={512} height={512} />);
-      expect(screen.queryByTestId('skeleton')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('common behavior', () => {
-    it('applies custom className to the button wrapper', () => {
-      render(<Image {...defaultProps} className="mb-4" />);
-      const button = screen.getByRole('button');
-      expect(button.className).toContain('mb-4');
-    });
-
-    it('sets correct alt text', () => {
-      render(<Image {...defaultProps} />);
-      const img = screen.getByRole('img');
-      expect(img).toHaveAttribute('alt', 'Test image');
-    });
-
-    it('has correct accessibility attributes on button', () => {
-      render(<Image {...defaultProps} />);
-      const button = screen.getByRole('button');
-      expect(button).toHaveAttribute('aria-label', 'View Test image in dialog');
-      expect(button).toHaveAttribute('aria-haspopup', 'dialog');
-    });
-  });
-
-  describe('dialog interaction', () => {
-    it('opens dialog on button click', () => {
-      render(<Image {...defaultProps} />);
-      expect(screen.queryByTestId('dialog-image')).not.toBeInTheDocument();
-
-      const button = screen.getByRole('button');
-      fireEvent.click(button);
-
-      expect(screen.getByTestId('dialog-image')).toBeInTheDocument();
-    });
-
-    it('dialog is always mounted (not gated by load state)', () => {
-      render(<Image {...defaultProps} />);
-      // DialogImage mock returns null when isOpen=false, but the component is in the tree
-      // Clicking should immediately show it
-      fireEvent.click(screen.getByRole('button'));
-      expect(screen.getByTestId('dialog-image')).toBeInTheDocument();
-    });
-  });
-
-  describe('image URL resolution', () => {
-    it('passes /images/ paths through with base URL', () => {
-      render(<Image {...defaultProps} imagePath="/images/test.png" />);
-      const img = screen.getByRole('img');
-      expect(img).toHaveAttribute('src', '/images/test.png');
-    });
-
-    it('passes absolute http URLs through unchanged', () => {
-      render(<Image {...defaultProps} imagePath="https://example.com/photo.jpg" />);
-      const img = screen.getByRole('img');
-      expect(img).toHaveAttribute('src', 'https://example.com/photo.jpg');
-    });
-
-    it('passes data URIs through unchanged', () => {
-      render(<Image {...defaultProps} imagePath="data:image/png;base64,abc" />);
-      const img = screen.getByRole('img');
-      expect(img).toHaveAttribute('src', 'data:image/png;base64,abc');
-    });
-
-    it('passes non-/images/ paths through unchanged', () => {
-      render(<Image {...defaultProps} imagePath="/other/path.png" />);
-      const img = screen.getByRole('img');
-      expect(img).toHaveAttribute('src', '/other/path.png');
-    });
-  });
-});

client/src/components/Chat/Messages/Content/__tests__/OpenAIImageGen.test.tsx

@@ -1,182 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import OpenAIImageGen from '../Parts/OpenAIImageGen/OpenAIImageGen';
-
-jest.mock('~/utils', () => ({
-  cn: (...classes: (string | boolean | undefined | null)[]) =>
-    classes
-      .flat(Infinity)
-      .filter((c): c is string => typeof c === 'string' && c.length > 0)
-      .join(' '),
-}));
-
-jest.mock('~/hooks', () => ({
-  useLocalize: () => (key: string) => key,
-}));
-
-jest.mock('~/components/Chat/Messages/Content/Image', () => ({
-  __esModule: true,
-  default: ({
-    altText,
-    imagePath,
-    className,
-  }: {
-    altText: string;
-    imagePath: string;
-    className?: string;
-  }) => (
-    <div
-      data-testid="image-component"
-      data-alt={altText}
-      data-src={imagePath}
-      className={className}
-    />
-  ),
-}));
-
-jest.mock('@librechat/client', () => ({
-  PixelCard: ({ progress }: { progress: number }) => (
-    <div data-testid="pixel-card" data-progress={progress} />
-  ),
-}));
-
-jest.mock('../Parts/OpenAIImageGen/ProgressText', () => ({
-  __esModule: true,
-  default: ({ progress, error }: { progress: number; error: boolean }) => (
-    <div data-testid="progress-text" data-progress={progress} data-error={String(error)} />
-  ),
-}));
-
-describe('OpenAIImageGen', () => {
-  const defaultProps = {
-    initialProgress: 0.1,
-    isSubmitting: true,
-    toolName: 'image_gen_oai',
-    args: '{"prompt":"a cat","quality":"high","size":"1024x1024"}',
-    output: null as string | null,
-    attachments: undefined,
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    jest.useFakeTimers();
-  });
-
-  afterEach(() => {
-    jest.useRealTimers();
-  });
-
-  describe('image preloading', () => {
-    it('keeps Image mounted during generation (progress < 1)', () => {
-      render(<OpenAIImageGen {...defaultProps} initialProgress={0.5} />);
-      expect(screen.getByTestId('image-component')).toBeInTheDocument();
-    });
-
-    it('hides Image with invisible absolute while progress < 1', () => {
-      render(<OpenAIImageGen {...defaultProps} initialProgress={0.5} />);
-      const image = screen.getByTestId('image-component');
-      expect(image.className).toContain('invisible');
-      expect(image.className).toContain('absolute');
-    });
-
-    it('shows Image without hiding classes when progress >= 1', () => {
-      render(
-        <OpenAIImageGen
-          {...defaultProps}
-          initialProgress={1}
-          isSubmitting={false}
-          attachments={[
-            {
-              filename: 'cat.png',
-              filepath: '/images/cat.png',
-              conversationId: 'conv1',
-            } as never,
-          ]}
-        />,
-      );
-      const image = screen.getByTestId('image-component');
-      expect(image.className).not.toContain('invisible');
-      expect(image.className).not.toContain('absolute');
-    });
-  });
-
-  describe('PixelCard visibility', () => {
-    it('shows PixelCard when progress < 1', () => {
-      render(<OpenAIImageGen {...defaultProps} initialProgress={0.5} />);
-      expect(screen.getByTestId('pixel-card')).toBeInTheDocument();
-    });
-
-    it('hides PixelCard when progress >= 1', () => {
-      render(<OpenAIImageGen {...defaultProps} initialProgress={1} isSubmitting={false} />);
-      expect(screen.queryByTestId('pixel-card')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('layout classes', () => {
-    it('applies max-h-[45vh] to the outer container', () => {
-      const { container } = render(<OpenAIImageGen {...defaultProps} />);
-      const outerDiv = container.querySelector('[class*="max-h-"]');
-      expect(outerDiv?.className).toContain('max-h-[45vh]');
-    });
-
-    it('applies h-[45vh] w-full to inner container during loading', () => {
-      const { container } = render(<OpenAIImageGen {...defaultProps} initialProgress={0.5} />);
-      const innerDiv = container.querySelector('[class*="h-[45vh]"]');
-      expect(innerDiv).not.toBeNull();
-      expect(innerDiv?.className).toContain('w-full');
-    });
-
-    it('applies w-auto to inner container when complete', () => {
-      const { container } = render(
-        <OpenAIImageGen {...defaultProps} initialProgress={1} isSubmitting={false} />,
-      );
-      const overflowDiv = container.querySelector('[class*="overflow-hidden"]');
-      expect(overflowDiv?.className).toContain('w-auto');
-    });
-  });
-
-  describe('args parsing', () => {
-    it('parses quality from args', () => {
-      render(<OpenAIImageGen {...defaultProps} />);
-      expect(screen.getByTestId('progress-text')).toBeInTheDocument();
-    });
-
-    it('handles invalid JSON args gracefully', () => {
-      const consoleSpy = jest.spyOn(console, 'error').mockImplementation();
-      render(<OpenAIImageGen {...defaultProps} args="invalid json" />);
-      expect(screen.getByTestId('image-component')).toBeInTheDocument();
-      consoleSpy.mockRestore();
-    });
-
-    it('handles object args', () => {
-      render(
-        <OpenAIImageGen
-          {...defaultProps}
-          args={{ prompt: 'a dog', quality: 'low', size: '512x512' }}
-        />,
-      );
-      expect(screen.getByTestId('image-component')).toBeInTheDocument();
-    });
-  });
-
-  describe('cancellation', () => {
-    it('shows error state when output contains error', () => {
-      render(
-        <OpenAIImageGen
-          {...defaultProps}
-          output="Error processing tool call"
-          isSubmitting={false}
-          initialProgress={0.5}
-        />,
-      );
-      const progressText = screen.getByTestId('progress-text');
-      expect(progressText).toHaveAttribute('data-error', 'true');
-    });
-
-    it('shows cancelled state when not submitting and incomplete', () => {
-      render(<OpenAIImageGen {...defaultProps} isSubmitting={false} initialProgress={0.5} />);
-      const progressText = screen.getByTestId('progress-text');
-      expect(progressText).toHaveAttribute('data-error', 'true');
-    });
-  });
-});

client/src/components/Chat/Messages/HoverButtons.tsx

@@ -18,7 +18,7 @@ type THoverButtons = {
   message: TMessage;
   regenerate: () => void;
   handleContinue: (e: React.MouseEvent<HTMLButtonElement>) => void;
-  latestMessageId?: string;
+  latestMessage: TMessage | null;
   isLast: boolean;
   index: number;
   handleFeedback?: ({ feedback }: { feedback: TFeedback | undefined }) => void;
@@ -119,7 +119,7 @@ const HoverButtons = ({
   message,
   regenerate,
   handleContinue,
-  latestMessageId,
+  latestMessage,
   isLast,
   handleFeedback,
 }: THoverButtons) => {
@@ -143,7 +143,7 @@ const HoverButtons = ({
     searchResult: message.searchResult,
     finish_reason: message.finish_reason,
     isCreatedByUser: message.isCreatedByUser,
-    latestMessageId: latestMessageId,
+    latestMessageId: latestMessage?.messageId,
   });
 
   const {
@@ -239,7 +239,7 @@ const HoverButtons = ({
         messageId={message.messageId}
         conversationId={conversation.conversationId}
         forkingSupported={forkingSupported}
-        latestMessageId={latestMessageId}
+        latestMessageId={latestMessage?.messageId}
         isLast={isLast}
       />
 

client/src/components/Chat/Messages/Message.tsx

@@ -4,23 +4,25 @@ import type { TMessageProps } from '~/common';
 import MessageRender from './ui/MessageRender';
 import MultiMessage from './MultiMessage';
 
-const MessageContainer = React.memo(function MessageContainer({
-  handleScroll,
-  children,
-}: {
-  handleScroll: (event?: unknown) => void;
-  children: React.ReactNode;
-}) {
-  return (
-    <div
-      className="text-token-text-primary w-full border-0 bg-transparent dark:border-0 dark:bg-transparent"
-      onWheel={handleScroll}
-      onTouchMove={handleScroll}
-    >
-      {children}
-    </div>
-  );
-});
+const MessageContainer = React.memo(
+  ({
+    handleScroll,
+    children,
+  }: {
+    handleScroll: (event?: unknown) => void;
+    children: React.ReactNode;
+  }) => {
+    return (
+      <div
+        className="text-token-text-primary w-full border-0 bg-transparent dark:border-0 dark:bg-transparent"
+        onWheel={handleScroll}
+        onTouchMove={handleScroll}
+      >
+        {children}
+      </div>
+    );
+  },
+);
 
 export default function Message(props: TMessageProps) {
   const { conversation, handleScroll } = useMessageProcess({

client/src/components/Chat/Messages/MessageParts.tsx

@@ -32,7 +32,7 @@ export default function Message(props: TMessageProps) {
     handleScroll,
     conversation,
     isSubmitting,
-    latestMessageId,
+    latestMessage,
     handleContinue,
     copyToClipboard,
     regenerateMessage,
@@ -129,7 +129,7 @@ export default function Message(props: TMessageProps) {
                 </h2>
               )}
               <div className="flex flex-col gap-1">
-                <div className="flex min-h-[20px] max-w-full flex-grow flex-col gap-0">
+                <div className="flex max-w-full flex-grow flex-col gap-0">
                   <ContentParts
                     edit={edit}
                     isLast={isLast}
@@ -142,12 +142,12 @@ export default function Message(props: TMessageProps) {
                     setSiblingIdx={setSiblingIdx}
                     isCreatedByUser={message.isCreatedByUser}
                     conversationId={conversation?.conversationId}
-                    isLatestMessage={messageId === latestMessageId}
+                    isLatestMessage={messageId === latestMessage?.messageId}
                     content={message.content as Array<TMessageContentParts | undefined>}
                   />
                 </div>
                 {isLast && isSubmitting ? (
-                  <div className="mt-1 h-[31px] bg-transparent" />
+                  <div className="mt-1 h-[27px] bg-transparent" />
                 ) : (
                   <SubRow classes="text-xs">
                     <SiblingSwitch
@@ -165,7 +165,7 @@ export default function Message(props: TMessageProps) {
                       regenerate={() => regenerateMessage()}
                       copyToClipboard={copyToClipboard}
                       handleContinue={handleContinue}
-                      latestMessageId={latestMessageId}
+                      latestMessage={latestMessage}
                       isLast={isLast}
                     />
                   </SubRow>

client/src/components/Chat/Messages/ui/MessageRender.tsx

@@ -4,11 +4,11 @@ import { useRecoilValue } from 'recoil';
 import { type TMessage } from 'librechat-data-provider';
 import type { TMessageProps, TMessageIcon } from '~/common';
 import MessageContent from '~/components/Chat/Messages/Content/MessageContent';
-import { useLocalize, useMessageActions, useContentMetadata } from '~/hooks';
 import PlaceholderRow from '~/components/Chat/Messages/ui/PlaceholderRow';
 import SiblingSwitch from '~/components/Chat/Messages/SiblingSwitch';
 import HoverButtons from '~/components/Chat/Messages/HoverButtons';
 import MessageIcon from '~/components/Chat/Messages/MessageIcon';
+import { useLocalize, useMessageActions, useContentMetadata } from '~/hooks';
 import SubRow from '~/components/Chat/Messages/SubRow';
 import { cn, getMessageAriaLabel } from '~/utils';
 import { fontSizeAtom } from '~/store/fontSize';
@@ -23,183 +23,180 @@ type MessageRenderProps = {
   'currentEditId' | 'setCurrentEditId' | 'siblingIdx' | 'setSiblingIdx' | 'siblingCount'
 >;
 
-const MessageRender = memo(function MessageRender({
-  message: msg,
-  siblingIdx,
-  siblingCount,
-  setSiblingIdx,
-  currentEditId,
-  setCurrentEditId,
-  isSubmitting = false,
-}: MessageRenderProps) {
-  const localize = useLocalize();
-  const {
-    ask,
-    edit,
-    index,
-    agent,
-    assistant,
-    enterEdit,
-    conversation,
-    messageLabel,
-    handleFeedback,
-    handleContinue,
-    latestMessageId,
-    copyToClipboard,
-    regenerateMessage,
-    latestMessageDepth,
-  } = useMessageActions({
+const MessageRender = memo(
+  ({
     message: msg,
+    siblingIdx,
+    siblingCount,
+    setSiblingIdx,
     currentEditId,
     setCurrentEditId,
-  });
-  const fontSize = useAtomValue(fontSizeAtom);
-  const maximizeChatSpace = useRecoilValue(store.maximizeChatSpace);
-
-  const handleRegenerateMessage = useCallback(() => regenerateMessage(), [regenerateMessage]);
-  const hasNoChildren = !(msg?.children?.length ?? 0);
-  const isLast = useMemo(
-    () => hasNoChildren && (msg?.depth === latestMessageDepth || msg?.depth === -1),
-    [hasNoChildren, msg?.depth, latestMessageDepth],
-  );
-  const isLatestMessage = msg?.messageId === latestMessageId;
-  /** Only pass isSubmitting to the latest message to prevent unnecessary re-renders */
-  const effectiveIsSubmitting = isLatestMessage ? isSubmitting : false;
-
-  const iconData: TMessageIcon = useMemo(
-    () => ({
-      endpoint: msg?.endpoint ?? conversation?.endpoint,
-      model: msg?.model ?? conversation?.model,
-      iconURL: msg?.iconURL,
-      modelLabel: messageLabel,
-      isCreatedByUser: msg?.isCreatedByUser,
-    }),
-    [
+    isSubmitting = false,
+  }: MessageRenderProps) => {
+    const localize = useLocalize();
+    const {
+      ask,
+      edit,
+      index,
+      agent,
+      assistant,
+      enterEdit,
+      conversation,
       messageLabel,
-      conversation?.endpoint,
-      conversation?.model,
-      msg?.model,
-      msg?.iconURL,
-      msg?.endpoint,
-      msg?.isCreatedByUser,
-    ],
-  );
+      latestMessage,
+      handleFeedback,
+      handleContinue,
+      copyToClipboard,
+      regenerateMessage,
+    } = useMessageActions({
+      message: msg,
+      currentEditId,
+      setCurrentEditId,
+    });
+    const fontSize = useAtomValue(fontSizeAtom);
+    const maximizeChatSpace = useRecoilValue(store.maximizeChatSpace);
 
-  const { hasParallelContent } = useContentMetadata(msg);
-  const messageId = msg?.messageId ?? '';
-  const messageContextValue = useMemo(
-    () => ({
-      messageId,
-      isLatestMessage,
-      isExpanded: false as const,
-      isSubmitting: effectiveIsSubmitting,
-      conversationId: conversation?.conversationId,
-    }),
-    [messageId, conversation?.conversationId, effectiveIsSubmitting, isLatestMessage],
-  );
+    const handleRegenerateMessage = useCallback(() => regenerateMessage(), [regenerateMessage]);
+    const hasNoChildren = !(msg?.children?.length ?? 0);
+    const isLast = useMemo(
+      () => hasNoChildren && (msg?.depth === latestMessage?.depth || msg?.depth === -1),
+      [hasNoChildren, msg?.depth, latestMessage?.depth],
+    );
+    const isLatestMessage = msg?.messageId === latestMessage?.messageId;
+    /** Only pass isSubmitting to the latest message to prevent unnecessary re-renders */
+    const effectiveIsSubmitting = isLatestMessage ? isSubmitting : false;
 
-  if (!msg) {
-    return null;
-  }
+    const iconData: TMessageIcon = useMemo(
+      () => ({
+        endpoint: msg?.endpoint ?? conversation?.endpoint,
+        model: msg?.model ?? conversation?.model,
+        iconURL: msg?.iconURL,
+        modelLabel: messageLabel,
+        isCreatedByUser: msg?.isCreatedByUser,
+      }),
+      [
+        messageLabel,
+        conversation?.endpoint,
+        conversation?.model,
+        msg?.model,
+        msg?.iconURL,
+        msg?.endpoint,
+        msg?.isCreatedByUser,
+      ],
+    );
 
-  const getChatWidthClass = () => {
-    if (maximizeChatSpace) {
-      return 'w-full max-w-full md:px-5 lg:px-1 xl:px-5';
+    const { hasParallelContent } = useContentMetadata(msg);
+
+    if (!msg) {
+      return null;
     }
-    if (hasParallelContent) {
-      return 'md:max-w-[58rem] xl:max-w-[70rem]';
-    }
-    return 'md:max-w-[47rem] xl:max-w-[55rem]';
-  };
 
-  const baseClasses = {
-    common: 'group mx-auto flex flex-1 gap-3 transition-all duration-300 transform-gpu ',
-    chat: getChatWidthClass(),
-  };
+    const getChatWidthClass = () => {
+      if (maximizeChatSpace) {
+        return 'w-full max-w-full md:px-5 lg:px-1 xl:px-5';
+      }
+      if (hasParallelContent) {
+        return 'md:max-w-[58rem] xl:max-w-[70rem]';
+      }
+      return 'md:max-w-[47rem] xl:max-w-[55rem]';
+    };
 
-  const conditionalClasses = {
-    focus: 'focus:outline-none focus:ring-2 focus:ring-border-xheavy',
-  };
+    const baseClasses = {
+      common: 'group mx-auto flex flex-1 gap-3 transition-all duration-300 transform-gpu ',
+      chat: getChatWidthClass(),
+    };
 
-  return (
-    <div
-      id={msg.messageId}
-      aria-label={getMessageAriaLabel(msg, localize)}
-      className={cn(
-        baseClasses.common,
-        baseClasses.chat,
-        conditionalClasses.focus,
-        'message-render',
-      )}
-    >
-      {!hasParallelContent && (
-        <div className="relative flex flex-shrink-0 flex-col items-center">
-          <div className="flex h-6 w-6 items-center justify-center overflow-hidden rounded-full">
-            <MessageIcon iconData={iconData} assistant={assistant} agent={agent} />
-          </div>
-        </div>
-      )}
+    const conditionalClasses = {
+      focus: 'focus:outline-none focus:ring-2 focus:ring-border-xheavy',
+    };
 
+    return (
       <div
+        id={msg.messageId}
+        aria-label={getMessageAriaLabel(msg, localize)}
         className={cn(
-          'relative flex flex-col',
-          hasParallelContent ? 'w-full' : 'w-11/12',
-          msg.isCreatedByUser ? 'user-turn' : 'agent-turn',
+          baseClasses.common,
+          baseClasses.chat,
+          conditionalClasses.focus,
+          'message-render',
         )}
       >
         {!hasParallelContent && (
-          <h2 className={cn('select-none font-semibold', fontSize)}>{messageLabel}</h2>
+          <div className="relative flex flex-shrink-0 flex-col items-center">
+            <div className="flex h-6 w-6 items-center justify-center overflow-hidden rounded-full">
+              <MessageIcon iconData={iconData} assistant={assistant} agent={agent} />
+            </div>
+          </div>
         )}
 
-        <div className="flex flex-col gap-1">
-          <div className="flex min-h-[20px] max-w-full flex-grow flex-col gap-0">
-            <MessageContext.Provider value={messageContextValue}>
-              <MessageContent
-                ask={ask}
-                edit={edit}
-                isLast={isLast}
-                text={msg.text || ''}
-                message={msg}
-                enterEdit={enterEdit}
-                error={!!(msg.error ?? false)}
-                isSubmitting={effectiveIsSubmitting}
-                unfinished={msg.unfinished ?? false}
-                isCreatedByUser={msg.isCreatedByUser ?? true}
-                siblingIdx={siblingIdx ?? 0}
-                setSiblingIdx={setSiblingIdx ?? (() => ({}))}
-              />
-            </MessageContext.Provider>
-          </div>
-          {hasNoChildren && effectiveIsSubmitting ? (
-            <PlaceholderRow />
-          ) : (
-            <SubRow classes="text-xs">
-              <SiblingSwitch
-                siblingIdx={siblingIdx}
-                siblingCount={siblingCount}
-                setSiblingIdx={setSiblingIdx}
-              />
-              <HoverButtons
-                index={index}
-                isEditing={edit}
-                message={msg}
-                enterEdit={enterEdit}
-                isSubmitting={isSubmitting}
-                conversation={conversation ?? null}
-                regenerate={handleRegenerateMessage}
-                copyToClipboard={copyToClipboard}
-                handleContinue={handleContinue}
-                latestMessageId={latestMessageId}
-                handleFeedback={handleFeedback}
-                isLast={isLast}
-              />
-            </SubRow>
+        <div
+          className={cn(
+            'relative flex flex-col',
+            hasParallelContent ? 'w-full' : 'w-11/12',
+            msg.isCreatedByUser ? 'user-turn' : 'agent-turn',
           )}
+        >
+          {!hasParallelContent && (
+            <h2 className={cn('select-none font-semibold', fontSize)}>{messageLabel}</h2>
+          )}
+
+          <div className="flex flex-col gap-1">
+            <div className="flex max-w-full flex-grow flex-col gap-0">
+              <MessageContext.Provider
+                value={{
+                  messageId: msg.messageId,
+                  conversationId: conversation?.conversationId,
+                  isExpanded: false,
+                  isSubmitting: effectiveIsSubmitting,
+                  isLatestMessage,
+                }}
+              >
+                <MessageContent
+                  ask={ask}
+                  edit={edit}
+                  isLast={isLast}
+                  text={msg.text || ''}
+                  message={msg}
+                  enterEdit={enterEdit}
+                  error={!!(msg.error ?? false)}
+                  isSubmitting={effectiveIsSubmitting}
+                  unfinished={msg.unfinished ?? false}
+                  isCreatedByUser={msg.isCreatedByUser ?? true}
+                  siblingIdx={siblingIdx ?? 0}
+                  setSiblingIdx={setSiblingIdx ?? (() => ({}))}
+                />
+              </MessageContext.Provider>
+            </div>
+            {hasNoChildren && effectiveIsSubmitting ? (
+              <PlaceholderRow />
+            ) : (
+              <SubRow classes="text-xs">
+                <SiblingSwitch
+                  siblingIdx={siblingIdx}
+                  siblingCount={siblingCount}
+                  setSiblingIdx={setSiblingIdx}
+                />
+                <HoverButtons
+                  index={index}
+                  isEditing={edit}
+                  message={msg}
+                  enterEdit={enterEdit}
+                  isSubmitting={isSubmitting}
+                  conversation={conversation ?? null}
+                  regenerate={handleRegenerateMessage}
+                  copyToClipboard={copyToClipboard}
+                  handleContinue={handleContinue}
+                  latestMessage={latestMessage}
+                  handleFeedback={handleFeedback}
+                  isLast={isLast}
+                />
+              </SubRow>
+            )}
+          </div>
         </div>
       </div>
-    </div>
-  );
-});
-MessageRender.displayName = 'MessageRender';
+    );
+  },
+);
 
 export default MessageRender;

client/src/components/Chat/Messages/ui/PlaceholderRow.tsx

@@ -1,9 +1,7 @@
 import { memo } from 'react';
 
-/** Height matches the SubRow action buttons row (31px) — keep in sync with HoverButtons */
-const PlaceholderRow = memo(function PlaceholderRow() {
-  return <div className="mt-1 h-[31px] bg-transparent" />;
+const PlaceholderRow = memo(() => {
+  return <div className="mt-1 h-[27px] bg-transparent" />;
 });
-PlaceholderRow.displayName = 'PlaceholderRow';
 
 export default PlaceholderRow;

client/src/components/Chat/TemporaryChat.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
-import { useRecoilValue } from 'recoil';
 import { TooltipAnchor } from '@librechat/client';
 import { MessageCircleDashed } from 'lucide-react';
 import { useRecoilState, useRecoilCallback } from 'recoil';
+import { useChatContext } from '~/Providers';
 import { useLocalize } from '~/hooks';
 import { cn } from '~/utils';
 import store from '~/store';
@@ -10,8 +10,13 @@ import store from '~/store';
 export function TemporaryChat() {
   const localize = useLocalize();
   const [isTemporary, setIsTemporary] = useRecoilState(store.isTemporary);
-  const conversation = useRecoilValue(store.conversationByIndex(0));
-  const isSubmitting = useRecoilValue(store.isSubmittingFamily(0));
+  const { conversation, isSubmitting } = useChatContext();
+
+  const temporaryBadge = {
+    id: 'temporary',
+    atom: store.isTemporary,
+    isAvailable: true,
+  };
 
   const handleBadgeToggle = useRecoilCallback(
     () => () => {

client/src/components/Endpoints/Icon.tsx

@@ -1,102 +1,64 @@
-import React, { memo } from 'react';
+import React, { memo, useState } from 'react';
 import { UserIcon, useAvatar } from '@librechat/client';
+import type { TUser } from 'librechat-data-provider';
 import type { IconProps } from '~/common';
 import MessageEndpointIcon from './MessageEndpointIcon';
 import { useAuthContext } from '~/hooks/AuthContext';
 import { useLocalize } from '~/hooks';
 import { cn } from '~/utils';
 
-type ResolvedAvatar = { type: 'image'; src: string } | { type: 'fallback' };
-
-/**
- * Caches the resolved avatar decision per user ID.
- * Invalidated when `user.avatar` changes (e.g., settings upload).
- * Tracks failed image URLs so they fall back to SVG permanently for the session.
- */
-const avatarCache = new Map<
-  string,
-  { avatar: string; avatarSrc: string; resolved: ResolvedAvatar }
->();
-const failedUrls = new Set<string>();
-
-function resolveAvatar(userId: string, userAvatar: string, avatarSrc: string): ResolvedAvatar {
-  if (!userId) {
-    const imgSrc = userAvatar || avatarSrc;
-    return imgSrc && !failedUrls.has(imgSrc)
-      ? { type: 'image', src: imgSrc }
-      : { type: 'fallback' };
-  }
-
-  const cached = avatarCache.get(userId);
-  if (cached && cached.avatar === userAvatar && cached.avatarSrc === avatarSrc) {
-    return cached.resolved;
-  }
-
-  const imgSrc = userAvatar || avatarSrc;
-  const resolved: ResolvedAvatar =
-    imgSrc && !failedUrls.has(imgSrc) ? { type: 'image', src: imgSrc } : { type: 'fallback' };
-
-  avatarCache.set(userId, { avatar: userAvatar, avatarSrc, resolved });
-  return resolved;
-}
-
-function markAvatarFailed(userId: string, src: string): ResolvedAvatar {
-  failedUrls.add(src);
-  const fallback: ResolvedAvatar = { type: 'fallback' };
-  const cached = avatarCache.get(userId);
-  if (cached) {
-    avatarCache.set(userId, { ...cached, resolved: fallback });
-  }
-  return fallback;
-}
-
 type UserAvatarProps = {
   size: number;
-  avatar: string;
+  user?: TUser;
   avatarSrc: string;
-  userId: string;
   username: string;
   className?: string;
 };
 
-const UserAvatar = memo(
-  ({ size, avatar, avatarSrc, userId, username, className }: UserAvatarProps) => {
-    const [resolved, setResolved] = React.useState(() => resolveAvatar(userId, avatar, avatarSrc));
+const UserAvatar = memo(({ size, user, avatarSrc, username, className }: UserAvatarProps) => {
+  const [imageError, setImageError] = useState(false);
 
-    React.useEffect(() => {
-      setResolved(resolveAvatar(userId, avatar, avatarSrc));
-    }, [userId, avatar, avatarSrc]);
+  const handleImageError = () => {
+    setImageError(true);
+  };
 
-    return (
-      <div
-        title={username}
-        style={{ width: size, height: size }}
-        className={cn('relative flex items-center justify-center', className ?? '')}
-      >
-        {resolved.type === 'image' ? (
-          <img
-            className="rounded-full"
-            src={resolved.src}
-            alt="avatar"
-            onError={() => setResolved(markAvatarFailed(userId, resolved.src))}
-          />
-        ) : (
-          <div
-            style={{
-              backgroundColor: 'rgb(121, 137, 255)',
-              width: '20px',
-              height: '20px',
-              boxShadow: 'rgba(240, 246, 252, 0.1) 0px 0px 0px 1px',
-            }}
-            className="relative flex h-9 w-9 items-center justify-center rounded-sm p-1 text-white"
-          >
-            <UserIcon />
-          </div>
-        )}
-      </div>
-    );
-  },
-);
+  const renderDefaultAvatar = () => (
+    <div
+      style={{
+        backgroundColor: 'rgb(121, 137, 255)',
+        width: '20px',
+        height: '20px',
+        boxShadow: 'rgba(240, 246, 252, 0.1) 0px 0px 0px 1px',
+      }}
+      className="relative flex h-9 w-9 items-center justify-center rounded-sm p-1 text-white"
+    >
+      <UserIcon />
+    </div>
+  );
+
+  return (
+    <div
+      title={username}
+      style={{
+        width: size,
+        height: size,
+      }}
+      className={cn('relative flex items-center justify-center', className ?? '')}
+    >
+      {(!(user?.avatar ?? '') && (!(user?.username ?? '') || user?.username.trim() === '')) ||
+      imageError ? (
+        renderDefaultAvatar()
+      ) : (
+        <img
+          className="rounded-full"
+          src={(user?.avatar ?? '') || avatarSrc}
+          alt="avatar"
+          onError={handleImageError}
+        />
+      )}
+    </div>
+  );
+});
 
 UserAvatar.displayName = 'UserAvatar';
 
@@ -112,10 +74,9 @@ const Icon: React.FC<IconProps> = memo((props) => {
     return (
       <UserAvatar
         size={size}
+        user={user}
         avatarSrc={avatarSrc}
         username={username}
-        userId={user?.id ?? ''}
-        avatar={user?.avatar ?? ''}
         className={props.className}
       />
     );