🔧 chore: Comment out unused font family configurations and typography plugin in Tailwind CSS config

🔧 chore: Enhance Vite configuration with improved environment variable handling and chunking strategies
🔧 chore: Update ESLint and related dependencies in package.json and package-lock.json
2025-02-27 16:36:14 +01:00 · 2025-02-27 16:34:16 +01:00 · 2025-02-27 16:30:10 +01:00 · 2025-02-27 16:16:56 +01:00 · 2025-02-27 16:15:42 +01:00 · 2025-02-27 15:56:22 +01:00
1005 changed files with 20864 additions and 65414 deletions
--- a/.env.example
+++ b/.env.example
@@ -20,8 +20,8 @@ DOMAIN_CLIENT=http://localhost:3080
 DOMAIN_SERVER=http://localhost:3080

 NO_INDEX=true
-# Use the address that is at most n number of hops away from the Express application.
-# req.socket.remoteAddress is the first hop, and the rest are looked for in the X-Forwarded-For header from right to left.
+# Use the address that is at most n number of hops away from the Express application. 
+# req.socket.remoteAddress is the first hop, and the rest are looked for in the X-Forwarded-For header from right to left. 
 # A value of 0 means that the first untrusted address would be req.socket.remoteAddress, i.e. there is no reverse proxy.
 # Defaulted to 1.
 TRUST_PROXY=1
@@ -88,7 +88,7 @@ PROXY=
 #============#

 ANTHROPIC_API_KEY=user_provided
-# ANTHROPIC_MODELS=claude-opus-4-20250514,claude-sonnet-4-20250514,claude-3-7-sonnet-20250219,claude-3-5-sonnet-20241022,claude-3-5-haiku-20241022,claude-3-opus-20240229,claude-3-sonnet-20240229,claude-3-haiku-20240307
+# ANTHROPIC_MODELS=claude-3-7-sonnet-latest,claude-3-7-sonnet-20250219,claude-3-5-haiku-20241022,claude-3-5-sonnet-20241022,claude-3-5-sonnet-latest,claude-3-5-sonnet-20240620,claude-3-opus-20240229,claude-3-sonnet-20240229,claude-3-haiku-20240307,claude-2.1,claude-2,claude-1.2,claude-1,claude-1-100k,claude-instant-1,claude-instant-1-100k
 # ANTHROPIC_REVERSE_PROXY=

 #============#
@@ -142,12 +142,12 @@ GOOGLE_KEY=user_provided
 # GOOGLE_AUTH_HEADER=true

 # Gemini API (AI Studio)
-# GOOGLE_MODELS=gemini-2.5-pro-preview-05-06,gemini-2.5-flash-preview-04-17,gemini-2.0-flash-001,gemini-2.0-flash-exp,gemini-2.0-flash-lite-001,gemini-1.5-pro-002,gemini-1.5-flash-002
+# GOOGLE_MODELS=gemini-2.0-flash-exp,gemini-2.0-flash-thinking-exp-1219,gemini-exp-1121,gemini-exp-1114,gemini-1.5-flash-latest,gemini-1.0-pro,gemini-1.0-pro-001,gemini-1.0-pro-latest,gemini-1.0-pro-vision-latest,gemini-1.5-pro-latest,gemini-pro,gemini-pro-vision

 # Vertex AI
-# GOOGLE_MODELS=gemini-2.5-pro-preview-05-06,gemini-2.5-flash-preview-04-17,gemini-2.0-flash-001,gemini-2.0-flash-exp,gemini-2.0-flash-lite-001,gemini-1.5-pro-002,gemini-1.5-flash-002
+# GOOGLE_MODELS=gemini-1.5-flash-preview-0514,gemini-1.5-pro-preview-0514,gemini-1.0-pro-vision-001,gemini-1.0-pro-002,gemini-1.0-pro-001,gemini-pro-vision,gemini-1.0-pro

-# GOOGLE_TITLE_MODEL=gemini-2.0-flash-lite-001
+# GOOGLE_TITLE_MODEL=gemini-pro

 # GOOGLE_LOC=us-central1

@@ -175,7 +175,7 @@ GOOGLE_KEY=user_provided
 #============#

 OPENAI_API_KEY=user_provided
-# OPENAI_MODELS=o1,o1-mini,o1-preview,gpt-4o,gpt-4.5-preview,chatgpt-4o-latest,gpt-4o-mini,gpt-3.5-turbo-0125,gpt-3.5-turbo-0301,gpt-3.5-turbo,gpt-4,gpt-4-0613,gpt-4-vision-preview,gpt-3.5-turbo-0613,gpt-3.5-turbo-16k-0613,gpt-4-0125-preview,gpt-4-turbo-preview,gpt-4-1106-preview,gpt-3.5-turbo-1106,gpt-3.5-turbo-instruct,gpt-3.5-turbo-instruct-0914,gpt-3.5-turbo-16k
+# OPENAI_MODELS=o1,o1-mini,o1-preview,gpt-4o,chatgpt-4o-latest,gpt-4o-mini,gpt-3.5-turbo-0125,gpt-3.5-turbo-0301,gpt-3.5-turbo,gpt-4,gpt-4-0613,gpt-4-vision-preview,gpt-3.5-turbo-0613,gpt-3.5-turbo-16k-0613,gpt-4-0125-preview,gpt-4-turbo-preview,gpt-4-1106-preview,gpt-3.5-turbo-1106,gpt-3.5-turbo-instruct,gpt-3.5-turbo-instruct-0914,gpt-3.5-turbo-16k

 DEBUG_OPENAI=false

@@ -231,14 +231,6 @@ AZURE_AI_SEARCH_SEARCH_OPTION_QUERY_TYPE=
 AZURE_AI_SEARCH_SEARCH_OPTION_TOP=
 AZURE_AI_SEARCH_SEARCH_OPTION_SELECT=

-# OpenAI Image Tools Customization
-#----------------
-# IMAGE_GEN_OAI_DESCRIPTION_WITH_FILES=Custom description for image generation tool when files are present
-# IMAGE_GEN_OAI_DESCRIPTION_NO_FILES=Custom description for image generation tool when no files are present
-# IMAGE_EDIT_OAI_DESCRIPTION=Custom description for image editing tool
-# IMAGE_GEN_OAI_PROMPT_DESCRIPTION=Custom prompt description for image generation tool
-# IMAGE_EDIT_OAI_PROMPT_DESCRIPTION=Custom prompt description for image editing tool
-
 # DALL·E
 #----------------
 # DALLE_API_KEY=
@@ -256,13 +248,6 @@ AZURE_AI_SEARCH_SEARCH_OPTION_SELECT=
 # DALLE3_AZURE_API_VERSION=
 # DALLE2_AZURE_API_VERSION=

-# Flux
-#-----------------
-FLUX_API_BASE_URL=https://api.us1.bfl.ai
-# FLUX_API_BASE_URL = 'https://api.bfl.ml';
-
-# Get your API key at https://api.us1.bfl.ai/auth/profile
-# FLUX_API_KEY=

 # Google
 #-----------------
@@ -372,7 +357,7 @@ ILLEGAL_MODEL_REQ_SCORE=5
 # Balance                #
 #========================#

-# CHECK_BALANCE=false
+CHECK_BALANCE=false
 # START_BALANCE=20000 # note: the number of tokens that will be credited after registration.

 #========================#
@@ -440,60 +425,15 @@ OPENID_NAME_CLAIM=

 OPENID_BUTTON_LABEL=
 OPENID_IMAGE_URL=
-# Set to true to automatically redirect to the OpenID provider when a user visits the login page
-# This will bypass the login form completely for users, only use this if OpenID is your only authentication method
-OPENID_AUTO_REDIRECT=false
-# Set to true to use PKCE (Proof Key for Code Exchange) for OpenID authentication
-OPENID_USE_PKCE=false
-#Set to true to reuse openid tokens for authentication management instead of using the mongodb session and the custom refresh token.
-OPENID_REUSE_TOKENS=
-#By default, signing key verification results are cached in order to prevent excessive HTTP requests to the JWKS endpoint.
-#If a signing key matching the kid is found, this will be cached and the next time this kid is requested the signing key will be served from the cache.
-#Default is true.
-OPENID_JWKS_URL_CACHE_ENABLED=
-OPENID_JWKS_URL_CACHE_TIME= # 600000 ms eq to 10 minutes leave empty to disable caching
-#Set to true to trigger token exchange flow to acquire access token for the userinfo endpoint.
-OPENID_ON_BEHALF_FLOW_FOR_USERINFRO_REQUIRED=
-OPENID_ON_BEHALF_FLOW_USERINFRO_SCOPE = "user.read" # example for Scope Needed for Microsoft Graph API
-# Set to true to use the OpenID Connect end session endpoint for logout
-OPENID_USE_END_SESSION_ENDPOINT=
-
-
-# SAML
-# Note: If OpenID is enabled, SAML authentication will be automatically disabled.
-SAML_ENTRY_POINT=
-SAML_ISSUER=
-SAML_CERT=
-SAML_CALLBACK_URL=/oauth/saml/callback
-SAML_SESSION_SECRET=
-
-# Attribute mappings (optional)
-SAML_EMAIL_CLAIM=
-SAML_USERNAME_CLAIM=
-SAML_GIVEN_NAME_CLAIM=
-SAML_FAMILY_NAME_CLAIM=
-SAML_PICTURE_CLAIM=
-SAML_NAME_CLAIM=
-
-# Logint buttion settings (optional)
-SAML_BUTTON_LABEL=
-SAML_IMAGE_URL=
-
-# Whether the SAML Response should be signed.
-# - If "true", the entire `SAML Response` will be signed.
-# - If "false" or unset, only the `SAML Assertion` will be signed (default behavior).
-# SAML_USE_AUTHN_RESPONSE_SIGNED=
-

 # LDAP
 LDAP_URL=
 LDAP_BIND_DN=
 LDAP_BIND_CREDENTIALS=
 LDAP_USER_SEARCH_BASE=
-#LDAP_SEARCH_FILTER="mail="
+LDAP_SEARCH_FILTER=mail={{username}}
 LDAP_CA_CERT_PATH=
 # LDAP_TLS_REJECT_UNAUTHORIZED=
-# LDAP_STARTTLS=
 # LDAP_LOGIN_USES_USERNAME=true
 # LDAP_ID=
 # LDAP_USERNAME=
@@ -526,24 +466,6 @@ FIREBASE_STORAGE_BUCKET=
 FIREBASE_MESSAGING_SENDER_ID=
 FIREBASE_APP_ID=

-#========================#
-# S3 AWS Bucket          #
-#========================#
-
-AWS_ENDPOINT_URL=
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_REGION=
-AWS_BUCKET_NAME=
-
-#========================#
-# Azure Blob Storage     #
-#========================#
-
-AZURE_STORAGE_CONNECTION_STRING=
-AZURE_STORAGE_PUBLIC_ACCESS=false
-AZURE_CONTAINER_NAME=files
-
 #========================#
 # Shared Links           #
 #========================#
@@ -604,9 +526,9 @@ HELP_AND_FAQ_URL=https://librechat.ai
 #   users always get the latest version. Customize    #
 #   only if you understand caching implications.      #

-# INDEX_CACHE_CONTROL=no-cache, no-store, must-revalidate
-# INDEX_PRAGMA=no-cache
-# INDEX_EXPIRES=0
+# INDEX_HTML_CACHE_CONTROL=no-cache, no-store, must-revalidate
+# INDEX_HTML_PRAGMA=no-cache
+# INDEX_HTML_EXPIRES=0

 # no-cache: Forces validation with server before using cached version
 # no-store: Prevents storing the response entirely
@@ -616,33 +538,3 @@ HELP_AND_FAQ_URL=https://librechat.ai
 #                  OpenWeather                        #
 #=====================================================#
 OPENWEATHER_API_KEY=
-
-#====================================#
-# LibreChat Code Interpreter API     #
-#====================================#
-
-# https://code.librechat.ai
-# LIBRECHAT_CODE_API_KEY=your-key
-
-#======================#
-# Web Search           #
-#======================#
-
-# Note: All of the following variable names can be customized.
-# Omit values to allow user to provide them.
-
-# For more information on configuration values, see:
-# https://librechat.ai/docs/features/web_search
-
-# Search Provider (Required)
-# SERPER_API_KEY=your_serper_api_key
-
-# Scraper (Required)
-# FIRECRAWL_API_KEY=your_firecrawl_api_key
-# Optional: Custom Firecrawl API URL
-# FIRECRAWL_API_URL=your_firecrawl_api_url
-
-# Reranker (Required)
-# JINA_API_KEY=your_jina_api_key
-# or
-# COHERE_API_KEY=your_cohere_api_key
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -24,40 +24,22 @@ Project maintainers have the right and responsibility to remove, edit, or reject

 ## To contribute to this project, please adhere to the following guidelines:

-## 1. Development Setup
+## 1. Development notes

-1. Use Node.JS 20.x.
-2. Install typescript globally: `npm i -g typescript`.
-3. Run `npm ci` to install dependencies.
-4. Build the data provider: `npm run build:data-provider`.
-5. Build MCP: `npm run build:mcp`.
-6. Build data schemas: `npm run build:data-schemas`.
-7. Setup and run unit tests:
-    - Copy `.env.test`: `cp api/test/.env.test.example api/test/.env.test`.
-    - Run backend unit tests: `npm run test:api`.
-    - Run frontend unit tests: `npm run test:client`.
-8. Setup and run integration tests:
-    - Build client: `cd client && npm run build`.
-    - Create `.env`: `cp .env.example .env`.
-    - Install [MongoDB Community Edition](https://www.mongodb.com/docs/manual/administration/install-community/), ensure that `mongosh` connects to your local instance.
-    - Run: `npx install playwright`, then `npx playwright install`.
-    - Copy `config.local`: `cp e2e/config.local.example.ts e2e/config.local.ts`.
-    - Copy `librechat.yaml`: `cp librechat.example.yaml librechat.yaml`.
-    - Run: `npm run e2e`.
-
-## 2. Development Notes
-
-1. Before starting work, make sure your main branch has the latest commits with `npm run update`.
-3. Run linting command to find errors: `npm run lint`. Alternatively, ensure husky pre-commit checks are functioning.
+1. Before starting work, make sure your main branch has the latest commits with `npm run update`
+2. Run linting command to find errors: `npm run lint`. Alternatively, ensure husky pre-commit checks are functioning.
 3. After your changes, reinstall packages in your current branch using `npm run reinstall` and ensure everything still works. 
    - Restart the ESLint server ("ESLint: Restart ESLint Server" in VS Code command bar) and your IDE after reinstalling or updating.
 4. Clear web app localStorage and cookies before and after changes.
-5. For frontend changes, compile typescript before and after changes to check for introduced errors: `cd client && npm run build`.
-6. Run backend unit tests: `npm run test:api`.
-7. Run frontend unit tests: `npm run test:client`.
-8. Run integration tests: `npm run e2e`.
+5. For frontend changes:
+    - Install typescript globally: `npm i -g typescript`.
+    - Compile typescript before and after changes to check for introduced errors: `cd client && tsc --noEmit`.
+6. Run tests locally:
+    - Backend unit tests: `npm run test:api`
+    - Frontend unit tests: `npm run test:client`
+    - Integration tests: `npm run e2e` (requires playwright installed, `npx install playwright`)

-## 3. Git Workflow
+## 2. Git Workflow

 We utilize a GitFlow workflow to manage changes to this project's codebase. Follow these general steps when contributing code:

@@ -67,7 +49,7 @@ We utilize a GitFlow workflow to manage changes to this project's codebase. Foll
 4. Submit a pull request with a clear and concise description of your changes and the reasons behind them.
 5. We will review your pull request, provide feedback as needed, and eventually merge the approved changes into the main branch.

-## 4. Commit Message Format
+## 3. Commit Message Format

 We follow the [semantic format](https://gist.github.com/joshbuchea/6f47e86d2510bce28f8e7f42ae84c716) for commit messages.

@@ -94,7 +76,7 @@ feat: add hat wobble
 ```


-## 5. Pull Request Process
+## 4. Pull Request Process

 When submitting a pull request, please follow these guidelines:

@@ -109,7 +91,7 @@ Ensure that your changes meet the following criteria:
 - The commit history is clean and easy to follow. You can use `git rebase` or `git merge --squash` to clean your commit history before submitting the pull request.
 - The pull request description clearly outlines the changes and the reasons behind them. Be sure to include the steps to test the pull request.

-## 6. Naming Conventions
+## 5. Naming Conventions

 Apply the following naming conventions to branches, labels, and other Git-related entities:

@@ -118,7 +100,7 @@ Apply the following naming conventions to branches, labels, and other Git-relate
 - **JS/TS:** Directories and file names: Descriptive and camelCase. First letter uppercased for React files (e.g., `helperFunction.ts, ReactComponent.tsx`).
 - **Docs:** Directories and file names: Descriptive and snake_case (e.g., `config_files.md`).

-## 7. TypeScript Conversion
+## 6. TypeScript Conversion

 1. **Original State**: The project was initially developed entirely in JavaScript (JS).

@@ -144,7 +126,7 @@ Apply the following naming conventions to branches, labels, and other Git-relate
      
   - **Current Stance**: At present, this backend transition is of lower priority and might not be pursued.

-## 8. Module Import Conventions
+## 7. Module Import Conventions

 - `npm` packages first, 
     - from shortest line (top) to longest (bottom)
--- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
@@ -79,8 +79,6 @@ body:

        For UI-related issues, browser console logs can be very helpful. You can provide these as screenshots or paste the text here.
      render: shell
-    validations:
-      required: true
  - type: textarea
    id: screenshots
    attributes:
--- a/.github/workflows/backend-review.yml
+++ b/.github/workflows/backend-review.yml
@@ -39,9 +39,6 @@ jobs:
      - name: Install MCP Package
        run: npm run build:mcp

-      - name: Install Data Schemas Package
-        run: npm run build:data-schemas
-
      - name: Create empty auth.json file
        run: |
          mkdir -p api/data
@@ -64,7 +61,4 @@ jobs:
        run: cd api && npm run test:ci

      - name: Run librechat-data-provider unit tests
-        run: cd packages/data-provider && npm run test:ci
-
-      - name: Run librechat-mcp unit tests
-        run: cd packages/mcp && npm run test:ci
+        run: cd packages/data-provider && npm run test:ci
--- a/.github/workflows/data-schemas.yml
+++ b/.github/workflows/data-schemas.yml
@@ -1,58 +0,0 @@
-name: Publish `@librechat/data-schemas` to NPM
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'packages/data-schemas/package.json'
-  workflow_dispatch:
-    inputs:
-      reason:
-        description: 'Reason for manual trigger'
-        required: false
-        default: 'Manual publish requested'
-
-jobs:
-  build-and-publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '18.x'
-          
-      - name: Install dependencies
-        run: cd packages/data-schemas && npm ci
-        
-      - name: Build
-        run: cd packages/data-schemas && npm run build
-        
-      - name: Set up npm authentication
-        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.PUBLISH_NPM_TOKEN }}" > ~/.npmrc
-        
-      - name: Check version change
-        id: check
-        working-directory: packages/data-schemas
-        run: |
-          PACKAGE_VERSION=$(node -p "require('./package.json').version")
-          PUBLISHED_VERSION=$(npm view @librechat/data-schemas version 2>/dev/null || echo "0.0.0")
-          if [ "$PACKAGE_VERSION" = "$PUBLISHED_VERSION" ]; then
-            echo "No version change, skipping publish"
-            echo "skip=true" >> $GITHUB_OUTPUT
-          else
-            echo "Version changed, proceeding with publish"
-            echo "skip=false" >> $GITHUB_OUTPUT
-          fi
-            
-      - name: Pack package
-        if: steps.check.outputs.skip != 'true'
-        working-directory: packages/data-schemas
-        run: npm pack
-        
-      - name: Publish
-        if: steps.check.outputs.skip != 'true'
-        working-directory: packages/data-schemas
-        run: npm publish *.tgz --access public
--- a/.github/workflows/generate-release-changelog-pr.yml
+++ b/.github/workflows/generate-release-changelog-pr.yml
@@ -4,7 +4,6 @@ on:
  push:
    tags:
      - 'v*.*.*'
-  workflow_dispatch:

 jobs:
  generate-release-changelog-pr:
@@ -85,11 +84,11 @@ jobs:
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          sign-commits: true
-          commit-message: "chore: update CHANGELOG for release ${{ github.ref_name }}"
+          commit-message: "chore: update CHANGELOG for release ${GITHUB_REF##*/}"
          base: main
-          branch: "changelog/${{ github.ref_name }}"
+          branch: "changelog/${GITHUB_REF##*/}"
          reviewers: danny-avila
-          title: "📜 docs: Changelog for release ${{ github.ref_name }}"
+          title: "chore: update CHANGELOG for release ${GITHUB_REF##*/}"
          body: |
            **Description**:
-            - This PR updates the CHANGELOG.md by removing the "Unreleased" section and adding new release notes for release ${{ github.ref_name }} above previous releases.
+            - This PR updates the CHANGELOG.md by removing the "Unreleased" section and adding new release notes for release ${GITHUB_REF##*/} above previous releases.
--- a/.github/workflows/generate-unreleased-changelog-pr.yml
+++ b/.github/workflows/generate-unreleased-changelog-pr.yml
@@ -3,7 +3,6 @@ name: Generate Unreleased Changelog PR
 on:
  schedule:
    - cron: "0 0 * * 1"  # Runs every Monday at 00:00 UTC
-  workflow_dispatch:

 jobs:
  generate-unreleased-changelog-pr:
@@ -99,9 +98,9 @@ jobs:
          branch: "changelog/unreleased-update"
          sign-commits: true
          commit-message: "action: update Unreleased changelog"
-          title: "📜 docs: Unreleased Changelog"
+          title: "action: update Unreleased changelog"
          body: |
            **Description**:
            - This PR updates the Unreleased section in CHANGELOG.md.
            - It compares the current main branch with the latest version tag (determined as ${{ steps.get_latest_tag.outputs.tag }}),
-              regenerates the Unreleased changelog, removes any old Unreleased block, and inserts the new content.
+              regenerates the Unreleased changelog, removes any old Unreleased block, and inserts the new content.
--- a/.github/workflows/helmcharts.yml
+++ b/.github/workflows/helmcharts.yml
@@ -26,15 +26,8 @@ jobs:
        uses: azure/setup-helm@v4
        env:
          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Build Subchart Deps
-        run: |
-          cd helm/librechat-rag-api
-          helm dependency build 

      - name: Run chart-releaser
        uses: helm/chart-releaser-action@v1.6.0
-        with:
-          charts_dir: helm
-          skip_existing: true
        env:
          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
--- a/.github/workflows/i18n-unused-keys.yml
+++ b/.github/workflows/i18n-unused-keys.yml
@@ -22,7 +22,7 @@ jobs:

          # Define paths
          I18N_FILE="client/src/locales/en/translation.json"
-          SOURCE_DIRS=("client/src" "api" "packages/data-provider/src")
+          SOURCE_DIRS=("client/src" "api")

          # Check if translation file exists
          if [[ ! -f "$I18N_FILE" ]]; then
@@ -39,35 +39,12 @@ jobs:
          # Check if each key is used in the source code
          for KEY in $KEYS; do
            FOUND=false
-            
-            # Special case for dynamically constructed special variable keys
-            if [[ "$KEY" == com_ui_special_var_* ]]; then
-              # Check if TSpecialVarLabel is used in the codebase
-              for DIR in "${SOURCE_DIRS[@]}"; do
-                if grep -r --include=\*.{js,jsx,ts,tsx} -q "TSpecialVarLabel" "$DIR"; then
-                  FOUND=true
-                  break
-                fi
-              done
-              
-              # Also check if the key is directly used somewhere
-              if [[ "$FOUND" == false ]]; then
-                for DIR in "${SOURCE_DIRS[@]}"; do
-                  if grep -r --include=\*.{js,jsx,ts,tsx} -q "$KEY" "$DIR"; then
-                    FOUND=true
-                    break
-                  fi
-                done
+            for DIR in "${SOURCE_DIRS[@]}"; do
+              if grep -r --include=\*.{js,jsx,ts,tsx} -q "$KEY" "$DIR"; then
+                FOUND=true
+                break
              fi
-            else
-              # Regular check for other keys
-              for DIR in "${SOURCE_DIRS[@]}"; do
-                if grep -r --include=\*.{js,jsx,ts,tsx} -q "$KEY" "$DIR"; then
-                  FOUND=true
-                  break
-                fi
-              done
-            fi
+            done
          
            if [[ "$FOUND" == false ]]; then
              UNUSED_KEYS+=("$KEY")
@@ -113,4 +90,4 @@ jobs:

      - name: Fail workflow if unused keys found
        if: env.unused_keys != '[]'
-        run: exit 1
+        run: exit 1
--- a/.gitignore
+++ b/.gitignore
@@ -37,10 +37,6 @@ client/public/main.js
 client/public/main.js.map
 client/public/main.js.LICENSE.txt

-# Azure Blob Storage Emulator (Azurite)
-__azurite**
-__blobstorage__/**/*
-
 # Dependency directorys
 # Deployed apps should consider commenting these lines out:
 # see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
@@ -52,10 +48,6 @@ bower_components/
 *.d.ts
 !vite-env.d.ts

-# AI
-.clineignore
-.cursor
-
 # Floobits
 .floo
 .floobit
@@ -114,13 +106,4 @@ uploads/

 # owner
 release/
-
-# Helm
-helm/librechat/Chart.lock
-helm/**/charts/
-helm/**/.values.yaml
-
 !/client/src/@types/i18next.d.ts
-
-# SAML Idp cert
-*.cert
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,5 +1,5 @@
 {
-  "tailwindConfig": "./client/tailwind.config.cjs",
+  "tailwindConfig": "./client/tailwind.config.mjs",
  "printWidth": 100,
  "tabWidth": 2,
  "useTabs": false,
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,236 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-
-
-
-
-
-## [Unreleased]
-
-### ✨ New Features
-
- ✨ feat: implement search parameter updates by **@mawburn** in [#7151](https://github.com/danny-avila/LibreChat/pull/7151)
- 🎏 feat: Add MCP support for Streamable HTTP Transport by **@benverhees** in [#7353](https://github.com/danny-avila/LibreChat/pull/7353)
- 🔒 feat: Add Content Security Policy using Helmet middleware by **@rubentalstra** in [#7377](https://github.com/danny-avila/LibreChat/pull/7377)
- ✨ feat: Add Normalization for MCP Server Names by **@danny-avila** in [#7421](https://github.com/danny-avila/LibreChat/pull/7421)
- 📊 feat: Improve Helm Chart by **@hofq** in [#3638](https://github.com/danny-avila/LibreChat/pull/3638)
- 🦾 feat: Claude-4 Support by **@danny-avila** in [#7509](https://github.com/danny-avila/LibreChat/pull/7509)
- 🪨 feat: Bedrock Support for Claude-4 Reasoning by **@danny-avila** in [#7517](https://github.com/danny-avila/LibreChat/pull/7517)
-
-### 🌍 Internationalization
-
- 🌍 i18n: Add `Danish` and `Czech` and `Catalan` localization support by **@rubentalstra** in [#7373](https://github.com/danny-avila/LibreChat/pull/7373)
- 🌍 i18n: Update translation.json with latest translations by **@github-actions[bot]** in [#7375](https://github.com/danny-avila/LibreChat/pull/7375)
- 🌍 i18n: Update translation.json with latest translations by **@github-actions[bot]** in [#7468](https://github.com/danny-avila/LibreChat/pull/7468)
-
-### 🔧 Fixes
-
- 💬 fix: update aria-label for accessibility in ConvoLink component by **@berry-13** in [#7320](https://github.com/danny-avila/LibreChat/pull/7320)
- 🔑 fix: use `apiKey` instead of `openAIApiKey` in OpenAI-like Config by **@danny-avila** in [#7337](https://github.com/danny-avila/LibreChat/pull/7337)
- 🔄 fix: update navigation logic in `useFocusChatEffect` to ensure correct search parameters are used by **@mawburn** in [#7340](https://github.com/danny-avila/LibreChat/pull/7340)
- 🔄 fix: Improve MCP Connection Cleanup by **@danny-avila** in [#7400](https://github.com/danny-avila/LibreChat/pull/7400)
- 🛡️ fix: Preset and Validation Logic for URL Query Params by **@danny-avila** in [#7407](https://github.com/danny-avila/LibreChat/pull/7407)
- 🌘 fix: artifact of preview text is illegible in dark mode by **@nhtruong** in [#7405](https://github.com/danny-avila/LibreChat/pull/7405)
- 🛡️ fix: Temporarily Remove CSP until Configurable by **@danny-avila** in [#7419](https://github.com/danny-avila/LibreChat/pull/7419)
- 💽 fix: Exclude index page `/` from static cache settings by **@sbruel** in [#7382](https://github.com/danny-avila/LibreChat/pull/7382)
-
-### ⚙️ Other Changes
-
- 📜 docs: CHANGELOG for release v0.7.8 by **@github-actions[bot]** in [#7290](https://github.com/danny-avila/LibreChat/pull/7290)
- 📦 chore: Update API Package Dependencies by **@danny-avila** in [#7359](https://github.com/danny-avila/LibreChat/pull/7359)
- 📜 docs: Unreleased Changelog by **@github-actions[bot]** in [#7321](https://github.com/danny-avila/LibreChat/pull/7321)
- 📜 docs: Unreleased Changelog by **@github-actions[bot]** in [#7434](https://github.com/danny-avila/LibreChat/pull/7434)
- 🛡️ chore: `multer` v2.0.0 for CVE-2025-47935 and CVE-2025-47944 by **@danny-avila** in [#7454](https://github.com/danny-avila/LibreChat/pull/7454)
- 📂 refactor: Improve `FileAttachment` & File Form Deletion by **@danny-avila** in [#7471](https://github.com/danny-avila/LibreChat/pull/7471)
- 📊 chore: Remove Old Helm Chart by **@hofq** in [#7512](https://github.com/danny-avila/LibreChat/pull/7512)
- 🪖 chore: bump helm app version to v0.7.8 by **@austin-barrington** in [#7524](https://github.com/danny-avila/LibreChat/pull/7524)
-
-
-
---
-## [v0.7.8] - 
-
-Changes from v0.7.8-rc1 to v0.7.8.
-
-### ✨ New Features
-
- ✨ feat: Enhance form submission for touch screens by **@berry-13** in [#7198](https://github.com/danny-avila/LibreChat/pull/7198)
- 🔍 feat: Additional Tavily API Tool Parameters by **@glowforge-opensource** in [#7232](https://github.com/danny-avila/LibreChat/pull/7232)
- 🐋 feat: Add python to Dockerfile for increased MCP compatibility by **@technicalpickles** in [#7270](https://github.com/danny-avila/LibreChat/pull/7270)
-
-### 🔧 Fixes
-
- 🔧 fix: Google Gemma Support & OpenAI Reasoning Instructions by **@danny-avila** in [#7196](https://github.com/danny-avila/LibreChat/pull/7196)
- 🛠️ fix: Conversation Navigation State by **@danny-avila** in [#7210](https://github.com/danny-avila/LibreChat/pull/7210)
- 🔄 fix: o-Series Model Regex for System Messages by **@danny-avila** in [#7245](https://github.com/danny-avila/LibreChat/pull/7245)
- 🔖 fix: Custom Headers for Initial MCP SSE Connection by **@danny-avila** in [#7246](https://github.com/danny-avila/LibreChat/pull/7246)
- 🛡️ fix: Deep Clone `MCPOptions` for User MCP Connections by **@danny-avila** in [#7247](https://github.com/danny-avila/LibreChat/pull/7247)
- 🔄 fix: URL Param Race Condition and File Draft Persistence by **@danny-avila** in [#7257](https://github.com/danny-avila/LibreChat/pull/7257)
- 🔄 fix: Assistants Endpoint & Minor Issues by **@danny-avila** in [#7274](https://github.com/danny-avila/LibreChat/pull/7274)
- 🔄 fix: Ollama Think Tag Edge Case with Tools by **@danny-avila** in [#7275](https://github.com/danny-avila/LibreChat/pull/7275)
-
-### ⚙️ Other Changes
-
- 📜 docs: CHANGELOG for release v0.7.8-rc1 by **@github-actions[bot]** in [#7153](https://github.com/danny-avila/LibreChat/pull/7153)
- 🔄 refactor: Artifact Visibility Management by **@danny-avila** in [#7181](https://github.com/danny-avila/LibreChat/pull/7181)
- 📦 chore: Bump Package Security by **@danny-avila** in [#7183](https://github.com/danny-avila/LibreChat/pull/7183)
- 🌿 refactor: Unmount Fork Popover on Hide for Better Performance by **@danny-avila** in [#7189](https://github.com/danny-avila/LibreChat/pull/7189)
- 🧰 chore: ESLint configuration to enforce Prettier formatting rules by **@mawburn** in [#7186](https://github.com/danny-avila/LibreChat/pull/7186)
- 🎨 style: Improve KaTeX Rendering for LaTeX Equations by **@andresgit** in [#7223](https://github.com/danny-avila/LibreChat/pull/7223)
- 📝 docs: Update `.env.example` Google models by **@marlonka** in [#7254](https://github.com/danny-avila/LibreChat/pull/7254)
- 💬 refactor: MCP Chat Visibility Option, Google Rates, Remove OpenAPI Plugins by **@danny-avila** in [#7286](https://github.com/danny-avila/LibreChat/pull/7286)
- 📜 docs: Unreleased Changelog by **@github-actions[bot]** in [#7214](https://github.com/danny-avila/LibreChat/pull/7214)
-
-
-
-[See full release details][release-v0.7.8]
-
-[release-v0.7.8]: https://github.com/danny-avila/LibreChat/releases/tag/v0.7.8
-
---
-## [v0.7.8-rc1] - 
-
-Changes from v0.7.7 to v0.7.8-rc1.
-
-### ✨ New Features
-
- 🔍 feat: Mistral OCR API / Upload Files as Text by **@danny-avila** in [#6274](https://github.com/danny-avila/LibreChat/pull/6274)
- 🤖 feat: Support OpenAI Web Search models by **@danny-avila** in [#6313](https://github.com/danny-avila/LibreChat/pull/6313)
- 🔗 feat: Agent Chain (Mixture-of-Agents) by **@danny-avila** in [#6374](https://github.com/danny-avila/LibreChat/pull/6374)
- ⌛ feat: `initTimeout` for Slow Starting MCP Servers by **@perweij** in [#6383](https://github.com/danny-avila/LibreChat/pull/6383)
- 🚀 feat: `S3` Integration for File handling and Image uploads by **@rubentalstra** in [#6142](https://github.com/danny-avila/LibreChat/pull/6142)
- 🔒feat: Enable OpenID Auto-Redirect by **@leondape** in [#6066](https://github.com/danny-avila/LibreChat/pull/6066)
- 🚀 feat: Integrate `Azure Blob Storage` for file handling and image uploads by **@rubentalstra** in [#6153](https://github.com/danny-avila/LibreChat/pull/6153)
- 🚀 feat: Add support for custom `AWS` endpoint in `S3` by **@rubentalstra** in [#6431](https://github.com/danny-avila/LibreChat/pull/6431)
- 🚀 feat: Add support for LDAP STARTTLS in LDAP authentication by **@rubentalstra** in [#6438](https://github.com/danny-avila/LibreChat/pull/6438)
- 🚀 feat: Refactor schema exports and update package version to 0.0.4 by **@rubentalstra** in [#6455](https://github.com/danny-avila/LibreChat/pull/6455)
- 🔼 feat: Add Auto Submit For URL Query Params by **@mjaverto** in [#6440](https://github.com/danny-avila/LibreChat/pull/6440)
- 🛠 feat: Enhance Redis Integration, Rate Limiters & Log Headers by **@danny-avila** in [#6462](https://github.com/danny-avila/LibreChat/pull/6462)
- 💵 feat: Add Automatic Balance Refill by **@rubentalstra** in [#6452](https://github.com/danny-avila/LibreChat/pull/6452)
- 🗣️ feat: add support for gpt-4o-transcribe models by **@berry-13** in [#6483](https://github.com/danny-avila/LibreChat/pull/6483)
- 🎨 feat: UI Refresh for Enhanced UX by **@berry-13** in [#6346](https://github.com/danny-avila/LibreChat/pull/6346)
- 🌍 feat: Add support for Hungarian language localization by **@rubentalstra** in [#6508](https://github.com/danny-avila/LibreChat/pull/6508)
- 🚀 feat: Add Gemini 2.5 Token/Context Values, Increase Max Possible Output to 64k by **@danny-avila** in [#6563](https://github.com/danny-avila/LibreChat/pull/6563)
- 🚀 feat: Enhance MCP Connections For Multi-User Support by **@danny-avila** in [#6610](https://github.com/danny-avila/LibreChat/pull/6610)
- 🚀 feat: Enhance S3 URL Expiry with Refresh; fix: S3 File Deletion by **@danny-avila** in [#6647](https://github.com/danny-avila/LibreChat/pull/6647)
- 🚀 feat: enhance UI components and refactor settings by **@berry-13** in [#6625](https://github.com/danny-avila/LibreChat/pull/6625)
- 💬 feat: move TemporaryChat to the Header by **@berry-13** in [#6646](https://github.com/danny-avila/LibreChat/pull/6646)
- 🚀 feat: Use Model Specs + Specific Endpoints, Limit Providers for Agents by **@danny-avila** in [#6650](https://github.com/danny-avila/LibreChat/pull/6650)
- 🪙 feat: Sync Balance Config on Login by **@danny-avila** in [#6671](https://github.com/danny-avila/LibreChat/pull/6671)
- 🔦 feat: MCP Support for Non-Agent Endpoints by **@danny-avila** in [#6775](https://github.com/danny-avila/LibreChat/pull/6775)
- 🗃️ feat: Code Interpreter File Persistence between Sessions by **@danny-avila** in [#6790](https://github.com/danny-avila/LibreChat/pull/6790)
- 🖥️ feat: Code Interpreter API for Non-Agent Endpoints by **@danny-avila** in [#6803](https://github.com/danny-avila/LibreChat/pull/6803)
- ⚡ feat: Self-hosted Artifacts Static Bundler URL by **@danny-avila** in [#6827](https://github.com/danny-avila/LibreChat/pull/6827)
- 🐳 feat: Add Jemalloc and UV to Docker Builds by **@danny-avila** in [#6836](https://github.com/danny-avila/LibreChat/pull/6836)
- 🤖 feat: GPT-4.1 by **@danny-avila** in [#6880](https://github.com/danny-avila/LibreChat/pull/6880)
- 👋 feat: remove Edge TTS by **@berry-13** in [#6885](https://github.com/danny-avila/LibreChat/pull/6885)
- feat: nav optimization  by **@berry-13** in [#5785](https://github.com/danny-avila/LibreChat/pull/5785)
- 🗺️ feat: Add Parameter Location Mapping for OpenAPI actions by **@peeeteeer** in [#6858](https://github.com/danny-avila/LibreChat/pull/6858)
- 🤖 feat: Support `o4-mini` and `o3` Models by **@danny-avila** in [#6928](https://github.com/danny-avila/LibreChat/pull/6928)
- 🎨 feat: OpenAI Image Tools (GPT-Image-1) by **@danny-avila** in [#7079](https://github.com/danny-avila/LibreChat/pull/7079)
- 🗓️ feat: Add Special Variables for Prompts & Agents, Prompt UI Improvements by **@danny-avila** in [#7123](https://github.com/danny-avila/LibreChat/pull/7123)
-
-### 🌍 Internationalization
-
- 🌍 i18n: Add Thai Language Support and Update Translations by **@rubentalstra** in [#6219](https://github.com/danny-avila/LibreChat/pull/6219)
- 🌍 i18n: Update translation.json with latest translations by **@github-actions[bot]** in [#6220](https://github.com/danny-avila/LibreChat/pull/6220)
- 🌍 i18n: Update translation.json with latest translations by **@github-actions[bot]** in [#6240](https://github.com/danny-avila/LibreChat/pull/6240)
- 🌍 i18n: Update translation.json with latest translations by **@github-actions[bot]** in [#6241](https://github.com/danny-avila/LibreChat/pull/6241)
- 🌍 i18n: Update translation.json with latest translations by **@github-actions[bot]** in [#6277](https://github.com/danny-avila/LibreChat/pull/6277)
- 🌍 i18n: Update translation.json with latest translations by **@github-actions[bot]** in [#6414](https://github.com/danny-avila/LibreChat/pull/6414)
- 🌍 i18n: Update translation.json with latest translations by **@github-actions[bot]** in [#6505](https://github.com/danny-avila/LibreChat/pull/6505)
- 🌍 i18n: Update translation.json with latest translations by **@github-actions[bot]** in [#6530](https://github.com/danny-avila/LibreChat/pull/6530)
- 🌍 i18n: Add Persian Localization Support by **@rubentalstra** in [#6669](https://github.com/danny-avila/LibreChat/pull/6669)
- 🌍 i18n: Update translation.json with latest translations by **@github-actions[bot]** in [#6667](https://github.com/danny-avila/LibreChat/pull/6667)
- 🌍 i18n: Update translation.json with latest translations by **@github-actions[bot]** in [#7126](https://github.com/danny-avila/LibreChat/pull/7126)
- 🌍 i18n: Update translation.json with latest translations by **@github-actions[bot]** in [#7148](https://github.com/danny-avila/LibreChat/pull/7148)
-
-### 👐 Accessibility
-
- 🎨 a11y: Update Model Spec Description Text by **@berry-13** in [#6294](https://github.com/danny-avila/LibreChat/pull/6294)
- 🗑️ a11y: Add Accessible Name to Button for File Attachment Removal by **@kangabell** in [#6709](https://github.com/danny-avila/LibreChat/pull/6709)
- ⌨️ a11y: enhance accessibility & visual consistency by **@berry-13** in [#6866](https://github.com/danny-avila/LibreChat/pull/6866)
- 🙌 a11y: Searchbar/Conversations List Focus by **@danny-avila** in [#7096](https://github.com/danny-avila/LibreChat/pull/7096)
- 👐 a11y: Improve Fork and SplitText Accessibility by **@danny-avila** in [#7147](https://github.com/danny-avila/LibreChat/pull/7147)
-
-### 🔧 Fixes
-
- 🐛 fix: Avatar Type Definitions in Agent/Assistant Schemas by **@danny-avila** in [#6235](https://github.com/danny-avila/LibreChat/pull/6235)
- 🔧 fix: MeiliSearch Field Error and Patch Incorrect Import by #6210 by **@rubentalstra** in [#6245](https://github.com/danny-avila/LibreChat/pull/6245)
- 🔏 fix: Enhance Two-Factor Authentication by **@rubentalstra** in [#6247](https://github.com/danny-avila/LibreChat/pull/6247)
- 🐛 fix: Await saveMessage in abortMiddleware to ensure proper execution by **@sh4shii** in [#6248](https://github.com/danny-avila/LibreChat/pull/6248)
- 🔧 fix: Axios Proxy Usage And Bump `mongoose` by **@danny-avila** in [#6298](https://github.com/danny-avila/LibreChat/pull/6298)
- 🔧 fix: comment out MCP servers to resolve service run issues by **@KunalScriptz** in [#6316](https://github.com/danny-avila/LibreChat/pull/6316)
- 🔧 fix: Update Token Calculations and Mapping, MCP `env` Initialization by **@danny-avila** in [#6406](https://github.com/danny-avila/LibreChat/pull/6406)
- 🐞 fix: Agent "Resend" Message Attachments + Source Icon Styling by **@danny-avila** in [#6408](https://github.com/danny-avila/LibreChat/pull/6408)
- 🐛 fix: Prevent Crash on Duplicate Message ID by **@Odrec** in [#6392](https://github.com/danny-avila/LibreChat/pull/6392)
- 🔐 fix: Invalid Key Length in 2FA Encryption by **@rubentalstra** in [#6432](https://github.com/danny-avila/LibreChat/pull/6432)
- 🏗️ fix: Fix Agents Token Spend Race Conditions, Expand Test Coverage by **@danny-avila** in [#6480](https://github.com/danny-avila/LibreChat/pull/6480)
- 🔃 fix: Draft Clearing, Claude Titles, Remove Default Vision Max Tokens by **@danny-avila** in [#6501](https://github.com/danny-avila/LibreChat/pull/6501)
- 🔧 fix: Update username reference to use user.name in greeting display by **@rubentalstra** in [#6534](https://github.com/danny-avila/LibreChat/pull/6534)
- 🔧 fix: S3 Download Stream with Key Extraction and Blob Storage Encoding for Vision by **@danny-avila** in [#6557](https://github.com/danny-avila/LibreChat/pull/6557)
- 🔧 fix: Mistral type strictness for `usage` & update token values/windows by **@danny-avila** in [#6562](https://github.com/danny-avila/LibreChat/pull/6562)
- 🔧 fix: Consolidate Text Parsing and TTS Edge Initialization by **@danny-avila** in [#6582](https://github.com/danny-avila/LibreChat/pull/6582)
- 🔧 fix: Ensure continuation in image processing on base64 encoding from Blob Storage by **@danny-avila** in [#6619](https://github.com/danny-avila/LibreChat/pull/6619)
- ✉️ fix: Fallback For User Name In Email Templates by **@danny-avila** in [#6620](https://github.com/danny-avila/LibreChat/pull/6620)
- 🔧 fix: Azure Blob Integration and File Source References by **@rubentalstra** in [#6575](https://github.com/danny-avila/LibreChat/pull/6575)
- 🐛 fix: Safeguard against undefined addedEndpoints by **@wipash** in [#6654](https://github.com/danny-avila/LibreChat/pull/6654)
- 🤖 fix: Gemini 2.5 Vision Support by **@danny-avila** in [#6663](https://github.com/danny-avila/LibreChat/pull/6663)
- 🔄 fix: Avatar & Error Handling Enhancements by **@danny-avila** in [#6687](https://github.com/danny-avila/LibreChat/pull/6687)
- 🔧 fix: Chat Middleware, Zod Conversion, Auto-Save and S3 URL Refresh by **@danny-avila** in [#6720](https://github.com/danny-avila/LibreChat/pull/6720)
- 🔧 fix: Agent Capability Checks & DocumentDB Compatibility for Agent Resource Removal by **@danny-avila** in [#6726](https://github.com/danny-avila/LibreChat/pull/6726)
- 🔄 fix: Improve audio MIME type detection and handling by **@berry-13** in [#6707](https://github.com/danny-avila/LibreChat/pull/6707)
- 🪺 fix: Update Role Handling due to New Schema Shape by **@danny-avila** in [#6774](https://github.com/danny-avila/LibreChat/pull/6774)
- 🗨️ fix: Show ModelSpec Greeting by **@berry-13** in [#6770](https://github.com/danny-avila/LibreChat/pull/6770)
- 🔧 fix: Keyv and Proxy Issues, and More Memory Optimizations by **@danny-avila** in [#6867](https://github.com/danny-avila/LibreChat/pull/6867)
- ✨ fix: Implement dynamic text sizing for greeting and name display by **@berry-13** in [#6833](https://github.com/danny-avila/LibreChat/pull/6833)
- 📝 fix: Mistral OCR Image Support and Azure Agent Titles by **@danny-avila** in [#6901](https://github.com/danny-avila/LibreChat/pull/6901)
- 📢 fix: Invalid `engineTTS` and Conversation State on Navigation by **@berry-13** in [#6904](https://github.com/danny-avila/LibreChat/pull/6904)
- 🛠️ fix: Improve Accessibility and Display of Conversation Menu by **@danny-avila** in [#6913](https://github.com/danny-avila/LibreChat/pull/6913)
- 🔧 fix: Agent Resource Form, Convo Menu Style, Ensure Draft Clears on Submission by **@danny-avila** in [#6925](https://github.com/danny-avila/LibreChat/pull/6925)
- 🔀 fix: MCP Improvements, Auto-Save Drafts, Artifact Markup by **@danny-avila** in [#7040](https://github.com/danny-avila/LibreChat/pull/7040)
- 🐋 fix: Improve Deepseek Compatbility by **@danny-avila** in [#7132](https://github.com/danny-avila/LibreChat/pull/7132)
- 🐙 fix: Add Redis Ping Interval to Prevent Connection Drops by **@peeeteeer** in [#7127](https://github.com/danny-avila/LibreChat/pull/7127)
-
-### ⚙️ Other Changes
-
- 📦 refactor: Move DB Models to `@librechat/data-schemas` by **@rubentalstra** in [#6210](https://github.com/danny-avila/LibreChat/pull/6210)
- 📦 chore: Patch `axios` to address CVE-2025-27152 by **@danny-avila** in [#6222](https://github.com/danny-avila/LibreChat/pull/6222)
- ⚠️ refactor: Use Error Content Part Instead Of Throwing Error for Agents by **@danny-avila** in [#6262](https://github.com/danny-avila/LibreChat/pull/6262)
- 🏃‍♂️ refactor: Improve Agent Run Context & Misc. Changes by **@danny-avila** in [#6448](https://github.com/danny-avila/LibreChat/pull/6448)
- 📝 docs: librechat.example.yaml by **@ineiti** in [#6442](https://github.com/danny-avila/LibreChat/pull/6442)
- 🏃‍♂️ refactor: More Agent Context Improvements during Run by **@danny-avila** in [#6477](https://github.com/danny-avila/LibreChat/pull/6477)
- 🔃 refactor: Allow streaming for `o1` models by **@danny-avila** in [#6509](https://github.com/danny-avila/LibreChat/pull/6509)
- 🔧 chore: `Vite` Plugin Upgrades & Config Optimizations by **@rubentalstra** in [#6547](https://github.com/danny-avila/LibreChat/pull/6547)
- 🔧 refactor: Consolidate Logging, Model Selection & Actions Optimizations, Minor Fixes by **@danny-avila** in [#6553](https://github.com/danny-avila/LibreChat/pull/6553)
- 🎨 style: Address Minor UI Refresh Issues by **@berry-13** in [#6552](https://github.com/danny-avila/LibreChat/pull/6552)
- 🔧 refactor: Enhance Model & Endpoint Configurations with Global Indicators 🌍 by **@berry-13** in [#6578](https://github.com/danny-avila/LibreChat/pull/6578)
- 💬 style: Chat UI, Greeting, and Message adjustments by **@berry-13** in [#6612](https://github.com/danny-avila/LibreChat/pull/6612)
- ⚡ refactor: DocumentDB Compatibility for Balance Updates by **@danny-avila** in [#6673](https://github.com/danny-avila/LibreChat/pull/6673)
- 🧹 chore: Update ESLint rules for React hooks by **@rubentalstra** in [#6685](https://github.com/danny-avila/LibreChat/pull/6685)
- 🪙 chore: Update Gemini Pricing by **@RedwindA** in [#6731](https://github.com/danny-avila/LibreChat/pull/6731)
- 🪺 refactor: Nest Permission fields for Roles by **@rubentalstra** in [#6487](https://github.com/danny-avila/LibreChat/pull/6487)
- 📦 chore: Update `caniuse-lite` dependency to version 1.0.30001706 by **@rubentalstra** in [#6482](https://github.com/danny-avila/LibreChat/pull/6482)
- ⚙️ refactor: OAuth Flow Signal, Type Safety, Tool Progress & Updated Packages by **@danny-avila** in [#6752](https://github.com/danny-avila/LibreChat/pull/6752)
- 📦 chore: bump vite from 6.2.3 to 6.2.5 by **@dependabot[bot]** in [#6745](https://github.com/danny-avila/LibreChat/pull/6745)
- 💾 chore: Enhance Local Storage Handling and Update MCP SDK by **@danny-avila** in [#6809](https://github.com/danny-avila/LibreChat/pull/6809)
- 🤖 refactor: Improve Agents Memory Usage, Bump Keyv, Grok 3 by **@danny-avila** in [#6850](https://github.com/danny-avila/LibreChat/pull/6850)
- 💾 refactor: Enhance Memory In Image Encodings & Client Disposal by **@danny-avila** in [#6852](https://github.com/danny-avila/LibreChat/pull/6852)
- 🔁 refactor: Token Event Handler and Standardize `maxTokens` Key by **@danny-avila** in [#6886](https://github.com/danny-avila/LibreChat/pull/6886)
- 🔍 refactor: Search & Message Retrieval by **@berry-13** in [#6903](https://github.com/danny-avila/LibreChat/pull/6903)
- 🎨 style: standardize dropdown styling & fix z-Index layering by **@berry-13** in [#6939](https://github.com/danny-avila/LibreChat/pull/6939)
- 📙 docs: CONTRIBUTING.md by **@dblock** in [#6831](https://github.com/danny-avila/LibreChat/pull/6831)
- 🧭 refactor: Modernize Nav/Header by **@danny-avila** in [#7094](https://github.com/danny-avila/LibreChat/pull/7094)
- 🪶 refactor: Chat Input Focus for Conversation Navigations & ChatForm Optimizations by **@danny-avila** in [#7100](https://github.com/danny-avila/LibreChat/pull/7100)
- 🔃 refactor: Streamline Navigation, Message Loading UX by **@danny-avila** in [#7118](https://github.com/danny-avila/LibreChat/pull/7118)
- 📜 docs: Unreleased changelog by **@github-actions[bot]** in [#6265](https://github.com/danny-avila/LibreChat/pull/6265)
-
-
-
-[See full release details][release-v0.7.8-rc1]
-
-[release-v0.7.8-rc1]: https://github.com/danny-avila/LibreChat/releases/tag/v0.7.8-rc1
-
---
--- a/15
+++ b/15
@@ -1,18 +1,9 @@
-# v0.7.8
+# v0.7.7-rc1

 # Base node image
 FROM node:20-alpine AS node

-# Install jemalloc
-RUN apk add --no-cache jemalloc
-RUN apk add --no-cache python3 py3-pip uv
-
-# Set environment variable to use jemalloc
-ENV LD_PRELOAD=/usr/lib/libjemalloc.so.2
-
-# Add `uv` for extended MCP support
-COPY --from=ghcr.io/astral-sh/uv:0.6.13 /uv /uvx /bin/
-RUN uv --version
+RUN apk --no-cache add curl

 RUN mkdir -p /app && chown node:node /app
 WORKDIR /app
@@ -47,4 +38,4 @@ CMD ["npm", "run", "backend"]
 # WORKDIR /usr/share/nginx/html
 # COPY --from=node /app/client/dist /usr/share/nginx/html
 # COPY client/nginx.conf /etc/nginx/conf.d/default.conf
-# ENTRYPOINT ["nginx", "-g", "daemon off;"]
+# ENTRYPOINT ["nginx", "-g", "daemon off;"]
--- a/Dockerfile.multi
+++ b/Dockerfile.multi
@@ -1,12 +1,8 @@
 # Dockerfile.multi
-# v0.7.8
+# v0.7.7-rc1

 # Base for all builds
 FROM node:20-alpine AS base-min
-# Install jemalloc
-RUN apk add --no-cache jemalloc
-# Set environment variable to use jemalloc
-ENV LD_PRELOAD=/usr/lib/libjemalloc.so.2
 WORKDIR /app
 RUN apk --no-cache add curl
 RUN npm config set fetch-retry-maxtimeout 600000 && \
@@ -15,7 +11,6 @@ RUN npm config set fetch-retry-maxtimeout 600000 && \
 COPY package*.json ./
 COPY packages/data-provider/package*.json ./packages/data-provider/
 COPY packages/mcp/package*.json ./packages/mcp/
-COPY packages/data-schemas/package*.json ./packages/data-schemas/
 COPY client/package*.json ./client/
 COPY api/package*.json ./api/

@@ -37,13 +32,6 @@ COPY packages/mcp ./
 COPY --from=data-provider-build /app/packages/data-provider/dist /app/packages/data-provider/dist
 RUN npm run build

-# Build data-schemas
-FROM base AS data-schemas-build
-WORKDIR /app/packages/data-schemas
-COPY packages/data-schemas ./
-COPY --from=data-provider-build /app/packages/data-provider/dist /app/packages/data-provider/dist
-RUN npm run build
-
 # Client build
 FROM base AS client-build
 WORKDIR /app/client
@@ -54,9 +42,6 @@ RUN npm run build

 # API setup (including client dist)
 FROM base-min AS api-build
-# Add `uv` for extended MCP support
-COPY --from=ghcr.io/astral-sh/uv:0.6.13 /uv /uvx /bin/
-RUN uv --version
 WORKDIR /app
 # Install only production deps
 RUN npm ci --omit=dev
@@ -64,9 +49,8 @@ COPY api ./api
 COPY config ./config
 COPY --from=data-provider-build /app/packages/data-provider/dist ./packages/data-provider/dist
 COPY --from=mcp-build /app/packages/mcp/dist ./packages/mcp/dist
-COPY --from=data-schemas-build /app/packages/data-schemas/dist ./packages/data-schemas/dist
 COPY --from=client-build /app/client/dist ./client/dist
 WORKDIR /app/api
 EXPOSE 3080
 ENV HOST=0.0.0.0
-CMD ["node", "server/index.js"]
+CMD ["node", "server/index.js"]
--- a/README.md
+++ b/README.md
@@ -71,19 +71,9 @@
    - [Model Context Protocol (MCP) Support](https://modelcontextprotocol.io/clients#librechat) for Tools
  - Use LibreChat Agents and OpenAI Assistants with Files, Code Interpreter, Tools, and API Actions

- 🔍 **Web Search**:  
-  - Search the internet and retrieve relevant information to enhance your AI context
-  - Combines search providers, content scrapers, and result rerankers for optimal results
-  - **[Learn More →](https://www.librechat.ai/docs/features/web_search)**
-
 - 🪄 **Generative UI with Code Artifacts**:  
  - [Code Artifacts](https://youtu.be/GfTj7O4gmd0?si=WJbdnemZpJzBrJo3) allow creation of React, HTML, and Mermaid diagrams directly in chat

- 🎨 **Image Generation & Editing**
-  - Text-to-image and image-to-image with [GPT-Image-1](https://www.librechat.ai/docs/features/image_gen#1--openai-image-tools-recommended)
-  - Text-to-image with [DALL-E (3/2)](https://www.librechat.ai/docs/features/image_gen#2--dalle-legacy), [Stable Diffusion](https://www.librechat.ai/docs/features/image_gen#3--stable-diffusion-local), [Flux](https://www.librechat.ai/docs/features/image_gen#4--flux), or any [MCP server](https://www.librechat.ai/docs/features/image_gen#5--model-context-protocol-mcp)
-  - Produce stunning visuals from prompts or refine existing images with a single instruction
-
 - 💾 **Presets & Context Management**:  
  - Create, Save, & Share Custom Presets  
  - Switch between AI Endpoints and Presets mid-chat
@@ -91,7 +81,7 @@
  - [Fork Messages & Conversations](https://www.librechat.ai/docs/features/fork) for Advanced Context control

 - 💬 **Multimodal & File Interactions**:  
-  - Upload and analyze images with Claude 3, GPT-4.5, GPT-4o, o1, Llama-Vision, and Gemini 📸  
+  - Upload and analyze images with Claude 3, GPT-4o, o1, Llama-Vision, and Gemini 📸  
  - Chat with Files using Custom Endpoints, OpenAI, Azure, Anthropic, AWS Bedrock, & Google 🗃️

 - 🌎 **Multilingual UI**:  
@@ -207,6 +197,6 @@ We thank [Locize](https://locize.com) for their translation management tools tha

 <p align="center">
  <a href="https://locize.com" target="_blank" rel="noopener noreferrer">
-    <img src="https://github.com/user-attachments/assets/d6b70894-6064-475e-bb65-92a9e23e0077" alt="Locize Logo" height="50">
+    <img src="https://locize.com/img/locize_color.svg" alt="Locize Logo" height="50">
  </a>
 </p>
--- a/api/app/clients/AnthropicClient.js
+++ b/api/app/clients/AnthropicClient.js
@@ -2,14 +2,12 @@ const Anthropic = require('@anthropic-ai/sdk');
 const { HttpsProxyAgent } = require('https-proxy-agent');
 const {
  Constants,
-  ErrorTypes,
  EModelEndpoint,
-  parseTextParts,
  anthropicSettings,
  getResponseSender,
  validateVisionModel,
 } = require('librechat-data-provider');
-const { SplitStreamHandler: _Handler } = require('@librechat/agents');
+const { SplitStreamHandler: _Handler, GraphEvents } = require('@librechat/agents');
 const {
  truncateText,
  formatMessage,
@@ -26,11 +24,10 @@ const {
 const { getModelMaxTokens, getModelMaxOutputTokens, matchModelName } = require('~/utils');
 const { spendTokens, spendStructuredTokens } = require('~/models/spendTokens');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
-const { createFetch, createStreamEventHandlers } = require('./generators');
 const Tokenizer = require('~/server/services/Tokenizer');
+const { logger, sendEvent } = require('~/config');
 const { sleep } = require('~/server/utils');
 const BaseClient = require('./BaseClient');
-const { logger } = require('~/config');

 const HUMAN_PROMPT = '\n\nHuman:';
 const AI_PROMPT = '\n\nAssistant:';
@@ -70,10 +67,13 @@ class AnthropicClient extends BaseClient {
    this.message_delta;
    /** Whether the model is part of the Claude 3 Family
     * @type {boolean} */
-    this.isClaudeLatest;
+    this.isClaude3;
    /** Whether to use Messages API or Completions API
     * @type {boolean} */
    this.useMessages;
+    /** Whether or not the model is limited to the legacy amount of output tokens
+     * @type {boolean} */
+    this.isLegacyOutput;
    /** Whether or not the model supports Prompt Caching
     * @type {boolean} */
    this.supportsCacheControl;
@@ -113,25 +113,21 @@ class AnthropicClient extends BaseClient {
    );

    const modelMatch = matchModelName(this.modelOptions.model, EModelEndpoint.anthropic);
-    this.isClaudeLatest =
-      /claude-[3-9]/.test(modelMatch) || /claude-(?:sonnet|opus|haiku)-[4-9]/.test(modelMatch);
-    const isLegacyOutput = !(
-      /claude-3[-.]5-sonnet/.test(modelMatch) ||
-      /claude-3[-.]7/.test(modelMatch) ||
-      /claude-(?:sonnet|opus|haiku)-[4-9]/.test(modelMatch) ||
-      /claude-[4-9]/.test(modelMatch)
+    this.isClaude3 = modelMatch.includes('claude-3');
+    this.isLegacyOutput = !(
+      /claude-3[-.]5-sonnet/.test(modelMatch) || /claude-3[-.]7/.test(modelMatch)
    );
    this.supportsCacheControl = this.options.promptCache && checkPromptCacheSupport(modelMatch);

    if (
-      isLegacyOutput &&
+      this.isLegacyOutput &&
      this.modelOptions.maxOutputTokens &&
      this.modelOptions.maxOutputTokens > legacy.maxOutputTokens.default
    ) {
      this.modelOptions.maxOutputTokens = legacy.maxOutputTokens.default;
    }

-    this.useMessages = this.isClaudeLatest || !!this.options.attachments;
+    this.useMessages = this.isClaude3 || !!this.options.attachments;

    this.defaultVisionModel = this.options.visionModel ?? 'claude-3-sonnet-20240229';
    this.options.attachments?.then((attachments) => this.checkVisionRequest(attachments));
@@ -151,17 +147,12 @@ class AnthropicClient extends BaseClient {
    this.maxPromptTokens =
      this.options.maxPromptTokens || this.maxContextTokens - this.maxResponseTokens;

-    const reservedTokens = this.maxPromptTokens + this.maxResponseTokens;
-    if (reservedTokens > this.maxContextTokens) {
-      const info = `Total Possible Tokens + Max Output Tokens must be less than or equal to Max Context Tokens: ${this.maxPromptTokens} (total possible output) + ${this.maxResponseTokens} (max output) = ${reservedTokens}/${this.maxContextTokens} (max context)`;
-      const errorMessage = `{ "type": "${ErrorTypes.INPUT_LENGTH}", "info": "${info}" }`;
-      logger.warn(info);
-      throw new Error(errorMessage);
-    } else if (this.maxResponseTokens === this.maxContextTokens) {
-      const info = `Max Output Tokens must be less than Max Context Tokens: ${this.maxResponseTokens} (max output) = ${this.maxContextTokens} (max context)`;
-      const errorMessage = `{ "type": "${ErrorTypes.INPUT_LENGTH}", "info": "${info}" }`;
-      logger.warn(info);
-      throw new Error(errorMessage);
+    if (this.maxPromptTokens + this.maxResponseTokens > this.maxContextTokens) {
+      throw new Error(
+        `maxPromptTokens + maxOutputTokens (${this.maxPromptTokens} + ${this.maxResponseTokens} = ${
+          this.maxPromptTokens + this.maxResponseTokens
+        }) must be less than or equal to maxContextTokens (${this.maxContextTokens})`,
+      );
    }

    this.sender =
@@ -186,10 +177,7 @@ class AnthropicClient extends BaseClient {
  getClient(requestOptions) {
    /** @type {Anthropic.ClientOptions} */
    const options = {
-      fetch: createFetch({
-        directEndpoint: this.options.directEndpoint,
-        reverseProxyUrl: this.options.reverseProxyUrl,
-      }),
+      fetch: this.fetch,
      apiKey: this.apiKey,
    };

@@ -397,13 +385,13 @@ class AnthropicClient extends BaseClient {
    const formattedMessages = orderedMessages.map((message, i) => {
      const formattedMessage = this.useMessages
        ? formatMessage({
-            message,
-            endpoint: EModelEndpoint.anthropic,
-          })
+          message,
+          endpoint: EModelEndpoint.anthropic,
+        })
        : {
-            author: message.isCreatedByUser ? this.userLabel : this.assistantLabel,
-            content: message?.content ?? message.text,
-          };
+          author: message.isCreatedByUser ? this.userLabel : this.assistantLabel,
+          content: message?.content ?? message.text,
+        };

      const needsTokenCount = this.contextStrategy && !orderedMessages[i].tokenCount;
      /* If tokens were never counted, or, is a Vision request and the message has files, count again */
@@ -419,9 +407,6 @@ class AnthropicClient extends BaseClient {
            this.contextHandlers?.processFile(file);
            continue;
          }
-          if (file.metadata?.fileIdentifier) {
-            continue;
-          }

          orderedMessages[i].tokenCount += this.calculateImageTokenCost({
            width: file.width,
@@ -655,10 +640,7 @@ class AnthropicClient extends BaseClient {
      );
    };

-    if (
-      /claude-[3-9]/.test(this.modelOptions.model) ||
-      /claude-(?:sonnet|opus|haiku)-[4-9]/.test(this.modelOptions.model)
-    ) {
+    if (this.modelOptions.model.includes('claude-3')) {
      await buildMessagesPayload();
      processTokens();
      return {
@@ -684,7 +666,7 @@ class AnthropicClient extends BaseClient {
  }

  getCompletion() {
-    logger.debug("AnthropicClient doesn't use getCompletion (all handled in sendCompletion)");
+    logger.debug('AnthropicClient doesn\'t use getCompletion (all handled in sendCompletion)');
  }

  /**
@@ -707,9 +689,6 @@ class AnthropicClient extends BaseClient {
    return (msg) => {
      if (msg.text != null && msg.text && msg.text.startsWith(':::thinking')) {
        msg.text = msg.text.replace(/:::thinking.*?:::/gs, '').trim();
-      } else if (msg.content != null) {
-        msg.text = parseTextParts(msg.content, true);
-        delete msg.content;
      }

      return msg;
@@ -767,6 +746,15 @@ class AnthropicClient extends BaseClient {
      metadata,
    };

+    if (!/claude-3[-.]7/.test(model)) {
+      if (top_p !== undefined) {
+        requestOptions.top_p = top_p;
+      }
+      if (top_k !== undefined) {
+        requestOptions.top_k = top_k;
+      }
+    }
+
    if (this.useMessages) {
      requestOptions.messages = payload;
      requestOptions.max_tokens =
@@ -781,14 +769,6 @@ class AnthropicClient extends BaseClient {
      thinkingBudget: this.options.thinkingBudget,
    });

-    if (!/claude-3[-.]7/.test(model)) {
-      requestOptions.top_p = top_p;
-      requestOptions.top_k = top_k;
-    } else if (requestOptions.thinking == null) {
-      requestOptions.topP = top_p;
-      requestOptions.topK = top_k;
-    }
-
    if (this.systemMessage && this.supportsCacheControl === true) {
      requestOptions.system = [
        {
@@ -806,11 +786,14 @@ class AnthropicClient extends BaseClient {
    }

    logger.debug('[AnthropicClient]', { ...requestOptions });
-    const handlers = createStreamEventHandlers(this.options.res);
    this.streamHandler = new SplitStreamHandler({
      accumulate: true,
      runId: this.responseMessageId,
-      handlers,
+      handlers: {
+        [GraphEvents.ON_RUN_STEP]: (event) => sendEvent(this.options.res, event),
+        [GraphEvents.ON_MESSAGE_DELTA]: (event) => sendEvent(this.options.res, event),
+        [GraphEvents.ON_REASONING_DELTA]: (event) => sendEvent(this.options.res, event),
+      },
    });

    let intermediateReply = this.streamHandler.tokens;
@@ -892,7 +875,7 @@ class AnthropicClient extends BaseClient {
  }

  getBuildMessagesOptions() {
-    logger.debug("AnthropicClient doesn't use getBuildMessagesOptions");
+    logger.debug('AnthropicClient doesn\'t use getBuildMessagesOptions');
  }

  getEncoding() {
--- a/api/app/clients/BaseClient.js
+++ b/api/app/clients/BaseClient.js
@@ -5,15 +5,14 @@ const {
  isAgentsEndpoint,
  isParamEndpoint,
  EModelEndpoint,
-  ContentTypes,
  excludedKeys,
  ErrorTypes,
  Constants,
 } = require('librechat-data-provider');
 const { getMessages, saveMessage, updateMessage, saveConvo, getConvo } = require('~/models');
-const { checkBalance } = require('~/models/balanceMethods');
+const { addSpaceIfNeeded, isEnabled } = require('~/server/utils');
 const { truncateToolCallOutputs } = require('./prompts');
-const { addSpaceIfNeeded } = require('~/server/utils');
+const checkBalance = require('~/models/checkBalance');
 const { getFiles } = require('~/models/File');
 const TextStream = require('./TextStream');
 const { logger } = require('~/config');
@@ -28,10 +27,15 @@ class BaseClient {
      month: 'long',
      day: 'numeric',
    });
+    this.fetch = this.fetch.bind(this);
    /** @type {boolean} */
    this.skipSaveConvo = false;
    /** @type {boolean} */
    this.skipSaveUserMessage = false;
+    /** @type {ClientDatabaseSavePromise} */
+    this.userMessagePromise;
+    /** @type {ClientDatabaseSavePromise} */
+    this.responsePromise;
    /** @type {string} */
    this.user;
    /** @type {string} */
@@ -63,15 +67,15 @@ class BaseClient {
  }

  setOptions() {
-    throw new Error("Method 'setOptions' must be implemented.");
+    throw new Error('Method \'setOptions\' must be implemented.');
  }

  async getCompletion() {
-    throw new Error("Method 'getCompletion' must be implemented.");
+    throw new Error('Method \'getCompletion\' must be implemented.');
  }

  async sendCompletion() {
-    throw new Error("Method 'sendCompletion' must be implemented.");
+    throw new Error('Method \'sendCompletion\' must be implemented.');
  }

  getSaveOptions() {
@@ -237,11 +241,11 @@ class BaseClient {
    const userMessage = opts.isEdited
      ? this.currentMessages[this.currentMessages.length - 2]
      : this.createUserMessage({
-          messageId: userMessageId,
-          parentMessageId,
-          conversationId,
-          text: message,
-        });
+        messageId: userMessageId,
+        parentMessageId,
+        conversationId,
+        text: message,
+      });

    if (typeof opts?.getReqData === 'function') {
      opts.getReqData({
@@ -361,14 +365,17 @@ class BaseClient {
   *  context: TMessage[],
   *  remainingContextTokens: number,
   *  messagesToRefine: TMessage[],
-   * }>} An object with three properties: `context`, `remainingContextTokens`, and `messagesToRefine`.
+   *  summaryIndex: number,
+   * }>} An object with four properties: `context`, `summaryIndex`, `remainingContextTokens`, and `messagesToRefine`.
   *    `context` is an array of messages that fit within the token limit.
+   *    `summaryIndex` is the index of the first message in the `messagesToRefine` array.
   *    `remainingContextTokens` is the number of tokens remaining within the limit after adding the messages to the context.
   *    `messagesToRefine` is an array of messages that were not added to the context because they would have exceeded the token limit.
   */
  async getMessagesWithinTokenLimit({ messages: _messages, maxContextTokens, instructions }) {
    // Every reply is primed with <|start|>assistant<|message|>, so we
    // start with 3 tokens for the label after all messages have been counted.
+    let summaryIndex = -1;
    let currentTokenCount = 3;
    const instructionsTokenCount = instructions?.tokenCount ?? 0;
    let remainingContextTokens =
@@ -401,12 +408,14 @@ class BaseClient {
    }

    const prunedMemory = messages;
+    summaryIndex = prunedMemory.length - 1;
    remainingContextTokens -= currentTokenCount;

    return {
      context: context.reverse(),
      remainingContextTokens,
      messagesToRefine: prunedMemory,
+      summaryIndex,
    };
  }

@@ -449,7 +458,7 @@ class BaseClient {

    let orderedWithInstructions = this.addInstructions(orderedMessages, instructions);

-    let { context, remainingContextTokens, messagesToRefine } =
+    let { context, remainingContextTokens, messagesToRefine, summaryIndex } =
      await this.getMessagesWithinTokenLimit({
        messages: orderedWithInstructions,
        instructions,
@@ -519,7 +528,7 @@ class BaseClient {
    }

    // Make sure to only continue summarization logic if the summary message was generated
-    shouldSummarize = summaryMessage != null && shouldSummarize === true;
+    shouldSummarize = summaryMessage && shouldSummarize;

    logger.debug('[BaseClient] Context Count (2/2)', {
      remainingContextTokens,
@@ -529,18 +538,17 @@ class BaseClient {
    /** @type {Record<string, number> | undefined} */
    let tokenCountMap;
    if (buildTokenMap) {
-      const currentPayload = shouldSummarize ? orderedWithInstructions : context;
-      tokenCountMap = currentPayload.reduce((map, message, index) => {
+      tokenCountMap = orderedWithInstructions.reduce((map, message, index) => {
        const { messageId } = message;
        if (!messageId) {
          return map;
        }

-        if (shouldSummarize && index === messagesToRefine.length - 1 && !usePrevSummary) {
+        if (shouldSummarize && index === summaryIndex && !usePrevSummary) {
          map.summaryMessage = { ...summaryMessage, messageId, tokenCount: summaryTokenCount };
        }

-        map[messageId] = currentPayload[index].tokenCount;
+        map[messageId] = orderedWithInstructions[index].tokenCount;
        return map;
      }, {});
    }
@@ -559,8 +567,6 @@ class BaseClient {
  }

  async sendMessage(message, opts = {}) {
-    /** @type {Promise<TMessage>} */
-    let userMessagePromise;
    const { user, head, isEdited, conversationId, responseMessageId, saveOptions, userMessage } =
      await this.handleStartMethods(message, opts);

@@ -622,18 +628,17 @@ class BaseClient {
    }

    if (!isEdited && !this.skipSaveUserMessage) {
-      userMessagePromise = this.saveMessageToDatabase(userMessage, saveOptions, user);
+      this.userMessagePromise = this.saveMessageToDatabase(userMessage, saveOptions, user);
      this.savedMessageIds.add(userMessage.messageId);
      if (typeof opts?.getReqData === 'function') {
        opts.getReqData({
-          userMessagePromise,
+          userMessagePromise: this.userMessagePromise,
        });
      }
    }

-    const balance = this.options.req?.app?.locals?.balance;
    if (
-      balance?.enabled &&
+      isEnabled(process.env.CHECK_BALANCE) &&
      supportsBalanceCheck[this.options.endpointType ?? this.options.endpoint]
    ) {
      await checkBalance({
@@ -652,9 +657,7 @@ class BaseClient {

    /** @type {string|string[]|undefined} */
    const completion = await this.sendCompletion(payload, opts);
-    if (this.abortController) {
-      this.abortController.requestCompleted = true;
-    }
+    this.abortController.requestCompleted = true;

    /** @type {TMessage} */
    const responseMessage = {
@@ -675,8 +678,7 @@ class BaseClient {
      responseMessage.text = addSpaceIfNeeded(generation) + completion;
    } else if (
      Array.isArray(completion) &&
-      (this.clientName === EModelEndpoint.agents ||
-        isParamEndpoint(this.options.endpoint, this.options.endpointType))
+      isParamEndpoint(this.options.endpoint, this.options.endpointType)
    ) {
      responseMessage.text = '';
      responseMessage.content = completion;
@@ -702,13 +704,7 @@ class BaseClient {
      if (usage != null && Number(usage[this.outputTokensKey]) > 0) {
        responseMessage.tokenCount = usage[this.outputTokensKey];
        completionTokens = responseMessage.tokenCount;
-        await this.updateUserMessageTokenCount({
-          usage,
-          tokenCountMap,
-          userMessage,
-          userMessagePromise,
-          opts,
-        });
+        await this.updateUserMessageTokenCount({ usage, tokenCountMap, userMessage, opts });
      } else {
        responseMessage.tokenCount = this.getTokenCountForResponse(responseMessage);
        completionTokens = responseMessage.tokenCount;
@@ -717,8 +713,8 @@ class BaseClient {
      await this.recordTokenUsage({ promptTokens, completionTokens, usage });
    }

-    if (userMessagePromise) {
-      await userMessagePromise;
+    if (this.userMessagePromise) {
+      await this.userMessagePromise;
    }

    if (this.artifactPromises) {
@@ -733,11 +729,7 @@ class BaseClient {
      }
    }

-    responseMessage.databasePromise = this.saveMessageToDatabase(
-      responseMessage,
-      saveOptions,
-      user,
-    );
+    this.responsePromise = this.saveMessageToDatabase(responseMessage, saveOptions, user);
    this.savedMessageIds.add(responseMessage.messageId);
    delete responseMessage.tokenCount;
    return responseMessage;
@@ -758,16 +750,9 @@ class BaseClient {
   * @param {StreamUsage} params.usage
   * @param {Record<string, number>} params.tokenCountMap
   * @param {TMessage} params.userMessage
-   * @param {Promise<TMessage>} params.userMessagePromise
   * @param {object} params.opts
   */
-  async updateUserMessageTokenCount({
-    usage,
-    tokenCountMap,
-    userMessage,
-    userMessagePromise,
-    opts,
-  }) {
+  async updateUserMessageTokenCount({ usage, tokenCountMap, userMessage, opts }) {
    /** @type {boolean} */
    const shouldUpdateCount =
      this.calculateCurrentTokenCount != null &&
@@ -803,7 +788,7 @@ class BaseClient {
      Note: we update the user message to be sure it gets the calculated token count;
      though `AskController` saves the user message, EditController does not
    */
-    await userMessagePromise;
+    await this.userMessagePromise;
    await this.updateMessageInDatabase({
      messageId: userMessage.messageId,
      tokenCount: userMessageTokenCount,
@@ -869,7 +854,7 @@ class BaseClient {
    }

    const savedMessage = await saveMessage(
-      this.options?.req,
+      this.options.req,
      {
        ...message,
        endpoint: this.options.endpoint,
@@ -893,17 +878,16 @@ class BaseClient {
    const existingConvo =
      this.fetchedConvo === true
        ? null
-        : await getConvo(this.options?.req?.user?.id, message.conversationId);
+        : await getConvo(this.options.req?.user?.id, message.conversationId);

    const unsetFields = {};
-    const exceptions = new Set(['spec', 'iconURL']);
    if (existingConvo != null) {
      this.fetchedConvo = true;
      for (const key in existingConvo) {
        if (!key) {
          continue;
        }
-        if (excludedKeys.has(key) && !exceptions.has(key)) {
+        if (excludedKeys.has(key)) {
          continue;
        }

@@ -913,7 +897,7 @@ class BaseClient {
      }
    }

-    const conversation = await saveConvo(this.options?.req, fieldsToKeep, {
+    const conversation = await saveConvo(this.options.req, fieldsToKeep, {
      context: 'api/app/clients/BaseClient.js - saveMessageToDatabase #saveConvo',
      unsetFields,
    });
@@ -1037,17 +1021,11 @@ class BaseClient {
    const processValue = (value) => {
      if (Array.isArray(value)) {
        for (let item of value) {
-          if (
-            !item ||
-            !item.type ||
-            item.type === ContentTypes.THINK ||
-            item.type === ContentTypes.ERROR ||
-            item.type === ContentTypes.IMAGE_URL
-          ) {
+          if (!item || !item.type || item.type === 'image_url') {
            continue;
          }

-          if (item.type === ContentTypes.TOOL_CALL && item.tool_call != null) {
+          if (item.type === 'tool_call' && item.tool_call != null) {
            const toolName = item.tool_call?.name || '';
            if (toolName != null && toolName && typeof toolName === 'string') {
              numTokens += this.getTokenCount(toolName);
@@ -1143,13 +1121,9 @@ class BaseClient {
        return message;
      }

-      const files = await getFiles(
-        {
-          file_id: { $in: fileIds },
-        },
-        {},
-        {},
-      );
+      const files = await getFiles({
+        file_id: { $in: fileIds },
+      });

      await this.addImageURLs(message, files, this.visionMode);

--- a/api/app/clients/ChatGPTClient.js
+++ b/api/app/clients/ChatGPTClient.js
@@ -1,4 +1,4 @@
-const { Keyv } = require('keyv');
+const Keyv = require('keyv');
 const crypto = require('crypto');
 const { CohereClient } = require('cohere-ai');
 const { fetchEventSource } = require('@waylaidwanderer/fetch-event-source');
@@ -339,7 +339,7 @@ class ChatGPTClient extends BaseClient {
    opts.body = JSON.stringify(modelOptions);

    if (modelOptions.stream) {
-
+      // eslint-disable-next-line no-async-promise-executor
      return new Promise(async (resolve, reject) => {
        try {
          let done = false;
--- a/api/app/clients/GoogleClient.js
+++ b/api/app/clients/GoogleClient.js
@@ -9,7 +9,6 @@ const {
  validateVisionModel,
  getResponseSender,
  endpointSettings,
-  parseTextParts,
  EModelEndpoint,
  ContentTypes,
  VisionModes,
@@ -140,7 +139,8 @@ class GoogleClient extends BaseClient {
    this.options.attachments?.then((attachments) => this.checkVisionRequest(attachments));

    /** @type {boolean} Whether using a "GenerativeAI" Model */
-    this.isGenerativeModel = /gemini|learnlm|gemma/.test(this.modelOptions.model);
+    this.isGenerativeModel =
+      this.modelOptions.model.includes('gemini') || this.modelOptions.model.includes('learnlm');

    this.maxContextTokens =
      this.options.maxContextTokens ??
@@ -198,11 +198,7 @@ class GoogleClient extends BaseClient {
   */
  checkVisionRequest(attachments) {
    /* Validation vision request */
-    this.defaultVisionModel =
-      this.options.visionModel ??
-      (!EXCLUDED_GENAI_MODELS.test(this.modelOptions.model)
-        ? this.modelOptions.model
-        : 'gemini-pro-vision');
+    this.defaultVisionModel = this.options.visionModel ?? 'gemini-pro-vision';
    const availableModels = this.options.modelsConfig?.[EModelEndpoint.google];
    this.isVisionModel = validateVisionModel({ model: this.modelOptions.model, availableModels });

@@ -317,9 +313,6 @@ class GoogleClient extends BaseClient {
          this.contextHandlers?.processFile(file);
          continue;
        }
-        if (file.metadata?.fileIdentifier) {
-          continue;
-        }
      }

      this.augmentedPrompt = await this.contextHandlers.createContext();
@@ -777,22 +770,6 @@ class GoogleClient extends BaseClient {
    return this.usage;
  }

-  getMessageMapMethod() {
-    /**
-     * @param {TMessage} msg
-     */
-    return (msg) => {
-      if (msg.text != null && msg.text && msg.text.startsWith(':::thinking')) {
-        msg.text = msg.text.replace(/:::thinking.*?:::/gs, '').trim();
-      } else if (msg.content != null) {
-        msg.text = parseTextParts(msg.content, true);
-        delete msg.content;
-      }
-
-      return msg;
-    };
-  }
-
  /**
   * Calculates the correct token count for the current user message based on the token count map and API usage.
   * Edge case: If the calculation results in a negative value, it returns the original estimate.
@@ -850,8 +827,7 @@ class GoogleClient extends BaseClient {
    let reply = '';
    const { abortController } = options;

-    const model =
-      this.options.titleModel ?? this.modelOptions.modelName ?? this.modelOptions.model ?? '';
+    const model = this.modelOptions.modelName ?? this.modelOptions.model ?? '';
    const safetySettings = getSafetySettings(model);
    if (!EXCLUDED_GENAI_MODELS.test(model) && !this.project_id) {
      logger.debug('Identified titling model as GenAI version');
--- a/api/app/clients/OpenAIClient.js
+++ b/api/app/clients/OpenAIClient.js
@@ -1,11 +1,10 @@
+const OpenAI = require('openai');
 const { OllamaClient } = require('./OllamaClient');
 const { HttpsProxyAgent } = require('https-proxy-agent');
-const { SplitStreamHandler, CustomOpenAIClient: OpenAI } = require('@librechat/agents');
+const { SplitStreamHandler, GraphEvents } = require('@librechat/agents');
 const {
  Constants,
  ImageDetail,
-  ContentTypes,
-  parseTextParts,
  EModelEndpoint,
  resolveHeaders,
  KnownEndpoints,
@@ -31,18 +30,17 @@ const {
  createContextHandlers,
 } = require('./prompts');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
-const { createFetch, createStreamEventHandlers } = require('./generators');
 const { addSpaceIfNeeded, isEnabled, sleep } = require('~/server/utils');
 const Tokenizer = require('~/server/services/Tokenizer');
 const { spendTokens } = require('~/models/spendTokens');
 const { handleOpenAIErrors } = require('./tools/util');
 const { createLLM, RunManager } = require('./llm');
+const { logger, sendEvent } = require('~/config');
 const ChatGPTClient = require('./ChatGPTClient');
 const { summaryBuffer } = require('./memory');
 const { runTitleChain } = require('./chains');
 const { tokenSplit } = require('./document');
 const BaseClient = require('./BaseClient');
-const { logger } = require('~/config');

 class OpenAIClient extends BaseClient {
  constructor(apiKey, options = {}) {
@@ -108,18 +106,13 @@ class OpenAIClient extends BaseClient {
      this.checkVisionRequest(this.options.attachments);
    }

-    const omniPattern = /\b(o\d)\b/i;
+    const omniPattern = /\b(o1|o3)\b/i;
    this.isOmni = omniPattern.test(this.modelOptions.model);

    const { OPENAI_FORCE_PROMPT } = process.env ?? {};
    const { reverseProxyUrl: reverseProxy } = this.options;

-    if (
-      !this.useOpenRouter &&
-      ((reverseProxy && reverseProxy.includes(KnownEndpoints.openrouter)) ||
-        (this.options.endpoint &&
-          this.options.endpoint.toLowerCase().includes(KnownEndpoints.openrouter)))
-    ) {
+    if (!this.useOpenRouter && reverseProxy && reverseProxy.includes(KnownEndpoints.openrouter)) {
      this.useOpenRouter = true;
    }

@@ -227,6 +220,10 @@ class OpenAIClient extends BaseClient {
      logger.debug('Using Azure endpoint');
    }

+    if (this.useOpenRouter) {
+      this.completionsUrl = 'https://openrouter.ai/api/v1/chat/completions';
+    }
+
    return this;
  }

@@ -301,9 +298,7 @@ class OpenAIClient extends BaseClient {
  }

  getEncoding() {
-    return this.modelOptions?.model && /gpt-4[^-\s]/.test(this.modelOptions.model)
-      ? 'o200k_base'
-      : 'cl100k_base';
+    return this.model?.includes('gpt-4o') ? 'o200k_base' : 'cl100k_base';
  }

  /**
@@ -455,9 +450,6 @@ class OpenAIClient extends BaseClient {
            this.contextHandlers?.processFile(file);
            continue;
          }
-          if (file.metadata?.fileIdentifier) {
-            continue;
-          }

          orderedMessages[i].tokenCount += this.calculateImageTokenCost({
            width: file.width,
@@ -475,9 +467,7 @@ class OpenAIClient extends BaseClient {
      promptPrefix = this.augmentedPrompt + promptPrefix;
    }

-    const noSystemModelRegex = /\b(o1-preview|o1-mini)\b/i.test(this.modelOptions.model);
-
-    if (promptPrefix && !noSystemModelRegex) {
+    if (promptPrefix && this.isOmni !== true) {
      promptPrefix = `Instructions:\n${promptPrefix.trim()}`;
      instructions = {
        role: 'system',
@@ -505,27 +495,11 @@ class OpenAIClient extends BaseClient {
    };

    /** EXPERIMENTAL */
-    if (promptPrefix && noSystemModelRegex) {
+    if (promptPrefix && this.isOmni === true) {
      const lastUserMessageIndex = payload.findLastIndex((message) => message.role === 'user');
      if (lastUserMessageIndex !== -1) {
-        if (Array.isArray(payload[lastUserMessageIndex].content)) {
-          const firstTextPartIndex = payload[lastUserMessageIndex].content.findIndex(
-            (part) => part.type === ContentTypes.TEXT,
-          );
-          if (firstTextPartIndex !== -1) {
-            const firstTextPart = payload[lastUserMessageIndex].content[firstTextPartIndex];
-            payload[lastUserMessageIndex].content[firstTextPartIndex].text =
-              `${promptPrefix}\n${firstTextPart.text}`;
-          } else {
-            payload[lastUserMessageIndex].content.unshift({
-              type: ContentTypes.TEXT,
-              text: promptPrefix,
-            });
-          }
-        } else {
-          payload[lastUserMessageIndex].content =
-            `${promptPrefix}\n${payload[lastUserMessageIndex].content}`;
-        }
+        payload[lastUserMessageIndex].content =
+          `${promptPrefix}\n${payload[lastUserMessageIndex].content}`;
      }
    }

@@ -614,7 +588,7 @@ class OpenAIClient extends BaseClient {
        return result.trim();
      }

-      logger.debug('[OpenAIClient] sendCompletion: result', { ...result });
+      logger.debug('[OpenAIClient] sendCompletion: result', result);

      if (this.isChatCompletion) {
        reply = result.choices[0].message.content;
@@ -631,7 +605,7 @@ class OpenAIClient extends BaseClient {
  }

  initializeLLM({
-    model = openAISettings.model.default,
+    model = 'gpt-4o-mini',
    modelName,
    temperature = 0.2,
    max_tokens,
@@ -732,7 +706,7 @@ class OpenAIClient extends BaseClient {

    const { OPENAI_TITLE_MODEL } = process.env ?? {};

-    let model = this.options.titleModel ?? OPENAI_TITLE_MODEL ?? openAISettings.model.default;
+    let model = this.options.titleModel ?? OPENAI_TITLE_MODEL ?? 'gpt-4o-mini';
    if (model === Constants.CURRENT_MODEL) {
      model = this.modelOptions.model;
    }
@@ -823,7 +797,7 @@ ${convo}

        const completionTokens = this.getTokenCount(title);

-        await this.recordTokenUsage({ promptTokens, completionTokens, context: 'title' });
+        this.recordTokenUsage({ promptTokens, completionTokens, context: 'title' });
      } catch (e) {
        logger.error(
          '[OpenAIClient] There was an issue generating the title with the completion method',
@@ -925,7 +899,7 @@ ${convo}
    let prompt;

    // TODO: remove the gpt fallback and make it specific to endpoint
-    const { OPENAI_SUMMARY_MODEL = openAISettings.model.default } = process.env ?? {};
+    const { OPENAI_SUMMARY_MODEL = 'gpt-4o-mini' } = process.env ?? {};
    let model = this.options.summaryModel ?? OPENAI_SUMMARY_MODEL;
    if (model === Constants.CURRENT_MODEL) {
      model = this.modelOptions.model;
@@ -1126,9 +1100,6 @@ ${convo}
    return (msg) => {
      if (msg.text != null && msg.text && msg.text.startsWith(':::thinking')) {
        msg.text = msg.text.replace(/:::thinking.*?:::/gs, '').trim();
-      } else if (msg.content != null) {
-        msg.text = parseTextParts(msg.content, true);
-        delete msg.content;
      }

      return msg;
@@ -1180,6 +1151,10 @@ ${convo}
        opts.httpAgent = new HttpsProxyAgent(this.options.proxy);
      }

+      if (this.isVisionModel) {
+        modelOptions.max_tokens = 4000;
+      }
+
      /** @type {TAzureConfig | undefined} */
      const azureConfig = this.options?.req?.app?.locals?.[EModelEndpoint.azureOpenAI];

@@ -1229,9 +1204,9 @@ ${convo}

        opts.baseURL = this.langchainProxy
          ? constructAzureURL({
-              baseURL: this.langchainProxy,
-              azureOptions: this.azure,
-            })
+            baseURL: this.langchainProxy,
+            azureOptions: this.azure,
+          })
          : this.azureEndpoint.split(/(?<!\/)\/(chat|completion)\//)[0];

        opts.defaultQuery = { 'api-version': this.azure.azureOpenAIApiVersion };
@@ -1242,9 +1217,6 @@ ${convo}
        modelOptions.max_completion_tokens = modelOptions.max_tokens;
        delete modelOptions.max_tokens;
      }
-      if (this.isOmni === true && modelOptions.temperature != null) {
-        delete modelOptions.temperature;
-      }

      if (process.env.OPENAI_ORGANIZATION) {
        opts.organization = process.env.OPENAI_ORGANIZATION;
@@ -1253,10 +1225,7 @@ ${convo}
      let chatCompletion;
      /** @type {OpenAI} */
      const openai = new OpenAI({
-        fetch: createFetch({
-          directEndpoint: this.options.directEndpoint,
-          reverseProxyUrl: this.options.reverseProxyUrl,
-        }),
+        fetch: this.fetch,
        apiKey: this.apiKey,
        ...opts,
      });
@@ -1285,56 +1254,23 @@ ${convo}
        modelOptions.messages[0].role = 'user';
      }

-      if (
-        (this.options.endpoint === EModelEndpoint.openAI ||
-          this.options.endpoint === EModelEndpoint.azureOpenAI) &&
-        modelOptions.stream === true
-      ) {
-        modelOptions.stream_options = { include_usage: true };
-      }
-
      if (this.options.addParams && typeof this.options.addParams === 'object') {
-        const addParams = { ...this.options.addParams };
        modelOptions = {
          ...modelOptions,
-          ...addParams,
+          ...this.options.addParams,
        };
        logger.debug('[OpenAIClient] chatCompletion: added params', {
-          addParams: addParams,
+          addParams: this.options.addParams,
          modelOptions,
        });
      }

-      /** Note: OpenAI Web Search models do not support any known parameters besdies `max_tokens` */
-      if (modelOptions.model && /gpt-4o.*search/.test(modelOptions.model)) {
-        const searchExcludeParams = [
-          'frequency_penalty',
-          'presence_penalty',
-          'temperature',
-          'top_p',
-          'top_k',
-          'stop',
-          'logit_bias',
-          'seed',
-          'response_format',
-          'n',
-          'logprobs',
-          'user',
-        ];
-
-        this.options.dropParams = this.options.dropParams || [];
-        this.options.dropParams = [
-          ...new Set([...this.options.dropParams, ...searchExcludeParams]),
-        ];
-      }
-
      if (this.options.dropParams && Array.isArray(this.options.dropParams)) {
-        const dropParams = [...this.options.dropParams];
-        dropParams.forEach((param) => {
+        this.options.dropParams.forEach((param) => {
          delete modelOptions[param];
        });
        logger.debug('[OpenAIClient] chatCompletion: dropped params', {
-          dropParams: dropParams,
+          dropParams: this.options.dropParams,
          modelOptions,
        });
      }
@@ -1357,11 +1293,15 @@ ${convo}
      let streamResolve;

      if (
-        (!this.isOmni || /^o1-(mini|preview)/i.test(modelOptions.model)) &&
-        modelOptions.reasoning_effort != null
+        this.isOmni === true &&
+        (this.azure || /o1(?!-(?:mini|preview)).*$/.test(modelOptions.model)) &&
+        !/o3-.*$/.test(this.modelOptions.model) &&
+        modelOptions.stream
      ) {
+        delete modelOptions.stream;
+        delete modelOptions.stop;
+      } else if (!this.isOmni && modelOptions.reasoning_effort != null) {
        delete modelOptions.reasoning_effort;
-        delete modelOptions.temperature;
      }

      let reasoningKey = 'reasoning_content';
@@ -1369,19 +1309,16 @@ ${convo}
        modelOptions.include_reasoning = true;
        reasoningKey = 'reasoning';
      }
-      if (this.useOpenRouter && modelOptions.reasoning_effort != null) {
-        modelOptions.reasoning = {
-          effort: modelOptions.reasoning_effort,
-        };
-        delete modelOptions.reasoning_effort;
-      }

-      const handlers = createStreamEventHandlers(this.options.res);
      this.streamHandler = new SplitStreamHandler({
        reasoningKey,
        accumulate: true,
        runId: this.responseMessageId,
-        handlers,
+        handlers: {
+          [GraphEvents.ON_RUN_STEP]: (event) => sendEvent(this.options.res, event),
+          [GraphEvents.ON_MESSAGE_DELTA]: (event) => sendEvent(this.options.res, event),
+          [GraphEvents.ON_REASONING_DELTA]: (event) => sendEvent(this.options.res, event),
+        },
      });

      intermediateReply = this.streamHandler.tokens;
@@ -1395,6 +1332,12 @@ ${convo}
          ...modelOptions,
          stream: true,
        };
+        if (
+          this.options.endpoint === EModelEndpoint.openAI ||
+          this.options.endpoint === EModelEndpoint.azureOpenAI
+        ) {
+          params.stream_options = { include_usage: true };
+        }
        const stream = await openai.beta.chat.completions
          .stream(params)
          .on('abort', () => {
@@ -1479,11 +1422,6 @@ ${convo}
          });
      }

-      if (openai.abortHandler && abortController.signal) {
-        abortController.signal.removeEventListener('abort', openai.abortHandler);
-        openai.abortHandler = undefined;
-      }
-
      if (!chatCompletion && UnexpectedRoleError) {
        throw new Error(
          'OpenAI error: Invalid final message: OpenAI expects final message to include role=assistant',
--- a/api/app/clients/PluginsClient.js
+++ b/api/app/clients/PluginsClient.js
@@ -5,8 +5,9 @@ const { addImages, buildErrorInput, buildPromptPrefix } = require('./output_pars
 const { initializeCustomAgent, initializeFunctionsAgent } = require('./agents');
 const { processFileURL } = require('~/server/services/Files/process');
 const { EModelEndpoint } = require('librechat-data-provider');
-const { checkBalance } = require('~/models/balanceMethods');
 const { formatLangChainMessages } = require('./prompts');
+const checkBalance = require('~/models/checkBalance');
+const { isEnabled } = require('~/server/utils');
 const { extractBaseURL } = require('~/utils');
 const { loadTools } = require('./tools/util');
 const { logger } = require('~/config');
@@ -252,14 +253,12 @@ class PluginsClient extends OpenAIClient {
      await this.recordTokenUsage(responseMessage);
    }

-    const databasePromise = this.saveMessageToDatabase(responseMessage, saveOptions, user);
+    this.responsePromise = this.saveMessageToDatabase(responseMessage, saveOptions, user);
    delete responseMessage.tokenCount;
-    return { ...responseMessage, ...result, databasePromise };
+    return { ...responseMessage, ...result };
  }

  async sendMessage(message, opts = {}) {
-    /** @type {Promise<TMessage>} */
-    let userMessagePromise;
    /** @type {{ filteredTools: string[], includedTools: string[] }} */
    const { filteredTools = [], includedTools = [] } = this.options.req.app.locals;

@@ -329,16 +328,15 @@ class PluginsClient extends OpenAIClient {
    }

    if (!this.skipSaveUserMessage) {
-      userMessagePromise = this.saveMessageToDatabase(userMessage, saveOptions, user);
+      this.userMessagePromise = this.saveMessageToDatabase(userMessage, saveOptions, user);
      if (typeof opts?.getReqData === 'function') {
        opts.getReqData({
-          userMessagePromise,
+          userMessagePromise: this.userMessagePromise,
        });
      }
    }

-    const balance = this.options.req?.app?.locals?.balance;
-    if (balance?.enabled) {
+    if (isEnabled(process.env.CHECK_BALANCE)) {
      await checkBalance({
        req: this.options.req,
        res: this.options.res,
--- a/api/app/clients/callbacks/createStartHandler.js
+++ b/api/app/clients/callbacks/createStartHandler.js
@@ -1,8 +1,8 @@
 const { promptTokensEstimate } = require('openai-chat-tokens');
 const { EModelEndpoint, supportsBalanceCheck } = require('librechat-data-provider');
 const { formatFromLangChain } = require('~/app/clients/prompts');
-const { getBalanceConfig } = require('~/server/services/Config');
-const { checkBalance } = require('~/models/balanceMethods');
+const checkBalance = require('~/models/checkBalance');
+const { isEnabled } = require('~/server/utils');
 const { logger } = require('~/config');

 const createStartHandler = ({
@@ -49,8 +49,8 @@ const createStartHandler = ({
    prelimPromptTokens += tokenBuffer;

    try {
-      const balance = await getBalanceConfig();
-      if (balance?.enabled && supportsBalanceCheck[EModelEndpoint.openAI]) {
+      // TODO: if plugins extends to non-OpenAI models, this will need to be updated
+      if (isEnabled(process.env.CHECK_BALANCE) && supportsBalanceCheck[EModelEndpoint.openAI]) {
        const generations =
          initialMessageCount && messages.length > initialMessageCount
            ? messages.slice(initialMessageCount)
--- a/api/app/clients/generators.js
+++ b/api/app/clients/generators.js
@@ -1,71 +0,0 @@
-const fetch = require('node-fetch');
-const { GraphEvents } = require('@librechat/agents');
-const { logger, sendEvent } = require('~/config');
-const { sleep } = require('~/server/utils');
-
-/**
- * Makes a function to make HTTP request and logs the process.
- * @param {Object} params
- * @param {boolean} [params.directEndpoint] - Whether to use a direct endpoint.
- * @param {string} [params.reverseProxyUrl] - The reverse proxy URL to use for the request.
- * @returns {Promise<Response>} - A promise that resolves to the response of the fetch request.
- */
-function createFetch({ directEndpoint = false, reverseProxyUrl = '' }) {
-  /**
-   * Makes an HTTP request and logs the process.
-   * @param {RequestInfo} url - The URL to make the request to. Can be a string or a Request object.
-   * @param {RequestInit} [init] - Optional init options for the request.
-   * @returns {Promise<Response>} - A promise that resolves to the response of the fetch request.
-   */
-  return async (_url, init) => {
-    let url = _url;
-    if (directEndpoint) {
-      url = reverseProxyUrl;
-    }
-    logger.debug(`Making request to ${url}`);
-    if (typeof Bun !== 'undefined') {
-      return await fetch(url, init);
-    }
-    return await fetch(url, init);
-  };
-}
-
-// Add this at the module level outside the class
-/**
- * Creates event handlers for stream events that don't capture client references
- * @param {Object} res - The response object to send events to
- * @returns {Object} Object containing handler functions
- */
-function createStreamEventHandlers(res) {
-  return {
-    [GraphEvents.ON_RUN_STEP]: (event) => {
-      if (res) {
-        sendEvent(res, event);
-      }
-    },
-    [GraphEvents.ON_MESSAGE_DELTA]: (event) => {
-      if (res) {
-        sendEvent(res, event);
-      }
-    },
-    [GraphEvents.ON_REASONING_DELTA]: (event) => {
-      if (res) {
-        sendEvent(res, event);
-      }
-    },
-  };
-}
-
-function createHandleLLMNewToken(streamRate) {
-  return async () => {
-    if (streamRate) {
-      await sleep(streamRate);
-    }
-  };
-}
-
-module.exports = {
-  createFetch,
-  createHandleLLMNewToken,
-  createStreamEventHandlers,
-};
--- a/api/app/clients/llm/createLLM.js
+++ b/api/app/clients/llm/createLLM.js
@@ -34,7 +34,6 @@ function createLLM({
  let credentials = { openAIApiKey };
  let configuration = {
    apiKey: openAIApiKey,
-    ...(configOptions.basePath && { baseURL: configOptions.basePath }),
  };

  /**  @type {AzureOptions} */
--- a/api/app/clients/prompts/formatAgentMessages.spec.js
+++ b/api/app/clients/prompts/formatAgentMessages.spec.js
@@ -325,37 +325,4 @@ describe('formatAgentMessages', () => {
    );
    expect(result[0].content).not.toContain('Analyzing the problem...');
  });
-
-  it('should exclude ERROR type content parts', () => {
-    const payload = [
-      {
-        role: 'assistant',
-        content: [
-          { type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Hello there' },
-          {
-            type: ContentTypes.ERROR,
-            [ContentTypes.ERROR]:
-              'An error occurred while processing the request: Something went wrong',
-          },
-          { type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Final answer' },
-        ],
-      },
-    ];
-
-    const result = formatAgentMessages(payload);
-
-    expect(result).toHaveLength(1);
-    expect(result[0]).toBeInstanceOf(AIMessage);
-    expect(result[0].content).toEqual([
-      { type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Hello there' },
-      { type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Final answer' },
-    ]);
-
-    // Make sure no error content exists in the result
-    const hasErrorContent = result[0].content.some(
-      (item) =>
-        item.type === ContentTypes.ERROR || JSON.stringify(item).includes('An error occurred'),
-    );
-    expect(hasErrorContent).toBe(false);
-  });
 });
--- a/api/app/clients/prompts/formatMessages.js
+++ b/api/app/clients/prompts/formatMessages.js
@@ -211,8 +211,6 @@ const formatAgentMessages = (payload) => {
      } else if (part.type === ContentTypes.THINK) {
        hasReasoning = true;
        continue;
-      } else if (part.type === ContentTypes.ERROR || part.type === ContentTypes.AGENT_UPDATE) {
-        continue;
      } else {
        currentContent.push(part);
      }
--- a/api/app/clients/specs/AnthropicClient.test.js
+++ b/api/app/clients/specs/AnthropicClient.test.js
@@ -15,7 +15,7 @@ describe('AnthropicClient', () => {
    {
      role: 'user',
      isCreatedByUser: true,
-      text: "What's up",
+      text: 'What\'s up',
      messageId: '3',
      parentMessageId: '2',
    },
@@ -170,7 +170,7 @@ describe('AnthropicClient', () => {
      client.options.modelLabel = 'Claude-2';
      const result = await client.buildMessages(messages, parentMessageId);
      const { prompt } = result;
-      expect(prompt).toContain("Human's name: John");
+      expect(prompt).toContain('Human\'s name: John');
      expect(prompt).toContain('You are Claude-2');
    });
  });
@@ -244,64 +244,6 @@ describe('AnthropicClient', () => {
      );
    });

-    describe('Claude 4 model headers', () => {
-      it('should add "prompt-caching" beta header for claude-sonnet-4 model', () => {
-        const client = new AnthropicClient('test-api-key');
-        const modelOptions = {
-          model: 'claude-sonnet-4-20250514',
-        };
-        client.setOptions({ modelOptions, promptCache: true });
-        const anthropicClient = client.getClient(modelOptions);
-        expect(anthropicClient._options.defaultHeaders).toBeDefined();
-        expect(anthropicClient._options.defaultHeaders).toHaveProperty('anthropic-beta');
-        expect(anthropicClient._options.defaultHeaders['anthropic-beta']).toBe(
-          'prompt-caching-2024-07-31',
-        );
-      });
-
-      it('should add "prompt-caching" beta header for claude-opus-4 model', () => {
-        const client = new AnthropicClient('test-api-key');
-        const modelOptions = {
-          model: 'claude-opus-4-20250514',
-        };
-        client.setOptions({ modelOptions, promptCache: true });
-        const anthropicClient = client.getClient(modelOptions);
-        expect(anthropicClient._options.defaultHeaders).toBeDefined();
-        expect(anthropicClient._options.defaultHeaders).toHaveProperty('anthropic-beta');
-        expect(anthropicClient._options.defaultHeaders['anthropic-beta']).toBe(
-          'prompt-caching-2024-07-31',
-        );
-      });
-
-      it('should add "prompt-caching" beta header for claude-4-sonnet model', () => {
-        const client = new AnthropicClient('test-api-key');
-        const modelOptions = {
-          model: 'claude-4-sonnet-20250514',
-        };
-        client.setOptions({ modelOptions, promptCache: true });
-        const anthropicClient = client.getClient(modelOptions);
-        expect(anthropicClient._options.defaultHeaders).toBeDefined();
-        expect(anthropicClient._options.defaultHeaders).toHaveProperty('anthropic-beta');
-        expect(anthropicClient._options.defaultHeaders['anthropic-beta']).toBe(
-          'prompt-caching-2024-07-31',
-        );
-      });
-
-      it('should add "prompt-caching" beta header for claude-4-opus model', () => {
-        const client = new AnthropicClient('test-api-key');
-        const modelOptions = {
-          model: 'claude-4-opus-20250514',
-        };
-        client.setOptions({ modelOptions, promptCache: true });
-        const anthropicClient = client.getClient(modelOptions);
-        expect(anthropicClient._options.defaultHeaders).toBeDefined();
-        expect(anthropicClient._options.defaultHeaders).toHaveProperty('anthropic-beta');
-        expect(anthropicClient._options.defaultHeaders['anthropic-beta']).toBe(
-          'prompt-caching-2024-07-31',
-        );
-      });
-    });
-
    it('should not add beta header for claude-3-5-sonnet-latest model', () => {
      const client = new AnthropicClient('test-api-key');
      const modelOptions = {
@@ -514,34 +456,6 @@ describe('AnthropicClient', () => {
      expect(client.modelOptions.maxOutputTokens).toBe(highTokenValue);
    });

-    it('should not cap maxOutputTokens for Claude 4 Sonnet models', () => {
-      const client = new AnthropicClient('test-api-key');
-      const highTokenValue = anthropicSettings.legacy.maxOutputTokens.default * 10; // 40,960 tokens
-
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-sonnet-4-20250514',
-          maxOutputTokens: highTokenValue,
-        },
-      });
-
-      expect(client.modelOptions.maxOutputTokens).toBe(highTokenValue);
-    });
-
-    it('should not cap maxOutputTokens for Claude 4 Opus models', () => {
-      const client = new AnthropicClient('test-api-key');
-      const highTokenValue = anthropicSettings.legacy.maxOutputTokens.default * 6; // 24,576 tokens (under 32K limit)
-
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-opus-4-20250514',
-          maxOutputTokens: highTokenValue,
-        },
-      });
-
-      expect(client.modelOptions.maxOutputTokens).toBe(highTokenValue);
-    });
-
    it('should cap maxOutputTokens for Claude 3.5 Haiku models', () => {
      const client = new AnthropicClient('test-api-key');
      const highTokenValue = anthropicSettings.legacy.maxOutputTokens.default * 2;
@@ -766,272 +680,4 @@ describe('AnthropicClient', () => {
      expect(capturedOptions).not.toHaveProperty('top_p');
    });
  });
-
-  it('should include top_k and top_p parameters for Claude-3.7 models when thinking is explicitly disabled', async () => {
-    const client = new AnthropicClient('test-api-key', {
-      modelOptions: {
-        model: 'claude-3-7-sonnet',
-        temperature: 0.7,
-        topK: 10,
-        topP: 0.9,
-      },
-      thinking: false,
-    });
-
-    async function* mockAsyncGenerator() {
-      yield { type: 'message_start', message: { usage: {} } };
-      yield { delta: { text: 'Test response' } };
-      yield { type: 'message_delta', usage: {} };
-    }
-
-    jest.spyOn(client, 'createResponse').mockImplementation(() => {
-      return mockAsyncGenerator();
-    });
-
-    let capturedOptions = null;
-    jest.spyOn(client, 'getClient').mockImplementation((options) => {
-      capturedOptions = options;
-      return {};
-    });
-
-    const payload = [{ role: 'user', content: 'Test message' }];
-    await client.sendCompletion(payload, {});
-
-    expect(capturedOptions).toHaveProperty('topK', 10);
-    expect(capturedOptions).toHaveProperty('topP', 0.9);
-
-    client.setOptions({
-      modelOptions: {
-        model: 'claude-3.7-sonnet',
-        temperature: 0.7,
-        topK: 10,
-        topP: 0.9,
-      },
-      thinking: false,
-    });
-
-    await client.sendCompletion(payload, {});
-
-    expect(capturedOptions).toHaveProperty('topK', 10);
-    expect(capturedOptions).toHaveProperty('topP', 0.9);
-  });
-
-  describe('isClaudeLatest', () => {
-    it('should set isClaudeLatest to true for claude-3 models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-3-sonnet-20240229',
-        },
-      });
-      expect(client.isClaudeLatest).toBe(true);
-    });
-
-    it('should set isClaudeLatest to true for claude-3.5 models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-3.5-sonnet-20240229',
-        },
-      });
-      expect(client.isClaudeLatest).toBe(true);
-    });
-
-    it('should set isClaudeLatest to true for claude-sonnet-4 models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-sonnet-4-20240229',
-        },
-      });
-      expect(client.isClaudeLatest).toBe(true);
-    });
-
-    it('should set isClaudeLatest to true for claude-opus-4 models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-opus-4-20240229',
-        },
-      });
-      expect(client.isClaudeLatest).toBe(true);
-    });
-
-    it('should set isClaudeLatest to true for claude-3.5-haiku models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-3.5-haiku-20240229',
-        },
-      });
-      expect(client.isClaudeLatest).toBe(true);
-    });
-
-    it('should set isClaudeLatest to false for claude-2 models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-2',
-        },
-      });
-      expect(client.isClaudeLatest).toBe(false);
-    });
-
-    it('should set isClaudeLatest to false for claude-instant models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-instant',
-        },
-      });
-      expect(client.isClaudeLatest).toBe(false);
-    });
-
-    it('should set isClaudeLatest to false for claude-sonnet-3 models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-sonnet-3-20240229',
-        },
-      });
-      expect(client.isClaudeLatest).toBe(false);
-    });
-
-    it('should set isClaudeLatest to false for claude-opus-3 models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-opus-3-20240229',
-        },
-      });
-      expect(client.isClaudeLatest).toBe(false);
-    });
-
-    it('should set isClaudeLatest to false for claude-haiku-3 models', () => {
-      const client = new AnthropicClient('test-api-key');
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-haiku-3-20240229',
-        },
-      });
-      expect(client.isClaudeLatest).toBe(false);
-    });
-  });
-
-  describe('configureReasoning', () => {
-    it('should enable thinking for claude-opus-4 and claude-sonnet-4 models', async () => {
-      const client = new AnthropicClient('test-api-key');
-      // Create a mock async generator function
-      async function* mockAsyncGenerator() {
-        yield { type: 'message_start', message: { usage: {} } };
-        yield { delta: { text: 'Test response' } };
-        yield { type: 'message_delta', usage: {} };
-      }
-
-      // Mock createResponse to return the async generator
-      jest.spyOn(client, 'createResponse').mockImplementation(() => {
-        return mockAsyncGenerator();
-      });
-
-      // Test claude-opus-4
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-opus-4-20250514',
-        },
-        thinking: true,
-        thinkingBudget: 2000,
-      });
-
-      let capturedOptions = null;
-      jest.spyOn(client, 'getClient').mockImplementation((options) => {
-        capturedOptions = options;
-        return {};
-      });
-
-      const payload = [{ role: 'user', content: 'Test message' }];
-      await client.sendCompletion(payload, {});
-
-      expect(capturedOptions).toHaveProperty('thinking');
-      expect(capturedOptions.thinking).toEqual({
-        type: 'enabled',
-        budget_tokens: 2000,
-      });
-
-      // Test claude-sonnet-4
-      client.setOptions({
-        modelOptions: {
-          model: 'claude-sonnet-4-20250514',
-        },
-        thinking: true,
-        thinkingBudget: 2000,
-      });
-
-      await client.sendCompletion(payload, {});
-
-      expect(capturedOptions).toHaveProperty('thinking');
-      expect(capturedOptions.thinking).toEqual({
-        type: 'enabled',
-        budget_tokens: 2000,
-      });
-    });
-  });
-});
-
-describe('Claude Model Tests', () => {
-  it('should handle Claude 3 and 4 series models correctly', () => {
-    const client = new AnthropicClient('test-key');
-    // Claude 3 series models
-    const claude3Models = [
-      'claude-3-opus-20240229',
-      'claude-3-sonnet-20240229',
-      'claude-3-haiku-20240307',
-      'claude-3-5-sonnet-20240620',
-      'claude-3-5-haiku-20240620',
-      'claude-3.5-sonnet-20240620',
-      'claude-3.5-haiku-20240620',
-      'claude-3.7-sonnet-20240620',
-      'claude-3.7-haiku-20240620',
-      'anthropic/claude-3-opus-20240229',
-      'claude-3-opus-20240229/anthropic',
-    ];
-
-    // Claude 4 series models
-    const claude4Models = [
-      'claude-sonnet-4-20250514',
-      'claude-opus-4-20250514',
-      'claude-4-sonnet-20250514',
-      'claude-4-opus-20250514',
-      'anthropic/claude-sonnet-4-20250514',
-      'claude-sonnet-4-20250514/anthropic',
-    ];
-
-    // Test Claude 3 series
-    claude3Models.forEach((model) => {
-      client.setOptions({ modelOptions: { model } });
-      expect(
-        /claude-[3-9]/.test(client.modelOptions.model) ||
-          /claude-(?:sonnet|opus|haiku)-[4-9]/.test(client.modelOptions.model),
-      ).toBe(true);
-    });
-
-    // Test Claude 4 series
-    claude4Models.forEach((model) => {
-      client.setOptions({ modelOptions: { model } });
-      expect(
-        /claude-[3-9]/.test(client.modelOptions.model) ||
-          /claude-(?:sonnet|opus|haiku)-[4-9]/.test(client.modelOptions.model),
-      ).toBe(true);
-    });
-
-    // Test non-Claude 3/4 models
-    const nonClaudeModels = ['claude-2', 'claude-instant', 'gpt-4', 'gpt-3.5-turbo'];
-
-    nonClaudeModels.forEach((model) => {
-      client.setOptions({ modelOptions: { model } });
-      expect(
-        /claude-[3-9]/.test(client.modelOptions.model) ||
-          /claude-(?:sonnet|opus|haiku)-[4-9]/.test(client.modelOptions.model),
-      ).toBe(false);
-    });
-  });
 });
--- a/api/app/clients/specs/BaseClient.test.js
+++ b/api/app/clients/specs/BaseClient.test.js
@@ -1,7 +1,7 @@
 const { Constants } = require('librechat-data-provider');
 const { initializeFakeClient } = require('./FakeClient');

-jest.mock('~/db/connect');
+jest.mock('~/lib/db/connectDb');
 jest.mock('~/models', () => ({
  User: jest.fn(),
  Key: jest.fn(),
@@ -30,9 +30,7 @@ jest.mock('~/models', () => ({
  updateFileUsage: jest.fn(),
 }));

-const { getConvo, saveConvo } = require('~/models');
-
-jest.mock('@librechat/agents', () => {
+jest.mock('@langchain/openai', () => {
  return {
    ChatOpenAI: jest.fn().mockImplementation(() => {
      return {};
@@ -52,7 +50,7 @@ const messageHistory = [
  {
    role: 'user',
    isCreatedByUser: true,
-    text: "What's up",
+    text: 'What\'s up',
    messageId: '3',
    parentMessageId: '2',
  },
@@ -164,7 +162,7 @@ describe('BaseClient', () => {
    const result = await TestClient.getMessagesWithinTokenLimit({ messages });

    expect(result.context).toEqual(expectedContext);
-    expect(result.messagesToRefine.length - 1).toEqual(expectedIndex);
+    expect(result.summaryIndex).toEqual(expectedIndex);
    expect(result.remainingContextTokens).toBe(expectedRemainingContextTokens);
    expect(result.messagesToRefine).toEqual(expectedMessagesToRefine);
  });
@@ -200,7 +198,7 @@ describe('BaseClient', () => {
    const result = await TestClient.getMessagesWithinTokenLimit({ messages });

    expect(result.context).toEqual(expectedContext);
-    expect(result.messagesToRefine.length - 1).toEqual(expectedIndex);
+    expect(result.summaryIndex).toEqual(expectedIndex);
    expect(result.remainingContextTokens).toBe(expectedRemainingContextTokens);
    expect(result.messagesToRefine).toEqual(expectedMessagesToRefine);
  });
@@ -456,7 +454,7 @@ describe('BaseClient', () => {

      const chatMessages2 = await TestClient.loadHistory(conversationId, '3');
      expect(TestClient.currentMessages).toHaveLength(3);
-      expect(chatMessages2[chatMessages2.length - 1].text).toEqual("What's up");
+      expect(chatMessages2[chatMessages2.length - 1].text).toEqual('What\'s up');
    });

    /* Most of the new sendMessage logic revolving around edited/continued AI messages
@@ -542,11 +540,10 @@ describe('BaseClient', () => {

    test('saveMessageToDatabase is called with the correct arguments', async () => {
      const saveOptions = TestClient.getSaveOptions();
-      const user = {};
+      const user = {}; // Mock user
      const opts = { user };
-      const saveSpy = jest.spyOn(TestClient, 'saveMessageToDatabase');
      await TestClient.sendMessage('Hello, world!', opts);
-      expect(saveSpy).toHaveBeenCalledWith(
+      expect(TestClient.saveMessageToDatabase).toHaveBeenCalledWith(
        expect.objectContaining({
          sender: expect.any(String),
          text: expect.any(String),
@@ -560,157 +557,6 @@ describe('BaseClient', () => {
      );
    });

-    test('should handle existing conversation when getConvo retrieves one', async () => {
-      const existingConvo = {
-        conversationId: 'existing-convo-id',
-        endpoint: 'openai',
-        endpointType: 'openai',
-        model: 'gpt-3.5-turbo',
-        messages: [
-          { role: 'user', content: 'Existing message 1' },
-          { role: 'assistant', content: 'Existing response 1' },
-        ],
-        temperature: 1,
-      };
-
-      const { temperature: _temp, ...newConvo } = existingConvo;
-
-      const user = {
-        id: 'user-id',
-      };
-
-      getConvo.mockResolvedValue(existingConvo);
-      saveConvo.mockResolvedValue(newConvo);
-
-      TestClient = initializeFakeClient(
-        apiKey,
-        {
-          ...options,
-          req: {
-            user,
-          },
-        },
-        [],
-      );
-
-      const saveSpy = jest.spyOn(TestClient, 'saveMessageToDatabase');
-
-      const newMessage = 'New message in existing conversation';
-      const response = await TestClient.sendMessage(newMessage, {
-        user,
-        conversationId: existingConvo.conversationId,
-      });
-
-      expect(getConvo).toHaveBeenCalledWith(user.id, existingConvo.conversationId);
-      expect(TestClient.conversationId).toBe(existingConvo.conversationId);
-      expect(response.conversationId).toBe(existingConvo.conversationId);
-      expect(TestClient.fetchedConvo).toBe(true);
-
-      expect(saveSpy).toHaveBeenCalledWith(
-        expect.objectContaining({
-          conversationId: existingConvo.conversationId,
-          text: newMessage,
-        }),
-        expect.any(Object),
-        expect.any(Object),
-      );
-
-      expect(saveConvo).toHaveBeenCalledTimes(2);
-      expect(saveConvo).toHaveBeenCalledWith(
-        expect.any(Object),
-        expect.objectContaining({
-          conversationId: existingConvo.conversationId,
-        }),
-        expect.objectContaining({
-          context: 'api/app/clients/BaseClient.js - saveMessageToDatabase #saveConvo',
-          unsetFields: {
-            temperature: 1,
-          },
-        }),
-      );
-
-      await TestClient.sendMessage('Another message', {
-        conversationId: existingConvo.conversationId,
-      });
-      expect(getConvo).toHaveBeenCalledTimes(1);
-    });
-
-    test('should correctly handle existing conversation and unset fields appropriately', async () => {
-      const existingConvo = {
-        conversationId: 'existing-convo-id',
-        endpoint: 'openai',
-        endpointType: 'openai',
-        model: 'gpt-3.5-turbo',
-        messages: [
-          { role: 'user', content: 'Existing message 1' },
-          { role: 'assistant', content: 'Existing response 1' },
-        ],
-        title: 'Existing Conversation',
-        someExistingField: 'existingValue',
-        anotherExistingField: 'anotherValue',
-        temperature: 0.7,
-        modelLabel: 'GPT-3.5',
-      };
-
-      getConvo.mockResolvedValue(existingConvo);
-      saveConvo.mockResolvedValue(existingConvo);
-
-      TestClient = initializeFakeClient(
-        apiKey,
-        {
-          ...options,
-          modelOptions: {
-            model: 'gpt-4',
-            temperature: 0.5,
-          },
-        },
-        [],
-      );
-
-      const newMessage = 'New message in existing conversation';
-      await TestClient.sendMessage(newMessage, {
-        conversationId: existingConvo.conversationId,
-      });
-
-      expect(saveConvo).toHaveBeenCalledTimes(2);
-
-      const saveConvoCall = saveConvo.mock.calls[0];
-      const [, savedFields, saveOptions] = saveConvoCall;
-
-      // Instead of checking all excludedKeys, we'll just check specific fields
-      // that we know should be excluded
-      expect(savedFields).not.toHaveProperty('messages');
-      expect(savedFields).not.toHaveProperty('title');
-
-      // Only check that someExistingField is in unsetFields
-      expect(saveOptions.unsetFields).toHaveProperty('someExistingField', 1);
-
-      // Mock saveConvo to return the expected fields
-      saveConvo.mockImplementation((req, fields) => {
-        return Promise.resolve({
-          ...fields,
-          endpoint: 'openai',
-          endpointType: 'openai',
-          model: 'gpt-4',
-          temperature: 0.5,
-        });
-      });
-
-      // Only check the conversationId since that's the only field we can be sure about
-      expect(savedFields).toHaveProperty('conversationId', 'existing-convo-id');
-
-      expect(TestClient.fetchedConvo).toBe(true);
-
-      await TestClient.sendMessage('Another message', {
-        conversationId: existingConvo.conversationId,
-      });
-
-      expect(getConvo).toHaveBeenCalledTimes(1);
-
-      const secondSaveConvoCall = saveConvo.mock.calls[1];
-      expect(secondSaveConvoCall[2]).toHaveProperty('unsetFields', {});
-    });
-
    test('sendCompletion is called with the correct arguments', async () => {
      const payload = {}; // Mock payload
      TestClient.buildMessages.mockReturnValue({ prompt: payload, tokenCountMap: null });
--- a/api/app/clients/specs/FakeClient.js
+++ b/api/app/clients/specs/FakeClient.js
@@ -56,6 +56,7 @@ const initializeFakeClient = (apiKey, options, fakeMessages) => {
  let TestClient = new FakeClient(apiKey);
  TestClient.options = options;
  TestClient.abortController = { abort: jest.fn() };
+  TestClient.saveMessageToDatabase = jest.fn();
  TestClient.loadHistory = jest
    .fn()
    .mockImplementation((conversationId, parentMessageId = null) => {
@@ -85,6 +86,7 @@ const initializeFakeClient = (apiKey, options, fakeMessages) => {
    return 'Mock response text';
  });

+  // eslint-disable-next-line no-unused-vars
  TestClient.getCompletion = jest.fn().mockImplementation(async (..._args) => {
    return {
      choices: [
--- a/api/app/clients/specs/OpenAIClient.test.js
+++ b/api/app/clients/specs/OpenAIClient.test.js
@@ -1,11 +1,13 @@
 jest.mock('~/cache/getLogStores');
 require('dotenv').config();
-const { fetchEventSource } = require('@waylaidwanderer/fetch-event-source');
+const OpenAI = require('openai');
 const getLogStores = require('~/cache/getLogStores');
+const { fetchEventSource } = require('@waylaidwanderer/fetch-event-source');
+const { genAzureChatCompletion } = require('~/utils/azureUtils');
 const OpenAIClient = require('../OpenAIClient');
 jest.mock('meilisearch');

-jest.mock('~/db/connect');
+jest.mock('~/lib/db/connectDb');
 jest.mock('~/models', () => ({
  User: jest.fn(),
  Key: jest.fn(),
@@ -34,21 +36,19 @@ jest.mock('~/models', () => ({
  updateFileUsage: jest.fn(),
 }));

-// Import the actual module but mock specific parts
-const agents = jest.requireActual('@librechat/agents');
-const { CustomOpenAIClient } = agents;
-
-// Also mock ChatOpenAI to prevent real API calls
-agents.ChatOpenAI = jest.fn().mockImplementation(() => {
-  return {};
-});
-agents.AzureChatOpenAI = jest.fn().mockImplementation(() => {
-  return {};
+jest.mock('@langchain/openai', () => {
+  return {
+    ChatOpenAI: jest.fn().mockImplementation(() => {
+      return {};
+    }),
+  };
 });

-// Mock only the CustomOpenAIClient constructor
-jest.spyOn(CustomOpenAIClient, 'constructor').mockImplementation(function (...options) {
-  return new CustomOpenAIClient(...options);
+jest.mock('openai');
+
+jest.spyOn(OpenAI, 'constructor').mockImplementation(function (...options) {
+  // We can add additional logic here if needed
+  return new OpenAI(...options);
 });

 const finalChatCompletion = jest.fn().mockResolvedValue({
@@ -120,13 +120,7 @@ const create = jest.fn().mockResolvedValue({
  ],
 });

-// Mock the implementation of CustomOpenAIClient instances
-jest.spyOn(CustomOpenAIClient.prototype, 'constructor').mockImplementation(function () {
-  return this;
-});
-
-// Create a mock for the CustomOpenAIClient class
-const mockCustomOpenAIClient = jest.fn().mockImplementation(() => ({
+OpenAI.mockImplementation(() => ({
  beta: {
    chat: {
      completions: {
@@ -141,14 +135,11 @@ const mockCustomOpenAIClient = jest.fn().mockImplementation(() => ({
  },
 }));

-CustomOpenAIClient.mockImplementation = mockCustomOpenAIClient;
-
 describe('OpenAIClient', () => {
+  const mockSet = jest.fn();
+  const mockCache = { set: mockSet };
+
  beforeEach(() => {
-    const mockCache = {
-      get: jest.fn().mockResolvedValue({}),
-      set: jest.fn(),
-    };
    getLogStores.mockReturnValue(mockCache);
  });
  let client;
@@ -462,17 +453,17 @@ describe('OpenAIClient', () => {
        role: 'system',
        name: 'example_user',
        content:
-          "Let's circle back when we have more bandwidth to touch base on opportunities for increased leverage.",
+          'Let\'s circle back when we have more bandwidth to touch base on opportunities for increased leverage.',
      },
      {
        role: 'system',
        name: 'example_assistant',
-        content: "Let's talk later when we're less busy about how to do better.",
+        content: 'Let\'s talk later when we\'re less busy about how to do better.',
      },
      {
        role: 'user',
        content:
-          "This late pivot means we don't have time to boil the ocean for the client deliverable.",
+          'This late pivot means we don\'t have time to boil the ocean for the client deliverable.',
      },
    ];

@@ -567,6 +558,41 @@ describe('OpenAIClient', () => {
      expect(requestBody).toHaveProperty('model');
      expect(requestBody.model).toBe(model);
    });
+
+    it('[Azure OpenAI] should call chatCompletion and OpenAI.stream with correct args', async () => {
+      // Set a default model
+      process.env.AZURE_OPENAI_DEFAULT_MODEL = 'gpt4-turbo';
+
+      const onProgress = jest.fn().mockImplementation(() => ({}));
+      client.azure = defaultAzureOptions;
+      const chatCompletion = jest.spyOn(client, 'chatCompletion');
+      await client.sendMessage('Hi mom!', {
+        replaceOptions: true,
+        ...defaultOptions,
+        modelOptions: { model: 'gpt4-turbo', stream: true },
+        onProgress,
+        azure: defaultAzureOptions,
+      });
+
+      expect(chatCompletion).toHaveBeenCalled();
+      expect(chatCompletion.mock.calls.length).toBe(1);
+
+      const chatCompletionArgs = chatCompletion.mock.calls[0][0];
+      const { payload } = chatCompletionArgs;
+
+      expect(payload[0].role).toBe('user');
+      expect(payload[0].content).toBe('Hi mom!');
+
+      // Azure OpenAI does not use the model property, and will error if it's passed
+      // This check ensures the model property is not present
+      const streamArgs = stream.mock.calls[0][0];
+      expect(streamArgs).not.toHaveProperty('model');
+
+      // Check if the baseURL is correct
+      const constructorArgs = OpenAI.mock.calls[0][0];
+      const expectedURL = genAzureChatCompletion(defaultAzureOptions).split('/chat')[0];
+      expect(constructorArgs.baseURL).toBe(expectedURL);
+    });
  });

  describe('checkVisionRequest functionality', () => {
--- a/api/app/clients/specs/PluginsClient.test.js
+++ b/api/app/clients/specs/PluginsClient.test.js
@@ -3,7 +3,7 @@ const { Constants } = require('librechat-data-provider');
 const { HumanMessage, AIMessage } = require('@langchain/core/messages');
 const PluginsClient = require('../PluginsClient');

-jest.mock('~/db/connect');
+jest.mock('~/lib/db/connectDb');
 jest.mock('~/models/Conversation', () => {
  return function () {
    return {
--- a/api/app/clients/tools/index.js
+++ b/api/app/clients/tools/index.js
@@ -2,15 +2,13 @@ const availableTools = require('./manifest.json');

 // Structured Tools
 const DALLE3 = require('./structured/DALLE3');
-const FluxAPI = require('./structured/FluxAPI');
 const OpenWeather = require('./structured/OpenWeather');
-const StructuredWolfram = require('./structured/Wolfram');
 const createYouTubeTools = require('./structured/YouTube');
+const StructuredWolfram = require('./structured/Wolfram');
 const StructuredACS = require('./structured/AzureAISearch');
 const StructuredSD = require('./structured/StableDiffusion');
 const GoogleSearchAPI = require('./structured/GoogleSearch');
 const TraversaalSearch = require('./structured/TraversaalSearch');
-const createOpenAIImageTools = require('./structured/OpenAIImageTools');
 const TavilySearchResults = require('./structured/TavilySearchResults');

 /** @type {Record<string, TPlugin | undefined>} */
@@ -32,7 +30,6 @@ module.exports = {
  manifestToolMap,
  // Structured Tools
  DALLE3,
-  FluxAPI,
  OpenWeather,
  StructuredSD,
  StructuredACS,
@@ -41,5 +38,4 @@ module.exports = {
  StructuredWolfram,
  createYouTubeTools,
  TavilySearchResults,
-  createOpenAIImageTools,
 };
--- a/api/app/clients/tools/manifest.json
+++ b/api/app/clients/tools/manifest.json
@@ -44,20 +44,6 @@
      }
    ]
  },
-  {
-    "name": "OpenAI Image Tools",
-    "pluginKey": "image_gen_oai",
-    "toolkit": true,
-    "description": "Image Generation and Editing using OpenAI's latest state-of-the-art models",
-    "icon": "/assets/image_gen_oai.png",
-    "authConfig": [
-      {
-        "authField": "IMAGE_GEN_OAI_API_KEY",
-        "label": "OpenAI Image Tools API Key",
-        "description": "Your OpenAI API Key for Image Generation and Editing"
-      }
-    ]
-  },
  {
    "name": "Wolfram",
    "pluginKey": "wolfram",
@@ -178,19 +164,5 @@
        "description": "Sign up at <a href=\"https://home.openweathermap.org/users/sign_up\" target=\"_blank\">OpenWeather</a>, then get your key at <a href=\"https://home.openweathermap.org/api_keys\" target=\"_blank\">API keys</a>."
      }
    ]
-  },
-  {
-    "name": "Flux",
-    "pluginKey": "flux",
-    "description": "Generate images using text with the Flux API.",
-    "icon": "https://blackforestlabs.ai/wp-content/uploads/2024/07/bfl_logo_retraced_blk.png",
-    "isAuthRequired": "true",
-    "authConfig": [
-      {
-        "authField": "FLUX_API_KEY",
-        "label": "Your Flux API Key",
-        "description": "Provide your Flux API key from your user profile."
-      }
-    ]
  }
 ]
--- a/api/app/clients/tools/structured/DALLE3.js
+++ b/api/app/clients/tools/structured/DALLE3.js
@@ -1,17 +1,14 @@
 const { z } = require('zod');
 const path = require('path');
 const OpenAI = require('openai');
-const fetch = require('node-fetch');
 const { v4: uuidv4 } = require('uuid');
 const { Tool } = require('@langchain/core/tools');
 const { HttpsProxyAgent } = require('https-proxy-agent');
-const { FileContext, ContentTypes } = require('librechat-data-provider');
+const { FileContext } = require('librechat-data-provider');
 const { getImageBasename } = require('~/server/services/Files/images');
 const extractBaseURL = require('~/utils/extractBaseURL');
 const { logger } = require('~/config');

-const displayMessage =
-  'DALL-E displayed an image. All generated images are already plainly visible, so don\'t repeat the descriptions in detail. Do not list download links as they are available in the UI already. The user may download the images by clicking on them, but do not mention anything about downloading to the user.';
 class DALLE3 extends Tool {
  constructor(fields = {}) {
    super();
@@ -117,7 +114,10 @@ class DALLE3 extends Tool {
    if (this.isAgent === true && typeof value === 'string') {
      return [value, {}];
    } else if (this.isAgent === true && typeof value === 'object') {
-      return [displayMessage, value];
+      return [
+        'DALL-E displayed an image. All generated images are already plainly visible, so don\'t repeat the descriptions in detail. Do not list download links as they are available in the UI already. The user may download the images by clicking on them, but do not mention anything about downloading to the user.',
+        value,
+      ];
    }

    return value;
@@ -160,32 +160,6 @@ Error Message: ${error.message}`);
      );
    }

-    if (this.isAgent) {
-      let fetchOptions = {};
-      if (process.env.PROXY) {
-        fetchOptions.agent = new HttpsProxyAgent(process.env.PROXY);
-      }
-      const imageResponse = await fetch(theImageUrl, fetchOptions);
-      const arrayBuffer = await imageResponse.arrayBuffer();
-      const base64 = Buffer.from(arrayBuffer).toString('base64');
-      const content = [
-        {
-          type: ContentTypes.IMAGE_URL,
-          image_url: {
-            url: `data:image/png;base64,${base64}`,
-          },
-        },
-      ];
-
-      const response = [
-        {
-          type: ContentTypes.TEXT,
-          text: displayMessage,
-        },
-      ];
-      return [response, { content }];
-    }
-
    const imageBasename = getImageBasename(theImageUrl);
    const imageExt = path.extname(imageBasename);

--- a/api/app/clients/tools/structured/FluxAPI.js
+++ b/api/app/clients/tools/structured/FluxAPI.js
@@ -1,554 +0,0 @@
-const { z } = require('zod');
-const axios = require('axios');
-const fetch = require('node-fetch');
-const { v4: uuidv4 } = require('uuid');
-const { Tool } = require('@langchain/core/tools');
-const { HttpsProxyAgent } = require('https-proxy-agent');
-const { FileContext, ContentTypes } = require('librechat-data-provider');
-const { logger } = require('~/config');
-
-const displayMessage =
-  'Flux displayed an image. All generated images are already plainly visible, so don\'t repeat the descriptions in detail. Do not list download links as they are available in the UI already. The user may download the images by clicking on them, but do not mention anything about downloading to the user.';
-
-/**
- * FluxAPI - A tool for generating high-quality images from text prompts using the Flux API.
- * Each call generates one image. If multiple images are needed, make multiple consecutive calls with the same or varied prompts.
- */
-class FluxAPI extends Tool {
-  // Pricing constants in USD per image
-  static PRICING = {
-    FLUX_PRO_1_1_ULTRA: -0.06, // /v1/flux-pro-1.1-ultra
-    FLUX_PRO_1_1: -0.04, // /v1/flux-pro-1.1
-    FLUX_PRO: -0.05, // /v1/flux-pro
-    FLUX_DEV: -0.025, // /v1/flux-dev
-    FLUX_PRO_FINETUNED: -0.06, // /v1/flux-pro-finetuned
-    FLUX_PRO_1_1_ULTRA_FINETUNED: -0.07, // /v1/flux-pro-1.1-ultra-finetuned
-  };
-
-  constructor(fields = {}) {
-    super();
-
-    /** @type {boolean} Used to initialize the Tool without necessary variables. */
-    this.override = fields.override ?? false;
-
-    this.userId = fields.userId;
-    this.fileStrategy = fields.fileStrategy;
-
-    /** @type {boolean} **/
-    this.isAgent = fields.isAgent;
-    this.returnMetadata = fields.returnMetadata ?? false;
-
-    if (fields.processFileURL) {
-      /** @type {processFileURL} Necessary for output to contain all image metadata. */
-      this.processFileURL = fields.processFileURL.bind(this);
-    }
-
-    this.apiKey = fields.FLUX_API_KEY || this.getApiKey();
-
-    this.name = 'flux';
-    this.description =
-      'Use Flux to generate images from text descriptions. This tool can generate images and list available finetunes. Each generate call creates one image. For multiple images, make multiple consecutive calls.';
-
-    this.description_for_model = `// Transform any image description into a detailed, high-quality prompt. Never submit a prompt under 3 sentences. Follow these core rules:
-    // 1. ALWAYS enhance basic prompts into 5-10 detailed sentences (e.g., "a cat" becomes: "A close-up photo of a sleek Siamese cat with piercing blue eyes. The cat sits elegantly on a vintage leather armchair, its tail curled gracefully around its paws. Warm afternoon sunlight streams through a nearby window, casting gentle shadows across its face and highlighting the subtle variations in its cream and chocolate-point fur. The background is softly blurred, creating a shallow depth of field that draws attention to the cat's expressive features. The overall composition has a peaceful, contemplative mood with a professional photography style.")
-    // 2. Each prompt MUST be 3-6 descriptive sentences minimum, focusing on visual elements: lighting, composition, mood, and style
-    // Use action: 'list_finetunes' to see available custom models. When using finetunes, use endpoint: '/v1/flux-pro-finetuned' (default) or '/v1/flux-pro-1.1-ultra-finetuned' for higher quality and aspect ratio.`;
-
-    // Add base URL from environment variable with fallback
-    this.baseUrl = process.env.FLUX_API_BASE_URL || 'https://api.us1.bfl.ai';
-
-    // Define the schema for structured input
-    this.schema = z.object({
-      action: z
-        .enum(['generate', 'list_finetunes', 'generate_finetuned'])
-        .default('generate')
-        .describe(
-          'Action to perform: "generate" for image generation, "generate_finetuned" for finetuned model generation, "list_finetunes" to get available custom models',
-        ),
-      prompt: z
-        .string()
-        .optional()
-        .describe(
-          'Text prompt for image generation. Required when action is "generate". Not used for list_finetunes.',
-        ),
-      width: z
-        .number()
-        .optional()
-        .describe(
-          'Width of the generated image in pixels. Must be a multiple of 32. Default is 1024.',
-        ),
-      height: z
-        .number()
-        .optional()
-        .describe(
-          'Height of the generated image in pixels. Must be a multiple of 32. Default is 768.',
-        ),
-      prompt_upsampling: z
-        .boolean()
-        .optional()
-        .default(false)
-        .describe('Whether to perform upsampling on the prompt.'),
-      steps: z
-        .number()
-        .int()
-        .optional()
-        .describe('Number of steps to run the model for, a number from 1 to 50. Default is 40.'),
-      seed: z.number().optional().describe('Optional seed for reproducibility.'),
-      safety_tolerance: z
-        .number()
-        .optional()
-        .default(6)
-        .describe(
-          'Tolerance level for input and output moderation. Between 0 and 6, 0 being most strict, 6 being least strict.',
-        ),
-      endpoint: z
-        .enum([
-          '/v1/flux-pro-1.1',
-          '/v1/flux-pro',
-          '/v1/flux-dev',
-          '/v1/flux-pro-1.1-ultra',
-          '/v1/flux-pro-finetuned',
-          '/v1/flux-pro-1.1-ultra-finetuned',
-        ])
-        .optional()
-        .default('/v1/flux-pro-1.1')
-        .describe('Endpoint to use for image generation.'),
-      raw: z
-        .boolean()
-        .optional()
-        .default(false)
-        .describe(
-          'Generate less processed, more natural-looking images. Only works for /v1/flux-pro-1.1-ultra.',
-        ),
-      finetune_id: z.string().optional().describe('ID of the finetuned model to use'),
-      finetune_strength: z
-        .number()
-        .optional()
-        .default(1.1)
-        .describe('Strength of the finetuning effect (typically between 0.1 and 1.2)'),
-      guidance: z.number().optional().default(2.5).describe('Guidance scale for finetuned models'),
-      aspect_ratio: z
-        .string()
-        .optional()
-        .default('16:9')
-        .describe('Aspect ratio for ultra models (e.g., "16:9")'),
-    });
-  }
-
-  getAxiosConfig() {
-    const config = {};
-    if (process.env.PROXY) {
-      config.httpsAgent = new HttpsProxyAgent(process.env.PROXY);
-    }
-    return config;
-  }
-
-  /** @param {Object|string} value */
-  getDetails(value) {
-    if (typeof value === 'string') {
-      return value;
-    }
-    return JSON.stringify(value, null, 2);
-  }
-
-  getApiKey() {
-    const apiKey = process.env.FLUX_API_KEY || '';
-    if (!apiKey && !this.override) {
-      throw new Error('Missing FLUX_API_KEY environment variable.');
-    }
-    return apiKey;
-  }
-
-  wrapInMarkdown(imageUrl) {
-    const serverDomain = process.env.DOMAIN_SERVER || 'http://localhost:3080';
-    return `![generated image](${serverDomain}${imageUrl})`;
-  }
-
-  returnValue(value) {
-    if (this.isAgent === true && typeof value === 'string') {
-      return [value, {}];
-    } else if (this.isAgent === true && typeof value === 'object') {
-      if (Array.isArray(value)) {
-        return value;
-      }
-      return [displayMessage, value];
-    }
-    return value;
-  }
-
-  async _call(data) {
-    const { action = 'generate', ...imageData } = data;
-
-    // Use provided API key for this request if available, otherwise use default
-    const requestApiKey = this.apiKey || this.getApiKey();
-
-    // Handle list_finetunes action
-    if (action === 'list_finetunes') {
-      return this.getMyFinetunes(requestApiKey);
-    }
-
-    // Handle finetuned generation
-    if (action === 'generate_finetuned') {
-      return this.generateFinetunedImage(imageData, requestApiKey);
-    }
-
-    // For generate action, ensure prompt is provided
-    if (!imageData.prompt) {
-      throw new Error('Missing required field: prompt');
-    }
-
-    let payload = {
-      prompt: imageData.prompt,
-      prompt_upsampling: imageData.prompt_upsampling || false,
-      safety_tolerance: imageData.safety_tolerance || 6,
-      output_format: imageData.output_format || 'png',
-    };
-
-    // Add optional parameters if provided
-    if (imageData.width) {
-      payload.width = imageData.width;
-    }
-    if (imageData.height) {
-      payload.height = imageData.height;
-    }
-    if (imageData.steps) {
-      payload.steps = imageData.steps;
-    }
-    if (imageData.seed !== undefined) {
-      payload.seed = imageData.seed;
-    }
-    if (imageData.raw) {
-      payload.raw = imageData.raw;
-    }
-
-    const generateUrl = `${this.baseUrl}${imageData.endpoint || '/v1/flux-pro'}`;
-    const resultUrl = `${this.baseUrl}/v1/get_result`;
-
-    logger.debug('[FluxAPI] Generating image with payload:', payload);
-    logger.debug('[FluxAPI] Using endpoint:', generateUrl);
-
-    let taskResponse;
-    try {
-      taskResponse = await axios.post(generateUrl, payload, {
-        headers: {
-          'x-key': requestApiKey,
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
-        },
-        ...this.getAxiosConfig(),
-      });
-    } catch (error) {
-      const details = this.getDetails(error?.response?.data || error.message);
-      logger.error('[FluxAPI] Error while submitting task:', details);
-
-      return this.returnValue(
-        `Something went wrong when trying to generate the image. The Flux API may be unavailable:
-        Error Message: ${details}`,
-      );
-    }
-
-    const taskId = taskResponse.data.id;
-
-    // Polling for the result
-    let status = 'Pending';
-    let resultData = null;
-    while (status !== 'Ready' && status !== 'Error') {
-      try {
-        // Wait 2 seconds between polls
-        await new Promise((resolve) => setTimeout(resolve, 2000));
-        const resultResponse = await axios.get(resultUrl, {
-          headers: {
-            'x-key': requestApiKey,
-            Accept: 'application/json',
-          },
-          params: { id: taskId },
-          ...this.getAxiosConfig(),
-        });
-        status = resultResponse.data.status;
-
-        if (status === 'Ready') {
-          resultData = resultResponse.data.result;
-          break;
-        } else if (status === 'Error') {
-          logger.error('[FluxAPI] Error in task:', resultResponse.data);
-          return this.returnValue('An error occurred during image generation.');
-        }
-      } catch (error) {
-        const details = this.getDetails(error?.response?.data || error.message);
-        logger.error('[FluxAPI] Error while getting result:', details);
-        return this.returnValue('An error occurred while retrieving the image.');
-      }
-    }
-
-    // If no result data
-    if (!resultData || !resultData.sample) {
-      logger.error('[FluxAPI] No image data received from API. Response:', resultData);
-      return this.returnValue('No image data received from Flux API.');
-    }
-
-    // Try saving the image locally
-    const imageUrl = resultData.sample;
-    const imageName = `img-${uuidv4()}.png`;
-
-    if (this.isAgent) {
-      try {
-        // Fetch the image and convert to base64
-        const fetchOptions = {};
-        if (process.env.PROXY) {
-          fetchOptions.agent = new HttpsProxyAgent(process.env.PROXY);
-        }
-        const imageResponse = await fetch(imageUrl, fetchOptions);
-        const arrayBuffer = await imageResponse.arrayBuffer();
-        const base64 = Buffer.from(arrayBuffer).toString('base64');
-        const content = [
-          {
-            type: ContentTypes.IMAGE_URL,
-            image_url: {
-              url: `data:image/png;base64,${base64}`,
-            },
-          },
-        ];
-
-        const response = [
-          {
-            type: ContentTypes.TEXT,
-            text: displayMessage,
-          },
-        ];
-        return [response, { content }];
-      } catch (error) {
-        logger.error('Error processing image for agent:', error);
-        return this.returnValue(`Failed to process the image. ${error.message}`);
-      }
-    }
-
-    try {
-      logger.debug('[FluxAPI] Saving image:', imageUrl);
-      const result = await this.processFileURL({
-        fileStrategy: this.fileStrategy,
-        userId: this.userId,
-        URL: imageUrl,
-        fileName: imageName,
-        basePath: 'images',
-        context: FileContext.image_generation,
-      });
-
-      logger.debug('[FluxAPI] Image saved to path:', result.filepath);
-
-      // Calculate cost based on endpoint
-      /**
-       * TODO: Cost handling
-      const endpoint = imageData.endpoint || '/v1/flux-pro';
-      const endpointKey = Object.entries(FluxAPI.PRICING).find(([key, _]) =>
-        endpoint.includes(key.toLowerCase().replace(/_/g, '-')),
-      )?.[0];
-      const cost = FluxAPI.PRICING[endpointKey] || 0;
-       */
-      this.result = this.returnMetadata ? result : this.wrapInMarkdown(result.filepath);
-      return this.returnValue(this.result);
-    } catch (error) {
-      const details = this.getDetails(error?.message ?? 'No additional error details.');
-      logger.error('Error while saving the image:', details);
-      return this.returnValue(`Failed to save the image locally. ${details}`);
-    }
-  }
-
-  async getMyFinetunes(apiKey = null) {
-    const finetunesUrl = `${this.baseUrl}/v1/my_finetunes`;
-    const detailsUrl = `${this.baseUrl}/v1/finetune_details`;
-
-    try {
-      const headers = {
-        'x-key': apiKey || this.getApiKey(),
-        'Content-Type': 'application/json',
-        Accept: 'application/json',
-      };
-
-      // Get list of finetunes
-      const response = await axios.get(finetunesUrl, {
-        headers,
-        ...this.getAxiosConfig(),
-      });
-      const finetunes = response.data.finetunes;
-
-      // Fetch details for each finetune
-      const finetuneDetails = await Promise.all(
-        finetunes.map(async (finetuneId) => {
-          try {
-            const detailResponse = await axios.get(`${detailsUrl}?finetune_id=${finetuneId}`, {
-              headers,
-              ...this.getAxiosConfig(),
-            });
-            return {
-              id: finetuneId,
-              ...detailResponse.data,
-            };
-          } catch (error) {
-            logger.error(`[FluxAPI] Error fetching details for finetune ${finetuneId}:`, error);
-            return {
-              id: finetuneId,
-              error: 'Failed to fetch details',
-            };
-          }
-        }),
-      );
-
-      if (this.isAgent) {
-        const formattedDetails = JSON.stringify(finetuneDetails, null, 2);
-        return [`Here are the available finetunes:\n${formattedDetails}`, null];
-      }
-      return JSON.stringify(finetuneDetails);
-    } catch (error) {
-      const details = this.getDetails(error?.response?.data || error.message);
-      logger.error('[FluxAPI] Error while getting finetunes:', details);
-      const errorMsg = `Failed to get finetunes: ${details}`;
-      return this.isAgent ? this.returnValue([errorMsg, {}]) : new Error(errorMsg);
-    }
-  }
-
-  async generateFinetunedImage(imageData, requestApiKey) {
-    if (!imageData.prompt) {
-      throw new Error('Missing required field: prompt');
-    }
-
-    if (!imageData.finetune_id) {
-      throw new Error(
-        'Missing required field: finetune_id for finetuned generation. Please supply a finetune_id!',
-      );
-    }
-
-    // Validate endpoint is appropriate for finetuned generation
-    const validFinetunedEndpoints = ['/v1/flux-pro-finetuned', '/v1/flux-pro-1.1-ultra-finetuned'];
-    const endpoint = imageData.endpoint || '/v1/flux-pro-finetuned';
-
-    if (!validFinetunedEndpoints.includes(endpoint)) {
-      throw new Error(
-        `Invalid endpoint for finetuned generation. Must be one of: ${validFinetunedEndpoints.join(', ')}`,
-      );
-    }
-
-    let payload = {
-      prompt: imageData.prompt,
-      prompt_upsampling: imageData.prompt_upsampling || false,
-      safety_tolerance: imageData.safety_tolerance || 6,
-      output_format: imageData.output_format || 'png',
-      finetune_id: imageData.finetune_id,
-      finetune_strength: imageData.finetune_strength || 1.0,
-      guidance: imageData.guidance || 2.5,
-    };
-
-    // Add optional parameters if provided
-    if (imageData.width) {
-      payload.width = imageData.width;
-    }
-    if (imageData.height) {
-      payload.height = imageData.height;
-    }
-    if (imageData.steps) {
-      payload.steps = imageData.steps;
-    }
-    if (imageData.seed !== undefined) {
-      payload.seed = imageData.seed;
-    }
-    if (imageData.raw) {
-      payload.raw = imageData.raw;
-    }
-
-    const generateUrl = `${this.baseUrl}${endpoint}`;
-    const resultUrl = `${this.baseUrl}/v1/get_result`;
-
-    logger.debug('[FluxAPI] Generating finetuned image with payload:', payload);
-    logger.debug('[FluxAPI] Using endpoint:', generateUrl);
-
-    let taskResponse;
-    try {
-      taskResponse = await axios.post(generateUrl, payload, {
-        headers: {
-          'x-key': requestApiKey,
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
-        },
-        ...this.getAxiosConfig(),
-      });
-    } catch (error) {
-      const details = this.getDetails(error?.response?.data || error.message);
-      logger.error('[FluxAPI] Error while submitting finetuned task:', details);
-      return this.returnValue(
-        `Something went wrong when trying to generate the finetuned image. The Flux API may be unavailable:
-        Error Message: ${details}`,
-      );
-    }
-
-    const taskId = taskResponse.data.id;
-
-    // Polling for the result
-    let status = 'Pending';
-    let resultData = null;
-    while (status !== 'Ready' && status !== 'Error') {
-      try {
-        // Wait 2 seconds between polls
-        await new Promise((resolve) => setTimeout(resolve, 2000));
-        const resultResponse = await axios.get(resultUrl, {
-          headers: {
-            'x-key': requestApiKey,
-            Accept: 'application/json',
-          },
-          params: { id: taskId },
-          ...this.getAxiosConfig(),
-        });
-        status = resultResponse.data.status;
-
-        if (status === 'Ready') {
-          resultData = resultResponse.data.result;
-          break;
-        } else if (status === 'Error') {
-          logger.error('[FluxAPI] Error in finetuned task:', resultResponse.data);
-          return this.returnValue('An error occurred during finetuned image generation.');
-        }
-      } catch (error) {
-        const details = this.getDetails(error?.response?.data || error.message);
-        logger.error('[FluxAPI] Error while getting finetuned result:', details);
-        return this.returnValue('An error occurred while retrieving the finetuned image.');
-      }
-    }
-
-    // If no result data
-    if (!resultData || !resultData.sample) {
-      logger.error('[FluxAPI] No image data received from API. Response:', resultData);
-      return this.returnValue('No image data received from Flux API.');
-    }
-
-    // Try saving the image locally
-    const imageUrl = resultData.sample;
-    const imageName = `img-${uuidv4()}.png`;
-
-    try {
-      logger.debug('[FluxAPI] Saving finetuned image:', imageUrl);
-      const result = await this.processFileURL({
-        fileStrategy: this.fileStrategy,
-        userId: this.userId,
-        URL: imageUrl,
-        fileName: imageName,
-        basePath: 'images',
-        context: FileContext.image_generation,
-      });
-
-      logger.debug('[FluxAPI] Finetuned image saved to path:', result.filepath);
-
-      // Calculate cost based on endpoint
-      const endpointKey = endpoint.includes('ultra')
-        ? 'FLUX_PRO_1_1_ULTRA_FINETUNED'
-        : 'FLUX_PRO_FINETUNED';
-      const cost = FluxAPI.PRICING[endpointKey] || 0;
-      // Return the result based on returnMetadata flag
-      this.result = this.returnMetadata ? result : this.wrapInMarkdown(result.filepath);
-      return this.returnValue(this.result);
-    } catch (error) {
-      const details = this.getDetails(error?.message ?? 'No additional error details.');
-      logger.error('Error while saving the finetuned image:', details);
-      return this.returnValue(`Failed to save the finetuned image locally. ${details}`);
-    }
-  }
-}
-
-module.exports = FluxAPI;
--- a/api/app/clients/tools/structured/OpenAIImageTools.js
+++ b/api/app/clients/tools/structured/OpenAIImageTools.js
@@ -1,518 +0,0 @@
-const { z } = require('zod');
-const axios = require('axios');
-const { v4 } = require('uuid');
-const OpenAI = require('openai');
-const FormData = require('form-data');
-const { tool } = require('@langchain/core/tools');
-const { HttpsProxyAgent } = require('https-proxy-agent');
-const { ContentTypes, EImageOutputType } = require('librechat-data-provider');
-const { getStrategyFunctions } = require('~/server/services/Files/strategies');
-const { logAxiosError, extractBaseURL } = require('~/utils');
-const { getFiles } = require('~/models/File');
-const { logger } = require('~/config');
-
-/** Default descriptions for image generation tool  */
-const DEFAULT_IMAGE_GEN_DESCRIPTION = `
-Generates high-quality, original images based solely on text, not using any uploaded reference images.
-
-When to use \`image_gen_oai\`:
- To create entirely new images from detailed text descriptions that do NOT reference any image files.
-
-When NOT to use \`image_gen_oai\`:
- If the user has uploaded any images and requests modifications, enhancements, or remixing based on those uploads → use \`image_edit_oai\` instead.
-
-Generated image IDs will be returned in the response, so you can refer to them in future requests made to \`image_edit_oai\`.
-`.trim();
-
-/** Default description for image editing tool  */
-const DEFAULT_IMAGE_EDIT_DESCRIPTION =
-  `Generates high-quality, original images based on text and one or more uploaded/referenced images.
-
-When to use \`image_edit_oai\`:
- The user wants to modify, extend, or remix one **or more** uploaded images, either:
- Previously generated, or in the current request (both to be included in the \`image_ids\` array).
- Always when the user refers to uploaded images for editing, enhancement, remixing, style transfer, or combining elements.
- Any current or existing images are to be used as visual guides.
- If there are any files in the current request, they are more likely than not expected as references for image edit requests.
-
-When NOT to use \`image_edit_oai\`:
- Brand-new generations that do not rely on an existing image → use \`image_gen_oai\` instead.
-
-Both generated and referenced image IDs will be returned in the response, so you can refer to them in future requests made to \`image_edit_oai\`.
-`.trim();
-
-/** Default prompt descriptions  */
-const DEFAULT_IMAGE_GEN_PROMPT_DESCRIPTION = `Describe the image you want in detail. 
-      Be highly specific—break your idea into layers: 
-      (1) main concept and subject,
-      (2) composition and position,
-      (3) lighting and mood,
-      (4) style, medium, or camera details,
-      (5) important features (age, expression, clothing, etc.),
-      (6) background.
-      Use positive, descriptive language and specify what should be included, not what to avoid. 
-      List number and characteristics of people/objects, and mention style/technical requirements (e.g., "DSLR photo, 85mm lens, golden hour").
-      Do not reference any uploaded images—use for new image creation from text only.`;
-
-const DEFAULT_IMAGE_EDIT_PROMPT_DESCRIPTION = `Describe the changes, enhancements, or new ideas to apply to the uploaded image(s).
-      Be highly specific—break your request into layers: 
-      (1) main concept or transformation,
-      (2) specific edits/replacements or composition guidance,
-      (3) desired style, mood, or technique,
-      (4) features/items to keep, change, or add (such as objects, people, clothing, lighting, etc.).
-      Use positive, descriptive language and clarify what should be included or changed, not what to avoid.
-      Always base this prompt on the most recently uploaded reference images.`;
-
-const displayMessage =
-  'The tool displayed an image. All generated images are already plainly visible, so don\'t repeat the descriptions in detail. Do not list download links as they are available in the UI already. The user may download the images by clicking on them, but do not mention anything about downloading to the user.';
-
-/**
- * Replaces unwanted characters from the input string
- * @param {string} inputString - The input string to process
- * @returns {string} - The processed string
- */
-function replaceUnwantedChars(inputString) {
-  return inputString
-    .replace(/\r\n|\r|\n/g, ' ')
-    .replace(/"/g, '')
-    .trim();
-}
-
-function returnValue(value) {
-  if (typeof value === 'string') {
-    return [value, {}];
-  } else if (typeof value === 'object') {
-    if (Array.isArray(value)) {
-      return value;
-    }
-    return [displayMessage, value];
-  }
-  return value;
-}
-
-const getImageGenDescription = () => {
-  return process.env.IMAGE_GEN_OAI_DESCRIPTION || DEFAULT_IMAGE_GEN_DESCRIPTION;
-};
-
-const getImageEditDescription = () => {
-  return process.env.IMAGE_EDIT_OAI_DESCRIPTION || DEFAULT_IMAGE_EDIT_DESCRIPTION;
-};
-
-const getImageGenPromptDescription = () => {
-  return process.env.IMAGE_GEN_OAI_PROMPT_DESCRIPTION || DEFAULT_IMAGE_GEN_PROMPT_DESCRIPTION;
-};
-
-const getImageEditPromptDescription = () => {
-  return process.env.IMAGE_EDIT_OAI_PROMPT_DESCRIPTION || DEFAULT_IMAGE_EDIT_PROMPT_DESCRIPTION;
-};
-
-/**
- * Creates OpenAI Image tools (generation and editing)
- * @param {Object} fields - Configuration fields
- * @param {ServerRequest} fields.req - Whether the tool is being used in an agent context
- * @param {boolean} fields.isAgent - Whether the tool is being used in an agent context
- * @param {string} fields.IMAGE_GEN_OAI_API_KEY - The OpenAI API key
- * @param {boolean} [fields.override] - Whether to override the API key check, necessary for app initialization
- * @param {MongoFile[]} [fields.imageFiles] - The images to be used for editing
- * @returns {Array} - Array of image tools
- */
-function createOpenAIImageTools(fields = {}) {
-  /** @type {boolean} Used to initialize the Tool without necessary variables. */
-  const override = fields.override ?? false;
-  /** @type {boolean} */
-  if (!override && !fields.isAgent) {
-    throw new Error('This tool is only available for agents.');
-  }
-  const { req } = fields;
-  const imageOutputType = req?.app.locals.imageOutputType || EImageOutputType.PNG;
-  const appFileStrategy = req?.app.locals.fileStrategy;
-
-  const getApiKey = () => {
-    const apiKey = process.env.IMAGE_GEN_OAI_API_KEY ?? '';
-    if (!apiKey && !override) {
-      throw new Error('Missing IMAGE_GEN_OAI_API_KEY environment variable.');
-    }
-    return apiKey;
-  };
-
-  let apiKey = fields.IMAGE_GEN_OAI_API_KEY ?? getApiKey();
-  const closureConfig = { apiKey };
-
-  let baseURL = 'https://api.openai.com/v1/';
-  if (!override && process.env.IMAGE_GEN_OAI_BASEURL) {
-    baseURL = extractBaseURL(process.env.IMAGE_GEN_OAI_BASEURL);
-    closureConfig.baseURL = baseURL;
-  }
-
-  // Note: Azure may not yet support the latest image generation models
-  if (
-    !override &&
-    process.env.IMAGE_GEN_OAI_AZURE_API_VERSION &&
-    process.env.IMAGE_GEN_OAI_BASEURL
-  ) {
-    baseURL = process.env.IMAGE_GEN_OAI_BASEURL;
-    closureConfig.baseURL = baseURL;
-    closureConfig.defaultQuery = { 'api-version': process.env.IMAGE_GEN_OAI_AZURE_API_VERSION };
-    closureConfig.defaultHeaders = {
-      'api-key': process.env.IMAGE_GEN_OAI_API_KEY,
-      'Content-Type': 'application/json',
-    };
-    closureConfig.apiKey = process.env.IMAGE_GEN_OAI_API_KEY;
-  }
-
-  const imageFiles = fields.imageFiles ?? [];
-
-  /**
-   * Image Generation Tool
-   */
-  const imageGenTool = tool(
-    async (
-      {
-        prompt,
-        background = 'auto',
-        n = 1,
-        output_compression = 100,
-        quality = 'auto',
-        size = 'auto',
-      },
-      runnableConfig,
-    ) => {
-      if (!prompt) {
-        throw new Error('Missing required field: prompt');
-      }
-      const clientConfig = { ...closureConfig };
-      if (process.env.PROXY) {
-        clientConfig.httpAgent = new HttpsProxyAgent(process.env.PROXY);
-      }
-
-      /** @type {OpenAI} */
-      const openai = new OpenAI(clientConfig);
-      let output_format = imageOutputType;
-      if (
-        background === 'transparent' &&
-        output_format !== EImageOutputType.PNG &&
-        output_format !== EImageOutputType.WEBP
-      ) {
-        logger.warn(
-          '[ImageGenOAI] Transparent background requires PNG or WebP format, defaulting to PNG',
-        );
-        output_format = EImageOutputType.PNG;
-      }
-
-      let resp;
-      try {
-        const derivedSignal = runnableConfig?.signal
-          ? AbortSignal.any([runnableConfig.signal])
-          : undefined;
-        resp = await openai.images.generate(
-          {
-            model: 'gpt-image-1',
-            prompt: replaceUnwantedChars(prompt),
-            n: Math.min(Math.max(1, n), 10),
-            background,
-            output_format,
-            output_compression:
-              output_format === EImageOutputType.WEBP || output_format === EImageOutputType.JPEG
-                ? output_compression
-                : undefined,
-            quality,
-            size,
-          },
-          {
-            signal: derivedSignal,
-          },
-        );
-      } catch (error) {
-        const message = '[image_gen_oai] Problem generating the image:';
-        logAxiosError({ error, message });
-        return returnValue(`Something went wrong when trying to generate the image. The OpenAI API may be unavailable:
-Error Message: ${error.message}`);
-      }
-
-      if (!resp) {
-        return returnValue(
-          'Something went wrong when trying to generate the image. The OpenAI API may be unavailable',
-        );
-      }
-
-      // For gpt-image-1, the response contains base64-encoded images
-      // TODO: handle cost in `resp.usage`
-      const base64Image = resp.data[0].b64_json;
-
-      if (!base64Image) {
-        return returnValue(
-          'No image data returned from OpenAI API. There may be a problem with the API or your configuration.',
-        );
-      }
-
-      const content = [
-        {
-          type: ContentTypes.IMAGE_URL,
-          image_url: {
-            url: `data:image/${output_format};base64,${base64Image}`,
-          },
-        },
-      ];
-
-      const file_ids = [v4()];
-      const response = [
-        {
-          type: ContentTypes.TEXT,
-          text: displayMessage + `\n\ngenerated_image_id: "${file_ids[0]}"`,
-        },
-      ];
-      return [response, { content, file_ids }];
-    },
-    {
-      name: 'image_gen_oai',
-      description: getImageGenDescription(),
-      schema: z.object({
-        prompt: z.string().max(32000).describe(getImageGenPromptDescription()),
-        background: z
-          .enum(['transparent', 'opaque', 'auto'])
-          .optional()
-          .describe(
-            'Sets transparency for the background. Must be one of transparent, opaque or auto (default). When transparent, the output format should be png or webp.',
-          ),
-        /*
-        n: z
-          .number()
-          .int()
-          .min(1)
-          .max(10)
-          .optional()
-          .describe('The number of images to generate. Must be between 1 and 10.'),
-        output_compression: z
-          .number()
-          .int()
-          .min(0)
-          .max(100)
-          .optional()
-          .describe('The compression level (0-100%) for webp or jpeg formats. Defaults to 100.'),
-           */
-        quality: z
-          .enum(['auto', 'high', 'medium', 'low'])
-          .optional()
-          .describe('The quality of the image. One of auto (default), high, medium, or low.'),
-        size: z
-          .enum(['auto', '1024x1024', '1536x1024', '1024x1536'])
-          .optional()
-          .describe(
-            'The size of the generated image. One of 1024x1024, 1536x1024 (landscape), 1024x1536 (portrait), or auto (default).',
-          ),
-      }),
-      responseFormat: 'content_and_artifact',
-    },
-  );
-
-  /**
-   * Image Editing Tool
-   */
-  const imageEditTool = tool(
-    async ({ prompt, image_ids, quality = 'auto', size = 'auto' }, runnableConfig) => {
-      if (!prompt) {
-        throw new Error('Missing required field: prompt');
-      }
-
-      const clientConfig = { ...closureConfig };
-      if (process.env.PROXY) {
-        clientConfig.httpAgent = new HttpsProxyAgent(process.env.PROXY);
-      }
-
-      const formData = new FormData();
-      formData.append('model', 'gpt-image-1');
-      formData.append('prompt', replaceUnwantedChars(prompt));
-      // TODO: `mask` support
-      // TODO: more than 1 image support
-      // formData.append('n', n.toString());
-      formData.append('quality', quality);
-      formData.append('size', size);
-
-      /** @type {Record<FileSources, undefined | NodeStreamDownloader<File>>} */
-      const streamMethods = {};
-
-      const requestFilesMap = Object.fromEntries(imageFiles.map((f) => [f.file_id, { ...f }]));
-
-      const orderedFiles = new Array(image_ids.length);
-      const idsToFetch = [];
-      const indexOfMissing = Object.create(null);
-
-      for (let i = 0; i < image_ids.length; i++) {
-        const id = image_ids[i];
-        const file = requestFilesMap[id];
-
-        if (file) {
-          orderedFiles[i] = file;
-        } else {
-          idsToFetch.push(id);
-          indexOfMissing[id] = i;
-        }
-      }
-
-      if (idsToFetch.length) {
-        const fetchedFiles = await getFiles(
-          {
-            user: req.user.id,
-            file_id: { $in: idsToFetch },
-            height: { $exists: true },
-            width: { $exists: true },
-          },
-          {},
-          {},
-        );
-
-        for (const file of fetchedFiles) {
-          requestFilesMap[file.file_id] = file;
-          orderedFiles[indexOfMissing[file.file_id]] = file;
-        }
-      }
-      for (const imageFile of orderedFiles) {
-        if (!imageFile) {
-          continue;
-        }
-        /** @type {NodeStream<File>} */
-        let stream;
-        /** @type {NodeStreamDownloader<File>} */
-        let getDownloadStream;
-        const source = imageFile.source || appFileStrategy;
-        if (!source) {
-          throw new Error('No source found for image file');
-        }
-        if (streamMethods[source]) {
-          getDownloadStream = streamMethods[source];
-        } else {
-          ({ getDownloadStream } = getStrategyFunctions(source));
-          streamMethods[source] = getDownloadStream;
-        }
-        if (!getDownloadStream) {
-          throw new Error(`No download stream method found for source: ${source}`);
-        }
-        stream = await getDownloadStream(req, imageFile.filepath);
-        if (!stream) {
-          throw new Error('Failed to get download stream for image file');
-        }
-        formData.append('image[]', stream, {
-          filename: imageFile.filename,
-          contentType: imageFile.type,
-        });
-      }
-
-      /** @type {import('axios').RawAxiosHeaders} */
-      let headers = {
-        ...formData.getHeaders(),
-      };
-
-      if (process.env.IMAGE_GEN_OAI_AZURE_API_VERSION && process.env.IMAGE_GEN_OAI_BASEURL) {
-        headers['api-key'] = apiKey;
-      } else {
-        headers['Authorization'] = `Bearer ${apiKey}`;
-      }
-
-      try {
-        const derivedSignal = runnableConfig?.signal
-          ? AbortSignal.any([runnableConfig.signal])
-          : undefined;
-
-        /** @type {import('axios').AxiosRequestConfig} */
-        const axiosConfig = {
-          headers,
-          ...clientConfig,
-          signal: derivedSignal,
-          baseURL,
-        };
-
-        if (process.env.IMAGE_GEN_OAI_AZURE_API_VERSION && process.env.IMAGE_GEN_OAI_BASEURL) {
-          axiosConfig.params = {
-            'api-version': process.env.IMAGE_GEN_OAI_AZURE_API_VERSION,
-            ...axiosConfig.params,
-          };
-        }
-        const response = await axios.post('/images/edits', formData, axiosConfig);
-
-        if (!response.data || !response.data.data || !response.data.data.length) {
-          return returnValue(
-            'No image data returned from OpenAI API. There may be a problem with the API or your configuration.',
-          );
-        }
-
-        const base64Image = response.data.data[0].b64_json;
-        if (!base64Image) {
-          return returnValue(
-            'No image data returned from OpenAI API. There may be a problem with the API or your configuration.',
-          );
-        }
-
-        const content = [
-          {
-            type: ContentTypes.IMAGE_URL,
-            image_url: {
-              url: `data:image/${imageOutputType};base64,${base64Image}`,
-            },
-          },
-        ];
-
-        const file_ids = [v4()];
-        const textResponse = [
-          {
-            type: ContentTypes.TEXT,
-            text:
-              displayMessage +
-              `\n\ngenerated_image_id: "${file_ids[0]}"\nreferenced_image_ids: ["${image_ids.join('", "')}"]`,
-          },
-        ];
-        return [textResponse, { content, file_ids }];
-      } catch (error) {
-        const message = '[image_edit_oai] Problem editing the image:';
-        logAxiosError({ error, message });
-        return returnValue(`Something went wrong when trying to edit the image. The OpenAI API may be unavailable:
-Error Message: ${error.message || 'Unknown error'}`);
-      }
-    },
-    {
-      name: 'image_edit_oai',
-      description: getImageEditDescription(),
-      schema: z.object({
-        image_ids: z
-          .array(z.string())
-          .min(1)
-          .describe(
-            `
-IDs (image ID strings) of previously generated or uploaded images that should guide the edit.
-
-Guidelines:
- If the user's request depends on any prior image(s), copy their image IDs into the \`image_ids\` array (in the same order the user refers to them).  
- Never invent or hallucinate IDs; only use IDs that are still visible in the conversation context.
- If no earlier image is relevant, omit the field entirely.
-`.trim(),
-          ),
-        prompt: z.string().max(32000).describe(getImageEditPromptDescription()),
-        /*
-        n: z
-          .number()
-          .int()
-          .min(1)
-          .max(10)
-          .optional()
-          .describe('The number of images to generate. Must be between 1 and 10. Defaults to 1.'),
-        */
-        quality: z
-          .enum(['auto', 'high', 'medium', 'low'])
-          .optional()
-          .describe(
-            'The quality of the image. One of auto (default), high, medium, or low. High/medium/low only supported for gpt-image-1.',
-          ),
-        size: z
-          .enum(['auto', '1024x1024', '1536x1024', '1024x1536', '256x256', '512x512'])
-          .optional()
-          .describe(
-            'The size of the generated images. For gpt-image-1: auto (default), 1024x1024, 1536x1024, 1024x1536. For dall-e-2: 256x256, 512x512, 1024x1024.',
-          ),
-      }),
-      responseFormat: 'content_and_artifact',
-    },
-  );
-
-  return [imageGenTool, imageEditTool];
-}
-
-module.exports = createOpenAIImageTools;
--- a/api/app/clients/tools/structured/StableDiffusion.js
+++ b/api/app/clients/tools/structured/StableDiffusion.js
@@ -6,13 +6,10 @@ const axios = require('axios');
 const sharp = require('sharp');
 const { v4: uuidv4 } = require('uuid');
 const { Tool } = require('@langchain/core/tools');
-const { FileContext, ContentTypes } = require('librechat-data-provider');
+const { FileContext } = require('librechat-data-provider');
 const paths = require('~/config/paths');
 const { logger } = require('~/config');

-const displayMessage =
-  'Stable Diffusion displayed an image. All generated images are already plainly visible, so don\'t repeat the descriptions in detail. Do not list download links as they are available in the UI already. The user may download the images by clicking on them, but do not mention anything about downloading to the user.';
-
 class StableDiffusionAPI extends Tool {
  constructor(fields) {
    super();
@@ -24,8 +21,6 @@ class StableDiffusionAPI extends Tool {
    this.override = fields.override ?? false;
    /** @type {boolean} Necessary for output to contain all image metadata. */
    this.returnMetadata = fields.returnMetadata ?? false;
-    /** @type {boolean} */
-    this.isAgent = fields.isAgent;
    if (fields.uploadImageBuffer) {
      /** @type {uploadImageBuffer} Necessary for output to contain all image metadata. */
      this.uploadImageBuffer = fields.uploadImageBuffer.bind(this);
@@ -71,16 +66,6 @@ class StableDiffusionAPI extends Tool {
    return `![generated image](/${imageUrl})`;
  }

-  returnValue(value) {
-    if (this.isAgent === true && typeof value === 'string') {
-      return [value, {}];
-    } else if (this.isAgent === true && typeof value === 'object') {
-      return [displayMessage, value];
-    }
-
-    return value;
-  }
-
  getServerURL() {
    const url = process.env.SD_WEBUI_URL || '';
    if (!url && !this.override) {
@@ -128,25 +113,6 @@ class StableDiffusionAPI extends Tool {
    }

    try {
-      if (this.isAgent) {
-        const content = [
-          {
-            type: ContentTypes.IMAGE_URL,
-            image_url: {
-              url: `data:image/png;base64,${image}`,
-            },
-          },
-        ];
-
-        const response = [
-          {
-            type: ContentTypes.TEXT,
-            text: displayMessage,
-          },
-        ];
-        return [response, { content }];
-      }
-
      const buffer = Buffer.from(image.split(',', 1)[0], 'base64');
      if (this.returnMetadata && this.uploadImageBuffer && this.req) {
        const file = await this.uploadImageBuffer({
@@ -188,7 +154,7 @@ class StableDiffusionAPI extends Tool {
      logger.error('[StableDiffusion] Error while saving the image:', error);
    }

-    return this.returnValue(this.result);
+    return this.result;
  }
 }

--- a/api/app/clients/tools/structured/TavilySearchResults.js
+++ b/api/app/clients/tools/structured/TavilySearchResults.js
@@ -43,39 +43,9 @@ class TavilySearchResults extends Tool {
        .boolean()
        .optional()
        .describe('Whether to include answers in the search results. Default is False.'),
-      include_raw_content: z
-        .boolean()
-        .optional()
-        .describe('Whether to include raw content in the search results. Default is False.'),
-      include_domains: z
-        .array(z.string())
-        .optional()
-        .describe('A list of domains to specifically include in the search results.'),
-      exclude_domains: z
-        .array(z.string())
-        .optional()
-        .describe('A list of domains to specifically exclude from the search results.'),
-      topic: z
-        .enum(['general', 'news', 'finance'])
-        .optional()
-        .describe(
-          'The category of the search. Use news ONLY if query SPECIFCALLY mentions the word "news".',
-        ),
-      time_range: z
-        .enum(['day', 'week', 'month', 'year', 'd', 'w', 'm', 'y'])
-        .optional()
-        .describe('The time range back from the current date to filter results.'),
-      days: z
-        .number()
-        .min(1)
-        .optional()
-        .describe('Number of days back from the current date to include. Only if topic is news.'),
-      include_image_descriptions: z
-        .boolean()
-        .optional()
-        .describe(
-          'When include_images is true, also add a descriptive text for each image. Default is false.',
-        ),
+      // include_raw_content: z.boolean().optional().describe('Whether to include raw content in the search results. Default is False.'),
+      // include_domains: z.array(z.string()).optional().describe('A list of domains to specifically include in the search results.'),
+      // exclude_domains: z.array(z.string()).optional().describe('A list of domains to specifically exclude from the search results.'),
    });
  }

--- a/api/app/clients/tools/util/addOpenAPISpecs.js
+++ b/api/app/clients/tools/util/addOpenAPISpecs.js
@@ -0,0 +1,30 @@
+const { loadSpecs } = require('./loadSpecs');
+
+function transformSpec(input) {
+  return {
+    name: input.name_for_human,
+    pluginKey: input.name_for_model,
+    description: input.description_for_human,
+    icon: input?.logo_url ?? 'https://placehold.co/70x70.png',
+    // TODO: add support for authentication
+    isAuthRequired: 'false',
+    authConfig: [],
+  };
+}
+
+async function addOpenAPISpecs(availableTools) {
+  try {
+    const specs = (await loadSpecs({})).map(transformSpec);
+    if (specs.length > 0) {
+      return [...specs, ...availableTools];
+    }
+    return availableTools;
+  } catch (error) {
+    return availableTools;
+  }
+}
+
+module.exports = {
+  transformSpec,
+  addOpenAPISpecs,
+};
--- a/api/app/clients/tools/util/addOpenAPISpecs.spec.js
+++ b/api/app/clients/tools/util/addOpenAPISpecs.spec.js
@@ -0,0 +1,76 @@
+const { addOpenAPISpecs, transformSpec } = require('./addOpenAPISpecs');
+const { loadSpecs } = require('./loadSpecs');
+const { createOpenAPIPlugin } = require('../dynamic/OpenAPIPlugin');
+
+jest.mock('./loadSpecs');
+jest.mock('../dynamic/OpenAPIPlugin');
+
+describe('transformSpec', () => {
+  it('should transform input spec to a desired format', () => {
+    const input = {
+      name_for_human: 'Human Name',
+      name_for_model: 'Model Name',
+      description_for_human: 'Human Description',
+      logo_url: 'https://example.com/logo.png',
+    };
+
+    const expectedOutput = {
+      name: 'Human Name',
+      pluginKey: 'Model Name',
+      description: 'Human Description',
+      icon: 'https://example.com/logo.png',
+      isAuthRequired: 'false',
+      authConfig: [],
+    };
+
+    expect(transformSpec(input)).toEqual(expectedOutput);
+  });
+
+  it('should use default icon if logo_url is not provided', () => {
+    const input = {
+      name_for_human: 'Human Name',
+      name_for_model: 'Model Name',
+      description_for_human: 'Human Description',
+    };
+
+    const expectedOutput = {
+      name: 'Human Name',
+      pluginKey: 'Model Name',
+      description: 'Human Description',
+      icon: 'https://placehold.co/70x70.png',
+      isAuthRequired: 'false',
+      authConfig: [],
+    };
+
+    expect(transformSpec(input)).toEqual(expectedOutput);
+  });
+});
+
+describe('addOpenAPISpecs', () => {
+  it('should add specs to available tools', async () => {
+    const availableTools = ['Tool1', 'Tool2'];
+    const specs = [
+      {
+        name_for_human: 'Human Name',
+        name_for_model: 'Model Name',
+        description_for_human: 'Human Description',
+        logo_url: 'https://example.com/logo.png',
+      },
+    ];
+
+    loadSpecs.mockResolvedValue(specs);
+    createOpenAPIPlugin.mockReturnValue('Plugin');
+
+    const result = await addOpenAPISpecs(availableTools);
+    expect(result).toEqual([...specs.map(transformSpec), ...availableTools]);
+  });
+
+  it('should return available tools if specs loading fails', async () => {
+    const availableTools = ['Tool1', 'Tool2'];
+
+    loadSpecs.mockRejectedValue(new Error('Failed to load specs'));
+
+    const result = await addOpenAPISpecs(availableTools);
+    expect(result).toEqual(availableTools);
+  });
+});
--- a/api/app/clients/tools/util/handleTools.js
+++ b/api/app/clients/tools/util/handleTools.js
@@ -1,13 +1,7 @@
+const { Tools, Constants } = require('librechat-data-provider');
 const { SerpAPI } = require('@langchain/community/tools/serpapi');
 const { Calculator } = require('@langchain/community/tools/calculator');
-const { EnvVar, createCodeExecutionTool, createSearchTool } = require('@librechat/agents');
-const {
-  Tools,
-  Constants,
-  EToolResources,
-  loadWebSearchAuth,
-  replaceSpecialVars,
-} = require('librechat-data-provider');
+const { createCodeExecutionTool, EnvVar } = require('@librechat/agents');
 const { getUserPluginAuthValue } = require('~/server/services/PluginService');
 const {
  availableTools,
@@ -16,7 +10,6 @@ const {
  GoogleSearchAPI,
  // Structured Tools
  DALLE3,
-  FluxAPI,
  OpenWeather,
  StructuredSD,
  StructuredACS,
@@ -24,12 +17,11 @@ const {
  StructuredWolfram,
  createYouTubeTools,
  TavilySearchResults,
-  createOpenAIImageTools,
 } = require('../');
 const { primeFiles: primeCodeFiles } = require('~/server/services/Files/Code/process');
 const { createFileSearchTool, primeFiles: primeSearchFiles } = require('./fileSearch');
-const { loadAuthValues } = require('~/server/services/Tools/credentials');
 const { createMCPTool } = require('~/server/services/MCP');
+const { loadSpecs } = require('./loadSpecs');
 const { logger } = require('~/config');

 const mcpToolPattern = new RegExp(`^.+${Constants.mcp_delimiter}.+$`);
@@ -97,6 +89,45 @@ const validateTools = async (user, tools = []) => {
  }
 };

+const loadAuthValues = async ({ userId, authFields, throwError = true }) => {
+  let authValues = {};
+
+  /**
+   * Finds the first non-empty value for the given authentication field, supporting alternate fields.
+   * @param {string[]} fields Array of strings representing the authentication fields. Supports alternate fields delimited by "||".
+   * @returns {Promise<{ authField: string, authValue: string} | null>} An object containing the authentication field and value, or null if not found.
+   */
+  const findAuthValue = async (fields) => {
+    for (const field of fields) {
+      let value = process.env[field];
+      if (value) {
+        return { authField: field, authValue: value };
+      }
+      try {
+        value = await getUserPluginAuthValue(userId, field, throwError);
+      } catch (err) {
+        if (field === fields[fields.length - 1] && !value) {
+          throw err;
+        }
+      }
+      if (value) {
+        return { authField: field, authValue: value };
+      }
+    }
+    return null;
+  };
+
+  for (let authField of authFields) {
+    const fields = authField.split('||');
+    const result = await findAuthValue(fields);
+    if (result) {
+      authValues[result.authField] = result.authValue;
+    }
+  }
+
+  return authValues;
+};
+
 /** @typedef {typeof import('@langchain/core/tools').Tool} ToolConstructor */
 /** @typedef {import('@langchain/core/tools').Tool} Tool */

@@ -129,7 +160,7 @@ const getAuthFields = (toolKey) => {
 *
 * @param {object} object
 * @param {string} object.user
- * @param {Pick<Agent, 'id' | 'provider' | 'model'>} [object.agent]
+ * @param {Agent} [object.agent]
 * @param {string} [object.model]
 * @param {EModelEndpoint} [object.endpoint]
 * @param {LoadToolOptions} [object.options]
@@ -144,13 +175,13 @@ const loadTools = async ({
  agent,
  model,
  endpoint,
+  useSpecs,
  tools = [],
  options = {},
  functions = true,
  returnMap = false,
 }) => {
  const toolConstructors = {
-    flux: FluxAPI,
    calculator: Calculator,
    google: GoogleSearchAPI,
    open_weather: OpenWeather,
@@ -162,7 +193,7 @@ const loadTools = async ({
  };

  const customConstructors = {
-    serpapi: async (_toolContextMap) => {
+    serpapi: async () => {
      const authFields = getAuthFields('serpapi');
      let envVar = authFields[0] ?? '';
      let apiKey = process.env[envVar];
@@ -175,40 +206,11 @@ const loadTools = async ({
        gl: 'us',
      });
    },
-    youtube: async (_toolContextMap) => {
+    youtube: async () => {
      const authFields = getAuthFields('youtube');
      const authValues = await loadAuthValues({ userId: user, authFields });
      return createYouTubeTools(authValues);
    },
-    image_gen_oai: async (toolContextMap) => {
-      const authFields = getAuthFields('image_gen_oai');
-      const authValues = await loadAuthValues({ userId: user, authFields });
-      const imageFiles = options.tool_resources?.[EToolResources.image_edit]?.files ?? [];
-      let toolContext = '';
-      for (let i = 0; i < imageFiles.length; i++) {
-        const file = imageFiles[i];
-        if (!file) {
-          continue;
-        }
-        if (i === 0) {
-          toolContext =
-            'Image files provided in this request (their image IDs listed in order of appearance) available for image editing:';
-        }
-        toolContext += `\n\t- ${file.file_id}`;
-        if (i === imageFiles.length - 1) {
-          toolContext += `\n\nInclude any you need in the \`image_ids\` array when calling \`${EToolResources.image_edit}_oai\`. You may also include previously referenced or generated image IDs.`;
-        }
-      }
-      if (toolContext) {
-        toolContextMap.image_edit_oai = toolContext;
-      }
-      return createOpenAIImageTools({
-        ...authValues,
-        isAgent: !!agent,
-        req: options.req,
-        imageFiles,
-      });
-    },
  };

  const requestedTools = {};
@@ -228,14 +230,13 @@ const loadTools = async ({
  };

  const toolOptions = {
-    flux: imageGenOptions,
+    serpapi: { location: 'Austin,Texas,United States', hl: 'en', gl: 'us' },
    dalle: imageGenOptions,
    'stable-diffusion': imageGenOptions,
-    serpapi: { location: 'Austin,Texas,United States', hl: 'en', gl: 'us' },
  };

-  /** @type {Record<string, string>} */
  const toolContextMap = {};
+  const remainingTools = [];
  const appTools = options.req?.app?.locals?.availableTools ?? {};

  for (const tool of tools) {
@@ -268,33 +269,6 @@ const loadTools = async ({
        return createFileSearchTool({ req: options.req, files, entity_id: agent?.id });
      };
      continue;
-    } else if (tool === Tools.web_search) {
-      const webSearchConfig = options?.req?.app?.locals?.webSearch;
-      const result = await loadWebSearchAuth({
-        userId: user,
-        loadAuthValues,
-        webSearchConfig,
-      });
-      const { onSearchResults, onGetHighlights } = options?.[Tools.web_search] ?? {};
-      requestedTools[tool] = async () => {
-        toolContextMap[tool] = `# \`${tool}\`:
-Current Date & Time: ${replaceSpecialVars({ text: '{{iso_datetime}}' })}
-1. **Execute immediately without preface** when using \`${tool}\`.
-2. **After the search, begin with a brief summary** that directly addresses the query without headers or explaining your process.
-3. **Structure your response clearly** using Markdown formatting (Level 2 headers for sections, lists for multiple points, tables for comparisons).
-4. **Cite sources properly** according to the citation anchor format, utilizing group anchors when appropriate.
-5. **Tailor your approach to the query type** (academic, news, coding, etc.) while maintaining an expert, journalistic, unbiased tone.
-6. **Provide comprehensive information** with specific details, examples, and as much relevant context as possible from search results.
-7. **Avoid moralizing language.**
-`.trim();
-        return createSearchTool({
-          ...result.authResult,
-          onSearchResults,
-          onGetHighlights,
-          logger,
-        });
-      };
-      continue;
    } else if (tool && appTools[tool] && mcpToolPattern.test(tool)) {
      requestedTools[tool] = async () =>
        createMCPTool({
@@ -307,7 +281,7 @@ Current Date & Time: ${replaceSpecialVars({ text: '{{iso_datetime}}' })}
    }

    if (customConstructors[tool]) {
-      requestedTools[tool] = async () => customConstructors[tool](toolContextMap);
+      requestedTools[tool] = customConstructors[tool];
      continue;
    }

@@ -322,6 +296,30 @@ Current Date & Time: ${replaceSpecialVars({ text: '{{iso_datetime}}' })}
      requestedTools[tool] = toolInstance;
      continue;
    }
+
+    if (functions === true) {
+      remainingTools.push(tool);
+    }
+  }
+
+  let specs = null;
+  if (useSpecs === true && functions === true && remainingTools.length > 0) {
+    specs = await loadSpecs({
+      llm: model,
+      user,
+      message: options.message,
+      memory: options.memory,
+      signal: options.signal,
+      tools: remainingTools,
+      map: true,
+      verbose: false,
+    });
+  }
+
+  for (const tool of remainingTools) {
+    if (specs && specs[tool]) {
+      requestedTools[tool] = specs[tool];
+    }
  }

  if (returnMap) {
@@ -347,6 +345,7 @@ Current Date & Time: ${replaceSpecialVars({ text: '{{iso_datetime}}' })}

 module.exports = {
  loadToolWithAuth,
+  loadAuthValues,
  validateTools,
  loadTools,
 };
--- a/api/app/clients/tools/util/handleTools.test.js
+++ b/api/app/clients/tools/util/handleTools.test.js
@@ -10,24 +10,18 @@ const mockPluginService = {
  getUserPluginAuthValue: jest.fn(),
 };

-const mockModels = {
-  User: mockUser,
-};
-jest.mock('~/db/connect', () => {
-  return {
-    connectDb: jest.fn(),
-    User: mockModels.mockUser,
+jest.mock('~/models/User', () => {
+  return function () {
+    return mockUser;
  };
 });
-jest.mock('~/models/File', () => ({
-  File: jest.fn(),
-}));

 jest.mock('~/server/services/PluginService', () => mockPluginService);

 const { BaseLLM } = require('@langchain/openai');
 const { Calculator } = require('@langchain/community/tools/calculator');

+const User = require('~/models/User');
 const PluginService = require('~/server/services/PluginService');
 const { validateTools, loadTools, loadToolWithAuth } = require('./handleTools');
 const { StructuredSD, availableTools, DALLE3 } = require('../');
@@ -58,7 +52,7 @@ describe('Tool Handlers', () => {
      },
    );

-    fakeUser = await mockModels.User.createUser({
+    fakeUser = new User({
      name: 'Fake User',
      username: 'fakeuser',
      email: 'fakeuser@example.com',
@@ -224,6 +218,7 @@ describe('Tool Handlers', () => {
      try {
        await loadTool2();
      } catch (error) {
+        // eslint-disable-next-line jest/no-conditional-expect
        expect(error).toBeDefined();
      }
    });
--- a/api/app/clients/tools/util/index.js
+++ b/api/app/clients/tools/util/index.js
@@ -1,8 +1,9 @@
-const { validateTools, loadTools } = require('./handleTools');
+const { validateTools, loadTools, loadAuthValues } = require('./handleTools');
 const handleOpenAIErrors = require('./handleOpenAIErrors');

 module.exports = {
  handleOpenAIErrors,
+  loadAuthValues,
  validateTools,
  loadTools,
 };
--- a/api/app/clients/tools/util/loadSpecs.js
+++ b/api/app/clients/tools/util/loadSpecs.js
@@ -0,0 +1,117 @@
+const fs = require('fs');
+const path = require('path');
+const { z } = require('zod');
+const { logger } = require('~/config');
+const { createOpenAPIPlugin } = require('~/app/clients/tools/dynamic/OpenAPIPlugin');
+
+// The minimum Manifest definition
+const ManifestDefinition = z.object({
+  schema_version: z.string().optional(),
+  name_for_human: z.string(),
+  name_for_model: z.string(),
+  description_for_human: z.string(),
+  description_for_model: z.string(),
+  auth: z.object({}).optional(),
+  api: z.object({
+    // Spec URL or can be the filename of the OpenAPI spec yaml file,
+    // located in api\app\clients\tools\.well-known\openapi
+    url: z.string(),
+    type: z.string().optional(),
+    is_user_authenticated: z.boolean().nullable().optional(),
+    has_user_authentication: z.boolean().nullable().optional(),
+  }),
+  // use to override any params that the LLM will consistently get wrong
+  params: z.object({}).optional(),
+  logo_url: z.string().optional(),
+  contact_email: z.string().optional(),
+  legal_info_url: z.string().optional(),
+});
+
+function validateJson(json) {
+  try {
+    return ManifestDefinition.parse(json);
+  } catch (error) {
+    logger.debug('[validateJson] manifest parsing error', error);
+    return false;
+  }
+}
+
+// omit the LLM to return the well known jsons as objects
+async function loadSpecs({ llm, user, message, tools = [], map = false, memory, signal }) {
+  const directoryPath = path.join(__dirname, '..', '.well-known');
+  let files = [];
+
+  for (let i = 0; i < tools.length; i++) {
+    const filePath = path.join(directoryPath, tools[i] + '.json');
+
+    try {
+      // If the access Promise is resolved, it means that the file exists
+      // Then we can add it to the files array
+      await fs.promises.access(filePath, fs.constants.F_OK);
+      files.push(tools[i] + '.json');
+    } catch (err) {
+      logger.error(`[loadSpecs] File ${tools[i] + '.json'} does not exist`, err);
+    }
+  }
+
+  if (files.length === 0) {
+    files = (await fs.promises.readdir(directoryPath)).filter(
+      (file) => path.extname(file) === '.json',
+    );
+  }
+
+  const validJsons = [];
+  const constructorMap = {};
+
+  logger.debug('[validateJson] files', files);
+
+  for (const file of files) {
+    if (path.extname(file) === '.json') {
+      const filePath = path.join(directoryPath, file);
+      const fileContent = await fs.promises.readFile(filePath, 'utf8');
+      const json = JSON.parse(fileContent);
+
+      if (!validateJson(json)) {
+        logger.debug('[validateJson] Invalid json', json);
+        continue;
+      }
+
+      if (llm && map) {
+        constructorMap[json.name_for_model] = async () =>
+          await createOpenAPIPlugin({
+            data: json,
+            llm,
+            message,
+            memory,
+            signal,
+            user,
+          });
+        continue;
+      }
+
+      if (llm) {
+        validJsons.push(createOpenAPIPlugin({ data: json, llm }));
+        continue;
+      }
+
+      validJsons.push(json);
+    }
+  }
+
+  if (map) {
+    return constructorMap;
+  }
+
+  const plugins = (await Promise.all(validJsons)).filter((plugin) => plugin);
+
+  //   logger.debug('[validateJson] plugins', plugins);
+  //   logger.debug(plugins[0].name);
+
+  return plugins;
+}
+
+module.exports = {
+  loadSpecs,
+  validateJson,
+  ManifestDefinition,
+};
--- a/api/app/clients/tools/util/loadSpecs.spec.js
+++ b/api/app/clients/tools/util/loadSpecs.spec.js
@@ -0,0 +1,101 @@
+const fs = require('fs');
+const { validateJson, loadSpecs, ManifestDefinition } = require('./loadSpecs');
+const { createOpenAPIPlugin } = require('../dynamic/OpenAPIPlugin');
+
+jest.mock('../dynamic/OpenAPIPlugin');
+
+describe('ManifestDefinition', () => {
+  it('should validate correct json', () => {
+    const json = {
+      name_for_human: 'Test',
+      name_for_model: 'Test',
+      description_for_human: 'Test',
+      description_for_model: 'Test',
+      api: {
+        url: 'http://test.com',
+      },
+    };
+
+    expect(() => ManifestDefinition.parse(json)).not.toThrow();
+  });
+
+  it('should not validate incorrect json', () => {
+    const json = {
+      name_for_human: 'Test',
+      name_for_model: 'Test',
+      description_for_human: 'Test',
+      description_for_model: 'Test',
+      api: {
+        url: 123, // incorrect type
+      },
+    };
+
+    expect(() => ManifestDefinition.parse(json)).toThrow();
+  });
+});
+
+describe('validateJson', () => {
+  it('should return parsed json if valid', () => {
+    const json = {
+      name_for_human: 'Test',
+      name_for_model: 'Test',
+      description_for_human: 'Test',
+      description_for_model: 'Test',
+      api: {
+        url: 'http://test.com',
+      },
+    };
+
+    expect(validateJson(json)).toEqual(json);
+  });
+
+  it('should return false if json is not valid', () => {
+    const json = {
+      name_for_human: 'Test',
+      name_for_model: 'Test',
+      description_for_human: 'Test',
+      description_for_model: 'Test',
+      api: {
+        url: 123, // incorrect type
+      },
+    };
+
+    expect(validateJson(json)).toEqual(false);
+  });
+});
+
+describe('loadSpecs', () => {
+  beforeEach(() => {
+    jest.spyOn(fs.promises, 'readdir').mockResolvedValue(['test.json']);
+    jest.spyOn(fs.promises, 'readFile').mockResolvedValue(
+      JSON.stringify({
+        name_for_human: 'Test',
+        name_for_model: 'Test',
+        description_for_human: 'Test',
+        description_for_model: 'Test',
+        api: {
+          url: 'http://test.com',
+        },
+      }),
+    );
+    createOpenAPIPlugin.mockResolvedValue({});
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('should return plugins', async () => {
+    const plugins = await loadSpecs({ llm: true, verbose: false });
+
+    expect(plugins).toHaveLength(1);
+    expect(createOpenAPIPlugin).toHaveBeenCalledTimes(1);
+  });
+
+  it('should return constructorMap if map is true', async () => {
+    const plugins = await loadSpecs({ llm: {}, map: true, verbose: false });
+
+    expect(plugins).toHaveProperty('Test');
+    expect(createOpenAPIPlugin).not.toHaveBeenCalled();
+  });
+});
--- a/api/cache/banViolation.js
+++ b/api/cache/banViolation.js
@@ -1,8 +1,8 @@
-const { logger } = require('@librechat/data-schemas');
 const { ViolationTypes } = require('librechat-data-provider');
 const { isEnabled, math, removePorts } = require('~/server/utils');
 const { deleteAllUserSessions } = require('~/models');
 const getLogStores = require('./getLogStores');
+const { logger } = require('~/config');

 const { BAN_VIOLATIONS, BAN_INTERVAL } = process.env ?? {};
 const interval = math(BAN_INTERVAL, 20);
@@ -32,6 +32,7 @@ const banViolation = async (req, res, errorMessage) => {
  if (!isEnabled(BAN_VIOLATIONS)) {
    return;
  }
+
  if (!errorMessage) {
    return;
  }
@@ -50,6 +51,7 @@ const banViolation = async (req, res, errorMessage) => {

  const banLogs = getLogStores(ViolationTypes.BAN);
  const duration = errorMessage.duration || banLogs.opts.ttl;
+
  if (duration <= 0) {
    return;
  }
--- a/api/cache/banViolation.spec.js
+++ b/api/cache/banViolation.spec.js
@@ -1,28 +1,7 @@
 const banViolation = require('./banViolation');

-const mockModels = {
-  Session: {
-    deleteAllUserSessions: jest.fn(),
-  },
-};
-
-jest.mock('~/db/connect', () => {
-  return {
-    connectDb: jest.fn(),
-    get models() {
-      return mockModels;
-    },
-  };
-});
-
-jest.mock('~/server/utils', () => ({
-  isEnabled: jest.fn(() => true), // default to false, override per test if needed
-  math: jest.fn(() => 20), // default to false, override per test if needed
-  removePorts: jest.fn(),
-}));
-
 jest.mock('keyv');
-// jest.mock('../models/Session');
+jest.mock('../models/Session');
 // Mocking the getLogStores function
 jest.mock('./getLogStores', () => {
  return jest.fn().mockImplementation(() => {
--- a/api/cache/clearPendingReq.js
+++ b/api/cache/clearPendingReq.js
@@ -1,8 +1,7 @@
-const { Time, CacheKeys } = require('librechat-data-provider');
-const { isEnabled } = require('~/server/utils');
 const getLogStores = require('./getLogStores');
-
+const { isEnabled } = require('../server/utils');
 const { USE_REDIS, LIMIT_CONCURRENT_MESSAGES } = process.env ?? {};
+const ttl = 1000 * 60 * 1;

 /**
 * Clear or decrement pending requests from the cache.
@@ -29,7 +28,7 @@ const clearPendingReq = async ({ userId, cache: _cache }) => {
    return;
  }

-  const namespace = CacheKeys.PENDING_REQ;
+  const namespace = 'pending_req';
  const cache = _cache ?? getLogStores(namespace);

  if (!cache) {
@@ -40,7 +39,7 @@ const clearPendingReq = async ({ userId, cache: _cache }) => {
  const currentReq = +((await cache.get(key)) ?? 0);

  if (currentReq && currentReq >= 1) {
-    await cache.set(key, currentReq - 1, Time.ONE_MINUTE);
+    await cache.set(key, currentReq - 1, ttl);
  } else {
    await cache.delete(key);
  }
--- a/api/cache/getLogStores.js
+++ b/api/cache/getLogStores.js
@@ -1,4 +1,4 @@
-const { Keyv } = require('keyv');
+const Keyv = require('keyv');
 const { CacheKeys, ViolationTypes, Time } = require('librechat-data-provider');
 const { logFile, violationFile } = require('./keyvFiles');
 const { math, isEnabled } = require('~/server/utils');
@@ -19,7 +19,7 @@ const createViolationInstance = (namespace) => {
 // Serve cache from memory so no need to clear it on startup/exit
 const pending_req = isRedisEnabled
  ? new Keyv({ store: keyvRedis })
-  : new Keyv({ namespace: CacheKeys.PENDING_REQ });
+  : new Keyv({ namespace: 'pending_req' });

 const config = isRedisEnabled
  ? new Keyv({ store: keyvRedis })
@@ -49,10 +49,6 @@ const genTitle = isRedisEnabled
  ? new Keyv({ store: keyvRedis, ttl: Time.TWO_MINUTES })
  : new Keyv({ namespace: CacheKeys.GEN_TITLE, ttl: Time.TWO_MINUTES });

-const s3ExpiryInterval = isRedisEnabled
-  ? new Keyv({ store: keyvRedis, ttl: Time.THIRTY_MINUTES })
-  : new Keyv({ namespace: CacheKeys.S3_EXPIRY_INTERVAL, ttl: Time.THIRTY_MINUTES });
-
 const modelQueries = isEnabled(process.env.USE_REDIS)
  ? new Keyv({ store: keyvRedis })
  : new Keyv({ namespace: CacheKeys.MODEL_QUERIES });
@@ -61,14 +57,10 @@ const abortKeys = isRedisEnabled
  ? new Keyv({ store: keyvRedis })
  : new Keyv({ namespace: CacheKeys.ABORT_KEYS, ttl: Time.TEN_MINUTES });

-const openIdExchangedTokensCache = isRedisEnabled
-  ? new Keyv({ store: keyvRedis, ttl: Time.TEN_MINUTES })
-  : new Keyv({ namespace: CacheKeys.OPENID_EXCHANGED_TOKENS, ttl: Time.TEN_MINUTES });
-
 const namespaces = {
  [CacheKeys.ROLES]: roles,
  [CacheKeys.CONFIG_STORE]: config,
-  [CacheKeys.PENDING_REQ]: pending_req,
+  pending_req,
  [ViolationTypes.BAN]: new Keyv({ store: keyvMongo, namespace: CacheKeys.BANS, ttl: duration }),
  [CacheKeys.ENCODED_DOMAINS]: new Keyv({
    store: keyvMongo,
@@ -97,12 +89,10 @@ const namespaces = {
  [CacheKeys.ABORT_KEYS]: abortKeys,
  [CacheKeys.TOKEN_CONFIG]: tokenConfig,
  [CacheKeys.GEN_TITLE]: genTitle,
-  [CacheKeys.S3_EXPIRY_INTERVAL]: s3ExpiryInterval,
  [CacheKeys.MODEL_QUERIES]: modelQueries,
  [CacheKeys.AUDIO_RUNS]: audioRuns,
  [CacheKeys.MESSAGES]: messages,
  [CacheKeys.FLOWS]: flows,
-  [CacheKeys.OPENID_EXCHANGED_TOKENS]: openIdExchangedTokensCache,
 };

 /**
--- a/api/cache/ioredisClient.js
+++ b/api/cache/ioredisClient.js
@@ -1,92 +0,0 @@
-const fs = require('fs');
-const Redis = require('ioredis');
-const { isEnabled } = require('~/server/utils');
-const logger = require('~/config/winston');
-
-const { REDIS_URI, USE_REDIS, USE_REDIS_CLUSTER, REDIS_CA, REDIS_MAX_LISTENERS } = process.env;
-
-/** @type {import('ioredis').Redis | import('ioredis').Cluster} */
-let ioredisClient;
-const redis_max_listeners = Number(REDIS_MAX_LISTENERS) || 40;
-
-function mapURI(uri) {
-  const regex =
-    /^(?:(?<scheme>\w+):\/\/)?(?:(?<user>[^:@]+)(?::(?<password>[^@]+))?@)?(?<host>[\w.-]+)(?::(?<port>\d{1,5}))?$/;
-  const match = uri.match(regex);
-
-  if (match) {
-    const { scheme, user, password, host, port } = match.groups;
-
-    return {
-      scheme: scheme || 'none',
-      user: user || null,
-      password: password || null,
-      host: host || null,
-      port: port || null,
-    };
-  } else {
-    const parts = uri.split(':');
-    if (parts.length === 2) {
-      return {
-        scheme: 'none',
-        user: null,
-        password: null,
-        host: parts[0],
-        port: parts[1],
-      };
-    }
-
-    return {
-      scheme: 'none',
-      user: null,
-      password: null,
-      host: uri,
-      port: null,
-    };
-  }
-}
-
-if (REDIS_URI && isEnabled(USE_REDIS)) {
-  let redisOptions = null;
-
-  if (REDIS_CA) {
-    const ca = fs.readFileSync(REDIS_CA);
-    redisOptions = { tls: { ca } };
-  }
-
-  if (isEnabled(USE_REDIS_CLUSTER)) {
-    const hosts = REDIS_URI.split(',').map((item) => {
-      var value = mapURI(item);
-
-      return {
-        host: value.host,
-        port: value.port,
-      };
-    });
-    ioredisClient = new Redis.Cluster(hosts, { redisOptions });
-  } else {
-    ioredisClient = new Redis(REDIS_URI, redisOptions);
-  }
-
-  ioredisClient.on('ready', () => {
-    logger.info('IoRedis connection ready');
-  });
-  ioredisClient.on('reconnecting', () => {
-    logger.info('IoRedis connection reconnecting');
-  });
-  ioredisClient.on('end', () => {
-    logger.info('IoRedis connection ended');
-  });
-  ioredisClient.on('close', () => {
-    logger.info('IoRedis connection closed');
-  });
-  ioredisClient.on('error', (err) => logger.error('IoRedis connection error:', err));
-  ioredisClient.setMaxListeners(redis_max_listeners);
-  logger.info(
-    '[Optional] IoRedis initialized for rate limiters. If you have issues, disable Redis or restart the server.',
-  );
-} else {
-  logger.info('[Optional] IoRedis not initialized for rate limiters.');
-}
-
-module.exports = ioredisClient;
--- a/api/cache/keyvFiles.js
+++ b/api/cache/keyvFiles.js
@@ -1,9 +1,11 @@
 const { KeyvFile } = require('keyv-file');

-const logFile = new KeyvFile({ filename: './data/logs.json' }).setMaxListeners(20);
-const violationFile = new KeyvFile({ filename: './data/violations.json' }).setMaxListeners(20);
+const logFile = new KeyvFile({ filename: './data/logs.json' });
+const pendingReqFile = new KeyvFile({ filename: './data/pendingReqCache.json' });
+const violationFile = new KeyvFile({ filename: './data/violations.json' });

 module.exports = {
  logFile,
+  pendingReqFile,
  violationFile,
 };
--- a/api/cache/keyvMongo.js
+++ b/api/cache/keyvMongo.js
@@ -1,272 +1,9 @@
-// api/cache/keyvMongo.js
-const mongoose = require('mongoose');
-const EventEmitter = require('events');
-const { GridFSBucket } = require('mongodb');
+const KeyvMongo = require('@keyv/mongo');
 const { logger } = require('~/config');

-const storeMap = new Map();
-
-class KeyvMongoCustom extends EventEmitter {
-  constructor(url, options = {}) {
-    super();
-
-    url = url || {};
-    if (typeof url === 'string') {
-      url = { url };
-    }
-    if (url.uri) {
-      url = { url: url.uri, ...url };
-    }
-
-    this.opts = {
-      url: 'mongodb://127.0.0.1:27017',
-      collection: 'keyv',
-      ...url,
-      ...options,
-    };
-
-    this.ttlSupport = false;
-
-    // Filter valid options
-    const keyvMongoKeys = new Set([
-      'url',
-      'collection',
-      'namespace',
-      'serialize',
-      'deserialize',
-      'uri',
-      'useGridFS',
-      'dialect',
-    ]);
-    this.opts = Object.fromEntries(Object.entries(this.opts).filter(([k]) => keyvMongoKeys.has(k)));
-  }
-
-  // Helper to access the store WITHOUT storing a promise on the instance
-  _getClient() {
-    const storeKey = `${this.opts.collection}:${this.opts.useGridFS ? 'gridfs' : 'collection'}`;
-
-    // If we already have the store initialized, return it directly
-    if (storeMap.has(storeKey)) {
-      return Promise.resolve(storeMap.get(storeKey));
-    }
-
-    // Check mongoose connection state
-    if (mongoose.connection.readyState !== 1) {
-      return Promise.reject(
-        new Error('Mongoose connection not ready. Ensure connectDb() is called first.'),
-      );
-    }
-
-    try {
-      const db = mongoose.connection.db;
-      let client;
-
-      if (this.opts.useGridFS) {
-        const bucket = new GridFSBucket(db, {
-          readPreference: this.opts.readPreference,
-          bucketName: this.opts.collection,
-        });
-        const store = db.collection(`${this.opts.collection}.files`);
-        client = { bucket, store, db };
-      } else {
-        const collection = this.opts.collection || 'keyv';
-        const store = db.collection(collection);
-        client = { store, db };
-      }
-
-      storeMap.set(storeKey, client);
-      return Promise.resolve(client);
-    } catch (error) {
-      this.emit('error', error);
-      return Promise.reject(error);
-    }
-  }
-
-  async get(key) {
-    const client = await this._getClient();
-
-    if (this.opts.useGridFS) {
-      await client.store.updateOne(
-        {
-          filename: key,
-        },
-        {
-          $set: {
-            'metadata.lastAccessed': new Date(),
-          },
-        },
-      );
-
-      const stream = client.bucket.openDownloadStreamByName(key);
-
-      return new Promise((resolve) => {
-        const resp = [];
-        stream.on('error', () => {
-          resolve(undefined);
-        });
-
-        stream.on('end', () => {
-          const data = Buffer.concat(resp).toString('utf8');
-          resolve(data);
-        });
-
-        stream.on('data', (chunk) => {
-          resp.push(chunk);
-        });
-      });
-    }
-
-    const document = await client.store.findOne({ key: { $eq: key } });
-
-    if (!document) {
-      return undefined;
-    }
-
-    return document.value;
-  }
-
-  async getMany(keys) {
-    const client = await this._getClient();
-
-    if (this.opts.useGridFS) {
-      const promises = [];
-      for (const key of keys) {
-        promises.push(this.get(key));
-      }
-
-      const values = await Promise.allSettled(promises);
-      const data = [];
-      for (const value of values) {
-        data.push(value.value);
-      }
-
-      return data;
-    }
-
-    const values = await client.store
-      .find({ key: { $in: keys } })
-      .project({ _id: 0, value: 1, key: 1 })
-      .toArray();
-
-    const results = [...keys];
-    let i = 0;
-    for (const key of keys) {
-      const rowIndex = values.findIndex((row) => row.key === key);
-      results[i] = rowIndex > -1 ? values[rowIndex].value : undefined;
-      i++;
-    }
-
-    return results;
-  }
-
-  async set(key, value, ttl) {
-    const client = await this._getClient();
-    const expiresAt = typeof ttl === 'number' ? new Date(Date.now() + ttl) : null;
-
-    if (this.opts.useGridFS) {
-      const stream = client.bucket.openUploadStream(key, {
-        metadata: {
-          expiresAt,
-          lastAccessed: new Date(),
-        },
-      });
-
-      return new Promise((resolve) => {
-        stream.on('finish', () => {
-          resolve(stream);
-        });
-        stream.end(value);
-      });
-    }
-
-    await client.store.updateOne(
-      { key: { $eq: key } },
-      { $set: { key, value, expiresAt } },
-      { upsert: true },
-    );
-  }
-
-  async delete(key) {
-    if (typeof key !== 'string') {
-      return false;
-    }
-
-    const client = await this._getClient();
-
-    if (this.opts.useGridFS) {
-      try {
-        const bucket = new GridFSBucket(client.db, {
-          bucketName: this.opts.collection,
-        });
-        const files = await bucket.find({ filename: key }).toArray();
-        await client.bucket.delete(files[0]._id);
-        return true;
-      } catch {
-        return false;
-      }
-    }
-
-    const object = await client.store.deleteOne({ key: { $eq: key } });
-    return object.deletedCount > 0;
-  }
-
-  async deleteMany(keys) {
-    const client = await this._getClient();
-
-    if (this.opts.useGridFS) {
-      const bucket = new GridFSBucket(client.db, {
-        bucketName: this.opts.collection,
-      });
-      const files = await bucket.find({ filename: { $in: keys } }).toArray();
-      if (files.length === 0) {
-        return false;
-      }
-
-      await Promise.all(files.map(async (file) => client.bucket.delete(file._id)));
-      return true;
-    }
-
-    const object = await client.store.deleteMany({ key: { $in: keys } });
-    return object.deletedCount > 0;
-  }
-
-  async clear() {
-    const client = await this._getClient();
-
-    if (this.opts.useGridFS) {
-      try {
-        await client.bucket.drop();
-      } catch (error) {
-        // Throw error if not "namespace not found" error
-        if (!(error.code === 26)) {
-          throw error;
-        }
-      }
-    }
-
-    await client.store.deleteMany({
-      key: { $regex: this.namespace ? `^${this.namespace}:*` : '' },
-    });
-  }
-
-  async has(key) {
-    const client = await this._getClient();
-    const filter = { [this.opts.useGridFS ? 'filename' : 'key']: { $eq: key } };
-    const document = await client.store.countDocuments(filter, { limit: 1 });
-    return document !== 0;
-  }
-
-  // No-op disconnect
-  async disconnect() {
-    // This is a no-op since we don't want to close the shared mongoose connection
-    return true;
-  }
-}
-
-const keyvMongo = new KeyvMongoCustom({
-  collection: 'logs',
-});
+const { MONGO_URI } = process.env ?? {};

+const keyvMongo = new KeyvMongo(MONGO_URI, { collection: 'logs' });
 keyvMongo.on('error', (err) => logger.error('KeyvMongo connection error:', err));

 module.exports = keyvMongo;
--- a/api/cache/keyvRedis.js
+++ b/api/cache/keyvRedis.js
@@ -1,6 +1,6 @@
 const fs = require('fs');
 const ioredis = require('ioredis');
-const KeyvRedis = require('@keyv/redis').default;
+const KeyvRedis = require('@keyv/redis');
 const { isEnabled } = require('~/server/utils');
 const logger = require('~/config/winston');

@@ -9,7 +9,7 @@ const { REDIS_URI, USE_REDIS, USE_REDIS_CLUSTER, REDIS_CA, REDIS_KEY_PREFIX, RED

 let keyvRedis;
 const redis_prefix = REDIS_KEY_PREFIX || '';
-const redis_max_listeners = Number(REDIS_MAX_LISTENERS) || 40;
+const redis_max_listeners = Number(REDIS_MAX_LISTENERS) || 10;

 function mapURI(uri) {
  const regex =
@@ -50,7 +50,6 @@ function mapURI(uri) {

 if (REDIS_URI && isEnabled(USE_REDIS)) {
  let redisOptions = null;
-  /** @type {import('@keyv/redis').KeyvRedisOptions} */
  let keyvOpts = {
    useRedisSets: false,
    keyPrefix: redis_prefix,
@@ -75,35 +74,13 @@ if (REDIS_URI && isEnabled(USE_REDIS)) {
  } else {
    keyvRedis = new KeyvRedis(REDIS_URI, keyvOpts);
  }
-
-  const pingInterval = setInterval(
-    () => {
-      logger.debug('KeyvRedis ping');
-      keyvRedis.client.ping().catch((err) => logger.error('Redis keep-alive ping failed:', err));
-    },
-    5 * 60 * 1000,
-  );
-
-  keyvRedis.on('ready', () => {
-    logger.info('KeyvRedis connection ready');
-  });
-  keyvRedis.on('reconnecting', () => {
-    logger.info('KeyvRedis connection reconnecting');
-  });
-  keyvRedis.on('end', () => {
-    logger.info('KeyvRedis connection ended');
-  });
-  keyvRedis.on('close', () => {
-    clearInterval(pingInterval);
-    logger.info('KeyvRedis connection closed');
-  });
  keyvRedis.on('error', (err) => logger.error('KeyvRedis connection error:', err));
  keyvRedis.setMaxListeners(redis_max_listeners);
  logger.info(
-    '[Optional] Redis initialized. If you have issues, or seeing older values, disable it or flush cache to refresh values.',
+    '[Optional] Redis initialized. Note: Redis support is experimental. If you have issues, disable it. Cache needs to be flushed for values to refresh.',
  );
 } else {
-  logger.info('[Optional] Redis not initialized.');
+  logger.info('[Optional] Redis not initialized. Note: Redis support is experimental.');
 }

 module.exports = keyvRedis;
--- a/api/cache/redis.js
+++ b/api/cache/redis.js
@@ -0,0 +1,4 @@
+const Redis = require('ioredis');
+const { REDIS_URI } = process.env ?? {};
+const redis = new Redis.Cluster(REDIS_URI);
+module.exports = redis;
--- a/api/config/index.js
+++ b/api/config/index.js
@@ -1,35 +1,31 @@
-const axios = require('axios');
 const { EventSource } = require('eventsource');
 const { Time, CacheKeys } = require('librechat-data-provider');
-const { MCPManager, FlowStateManager } = require('librechat-mcp');
 const logger = require('./winston');

 global.EventSource = EventSource;

-/** @type {MCPManager} */
 let mcpManager = null;
 let flowManager = null;

 /**
- * @param {string} [userId] - Optional user ID, to avoid disconnecting the current user.
- * @returns {MCPManager}
+ * @returns {Promise<MCPManager>}
 */
-function getMCPManager(userId) {
+async function getMCPManager() {
  if (!mcpManager) {
+    const { MCPManager } = await import('librechat-mcp');
    mcpManager = MCPManager.getInstance(logger);
-  } else {
-    mcpManager.checkIdleConnections(userId);
  }
  return mcpManager;
 }

 /**
- * @param {Keyv} flowsCache
- * @returns {FlowStateManager}
+ * @param {(key: string) => Keyv} getLogStores
+ * @returns {Promise<FlowStateManager>}
 */
-function getFlowStateManager(flowsCache) {
+async function getFlowStateManager(getLogStores) {
  if (!flowManager) {
-    flowManager = new FlowStateManager(flowsCache, {
+    const { FlowStateManager } = await import('librechat-mcp');
+    flowManager = new FlowStateManager(getLogStores(CacheKeys.FLOWS), {
      ttl: Time.ONE_MINUTE * 3,
      logger,
    });
@@ -51,46 +47,9 @@ const sendEvent = (res, event) => {
  res.write(`event: message\ndata: ${JSON.stringify(event)}\n\n`);
 };

-/**
- * Creates and configures an Axios instance with optional proxy settings.
- *
- * @typedef {import('axios').AxiosInstance} AxiosInstance
- * @typedef {import('axios').AxiosProxyConfig} AxiosProxyConfig
- *
- * @returns {AxiosInstance} A configured Axios instance
- * @throws {Error} If there's an issue creating the Axios instance or parsing the proxy URL
- */
-function createAxiosInstance() {
-  const instance = axios.create();
-
-  if (process.env.proxy) {
-    try {
-      const url = new URL(process.env.proxy);
-
-      /** @type {AxiosProxyConfig} */
-      const proxyConfig = {
-        host: url.hostname.replace(/^\[|\]$/g, ''),
-        protocol: url.protocol.replace(':', ''),
-      };
-
-      if (url.port) {
-        proxyConfig.port = parseInt(url.port, 10);
-      }
-
-      instance.defaults.proxy = proxyConfig;
-    } catch (error) {
-      console.error('Error parsing proxy URL:', error);
-      throw new Error(`Invalid proxy URL: ${process.env.proxy}`);
-    }
-  }
-
-  return instance;
-}
-
 module.exports = {
  logger,
  sendEvent,
  getMCPManager,
-  createAxiosInstance,
  getFlowStateManager,
 };
--- a/api/config/index.spec.js
+++ b/api/config/index.spec.js
@@ -1,126 +0,0 @@
-const axios = require('axios');
-const { createAxiosInstance } = require('./index');
-
-// Mock axios
-jest.mock('axios', () => ({
-  interceptors: {
-    request: { use: jest.fn(), eject: jest.fn() },
-    response: { use: jest.fn(), eject: jest.fn() },
-  },
-  create: jest.fn().mockReturnValue({
-    defaults: {
-      proxy: null,
-    },
-    get: jest.fn().mockResolvedValue({ data: {} }),
-    post: jest.fn().mockResolvedValue({ data: {} }),
-    put: jest.fn().mockResolvedValue({ data: {} }),
-    delete: jest.fn().mockResolvedValue({ data: {} }),
-  }),
-  get: jest.fn().mockResolvedValue({ data: {} }),
-  post: jest.fn().mockResolvedValue({ data: {} }),
-  put: jest.fn().mockResolvedValue({ data: {} }),
-  delete: jest.fn().mockResolvedValue({ data: {} }),
-  reset: jest.fn().mockImplementation(function () {
-    this.get.mockClear();
-    this.post.mockClear();
-    this.put.mockClear();
-    this.delete.mockClear();
-    this.create.mockClear();
-  }),
-}));
-
-describe('createAxiosInstance', () => {
-  const originalEnv = process.env;
-
-  beforeEach(() => {
-    // Reset mocks
-    jest.clearAllMocks();
-    // Create a clean copy of process.env
-    process.env = { ...originalEnv };
-    // Default: no proxy
-    delete process.env.proxy;
-  });
-
-  afterAll(() => {
-    // Restore original process.env
-    process.env = originalEnv;
-  });
-
-  test('creates an axios instance without proxy when no proxy env is set', () => {
-    const instance = createAxiosInstance();
-
-    expect(axios.create).toHaveBeenCalledTimes(1);
-    expect(instance.defaults.proxy).toBeNull();
-  });
-
-  test('configures proxy correctly with hostname and protocol', () => {
-    process.env.proxy = 'http://example.com';
-
-    const instance = createAxiosInstance();
-
-    expect(axios.create).toHaveBeenCalledTimes(1);
-    expect(instance.defaults.proxy).toEqual({
-      host: 'example.com',
-      protocol: 'http',
-    });
-  });
-
-  test('configures proxy correctly with hostname, protocol and port', () => {
-    process.env.proxy = 'https://proxy.example.com:8080';
-
-    const instance = createAxiosInstance();
-
-    expect(axios.create).toHaveBeenCalledTimes(1);
-    expect(instance.defaults.proxy).toEqual({
-      host: 'proxy.example.com',
-      protocol: 'https',
-      port: 8080,
-    });
-  });
-
-  test('handles proxy URLs with authentication', () => {
-    process.env.proxy = 'http://user:pass@proxy.example.com:3128';
-
-    const instance = createAxiosInstance();
-
-    expect(axios.create).toHaveBeenCalledTimes(1);
-    expect(instance.defaults.proxy).toEqual({
-      host: 'proxy.example.com',
-      protocol: 'http',
-      port: 3128,
-      // Note: The current implementation doesn't handle auth - if needed, add this functionality
-    });
-  });
-
-  test('throws error when proxy URL is invalid', () => {
-    process.env.proxy = 'invalid-url';
-
-    expect(() => createAxiosInstance()).toThrow('Invalid proxy URL');
-    expect(axios.create).toHaveBeenCalledTimes(1);
-  });
-
-  // If you want to test the actual URL parsing more thoroughly
-  test('handles edge case proxy URLs correctly', () => {
-    // IPv6 address
-    process.env.proxy = 'http://[::1]:8080';
-
-    let instance = createAxiosInstance();
-
-    expect(instance.defaults.proxy).toEqual({
-      host: '::1',
-      protocol: 'http',
-      port: 8080,
-    });
-
-    // URL with path (which should be ignored for proxy config)
-    process.env.proxy = 'http://proxy.example.com:8080/some/path';
-
-    instance = createAxiosInstance();
-
-    expect(instance.defaults.proxy).toEqual({
-      host: 'proxy.example.com',
-      protocol: 'http',
-      port: 8080,
-    });
-  });
-});
--- a/api/config/meiliLogger.js
+++ b/api/config/meiliLogger.js
@@ -4,11 +4,7 @@ require('winston-daily-rotate-file');

 const logDir = path.join(__dirname, '..', 'logs');

-const { NODE_ENV, DEBUG_LOGGING = false } = process.env;
-
-const useDebugLogging =
-  (typeof DEBUG_LOGGING === 'string' && DEBUG_LOGGING?.toLowerCase() === 'true') ||
-  DEBUG_LOGGING === true;
+const { NODE_ENV } = process.env;

 const levels = {
  error: 0,
@@ -40,10 +36,9 @@ const fileFormat = winston.format.combine(
  winston.format.splat(),
 );

-const logLevel = useDebugLogging ? 'debug' : 'error';
 const transports = [
  new winston.transports.DailyRotateFile({
-    level: logLevel,
+    level: 'debug',
    filename: `${logDir}/meiliSync-%DATE%.log`,
    datePattern: 'YYYY-MM-DD',
    zippedArchive: true,
@@ -53,6 +48,14 @@ const transports = [
  }),
 ];

+// if (NODE_ENV !== 'production') {
+//   transports.push(
+//     new winston.transports.Console({
+//       format: winston.format.combine(winston.format.colorize(), winston.format.simple()),
+//     }),
+//   );
+// }
+
 const consoleFormat = winston.format.combine(
  winston.format.colorize({ all: true }),
  winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
--- a/api/config/winston.js
+++ b/api/config/winston.js
@@ -5,7 +5,7 @@ const { redactFormat, redactMessage, debugTraverse, jsonTruncateFormat } = requi

 const logDir = path.join(__dirname, '..', 'logs');

-const { NODE_ENV, DEBUG_LOGGING = true, CONSOLE_JSON = false, DEBUG_CONSOLE = false } = process.env;
+const { NODE_ENV, DEBUG_LOGGING = true, DEBUG_CONSOLE = false, CONSOLE_JSON = false } = process.env;

 const useConsoleJson =
  (typeof CONSOLE_JSON === 'string' && CONSOLE_JSON?.toLowerCase() === 'true') ||
@@ -15,10 +15,6 @@ const useDebugConsole =
  (typeof DEBUG_CONSOLE === 'string' && DEBUG_CONSOLE?.toLowerCase() === 'true') ||
  DEBUG_CONSOLE === true;

-const useDebugLogging =
-  (typeof DEBUG_LOGGING === 'string' && DEBUG_LOGGING?.toLowerCase() === 'true') ||
-  DEBUG_LOGGING === true;
-
 const levels = {
  error: 0,
  warn: 1,
@@ -61,9 +57,28 @@ const transports = [
    maxFiles: '14d',
    format: fileFormat,
  }),
+  // new winston.transports.DailyRotateFile({
+  //   level: 'info',
+  //   filename: `${logDir}/info-%DATE%.log`,
+  //   datePattern: 'YYYY-MM-DD',
+  //   zippedArchive: true,
+  //   maxSize: '20m',
+  //   maxFiles: '14d',
+  // }),
 ];

-if (useDebugLogging) {
+// if (NODE_ENV !== 'production') {
+//   transports.push(
+//     new winston.transports.Console({
+//       format: winston.format.combine(winston.format.colorize(), winston.format.simple()),
+//     }),
+//   );
+// }
+
+if (
+  (typeof DEBUG_LOGGING === 'string' && DEBUG_LOGGING?.toLowerCase() === 'true') ||
+  DEBUG_LOGGING === true
+) {
  transports.push(
    new winston.transports.DailyRotateFile({
      level: 'debug',
@@ -92,16 +107,10 @@ const consoleFormat = winston.format.combine(
  }),
 );

-// Determine console log level
-let consoleLogLevel = 'info';
-if (useDebugConsole) {
-  consoleLogLevel = 'debug';
-}
-
 if (useDebugConsole) {
  transports.push(
    new winston.transports.Console({
-      level: consoleLogLevel,
+      level: 'debug',
      format: useConsoleJson
        ? winston.format.combine(fileFormat, jsonTruncateFormat(), winston.format.json())
        : winston.format.combine(fileFormat, debugTraverse),
@@ -110,14 +119,14 @@ if (useDebugConsole) {
 } else if (useConsoleJson) {
  transports.push(
    new winston.transports.Console({
-      level: consoleLogLevel,
+      level: 'info',
      format: winston.format.combine(fileFormat, jsonTruncateFormat(), winston.format.json()),
    }),
  );
 } else {
  transports.push(
    new winston.transports.Console({
-      level: consoleLogLevel,
+      level: 'info',
      format: consoleFormat,
    }),
  );
--- a/api/db/index.js
+++ b/api/db/index.js
@@ -1,8 +0,0 @@
-const mongoose = require('mongoose');
-const { createModels } = require('@librechat/data-schemas');
-const { connectDb } = require('./connect');
-const indexSync = require('./indexSync');
-
-createModels(mongoose);
-
-module.exports = { connectDb, indexSync };
--- a/api/db/models.js
+++ b/api/db/models.js
@@ -1,5 +0,0 @@
-const mongoose = require('mongoose');
-const { createModels } = require('@librechat/data-schemas');
-const models = createModels(mongoose);
-
-module.exports = { ...models };
--- a/api/jest.config.js
+++ b/api/jest.config.js
@@ -5,14 +5,12 @@ module.exports = {
  coverageDirectory: 'coverage',
  setupFiles: [
    './test/jestSetup.js',
+    './test/__mocks__/KeyvMongo.js',
    './test/__mocks__/logger.js',
    './test/__mocks__/fetchEventSource.js',
  ],
  moduleNameMapper: {
    '~/(.*)': '<rootDir>/$1',
    '~/data/auth.json': '<rootDir>/__mocks__/auth.mock.json',
-    '^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)/).*/'],
 };
--- a/api/lib/db/connectDb.js
+++ b/api/lib/db/connectDb.js
@@ -39,10 +39,7 @@ async function connectDb() {
    });
  }
  cached.conn = await cached.promise;
-
  return cached.conn;
 }

-module.exports = {
-  connectDb,
-};
+module.exports = connectDb;
--- a/api/lib/db/index.js
+++ b/api/lib/db/index.js
@@ -0,0 +1,4 @@
+const connectDb = require('./connectDb');
+const indexSync = require('./indexSync');
+
+module.exports = { connectDb, indexSync };
--- a/api/lib/db/indexSync.js
+++ b/api/lib/db/indexSync.js
@@ -1,11 +1,8 @@
-const mongoose = require('mongoose');
 const { MeiliSearch } = require('meilisearch');
-const { logger } = require('@librechat/data-schemas');
-
+const Conversation = require('~/models/schema/convoSchema');
+const Message = require('~/models/schema/messageSchema');
 const { isEnabled } = require('~/server/utils');
-
-const Conversation = mongoose.models.Conversation;
-const Message = mongoose.models.Message;
+const { logger } = require('~/config');

 const searchEnabled = isEnabled(process.env.SEARCH);
 const indexingDisabled = isEnabled(process.env.MEILI_NO_SYNC);
@@ -32,6 +29,7 @@ async function indexSync() {
  if (!searchEnabled) {
    return;
  }
+
  try {
    const client = MeiliSearchClient.getInstance();

--- a/api/lib/utils/reduceHits.js
+++ b/api/lib/utils/reduceHits.js
@@ -0,0 +1,59 @@
+const mergeSort = require('./mergeSort');
+const { cleanUpPrimaryKeyValue } = require('./misc');
+
+function reduceMessages(hits) {
+  const counts = {};
+
+  for (const hit of hits) {
+    if (!counts[hit.conversationId]) {
+      counts[hit.conversationId] = 1;
+    } else {
+      counts[hit.conversationId]++;
+    }
+  }
+
+  const result = [];
+
+  for (const [conversationId, count] of Object.entries(counts)) {
+    result.push({
+      conversationId,
+      count,
+    });
+  }
+
+  return mergeSort(result, (a, b) => b.count - a.count);
+}
+
+function reduceHits(hits, titles = []) {
+  const counts = {};
+  const titleMap = {};
+  const convos = [...hits, ...titles];
+
+  for (const convo of convos) {
+    const currentId = cleanUpPrimaryKeyValue(convo.conversationId);
+    if (!counts[currentId]) {
+      counts[currentId] = 1;
+    } else {
+      counts[currentId]++;
+    }
+
+    if (convo.title) {
+      // titleMap[currentId] = convo._formatted.title;
+      titleMap[currentId] = convo.title;
+    }
+  }
+
+  const result = [];
+
+  for (const [conversationId, count] of Object.entries(counts)) {
+    result.push({
+      conversationId,
+      count,
+      title: titleMap[conversationId] ? titleMap[conversationId] : null,
+    });
+  }
+
+  return mergeSort(result, (a, b) => b.count - a.count);
+}
+
+module.exports = { reduceMessages, reduceHits };
--- a/api/models/Action.js
+++ b/api/models/Action.js
@@ -1,5 +1,7 @@
 const mongoose = require('mongoose');
-const Action = require('~/db/models').Action;
+const actionSchema = require('./schema/action');
+
+const Action = mongoose.model('action', actionSchema);

 /**
 * Update an action with new data without overwriting existing properties,
--- a/api/models/Agent.js
+++ b/api/models/Agent.js
@@ -1,9 +1,6 @@
 const mongoose = require('mongoose');
-const crypto = require('node:crypto');
-const { logger } = require('@librechat/data-schemas');
-const { SystemRoles, Tools, actionDelimiter } = require('librechat-data-provider');
-const { GLOBAL_PROJECT_NAME, EPHEMERAL_AGENT_ID, mcp_delimiter } =
-  require('librechat-data-provider').Constants;
+const { SystemRoles } = require('librechat-data-provider');
+const { GLOBAL_PROJECT_NAME } = require('librechat-data-provider').Constants;
 const { CONFIG_STORE, STARTUP_CONFIG } = require('librechat-data-provider').CacheKeys;
 const {
  getProjectByName,
@@ -12,9 +9,9 @@ const {
  removeAgentFromAllProjects,
 } = require('./Project');
 const getLogStores = require('~/cache/getLogStores');
-const { getActions } = require('./Action');
+const agentSchema = require('./schema/agent');

-const Agent = require('~/db/models').Agent;
+const Agent = mongoose.model('agent', agentSchema);

 /**
 * Create an agent with the provided data.
@@ -23,19 +20,7 @@ const Agent = require('~/db/models').Agent;
 * @throws {Error} If the agent creation fails.
 */
 const createAgent = async (agentData) => {
-  const { author, ...versionData } = agentData;
-  const timestamp = new Date();
-  const initialAgentData = {
-    ...agentData,
-    versions: [
-      {
-        ...versionData,
-        createdAt: timestamp,
-        updatedAt: timestamp,
-      },
-    ],
-  };
-  return (await Agent.create(initialAgentData)).toObject();
+  return (await Agent.create(agentData)).toObject();
 };

 /**
@@ -54,76 +39,13 @@ const getAgent = async (searchParameter) => await Agent.findOne(searchParameter)
 * @param {Object} params
 * @param {ServerRequest} params.req
 * @param {string} params.agent_id
- * @param {string} params.endpoint
- * @param {import('@librechat/agents').ClientOptions} [params.model_parameters]
- * @returns {Agent|null} The agent document as a plain object, or null if not found.
- */
-const loadEphemeralAgent = ({ req, agent_id, endpoint, model_parameters: _m }) => {
-  const { model, ...model_parameters } = _m;
-  /** @type {Record<string, FunctionTool>} */
-  const availableTools = req.app.locals.availableTools;
-  /** @type {TEphemeralAgent | null} */
-  const ephemeralAgent = req.body.ephemeralAgent;
-  const mcpServers = new Set(ephemeralAgent?.mcp);
-  /** @type {string[]} */
-  const tools = [];
-  if (ephemeralAgent?.execute_code === true) {
-    tools.push(Tools.execute_code);
-  }
-  if (ephemeralAgent?.web_search === true) {
-    tools.push(Tools.web_search);
-  }
-
-  if (mcpServers.size > 0) {
-    for (const toolName of Object.keys(availableTools)) {
-      if (!toolName.includes(mcp_delimiter)) {
-        continue;
-      }
-      const mcpServer = toolName.split(mcp_delimiter)?.[1];
-      if (mcpServer && mcpServers.has(mcpServer)) {
-        tools.push(toolName);
-      }
-    }
-  }
-
-  const instructions = req.body.promptPrefix;
-  return {
-    id: agent_id,
-    instructions,
-    provider: endpoint,
-    model_parameters,
-    model,
-    tools,
-  };
-};
-
-/**
- * Load an agent based on the provided ID
- *
- * @param {Object} params
- * @param {ServerRequest} params.req
- * @param {string} params.agent_id
- * @param {string} params.endpoint
- * @param {import('@librechat/agents').ClientOptions} [params.model_parameters]
 * @returns {Promise<Agent|null>} The agent document as a plain object, or null if not found.
 */
-const loadAgent = async ({ req, agent_id, endpoint, model_parameters }) => {
-  if (!agent_id) {
-    return null;
-  }
-  if (agent_id === EPHEMERAL_AGENT_ID) {
-    return loadEphemeralAgent({ req, agent_id, endpoint, model_parameters });
-  }
+const loadAgent = async ({ req, agent_id }) => {
  const agent = await getAgent({
    id: agent_id,
  });

-  if (!agent) {
-    return null;
-  }
-
-  agent.version = agent.versions ? agent.versions.length : 0;
-
  if (agent.author.toString() === req.user.id) {
    return agent;
  }
@@ -148,207 +70,19 @@ const loadAgent = async ({ req, agent_id, endpoint, model_parameters }) => {
  }
 };

-/**
- * Check if a version already exists in the versions array, excluding timestamp and author fields
- * @param {Object} updateData - The update data to compare
- * @param {Object} currentData - The current agent data
- * @param {Array} versions - The existing versions array
- * @param {string} [actionsHash] - Hash of current action metadata
- * @returns {Object|null} - The matching version if found, null otherwise
- */
-const isDuplicateVersion = (updateData, currentData, versions, actionsHash = null) => {
-  if (!versions || versions.length === 0) {
-    return null;
-  }
-
-  const excludeFields = [
-    '_id',
-    'id',
-    'createdAt',
-    'updatedAt',
-    'author',
-    'updatedBy',
-    'created_at',
-    'updated_at',
-    '__v',
-    'agent_ids',
-    'versions',
-    'actionsHash', // Exclude actionsHash from direct comparison
-  ];
-
-  const { $push, $pull, $addToSet, ...directUpdates } = updateData;
-
-  if (Object.keys(directUpdates).length === 0 && !actionsHash) {
-    return null;
-  }
-
-  const wouldBeVersion = { ...currentData, ...directUpdates };
-  const lastVersion = versions[versions.length - 1];
-
-  if (actionsHash && lastVersion.actionsHash !== actionsHash) {
-    return null;
-  }
-
-  const allFields = new Set([...Object.keys(wouldBeVersion), ...Object.keys(lastVersion)]);
-
-  const importantFields = Array.from(allFields).filter((field) => !excludeFields.includes(field));
-
-  let isMatch = true;
-  for (const field of importantFields) {
-    if (!wouldBeVersion[field] && !lastVersion[field]) {
-      continue;
-    }
-
-    if (Array.isArray(wouldBeVersion[field]) && Array.isArray(lastVersion[field])) {
-      if (wouldBeVersion[field].length !== lastVersion[field].length) {
-        isMatch = false;
-        break;
-      }
-
-      // Special handling for projectIds (MongoDB ObjectIds)
-      if (field === 'projectIds') {
-        const wouldBeIds = wouldBeVersion[field].map((id) => id.toString()).sort();
-        const versionIds = lastVersion[field].map((id) => id.toString()).sort();
-
-        if (!wouldBeIds.every((id, i) => id === versionIds[i])) {
-          isMatch = false;
-          break;
-        }
-      }
-      // Handle arrays of objects like tool_kwargs
-      else if (typeof wouldBeVersion[field][0] === 'object' && wouldBeVersion[field][0] !== null) {
-        const sortedWouldBe = [...wouldBeVersion[field]].map((item) => JSON.stringify(item)).sort();
-        const sortedVersion = [...lastVersion[field]].map((item) => JSON.stringify(item)).sort();
-
-        if (!sortedWouldBe.every((item, i) => item === sortedVersion[i])) {
-          isMatch = false;
-          break;
-        }
-      } else {
-        const sortedWouldBe = [...wouldBeVersion[field]].sort();
-        const sortedVersion = [...lastVersion[field]].sort();
-
-        if (!sortedWouldBe.every((item, i) => item === sortedVersion[i])) {
-          isMatch = false;
-          break;
-        }
-      }
-    } else if (field === 'model_parameters') {
-      const wouldBeParams = wouldBeVersion[field] || {};
-      const lastVersionParams = lastVersion[field] || {};
-      if (JSON.stringify(wouldBeParams) !== JSON.stringify(lastVersionParams)) {
-        isMatch = false;
-        break;
-      }
-    } else if (wouldBeVersion[field] !== lastVersion[field]) {
-      isMatch = false;
-      break;
-    }
-  }
-
-  return isMatch ? lastVersion : null;
-};
-
 /**
 * Update an agent with new data without overwriting existing
 *  properties, or create a new agent if it doesn't exist.
- * When an agent is updated, a copy of the current state will be saved to the versions array.
 *
 * @param {Object} searchParameter - The search parameters to find the agent to update.
 * @param {string} searchParameter.id - The ID of the agent to update.
 * @param {string} [searchParameter.author] - The user ID of the agent's author.
 * @param {Object} updateData - An object containing the properties to update.
- * @param {Object} [options] - Optional configuration object.
- * @param {string} [options.updatingUserId] - The ID of the user performing the update (used for tracking non-author updates).
- * @param {boolean} [options.forceVersion] - Force creation of a new version even if no fields changed.
 * @returns {Promise<Agent>} The updated or newly created agent document as a plain object.
- * @throws {Error} If the update would create a duplicate version
 */
-const updateAgent = async (searchParameter, updateData, options = {}) => {
-  const { updatingUserId = null, forceVersion = false } = options;
-  const mongoOptions = { new: true, upsert: false };
-
-  const currentAgent = await Agent.findOne(searchParameter);
-  if (currentAgent) {
-    const { __v, _id, id, versions, author, ...versionData } = currentAgent.toObject();
-    const { $push, $pull, $addToSet, ...directUpdates } = updateData;
-
-    let actionsHash = null;
-
-    // Generate actions hash if agent has actions
-    if (currentAgent.actions && currentAgent.actions.length > 0) {
-      // Extract action IDs from the format "domain_action_id"
-      const actionIds = currentAgent.actions
-        .map((action) => {
-          const parts = action.split(actionDelimiter);
-          return parts[1]; // Get just the action ID part
-        })
-        .filter(Boolean);
-
-      if (actionIds.length > 0) {
-        try {
-          const actions = await getActions(
-            {
-              action_id: { $in: actionIds },
-            },
-            true,
-          ); // Include sensitive data for hash
-
-          actionsHash = await generateActionMetadataHash(currentAgent.actions, actions);
-        } catch (error) {
-          logger.error('Error fetching actions for hash generation:', error);
-        }
-      }
-    }
-
-    const shouldCreateVersion =
-      forceVersion ||
-      (versions &&
-        versions.length > 0 &&
-        (Object.keys(directUpdates).length > 0 || $push || $pull || $addToSet));
-
-    if (shouldCreateVersion) {
-      const duplicateVersion = isDuplicateVersion(updateData, versionData, versions, actionsHash);
-      if (duplicateVersion && !forceVersion) {
-        const error = new Error(
-          'Duplicate version: This would create a version identical to an existing one',
-        );
-        error.statusCode = 409;
-        error.details = {
-          duplicateVersion,
-          versionIndex: versions.findIndex(
-            (v) => JSON.stringify(duplicateVersion) === JSON.stringify(v),
-          ),
-        };
-        throw error;
-      }
-    }
-
-    const versionEntry = {
-      ...versionData,
-      ...directUpdates,
-      updatedAt: new Date(),
-    };
-
-    // Include actions hash in version if available
-    if (actionsHash) {
-      versionEntry.actionsHash = actionsHash;
-    }
-
-    // Always store updatedBy field to track who made the change
-    if (updatingUserId) {
-      versionEntry.updatedBy = new mongoose.Types.ObjectId(updatingUserId);
-    }
-
-    if (shouldCreateVersion || forceVersion) {
-      updateData.$push = {
-        ...($push || {}),
-        versions: versionEntry,
-      };
-    }
-  }
-
-  return Agent.findOneAndUpdate(searchParameter, updateData, mongoOptions).lean();
+const updateAgent = async (searchParameter, updateData) => {
+  const options = { new: true, upsert: false };
+  return Agent.findOneAndUpdate(searchParameter, updateData, options).lean();
 };

 /**
@@ -360,13 +94,11 @@ const updateAgent = async (searchParameter, updateData, options = {}) => {
 * @param {string} params.file_id
 * @returns {Promise<Agent>} The updated agent.
 */
-const addAgentResourceFile = async ({ req, agent_id, tool_resource, file_id }) => {
+const addAgentResourceFile = async ({ agent_id, tool_resource, file_id }) => {
  const searchParameter = { id: agent_id };
-  let agent = await getAgent(searchParameter);
-  if (!agent) {
-    throw new Error('Agent not found for adding resource file');
-  }
+
  const fileIdsPath = `tool_resources.${tool_resource}.file_ids`;
+
  await Agent.updateOne(
    {
      id: agent_id,
@@ -379,16 +111,9 @@ const addAgentResourceFile = async ({ req, agent_id, tool_resource, file_id }) =
    },
  );

-  const updateData = {
-    $addToSet: {
-      tools: tool_resource,
-      [fileIdsPath]: file_id,
-    },
-  };
+  const updateData = { $addToSet: { [fileIdsPath]: file_id } };

-  const updatedAgent = await updateAgent(searchParameter, updateData, {
-    updatingUserId: req?.user?.id,
-  });
+  const updatedAgent = await updateAgent(searchParameter, updateData);
  if (updatedAgent) {
    return updatedAgent;
  } else {
@@ -397,17 +122,16 @@ const addAgentResourceFile = async ({ req, agent_id, tool_resource, file_id }) =
 };

 /**
- * Removes multiple resource files from an agent using atomic operations.
+ * Removes multiple resource files from an agent in a single update.
 * @param {object} params
 * @param {string} params.agent_id
 * @param {Array<{tool_resource: string, file_id: string}>} params.files
 * @returns {Promise<Agent>} The updated agent.
- * @throws {Error} If the agent is not found or update fails.
 */
 const removeAgentResourceFiles = async ({ agent_id, files }) => {
  const searchParameter = { id: agent_id };

-  // Group files to remove by resource
+  // associate each tool resource with the respective file ids array
  const filesByResource = files.reduce((acc, { tool_resource, file_id }) => {
    if (!acc[tool_resource]) {
      acc[tool_resource] = [];
@@ -416,35 +140,42 @@ const removeAgentResourceFiles = async ({ agent_id, files }) => {
    return acc;
  }, {});

-  // Step 1: Atomically remove file IDs using $pull
-  const pullOps = {};
-  const resourcesToCheck = new Set();
-  for (const [resource, fileIds] of Object.entries(filesByResource)) {
-    const fileIdsPath = `tool_resources.${resource}.file_ids`;
-    pullOps[fileIdsPath] = { $in: fileIds };
-    resourcesToCheck.add(resource);
+  // build the update aggregation pipeline wich removes file ids from tool resources array
+  // and eventually deletes empty tool resources
+  const updateData = [];
+  Object.entries(filesByResource).forEach(([resource, fileIds]) => {
+    const toolResourcePath = `tool_resources.${resource}`;
+    const fileIdsPath = `${toolResourcePath}.file_ids`;
+
+    // file ids removal stage
+    updateData.push({
+      $set: {
+        [fileIdsPath]: {
+          $filter: {
+            input: `$${fileIdsPath}`,
+            cond: { $not: [{ $in: ['$$this', fileIds] }] },
+          },
+        },
+      },
+    });
+
+    // empty tool resource deletion stage
+    updateData.push({
+      $set: {
+        [toolResourcePath]: {
+          $cond: [{ $eq: [`$${fileIdsPath}`, []] }, '$$REMOVE', `$${toolResourcePath}`],
+        },
+      },
+    });
+  });
+
+  // return the updated agent or throw if no agent matches
+  const updatedAgent = await updateAgent(searchParameter, updateData);
+  if (updatedAgent) {
+    return updatedAgent;
+  } else {
+    throw new Error('Agent not found for removing resource files');
  }
-
-  const updatePullData = { $pull: pullOps };
-  const agentAfterPull = await Agent.findOneAndUpdate(searchParameter, updatePullData, {
-    new: true,
-  }).lean();
-
-  if (!agentAfterPull) {
-    // Agent might have been deleted concurrently, or never existed.
-    // Check if it existed before trying to throw.
-    const agentExists = await getAgent(searchParameter);
-    if (!agentExists) {
-      throw new Error('Agent not found for removing resource files');
-    }
-    // If it existed but findOneAndUpdate returned null, something else went wrong.
-    throw new Error('Failed to update agent during file removal (pull step)');
-  }
-
-  // Return the agent state directly after the $pull operation.
-  // Skipping the $unset step for now to simplify and test core $pull atomicity.
-  // Empty arrays might remain, but the removal itself should be correct.
-  return agentAfterPull;
 };

 /**
@@ -480,6 +211,7 @@ const getListAgents = async (searchParameter) => {
    delete globalQuery.author;
    query = { $or: [globalQuery, query] };
  }
+
  const agents = (
    await Agent.find(query, {
      id: 1,
@@ -518,7 +250,7 @@ const getListAgents = async (searchParameter) => {
 * This function also updates the corresponding projects to include or exclude the agent ID.
 *
 * @param {Object} params - Parameters for updating the agent's projects.
- * @param {MongoUser} params.user - Parameters for updating the agent's projects.
+ * @param {import('librechat-data-provider').TUser} params.user - Parameters for updating the agent's projects.
 * @param {string} params.agentId - The ID of the agent to update.
 * @param {string[]} [params.projectIds] - Array of project IDs to add to the agent.
 * @param {string[]} [params.removeProjectIds] - Array of project IDs to remove from the agent.
@@ -551,7 +283,7 @@ const updateAgentProjects = async ({ user, agentId, projectIds, removeProjectIds
    delete updateQuery.author;
  }

-  const updatedAgent = await updateAgent(updateQuery, updateOps, { updatingUserId: user.id });
+  const updatedAgent = await updateAgent(updateQuery, updateOps);
  if (updatedAgent) {
    return updatedAgent;
  }
@@ -568,107 +300,15 @@ const updateAgentProjects = async ({ user, agentId, projectIds, removeProjectIds
  return await getAgent({ id: agentId });
 };

-/**
- * Reverts an agent to a specific version in its version history.
- * @param {Object} searchParameter - The search parameters to find the agent to revert.
- * @param {string} searchParameter.id - The ID of the agent to revert.
- * @param {string} [searchParameter.author] - The user ID of the agent's author.
- * @param {number} versionIndex - The index of the version to revert to in the versions array.
- * @returns {Promise<MongoAgent>} The updated agent document after reverting.
- * @throws {Error} If the agent is not found or the specified version does not exist.
- */
-const revertAgentVersion = async (searchParameter, versionIndex) => {
-  const agent = await Agent.findOne(searchParameter);
-  if (!agent) {
-    throw new Error('Agent not found');
-  }
-
-  if (!agent.versions || !agent.versions[versionIndex]) {
-    throw new Error(`Version ${versionIndex} not found`);
-  }
-
-  const revertToVersion = agent.versions[versionIndex];
-
-  const updateData = {
-    ...revertToVersion,
-  };
-
-  delete updateData._id;
-  delete updateData.id;
-  delete updateData.versions;
-  delete updateData.author;
-  delete updateData.updatedBy;
-
-  return Agent.findOneAndUpdate(searchParameter, updateData, { new: true }).lean();
-};
-
-/**
- * Generates a hash of action metadata for version comparison
- * @param {string[]} actionIds - Array of action IDs in format "domain_action_id"
- * @param {Action[]} actions - Array of action documents
- * @returns {Promise<string>} - SHA256 hash of the action metadata
- */
-const generateActionMetadataHash = async (actionIds, actions) => {
-  if (!actionIds || actionIds.length === 0) {
-    return '';
-  }
-
-  // Create a map of action_id to metadata for quick lookup
-  const actionMap = new Map();
-  actions.forEach((action) => {
-    actionMap.set(action.action_id, action.metadata);
-  });
-
-  // Sort action IDs for consistent hashing
-  const sortedActionIds = [...actionIds].sort();
-
-  // Build a deterministic string representation of all action metadata
-  const metadataString = sortedActionIds
-    .map((actionFullId) => {
-      // Extract just the action_id part (after the delimiter)
-      const parts = actionFullId.split(actionDelimiter);
-      const actionId = parts[1];
-
-      const metadata = actionMap.get(actionId);
-      if (!metadata) {
-        return `${actionId}:null`;
-      }
-
-      // Sort metadata keys for deterministic output
-      const sortedKeys = Object.keys(metadata).sort();
-      const metadataStr = sortedKeys
-        .map((key) => `${key}:${JSON.stringify(metadata[key])}`)
-        .join(',');
-      return `${actionId}:{${metadataStr}}`;
-    })
-    .join(';');
-
-  // Use Web Crypto API to generate hash
-  const encoder = new TextEncoder();
-  const data = encoder.encode(metadataString);
-  const hashBuffer = await crypto.webcrypto.subtle.digest('SHA-256', data);
-  const hashArray = Array.from(new Uint8Array(hashBuffer));
-  const hashHex = hashArray.map((b) => b.toString(16).padStart(2, '0')).join('');
-
-  return hashHex;
-};
-
-/**
- * Load a default agent based on the endpoint
- * @param {string} endpoint
- * @returns {Agent | null}
- */
-
 module.exports = {
+  Agent,
  getAgent,
  loadAgent,
  createAgent,
  updateAgent,
  deleteAgent,
  getListAgents,
-  revertAgentVersion,
  updateAgentProjects,
  addAgentResourceFile,
  removeAgentResourceFiles,
-  generateActionMetadataHash,
 };
--- a/api/models/Agent.spec.js
+++ b/api/models/Agent.spec.js
@@ -1,27 +1,7 @@
-const originalEnv = {
-  CREDS_KEY: process.env.CREDS_KEY,
-  CREDS_IV: process.env.CREDS_IV,
-};
-
-process.env.CREDS_KEY = '0123456789abcdef0123456789abcdef';
-process.env.CREDS_IV = '0123456789abcdef';
-
 const mongoose = require('mongoose');
 const { v4: uuidv4 } = require('uuid');
-
 const { MongoMemoryServer } = require('mongodb-memory-server');
-const {
-  getAgent,
-  updateAgent,
-  deleteAgent,
-  createAgent,
-  getListAgents,
-  updateAgentProjects,
-  addAgentResourceFile,
-  removeAgentResourceFiles,
-} = require('./Agent');
-
-const Agent = require('~/db/models').Agent;
+const { Agent, addAgentResourceFile, removeAgentResourceFiles } = require('./Agent');

 describe('Agent Resource File Operations', () => {
  let mongoServer;
@@ -35,8 +15,6 @@ describe('Agent Resource File Operations', () => {
  afterAll(async () => {
    await mongoose.disconnect();
    await mongoServer.stop();
-    process.env.CREDS_KEY = originalEnv.CREDS_KEY;
-    process.env.CREDS_IV = originalEnv.CREDS_IV;
  });

  beforeEach(async () => {
@@ -55,51 +33,6 @@ describe('Agent Resource File Operations', () => {
    return agent;
  };

-  test('should add tool_resource to tools if missing', async () => {
-    const agent = await createBasicAgent();
-
-    const fileId = uuidv4();
-    const toolResource = 'file_search';
-
-    const updatedAgent = await addAgentResourceFile({
-      agent_id: agent.id,
-      tool_resource: toolResource,
-      file_id: fileId,
-    });
-
-    expect(updatedAgent.tools).toContain(toolResource);
-    expect(Array.isArray(updatedAgent.tools)).toBe(true);
-    // Should not duplicate
-    const count = updatedAgent.tools.filter((t) => t === toolResource).length;
-    expect(count).toBe(1);
-  });
-
-  test('should not duplicate tool_resource in tools if already present', async () => {
-    const agent = await createBasicAgent();
-    const fileId1 = uuidv4();
-    const fileId2 = uuidv4();
-    const toolResource = 'file_search';
-
-    // First add
-    await addAgentResourceFile({
-      agent_id: agent.id,
-      tool_resource: toolResource,
-      file_id: fileId1,
-    });
-
-    // Second add (should not duplicate)
-    const updatedAgent = await addAgentResourceFile({
-      agent_id: agent.id,
-      tool_resource: toolResource,
-      file_id: fileId2,
-    });
-
-    expect(updatedAgent.tools).toContain(toolResource);
-    expect(Array.isArray(updatedAgent.tools)).toBe(true);
-    const count = updatedAgent.tools.filter((t) => t === toolResource).length;
-    expect(count).toBe(1);
-  });
-
  test('should handle concurrent file additions', async () => {
    const agent = await createBasicAgent();
    const fileIds = Array.from({ length: 10 }, () => uuidv4());
@@ -224,856 +157,4 @@ describe('Agent Resource File Operations', () => {
      expect(updatedAgent.tool_resources[tool].file_ids).toHaveLength(5);
    });
  });
-
-  test('should handle concurrent duplicate additions', async () => {
-    const agent = await createBasicAgent();
-    const fileId = uuidv4();
-
-    // Concurrent additions of the same file
-    const additionPromises = Array.from({ length: 5 }).map(() =>
-      addAgentResourceFile({
-        agent_id: agent.id,
-        tool_resource: 'test_tool',
-        file_id: fileId,
-      }),
-    );
-
-    await Promise.all(additionPromises);
-
-    const updatedAgent = await Agent.findOne({ id: agent.id });
-    expect(updatedAgent.tool_resources.test_tool.file_ids).toBeDefined();
-    // Should only contain one instance of the fileId
-    expect(updatedAgent.tool_resources.test_tool.file_ids).toHaveLength(1);
-    expect(updatedAgent.tool_resources.test_tool.file_ids[0]).toBe(fileId);
-  });
-
-  test('should handle concurrent add and remove of the same file', async () => {
-    const agent = await createBasicAgent();
-    const fileId = uuidv4();
-
-    // First, ensure the file exists (or test might be trivial if remove runs first)
-    await addAgentResourceFile({
-      agent_id: agent.id,
-      tool_resource: 'test_tool',
-      file_id: fileId,
-    });
-
-    // Concurrent add (which should be ignored) and remove
-    const operations = [
-      addAgentResourceFile({
-        agent_id: agent.id,
-        tool_resource: 'test_tool',
-        file_id: fileId,
-      }),
-      removeAgentResourceFiles({
-        agent_id: agent.id,
-        files: [{ tool_resource: 'test_tool', file_id: fileId }],
-      }),
-    ];
-
-    await Promise.all(operations);
-
-    const updatedAgent = await Agent.findOne({ id: agent.id });
-    // The final state should ideally be that the file is removed,
-    // but the key point is consistency (not duplicated or error state).
-    // Depending on execution order, the file might remain if the add operation's
-    // findOneAndUpdate runs after the remove operation completes.
-    // A more robust check might be that the length is <= 1.
-    // Given the remove uses an update pipeline, it might be more likely to win.
-    // The final state depends on race condition timing (add or remove might "win").
-    // The critical part is that the state is consistent (no duplicates, no errors).
-    // Assert that the fileId is either present exactly once or not present at all.
-    expect(updatedAgent.tool_resources.test_tool.file_ids).toBeDefined();
-    const finalFileIds = updatedAgent.tool_resources.test_tool.file_ids;
-    const count = finalFileIds.filter((id) => id === fileId).length;
-    expect(count).toBeLessThanOrEqual(1); // Should be 0 or 1, never more
-    // Optional: Check overall length is consistent with the count
-    if (count === 0) {
-      expect(finalFileIds).toHaveLength(0);
-    } else {
-      expect(finalFileIds).toHaveLength(1);
-      expect(finalFileIds[0]).toBe(fileId);
-    }
-  });
-
-  test('should handle concurrent duplicate removals', async () => {
-    const agent = await createBasicAgent();
-    const fileId = uuidv4();
-
-    // Add the file first
-    await addAgentResourceFile({
-      agent_id: agent.id,
-      tool_resource: 'test_tool',
-      file_id: fileId,
-    });
-
-    // Concurrent removals of the same file
-    const removalPromises = Array.from({ length: 5 }).map(() =>
-      removeAgentResourceFiles({
-        agent_id: agent.id,
-        files: [{ tool_resource: 'test_tool', file_id: fileId }],
-      }),
-    );
-
-    await Promise.all(removalPromises);
-
-    const updatedAgent = await Agent.findOne({ id: agent.id });
-    // Check if the array is empty or the tool resource itself is removed
-    const fileIds = updatedAgent.tool_resources?.test_tool?.file_ids ?? [];
-    expect(fileIds).toHaveLength(0);
-    expect(fileIds).not.toContain(fileId);
-  });
-
-  test('should handle concurrent removals of different files', async () => {
-    const agent = await createBasicAgent();
-    const fileIds = Array.from({ length: 10 }, () => uuidv4());
-
-    // Add all files first
-    await Promise.all(
-      fileIds.map((fileId) =>
-        addAgentResourceFile({
-          agent_id: agent.id,
-          tool_resource: 'test_tool',
-          file_id: fileId,
-        }),
-      ),
-    );
-
-    // Concurrently remove all files
-    const removalPromises = fileIds.map((fileId) =>
-      removeAgentResourceFiles({
-        agent_id: agent.id,
-        files: [{ tool_resource: 'test_tool', file_id: fileId }],
-      }),
-    );
-
-    await Promise.all(removalPromises);
-
-    const updatedAgent = await Agent.findOne({ id: agent.id });
-    // Check if the array is empty or the tool resource itself is removed
-    const finalFileIds = updatedAgent.tool_resources?.test_tool?.file_ids ?? [];
-    expect(finalFileIds).toHaveLength(0);
-  });
-});
-
-describe('Agent CRUD Operations', () => {
-  let mongoServer;
-
-  beforeAll(async () => {
-    mongoServer = await MongoMemoryServer.create();
-    const mongoUri = mongoServer.getUri();
-    await mongoose.connect(mongoUri);
-  });
-
-  afterAll(async () => {
-    await mongoose.disconnect();
-    await mongoServer.stop();
-  });
-
-  beforeEach(async () => {
-    await Agent.deleteMany({});
-  });
-
-  test('should create and get an agent', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
-
-    const newAgent = await createAgent({
-      id: agentId,
-      name: 'Test Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
-      description: 'Test description',
-    });
-
-    expect(newAgent).toBeDefined();
-    expect(newAgent.id).toBe(agentId);
-    expect(newAgent.name).toBe('Test Agent');
-
-    const retrievedAgent = await getAgent({ id: agentId });
-    expect(retrievedAgent).toBeDefined();
-    expect(retrievedAgent.id).toBe(agentId);
-    expect(retrievedAgent.name).toBe('Test Agent');
-    expect(retrievedAgent.description).toBe('Test description');
-  });
-
-  test('should delete an agent', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'Agent To Delete',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
-    });
-
-    const agentBeforeDelete = await getAgent({ id: agentId });
-    expect(agentBeforeDelete).toBeDefined();
-
-    await deleteAgent({ id: agentId });
-
-    const agentAfterDelete = await getAgent({ id: agentId });
-    expect(agentAfterDelete).toBeNull();
-  });
-
-  test('should list agents by author', async () => {
-    const authorId = new mongoose.Types.ObjectId();
-    const otherAuthorId = new mongoose.Types.ObjectId();
-
-    const agentIds = [];
-    for (let i = 0; i < 5; i++) {
-      const id = `agent_${uuidv4()}`;
-      agentIds.push(id);
-      await createAgent({
-        id,
-        name: `Agent ${i}`,
-        provider: 'test',
-        model: 'test-model',
-        author: authorId,
-      });
-    }
-
-    for (let i = 0; i < 3; i++) {
-      await createAgent({
-        id: `other_agent_${uuidv4()}`,
-        name: `Other Agent ${i}`,
-        provider: 'test',
-        model: 'test-model',
-        author: otherAuthorId,
-      });
-    }
-
-    const result = await getListAgents({ author: authorId.toString() });
-
-    expect(result).toBeDefined();
-    expect(result.data).toBeDefined();
-    expect(result.data).toHaveLength(5);
-    expect(result.has_more).toBe(true);
-
-    for (const agent of result.data) {
-      expect(agent.author).toBe(authorId.toString());
-    }
-  });
-
-  test('should update agent projects', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
-    const projectId1 = new mongoose.Types.ObjectId();
-    const projectId2 = new mongoose.Types.ObjectId();
-    const projectId3 = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'Project Test Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
-      projectIds: [projectId1],
-    });
-
-    await updateAgent(
-      { id: agentId },
-      { $addToSet: { projectIds: { $each: [projectId2, projectId3] } } },
-    );
-
-    await updateAgent({ id: agentId }, { $pull: { projectIds: projectId1 } });
-
-    await updateAgent({ id: agentId }, { projectIds: [projectId2, projectId3] });
-
-    const updatedAgent = await getAgent({ id: agentId });
-    expect(updatedAgent.projectIds).toHaveLength(2);
-    expect(updatedAgent.projectIds.map((id) => id.toString())).toContain(projectId2.toString());
-    expect(updatedAgent.projectIds.map((id) => id.toString())).toContain(projectId3.toString());
-    expect(updatedAgent.projectIds.map((id) => id.toString())).not.toContain(projectId1.toString());
-
-    await updateAgent({ id: agentId }, { projectIds: [] });
-
-    const emptyProjectsAgent = await getAgent({ id: agentId });
-    expect(emptyProjectsAgent.projectIds).toHaveLength(0);
-
-    const nonExistentId = `agent_${uuidv4()}`;
-    await expect(
-      updateAgentProjects({
-        id: nonExistentId,
-        projectIds: [projectId1],
-      }),
-    ).rejects.toThrow();
-  });
-
-  test('should handle ephemeral agent loading', async () => {
-    const agentId = 'ephemeral_test';
-    const endpoint = 'openai';
-
-    const originalModule = jest.requireActual('librechat-data-provider');
-
-    const mockDataProvider = {
-      ...originalModule,
-      Constants: {
-        ...originalModule.Constants,
-        EPHEMERAL_AGENT_ID: 'ephemeral_test',
-      },
-    };
-
-    jest.doMock('librechat-data-provider', () => mockDataProvider);
-
-    const mockReq = {
-      user: { id: 'user123' },
-      body: {
-        promptPrefix: 'This is a test instruction',
-        ephemeralAgent: {
-          execute_code: true,
-          mcp: ['server1', 'server2'],
-        },
-      },
-      app: {
-        locals: {
-          availableTools: {
-            tool__server1: {},
-            tool__server2: {},
-            another_tool: {},
-          },
-        },
-      },
-    };
-
-    const params = {
-      req: mockReq,
-      agent_id: agentId,
-      endpoint,
-      model_parameters: {
-        model: 'gpt-4',
-        temperature: 0.7,
-      },
-    };
-
-    expect(agentId).toBeDefined();
-    expect(endpoint).toBeDefined();
-
-    jest.dontMock('librechat-data-provider');
-  });
-
-  test('should handle loadAgent functionality and errors', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'Test Load Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
-      tools: ['tool1', 'tool2'],
-    });
-
-    const agent = await getAgent({ id: agentId });
-
-    expect(agent).toBeDefined();
-    expect(agent.id).toBe(agentId);
-    expect(agent.name).toBe('Test Load Agent');
-    expect(agent.tools).toEqual(expect.arrayContaining(['tool1', 'tool2']));
-
-    const mockLoadAgent = jest.fn().mockResolvedValue(agent);
-    const loadedAgent = await mockLoadAgent();
-    expect(loadedAgent).toBeDefined();
-    expect(loadedAgent.id).toBe(agentId);
-
-    const nonExistentId = `agent_${uuidv4()}`;
-    const nonExistentAgent = await getAgent({ id: nonExistentId });
-    expect(nonExistentAgent).toBeNull();
-
-    const mockLoadAgentError = jest.fn().mockRejectedValue(new Error('No agent found with ID'));
-    await expect(mockLoadAgentError()).rejects.toThrow('No agent found with ID');
-  });
-});
-
-describe('Agent Version History', () => {
-  let mongoServer;
-
-  beforeAll(async () => {
-    mongoServer = await MongoMemoryServer.create();
-    const mongoUri = mongoServer.getUri();
-    await mongoose.connect(mongoUri);
-  });
-
-  afterAll(async () => {
-    await mongoose.disconnect();
-    await mongoServer.stop();
-  });
-
-  beforeEach(async () => {
-    await Agent.deleteMany({});
-  });
-
-  test('should create an agent with a single entry in versions array', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const agent = await createAgent({
-      id: agentId,
-      name: 'Test Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: new mongoose.Types.ObjectId(),
-    });
-
-    expect(agent.versions).toBeDefined();
-    expect(Array.isArray(agent.versions)).toBe(true);
-    expect(agent.versions).toHaveLength(1);
-    expect(agent.versions[0].name).toBe('Test Agent');
-    expect(agent.versions[0].provider).toBe('test');
-    expect(agent.versions[0].model).toBe('test-model');
-  });
-
-  test('should accumulate version history across multiple updates', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const author = new mongoose.Types.ObjectId();
-    await createAgent({
-      id: agentId,
-      name: 'First Name',
-      provider: 'test',
-      model: 'test-model',
-      author,
-      description: 'First description',
-    });
-
-    await updateAgent({ id: agentId }, { name: 'Second Name', description: 'Second description' });
-    await updateAgent({ id: agentId }, { name: 'Third Name', model: 'new-model' });
-    const finalAgent = await updateAgent({ id: agentId }, { description: 'Final description' });
-
-    expect(finalAgent.versions).toBeDefined();
-    expect(Array.isArray(finalAgent.versions)).toBe(true);
-    expect(finalAgent.versions).toHaveLength(4);
-
-    expect(finalAgent.versions[0].name).toBe('First Name');
-    expect(finalAgent.versions[0].description).toBe('First description');
-    expect(finalAgent.versions[0].model).toBe('test-model');
-
-    expect(finalAgent.versions[1].name).toBe('Second Name');
-    expect(finalAgent.versions[1].description).toBe('Second description');
-    expect(finalAgent.versions[1].model).toBe('test-model');
-
-    expect(finalAgent.versions[2].name).toBe('Third Name');
-    expect(finalAgent.versions[2].description).toBe('Second description');
-    expect(finalAgent.versions[2].model).toBe('new-model');
-
-    expect(finalAgent.versions[3].name).toBe('Third Name');
-    expect(finalAgent.versions[3].description).toBe('Final description');
-    expect(finalAgent.versions[3].model).toBe('new-model');
-
-    expect(finalAgent.name).toBe('Third Name');
-    expect(finalAgent.description).toBe('Final description');
-    expect(finalAgent.model).toBe('new-model');
-  });
-
-  test('should not include metadata fields in version history', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    await createAgent({
-      id: agentId,
-      name: 'Test Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: new mongoose.Types.ObjectId(),
-    });
-
-    const updatedAgent = await updateAgent({ id: agentId }, { description: 'New description' });
-
-    expect(updatedAgent.versions).toHaveLength(2);
-    expect(updatedAgent.versions[0]._id).toBeUndefined();
-    expect(updatedAgent.versions[0].__v).toBeUndefined();
-    expect(updatedAgent.versions[0].name).toBe('Test Agent');
-    expect(updatedAgent.versions[0].author).toBeUndefined();
-
-    expect(updatedAgent.versions[1]._id).toBeUndefined();
-    expect(updatedAgent.versions[1].__v).toBeUndefined();
-  });
-
-  test('should not recursively include previous versions', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    await createAgent({
-      id: agentId,
-      name: 'Test Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: new mongoose.Types.ObjectId(),
-    });
-
-    await updateAgent({ id: agentId }, { name: 'Updated Name 1' });
-    await updateAgent({ id: agentId }, { name: 'Updated Name 2' });
-    const finalAgent = await updateAgent({ id: agentId }, { name: 'Updated Name 3' });
-
-    expect(finalAgent.versions).toHaveLength(4);
-
-    finalAgent.versions.forEach((version) => {
-      expect(version.versions).toBeUndefined();
-    });
-  });
-
-  test('should handle MongoDB operators and field updates correctly', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
-    const projectId = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'MongoDB Operator Test',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
-      tools: ['tool1'],
-    });
-
-    await updateAgent(
-      { id: agentId },
-      {
-        description: 'Updated description',
-        $push: { tools: 'tool2' },
-        $addToSet: { projectIds: projectId },
-      },
-    );
-
-    const firstUpdate = await getAgent({ id: agentId });
-    expect(firstUpdate.description).toBe('Updated description');
-    expect(firstUpdate.tools).toContain('tool1');
-    expect(firstUpdate.tools).toContain('tool2');
-    expect(firstUpdate.projectIds.map((id) => id.toString())).toContain(projectId.toString());
-    expect(firstUpdate.versions).toHaveLength(2);
-
-    await updateAgent(
-      { id: agentId },
-      {
-        tools: ['tool2', 'tool3'],
-      },
-    );
-
-    const secondUpdate = await getAgent({ id: agentId });
-    expect(secondUpdate.tools).toHaveLength(2);
-    expect(secondUpdate.tools).toContain('tool2');
-    expect(secondUpdate.tools).toContain('tool3');
-    expect(secondUpdate.tools).not.toContain('tool1');
-    expect(secondUpdate.versions).toHaveLength(3);
-
-    await updateAgent(
-      { id: agentId },
-      {
-        $push: { tools: 'tool3' },
-      },
-    );
-
-    const thirdUpdate = await getAgent({ id: agentId });
-    const toolCount = thirdUpdate.tools.filter((t) => t === 'tool3').length;
-    expect(toolCount).toBe(2);
-    expect(thirdUpdate.versions).toHaveLength(4);
-  });
-
-  test('should handle parameter objects correctly', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'Parameters Test',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
-      model_parameters: { temperature: 0.7 },
-    });
-
-    const updatedAgent = await updateAgent(
-      { id: agentId },
-      { model_parameters: { temperature: 0.8 } },
-    );
-
-    expect(updatedAgent.versions).toHaveLength(2);
-    expect(updatedAgent.model_parameters.temperature).toBe(0.8);
-
-    await updateAgent(
-      { id: agentId },
-      {
-        model_parameters: {
-          temperature: 0.8,
-          max_tokens: 1000,
-        },
-      },
-    );
-
-    const complexAgent = await getAgent({ id: agentId });
-    expect(complexAgent.versions).toHaveLength(3);
-    expect(complexAgent.model_parameters.temperature).toBe(0.8);
-    expect(complexAgent.model_parameters.max_tokens).toBe(1000);
-
-    await updateAgent({ id: agentId }, { model_parameters: {} });
-
-    const emptyParamsAgent = await getAgent({ id: agentId });
-    expect(emptyParamsAgent.versions).toHaveLength(4);
-    expect(emptyParamsAgent.model_parameters).toEqual({});
-  });
-
-  test('should detect duplicate versions and reject updates', async () => {
-    const originalConsoleError = console.error;
-    console.error = jest.fn();
-
-    try {
-      const agentId = `agent_${uuidv4()}`;
-      const authorId = new mongoose.Types.ObjectId();
-      const projectId1 = new mongoose.Types.ObjectId();
-      const projectId2 = new mongoose.Types.ObjectId();
-
-      const testCases = [
-        {
-          name: 'simple field update',
-          initial: {
-            name: 'Test Agent',
-            description: 'Initial description',
-          },
-          update: { name: 'Updated Name' },
-          duplicate: { name: 'Updated Name' },
-        },
-        {
-          name: 'object field update',
-          initial: {
-            model_parameters: { temperature: 0.7 },
-          },
-          update: { model_parameters: { temperature: 0.8 } },
-          duplicate: { model_parameters: { temperature: 0.8 } },
-        },
-        {
-          name: 'array field update',
-          initial: {
-            tools: ['tool1', 'tool2'],
-          },
-          update: { tools: ['tool2', 'tool3'] },
-          duplicate: { tools: ['tool2', 'tool3'] },
-        },
-        {
-          name: 'projectIds update',
-          initial: {
-            projectIds: [projectId1],
-          },
-          update: { projectIds: [projectId1, projectId2] },
-          duplicate: { projectIds: [projectId2, projectId1] },
-        },
-      ];
-
-      for (const testCase of testCases) {
-        const testAgentId = `agent_${uuidv4()}`;
-
-        await createAgent({
-          id: testAgentId,
-          provider: 'test',
-          model: 'test-model',
-          author: authorId,
-          ...testCase.initial,
-        });
-
-        await updateAgent({ id: testAgentId }, testCase.update);
-
-        let error;
-        try {
-          await updateAgent({ id: testAgentId }, testCase.duplicate);
-        } catch (e) {
-          error = e;
-        }
-
-        expect(error).toBeDefined();
-        expect(error.message).toContain('Duplicate version');
-        expect(error.statusCode).toBe(409);
-        expect(error.details).toBeDefined();
-        expect(error.details.duplicateVersion).toBeDefined();
-
-        const agent = await getAgent({ id: testAgentId });
-        expect(agent.versions).toHaveLength(2);
-      }
-    } finally {
-      console.error = originalConsoleError;
-    }
-  });
-
-  test('should track updatedBy when a different user updates an agent', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const originalAuthor = new mongoose.Types.ObjectId();
-    const updatingUser = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'Original Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: originalAuthor,
-      description: 'Original description',
-    });
-
-    const updatedAgent = await updateAgent(
-      { id: agentId },
-      { name: 'Updated Agent', description: 'Updated description' },
-      { updatingUserId: updatingUser.toString() },
-    );
-
-    expect(updatedAgent.versions).toHaveLength(2);
-    expect(updatedAgent.versions[1].updatedBy.toString()).toBe(updatingUser.toString());
-    expect(updatedAgent.author.toString()).toBe(originalAuthor.toString());
-  });
-
-  test('should include updatedBy even when the original author updates the agent', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const originalAuthor = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'Original Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: originalAuthor,
-      description: 'Original description',
-    });
-
-    const updatedAgent = await updateAgent(
-      { id: agentId },
-      { name: 'Updated Agent', description: 'Updated description' },
-      { updatingUserId: originalAuthor.toString() },
-    );
-
-    expect(updatedAgent.versions).toHaveLength(2);
-    expect(updatedAgent.versions[1].updatedBy.toString()).toBe(originalAuthor.toString());
-    expect(updatedAgent.author.toString()).toBe(originalAuthor.toString());
-  });
-
-  test('should track multiple different users updating the same agent', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const originalAuthor = new mongoose.Types.ObjectId();
-    const user1 = new mongoose.Types.ObjectId();
-    const user2 = new mongoose.Types.ObjectId();
-    const user3 = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'Original Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: originalAuthor,
-      description: 'Original description',
-    });
-
-    // User 1 makes an update
-    await updateAgent(
-      { id: agentId },
-      { name: 'Updated by User 1', description: 'First update' },
-      { updatingUserId: user1.toString() },
-    );
-
-    // Original author makes an update
-    await updateAgent(
-      { id: agentId },
-      { description: 'Updated by original author' },
-      { updatingUserId: originalAuthor.toString() },
-    );
-
-    // User 2 makes an update
-    await updateAgent(
-      { id: agentId },
-      { name: 'Updated by User 2', model: 'new-model' },
-      { updatingUserId: user2.toString() },
-    );
-
-    // User 3 makes an update
-    const finalAgent = await updateAgent(
-      { id: agentId },
-      { description: 'Final update by User 3' },
-      { updatingUserId: user3.toString() },
-    );
-
-    expect(finalAgent.versions).toHaveLength(5);
-    expect(finalAgent.author.toString()).toBe(originalAuthor.toString());
-
-    // Check that each version has the correct updatedBy
-    expect(finalAgent.versions[0].updatedBy).toBeUndefined(); // Initial creation has no updatedBy
-    expect(finalAgent.versions[1].updatedBy.toString()).toBe(user1.toString());
-    expect(finalAgent.versions[2].updatedBy.toString()).toBe(originalAuthor.toString());
-    expect(finalAgent.versions[3].updatedBy.toString()).toBe(user2.toString());
-    expect(finalAgent.versions[4].updatedBy.toString()).toBe(user3.toString());
-
-    // Verify the final state
-    expect(finalAgent.name).toBe('Updated by User 2');
-    expect(finalAgent.description).toBe('Final update by User 3');
-    expect(finalAgent.model).toBe('new-model');
-  });
-
-  test('should preserve original author during agent restoration', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const originalAuthor = new mongoose.Types.ObjectId();
-    const updatingUser = new mongoose.Types.ObjectId();
-
-    await createAgent({
-      id: agentId,
-      name: 'Original Agent',
-      provider: 'test',
-      model: 'test-model',
-      author: originalAuthor,
-      description: 'Original description',
-    });
-
-    await updateAgent(
-      { id: agentId },
-      { name: 'Updated Agent', description: 'Updated description' },
-      { updatingUserId: updatingUser.toString() },
-    );
-
-    const { revertAgentVersion } = require('./Agent');
-    const revertedAgent = await revertAgentVersion({ id: agentId }, 0);
-
-    expect(revertedAgent.author.toString()).toBe(originalAuthor.toString());
-    expect(revertedAgent.name).toBe('Original Agent');
-    expect(revertedAgent.description).toBe('Original description');
-  });
-
-  test('should detect action metadata changes and force version update', async () => {
-    const agentId = `agent_${uuidv4()}`;
-    const authorId = new mongoose.Types.ObjectId();
-    const actionId = 'testActionId123';
-
-    // Create agent with actions
-    await createAgent({
-      id: agentId,
-      name: 'Agent with Actions',
-      provider: 'test',
-      model: 'test-model',
-      author: authorId,
-      actions: [`test.com_action_${actionId}`],
-      tools: ['listEvents_action_test.com', 'createEvent_action_test.com'],
-    });
-
-    // First update with forceVersion should create a version
-    const firstUpdate = await updateAgent(
-      { id: agentId },
-      { tools: ['listEvents_action_test.com', 'createEvent_action_test.com'] },
-      { updatingUserId: authorId.toString(), forceVersion: true },
-    );
-
-    expect(firstUpdate.versions).toHaveLength(2);
-
-    // Second update with same data but forceVersion should still create a version
-    const secondUpdate = await updateAgent(
-      { id: agentId },
-      { tools: ['listEvents_action_test.com', 'createEvent_action_test.com'] },
-      { updatingUserId: authorId.toString(), forceVersion: true },
-    );
-
-    expect(secondUpdate.versions).toHaveLength(3);
-
-    // Update without forceVersion and no changes should not create a version
-    let error;
-    try {
-      await updateAgent(
-        { id: agentId },
-        { tools: ['listEvents_action_test.com', 'createEvent_action_test.com'] },
-        { updatingUserId: authorId.toString(), forceVersion: false },
-      );
-    } catch (e) {
-      error = e;
-    }
-
-    expect(error).toBeDefined();
-    expect(error.message).toContain('Duplicate version');
-    expect(error.statusCode).toBe(409);
-  });
 });
--- a/api/models/Assistant.js
+++ b/api/models/Assistant.js
@@ -1,5 +1,7 @@
 const mongoose = require('mongoose');
-const Assistant = require('~/db/models').Assistant;
+const assistantSchema = require('./schema/assistant');
+
+const Assistant = mongoose.model('assistant', assistantSchema);

 /**
 * Update an assistant with new data without overwriting existing properties,
--- a/api/models/Balance.js
+++ b/api/models/Balance.js
@@ -0,0 +1,44 @@
+const mongoose = require('mongoose');
+const balanceSchema = require('./schema/balance');
+const { getMultiplier } = require('./tx');
+const { logger } = require('~/config');
+
+balanceSchema.statics.check = async function ({
+  user,
+  model,
+  endpoint,
+  valueKey,
+  tokenType,
+  amount,
+  endpointTokenConfig,
+}) {
+  const multiplier = getMultiplier({ valueKey, tokenType, model, endpoint, endpointTokenConfig });
+  const tokenCost = amount * multiplier;
+  const { tokenCredits: balance } = (await this.findOne({ user }, 'tokenCredits').lean()) ?? {};
+
+  logger.debug('[Balance.check]', {
+    user,
+    model,
+    endpoint,
+    valueKey,
+    tokenType,
+    amount,
+    balance,
+    multiplier,
+    endpointTokenConfig: !!endpointTokenConfig,
+  });
+
+  if (!balance) {
+    return {
+      canSpend: false,
+      balance: 0,
+      tokenCost,
+    };
+  }
+
+  logger.debug('[Balance.check]', { tokenCost });
+
+  return { canSpend: balance >= tokenCost, balance, tokenCost };
+};
+
+module.exports = mongoose.model('Balance', balanceSchema);
--- a/api/models/Banner.js
+++ b/api/models/Banner.js
@@ -1,8 +1,5 @@
-const mongoose = require('mongoose');
-const { logger } = require('@librechat/data-schemas');
-
-const Banner = require('~/db/models').Banner;
-
+const Banner = require('./schema/banner');
+const logger = require('~/config/winston');
 /**
 * Retrieves the current active banner.
 * @returns {Promise<Object|null>} The active banner object or null if no active banner is found.
--- a/api/models/Categories.js
+++ b/api/models/Categories.js
@@ -1,4 +1,5 @@
 const { logger } = require('~/config');
+// const { Categories } = require('./schema/categories');

 const options = [
  {
--- a/api/models/Config.js
+++ b/api/models/Config.js
@@ -0,0 +1,86 @@
+const mongoose = require('mongoose');
+const { logger } = require('~/config');
+
+const major = [0, 0];
+const minor = [0, 0];
+const patch = [0, 5];
+
+const configSchema = mongoose.Schema(
+  {
+    tag: {
+      type: String,
+      required: true,
+      validate: {
+        validator: function (tag) {
+          const [part1, part2, part3] = tag.replace('v', '').split('.').map(Number);
+
+          // Check if all parts are numbers
+          if (isNaN(part1) || isNaN(part2) || isNaN(part3)) {
+            return false;
+          }
+
+          // Check if all parts are within their respective ranges
+          if (part1 < major[0] || part1 > major[1]) {
+            return false;
+          }
+          if (part2 < minor[0] || part2 > minor[1]) {
+            return false;
+          }
+          if (part3 < patch[0] || part3 > patch[1]) {
+            return false;
+          }
+          return true;
+        },
+        message: 'Invalid tag value',
+      },
+    },
+    searchEnabled: {
+      type: Boolean,
+      default: false,
+    },
+    usersEnabled: {
+      type: Boolean,
+      default: false,
+    },
+    startupCounts: {
+      type: Number,
+      default: 0,
+    },
+  },
+  { timestamps: true },
+);
+
+// Instance method
+configSchema.methods.incrementCount = function () {
+  this.startupCounts += 1;
+};
+
+// Static methods
+configSchema.statics.findByTag = async function (tag) {
+  return await this.findOne({ tag }).lean();
+};
+
+configSchema.statics.updateByTag = async function (tag, update) {
+  return await this.findOneAndUpdate({ tag }, update, { new: true });
+};
+
+const Config = mongoose.models.Config || mongoose.model('Config', configSchema);
+
+module.exports = {
+  getConfigs: async (filter) => {
+    try {
+      return await Config.find(filter).lean();
+    } catch (error) {
+      logger.error('Error getting configs', error);
+      return { config: 'Error getting configs' };
+    }
+  },
+  deleteConfigs: async (filter) => {
+    try {
+      return await Config.deleteMany(filter);
+    } catch (error) {
+      logger.error('Error deleting configs', error);
+      return { config: 'Error deleting configs' };
+    }
+  },
+};
--- a/api/models/Conversation.js
+++ b/api/models/Conversation.js
@@ -1,8 +1,6 @@
-const mongoose = require('mongoose');
-const { logger } = require('@librechat/data-schemas');
+const Conversation = require('./schema/convoSchema');
 const { getMessages, deleteMessages } = require('./Message');
-
-const Conversation = require('~/db/models').Conversation;
+const logger = require('~/config/winston');

 /**
 * Searches for a conversation by conversationId and returns a lean document with only conversationId and user.
@@ -17,6 +15,19 @@ const searchConversation = async (conversationId) => {
    throw new Error('Error searching conversation');
  }
 };
+/**
+ * Searches for a conversation by conversationId and returns associated file ids.
+ * @param {string} conversationId - The conversation's ID.
+ * @returns {Promise<string[] | null>}
+ */
+const getConvoFiles = async (conversationId) => {
+  try {
+    return (await Conversation.findOne({ conversationId }, 'files').lean())?.files ?? [];
+  } catch (error) {
+    logger.error('[getConvoFiles] Error getting conversation files', error);
+    throw new Error('Error getting conversation files');
+  }
+};

 /**
 * Retrieves a single conversation for a given user and conversation ID.
@@ -62,21 +73,8 @@ const deleteNullOrEmptyConversations = async () => {
  }
 };

-/**
- * Searches for a conversation by conversationId and returns associated file ids.
- * @param {string} conversationId - The conversation's ID.
- * @returns {Promise<string[] | null>}
- */
-const getConvoFiles = async (conversationId) => {
-  try {
-    return (await Conversation.findOne({ conversationId }, 'files').lean())?.files ?? [];
-  } catch (error) {
-    logger.error('[getConvoFiles] Error getting conversation files', error);
-    throw new Error('Error getting conversation files');
-  }
-};
-
 module.exports = {
+  Conversation,
  getConvoFiles,
  searchConversation,
  deleteNullOrEmptyConversations,
@@ -89,13 +87,11 @@ module.exports = {
   */
  saveConvo: async (req, { conversationId, newConversationId, ...convo }, metadata) => {
    try {
-      if (metadata?.context) {
+      if (metadata && metadata?.context) {
        logger.debug(`[saveConvo] ${metadata.context}`);
      }
-
      const messages = await getMessages({ conversationId }, '_id');
      const update = { ...convo, messages, user: req.user.id };
-
      if (newConversationId) {
        update.conversationId = newConversationId;
      }
@@ -151,101 +147,75 @@ module.exports = {
      throw new Error('Failed to save conversations in bulk.');
    }
  },
-  getConvosByCursor: async (
-    user,
-    { cursor, limit = 25, isArchived = false, tags, search, order = 'desc' } = {},
-  ) => {
-    const filters = [{ user }];
+  getConvosByPage: async (user, pageNumber = 1, pageSize = 25, isArchived = false, tags) => {
+    const query = { user };
    if (isArchived) {
-      filters.push({ isArchived: true });
+      query.isArchived = true;
    } else {
-      filters.push({ $or: [{ isArchived: false }, { isArchived: { $exists: false } }] });
+      query.$or = [{ isArchived: false }, { isArchived: { $exists: false } }];
    }
-
    if (Array.isArray(tags) && tags.length > 0) {
-      filters.push({ tags: { $in: tags } });
+      query.tags = { $in: tags };
    }

-    filters.push({ $or: [{ expiredAt: null }, { expiredAt: { $exists: false } }] });
-
-    if (search) {
-      try {
-        const meiliResults = await Conversation.meiliSearch(search);
-        const matchingIds = Array.isArray(meiliResults.hits)
-          ? meiliResults.hits.map((result) => result.conversationId)
-          : [];
-        if (!matchingIds.length) {
-          return { conversations: [], nextCursor: null };
-        }
-        filters.push({ conversationId: { $in: matchingIds } });
-      } catch (error) {
-        logger.error('[getConvosByCursor] Error during meiliSearch', error);
-        return { message: 'Error during meiliSearch' };
-      }
-    }
-
-    if (cursor) {
-      filters.push({ updatedAt: { $lt: new Date(cursor) } });
-    }
-
-    const query = filters.length === 1 ? filters[0] : { $and: filters };
+    query.$and = [{ $or: [{ expiredAt: null }, { expiredAt: { $exists: false } }] }];

    try {
+      const totalConvos = (await Conversation.countDocuments(query)) || 1;
+      const totalPages = Math.ceil(totalConvos / pageSize);
      const convos = await Conversation.find(query)
-        .select(
-          'conversationId endpoint title createdAt updatedAt user model agent_id assistant_id spec iconURL',
-        )
-        .sort({ updatedAt: order === 'asc' ? 1 : -1 })
-        .limit(limit + 1)
+        .sort({ updatedAt: -1 })
+        .skip((pageNumber - 1) * pageSize)
+        .limit(pageSize)
        .lean();
-
-      let nextCursor = null;
-      if (convos.length > limit) {
-        const lastConvo = convos.pop();
-        nextCursor = lastConvo.updatedAt.toISOString();
-      }
-
-      return { conversations: convos, nextCursor };
+      return { conversations: convos, pages: totalPages, pageNumber, pageSize };
    } catch (error) {
-      logger.error('[getConvosByCursor] Error getting conversations', error);
+      logger.error('[getConvosByPage] Error getting conversations', error);
      return { message: 'Error getting conversations' };
    }
  },
-  getConvosQueried: async (user, convoIds, cursor = null, limit = 25) => {
+  getConvosQueried: async (user, convoIds, pageNumber = 1, pageSize = 25) => {
    try {
-      if (!convoIds?.length) {
-        return { conversations: [], nextCursor: null, convoMap: {} };
-      }
-
-      const conversationIds = convoIds.map((convo) => convo.conversationId);
-
-      const results = await Conversation.find({
-        user,
-        conversationId: { $in: conversationIds },
-        $or: [{ expiredAt: { $exists: false } }, { expiredAt: null }],
-      }).lean();
-
-      results.sort((a, b) => new Date(b.updatedAt) - new Date(a.updatedAt));
-
-      let filtered = results;
-      if (cursor && cursor !== 'start') {
-        const cursorDate = new Date(cursor);
-        filtered = results.filter((convo) => new Date(convo.updatedAt) < cursorDate);
-      }
-
-      const limited = filtered.slice(0, limit + 1);
-      let nextCursor = null;
-      if (limited.length > limit) {
-        const lastConvo = limited.pop();
-        nextCursor = lastConvo.updatedAt.toISOString();
+      if (!convoIds || convoIds.length === 0) {
+        return { conversations: [], pages: 1, pageNumber, pageSize };
      }

+      const cache = {};
      const convoMap = {};
-      limited.forEach((convo) => {
+      const promises = [];
+
+      convoIds.forEach((convo) =>
+        promises.push(
+          Conversation.findOne({
+            user,
+            conversationId: convo.conversationId,
+            $or: [{ expiredAt: { $exists: false } }, { expiredAt: null }],
+          }).lean(),
+        ),
+      );
+
+      const results = (await Promise.all(promises)).filter(Boolean);
+
+      results.forEach((convo, i) => {
+        const page = Math.floor(i / pageSize) + 1;
+        if (!cache[page]) {
+          cache[page] = [];
+        }
+        cache[page].push(convo);
        convoMap[convo.conversationId] = convo;
      });

-      return { conversations: limited, nextCursor, convoMap };
+      const totalPages = Math.ceil(results.length / pageSize);
+      cache.pages = totalPages;
+      cache.pageSize = pageSize;
+      return {
+        cache,
+        conversations: cache[pageNumber] || [],
+        pages: totalPages || 1,
+        pageNumber,
+        pageSize,
+        convoMap,
+      };
    } catch (error) {
      logger.error('[getConvosQueried] Error getting conversations', error);
      return { message: 'Error fetching conversations' };
@@ -286,25 +256,10 @@ module.exports = {
   * logger.error(result); // { n: 5, ok: 1, deletedCount: 5, messages: { n: 10, ok: 1, deletedCount: 10 } }
   */
  deleteConvos: async (user, filter) => {
-    try {
-      const userFilter = { ...filter, user };
-      const conversations = await Conversation.find(userFilter).select('conversationId');
-      const conversationIds = conversations.map((c) => c.conversationId);
-
-      if (!conversationIds.length) {
-        throw new Error('Conversation not found or already deleted.');
-      }
-
-      const deleteConvoResult = await Conversation.deleteMany(userFilter);
-
-      const deleteMessagesResult = await deleteMessages({
-        conversationId: { $in: conversationIds },
-      });
-
-      return { ...deleteConvoResult, messages: deleteMessagesResult };
-    } catch (error) {
-      logger.error('[deleteConvos] Error deleting conversations and messages', error);
-      throw error;
-    }
+    let toRemove = await Conversation.find({ ...filter, user }).select('conversationId');
+    const ids = toRemove.map((instance) => instance.conversationId);
+    let deleteCount = await Conversation.deleteMany({ ...filter, user });
+    deleteCount.messages = await deleteMessages({ conversationId: { $in: ids } });
+    return deleteCount;
  },
 };
--- a/api/models/ConversationTag.js
+++ b/api/models/ConversationTag.js
@@ -1,8 +1,6 @@
-const mongoose = require('mongoose');
-const { logger } = require('@librechat/data-schemas');
-
-const ConversationTag = require('~/db/models').ConversationTag;
-const Conversation = require('~/db/models').Conversation;
+const ConversationTag = require('./schema/conversationTagSchema');
+const Conversation = require('./schema/convoSchema');
+const logger = require('~/config/winston');

 /**
 * Retrieves all conversation tags for a user.
@@ -138,13 +136,13 @@ const adjustPositions = async (user, oldPosition, newPosition) => {
  const position =
    oldPosition < newPosition
      ? {
-          $gt: Math.min(oldPosition, newPosition),
-          $lte: Math.max(oldPosition, newPosition),
-        }
+        $gt: Math.min(oldPosition, newPosition),
+        $lte: Math.max(oldPosition, newPosition),
+      }
      : {
-          $gte: Math.min(oldPosition, newPosition),
-          $lt: Math.max(oldPosition, newPosition),
-        };
+        $gte: Math.min(oldPosition, newPosition),
+        $lt: Math.max(oldPosition, newPosition),
+      };

  await ConversationTag.updateMany(
    {
--- a/api/models/File.js
+++ b/api/models/File.js
@@ -1,8 +1,7 @@
 const mongoose = require('mongoose');
-const { logger } = require('@librechat/data-schemas');
-const { EToolResources } = require('librechat-data-provider');
+const fileSchema = require('./schema/fileSchema');

-const File = require('~/db/models').File;
+const File = mongoose.model('File', fileSchema);

 /**
 * Finds a file by its file_id with additional query options.
@@ -18,50 +17,11 @@ const findFileById = async (file_id, options = {}) => {
 * Retrieves files matching a given filter, sorted by the most recently updated.
 * @param {Object} filter - The filter criteria to apply.
 * @param {Object} [_sortOptions] - Optional sort parameters.
- * @param {Object|String} [selectFields={ text: 0 }] - Fields to include/exclude in the query results.
- *                                                   Default excludes the 'text' field.
 * @returns {Promise<Array<MongoFile>>} A promise that resolves to an array of file documents.
 */
-const getFiles = async (filter, _sortOptions, selectFields = { text: 0 }) => {
+const getFiles = async (filter, _sortOptions) => {
  const sortOptions = { updatedAt: -1, ..._sortOptions };
-  return await File.find(filter).select(selectFields).sort(sortOptions).lean();
-};
-
-/**
- * Retrieves tool files (files that are embedded or have a fileIdentifier) from an array of file IDs
- * @param {string[]} fileIds - Array of file_id strings to search for
- * @param {Set<EToolResources>} toolResourceSet - Optional filter for tool resources
- * @returns {Promise<Array<MongoFile>>} Files that match the criteria
- */
-const getToolFilesByIds = async (fileIds, toolResourceSet) => {
-  if (!fileIds || !fileIds.length) {
-    return [];
-  }
-
-  try {
-    const filter = {
-      file_id: { $in: fileIds },
-    };
-
-    if (toolResourceSet.size) {
-      filter.$or = [];
-    }
-
-    if (toolResourceSet.has(EToolResources.file_search)) {
-      filter.$or.push({ embedded: true });
-    }
-    if (toolResourceSet.has(EToolResources.execute_code)) {
-      filter.$or.push({ 'metadata.fileIdentifier': { $exists: true } });
-    }
-
-    const selectFields = { text: 0 };
-    const sortOptions = { updatedAt: -1 };
-
-    return await getFiles(filter, sortOptions, selectFields);
-  } catch (error) {
-    logger.error('[getToolFilesByIds] Error retrieving tool files:', error);
-    throw new Error('Error retrieving tool files');
-  }
+  return await File.find(filter).sort(sortOptions).lean();
 };

 /**
@@ -145,37 +105,14 @@ const deleteFiles = async (file_ids, user) => {
  return await File.deleteMany(deleteQuery);
 };

-/**
- * Batch updates files with new signed URLs in MongoDB
- *
- * @param {MongoFile[]} updates - Array of updates in the format { file_id, filepath }
- * @returns {Promise<void>}
- */
-async function batchUpdateFiles(updates) {
-  if (!updates || updates.length === 0) {
-    return;
-  }
-
-  const bulkOperations = updates.map((update) => ({
-    updateOne: {
-      filter: { file_id: update.file_id },
-      update: { $set: { filepath: update.filepath } },
-    },
-  }));
-
-  const result = await File.bulkWrite(bulkOperations);
-  logger.info(`Updated ${result.modifiedCount} files with new S3 URLs`);
-}
-
 module.exports = {
+  File,
  findFileById,
  getFiles,
-  getToolFilesByIds,
  createFile,
  updateFile,
  updateFileUsage,
  deleteFile,
  deleteFiles,
  deleteFileByFilter,
-  batchUpdateFiles,
 };
--- a/api/models/Key.js
+++ b/api/models/Key.js
@@ -0,0 +1,4 @@
+const mongoose = require('mongoose');
+const keySchema = require('./schema/key');
+
+module.exports = mongoose.model('Key', keySchema);
--- a/api/models/Message.js
+++ b/api/models/Message.js
@@ -1,7 +1,7 @@
 const { z } = require('zod');
-const { logger } = require('@librechat/data-schemas');
+const Message = require('./schema/messageSchema');
+const { logger } = require('~/config');

-const Message = require('~/db/models').Message;
 const idSchema = z.string().uuid();

 /**
@@ -61,13 +61,6 @@ async function saveMessage(req, params, metadata) {
      update.expiredAt = null;
    }

-    if (update.tokenCount != null && isNaN(update.tokenCount)) {
-      logger.warn(
-        `Resetting invalid \`tokenCount\` for message \`${params.messageId}\`: ${update.tokenCount}`,
-      );
-      logger.info(`---\`saveMessage\` context: ${metadata?.context}`);
-      update.tokenCount = 0;
-    }
    const message = await Message.findOneAndUpdate(
      { messageId: params.messageId, user: req.user.id },
      update,
@@ -78,44 +71,7 @@ async function saveMessage(req, params, metadata) {
  } catch (err) {
    logger.error('Error saving message:', err);
    logger.info(`---\`saveMessage\` context: ${metadata?.context}`);
-
-    // Check if this is a duplicate key error (MongoDB error code 11000)
-    if (err.code === 11000 && err.message.includes('duplicate key error')) {
-      // Log the duplicate key error but don't crash the application
-      logger.warn(`Duplicate messageId detected: ${params.messageId}. Continuing execution.`);
-
-      try {
-        // Try to find the existing message with this ID
-        const existingMessage = await Message.findOne({
-          messageId: params.messageId,
-          user: req.user.id,
-        });
-
-        // If we found it, return it
-        if (existingMessage) {
-          return existingMessage.toObject();
-        }
-
-        // If we can't find it (unlikely but possible in race conditions)
-        return {
-          ...params,
-          messageId: params.messageId,
-          user: req.user.id,
-        };
-      } catch (findError) {
-        // If the findOne also fails, log it but don't crash
-        logger.warn(
-          `Could not retrieve existing message with ID ${params.messageId}: ${findError.message}`,
-        );
-        return {
-          ...params,
-          messageId: params.messageId,
-          user: req.user.id,
-        };
-      }
-    }
-
-    throw err; // Re-throw other errors
+    throw err;
  }
 }

@@ -139,6 +95,7 @@ async function bulkSaveMessages(messages, overrideTimestamp = false) {
        upsert: true,
      },
    }));
+
    const result = await Message.bulkWrite(bulkOps);
    return result;
  } catch (err) {
@@ -353,6 +310,7 @@ async function deleteMessages(filter) {
 }

 module.exports = {
+  Message,
  saveMessage,
  bulkSaveMessages,
  recordMessage,
--- a/api/models/Message.spec.js
+++ b/api/models/Message.spec.js
@@ -1,3 +1,4 @@
+const mongoose = require('mongoose');
 const { v4: uuidv4 } = require('uuid');

 jest.mock('mongoose');
@@ -19,20 +20,14 @@ const mockSchema = {
  deleteMany: jest.fn(),
 };

+mongoose.model.mockReturnValue(mockSchema);
+
+jest.mock('~/models/schema/messageSchema', () => mockSchema);
+
 jest.mock('~/config/winston', () => ({
  error: jest.fn(),
 }));

-const mockModels = {
-  Message: {
-    findOneAndUpdate: mockSchema.findOneAndUpdate,
-    updateOne: mockSchema.updateOne,
-    findOne: mockSchema.findOne,
-    find: mockSchema.find,
-    deleteMany: mockSchema.deleteMany,
-  },
-};
-
 const {
  saveMessage,
  getMessages,
@@ -158,7 +153,7 @@ describe('Message Operations', () => {
  });

  describe('Conversation Hijacking Prevention', () => {
-    it("should not allow editing a message in another user's conversation", async () => {
+    it('should not allow editing a message in another user\'s conversation', async () => {
      const attackerReq = { user: { id: 'attacker123' } };
      const victimConversationId = 'victim-convo-123';
      const victimMessageId = 'victim-msg-123';
@@ -180,7 +175,7 @@ describe('Message Operations', () => {
      );
    });

-    it("should not allow deleting messages from another user's conversation", async () => {
+    it('should not allow deleting messages from another user\'s conversation', async () => {
      const attackerReq = { user: { id: 'attacker123' } };
      const victimConversationId = 'victim-convo-123';
      const victimMessageId = 'victim-msg-123';
@@ -198,7 +193,7 @@ describe('Message Operations', () => {
      });
    });

-    it("should not allow inserting a new message into another user's conversation", async () => {
+    it('should not allow inserting a new message into another user\'s conversation', async () => {
      const attackerReq = { user: { id: 'attacker123' } };
      const victimConversationId = uuidv4(); // Use a valid UUID

--- a/api/models/Preset.js
+++ b/api/models/Preset.js
@@ -1,7 +1,5 @@
-const mongoose = require('mongoose');
-const { logger } = require('@librechat/data-schemas');
-
-const Preset = require('~/db/models').Preset;
+const Preset = require('./schema/presetSchema');
+const { logger } = require('~/config');

 const getPreset = async (user, presetId) => {
  try {
@@ -13,6 +11,7 @@ const getPreset = async (user, presetId) => {
 };

 module.exports = {
+  Preset,
  getPreset,
  getPresets: async (user, filter) => {
    try {
--- a/api/models/Project.js
+++ b/api/models/Project.js
@@ -1,14 +1,15 @@
-const mongoose = require('mongoose');
+const { model } = require('mongoose');
 const { GLOBAL_PROJECT_NAME } = require('librechat-data-provider').Constants;
+const projectSchema = require('~/models/schema/projectSchema');

-const Project = require('~/db/models').Project;
+const Project = model('Project', projectSchema);

 /**
 * Retrieve a project by ID and convert the found project document to a plain object.
 *
 * @param {string} projectId - The ID of the project to find and return as a plain object.
 * @param {string|string[]} [fieldsToSelect] - The fields to include or exclude in the returned document.
- * @returns {Promise<IMongoProject>} A plain object representing the project document, or `null` if no project is found.
+ * @returns {Promise<MongoProject>} A plain object representing the project document, or `null` if no project is found.
 */
 const getProjectById = async function (projectId, fieldsToSelect = null) {
  const query = Project.findById(projectId);
@@ -26,7 +27,7 @@ const getProjectById = async function (projectId, fieldsToSelect = null) {
 *
 * @param {string} projectName - The name of the project to find or create.
 * @param {string|string[]} [fieldsToSelect] - The fields to include or exclude in the returned document.
- * @returns {Promise<IMongoProject>} A plain object representing the project document.
+ * @returns {Promise<MongoProject>} A plain object representing the project document.
 */
 const getProjectByName = async function (projectName, fieldsToSelect = null) {
  const query = { name: projectName };
@@ -46,7 +47,7 @@ const getProjectByName = async function (projectName, fieldsToSelect = null) {
 *
 * @param {string} projectId - The ID of the project to update.
 * @param {string[]} promptGroupIds - The array of prompt group IDs to add to the project.
- * @returns {Promise<IMongoProject>} The updated project document.
+ * @returns {Promise<MongoProject>} The updated project document.
 */
 const addGroupIdsToProject = async function (projectId, promptGroupIds) {
  return await Project.findByIdAndUpdate(
@@ -61,7 +62,7 @@ const addGroupIdsToProject = async function (projectId, promptGroupIds) {
 *
 * @param {string} projectId - The ID of the project to update.
 * @param {string[]} promptGroupIds - The array of prompt group IDs to remove from the project.
- * @returns {Promise<IMongoProject>} The updated project document.
+ * @returns {Promise<MongoProject>} The updated project document.
 */
 const removeGroupIdsFromProject = async function (projectId, promptGroupIds) {
  return await Project.findByIdAndUpdate(
@@ -86,7 +87,7 @@ const removeGroupFromAllProjects = async (promptGroupId) => {
 *
 * @param {string} projectId - The ID of the project to update.
 * @param {string[]} agentIds - The array of agent IDs to add to the project.
- * @returns {Promise<IMongoProject>} The updated project document.
+ * @returns {Promise<MongoProject>} The updated project document.
 */
 const addAgentIdsToProject = async function (projectId, agentIds) {
  return await Project.findByIdAndUpdate(
@@ -101,7 +102,7 @@ const addAgentIdsToProject = async function (projectId, agentIds) {
 *
 * @param {string} projectId - The ID of the project to update.
 * @param {string[]} agentIds - The array of agent IDs to remove from the project.
- * @returns {Promise<IMongoProject>} The updated project document.
+ * @returns {Promise<MongoProject>} The updated project document.
 */
 const removeAgentIdsFromProject = async function (projectId, agentIds) {
  return await Project.findByIdAndUpdate(
--- a/api/models/Prompt.js
+++ b/api/models/Prompt.js
@@ -1,6 +1,4 @@
-const mongoose = require('mongoose');
 const { ObjectId } = require('mongodb');
-const { logger } = require('@librechat/data-schemas');
 const { SystemRoles, SystemCategories, Constants } = require('librechat-data-provider');
 const {
  getProjectByName,
@@ -8,10 +6,9 @@ const {
  removeGroupIdsFromProject,
  removeGroupFromAllProjects,
 } = require('./Project');
+const { Prompt, PromptGroup } = require('./schema/promptSchema');
 const { escapeRegExp } = require('~/server/utils');
-
-const PromptGroup = require('~/db/models').PromptGroup;
-const Prompt = require('~/db/models').Prompt;
+const { logger } = require('~/config');

 /**
 * Create a pipeline for the aggregation to get prompt groups
--- a/api/models/Role.js
+++ b/api/models/Role.js
@@ -3,26 +3,29 @@ const {
  SystemRoles,
  roleDefaults,
  PermissionTypes,
-  permissionsSchema,
  removeNullishValues,
+  agentPermissionsSchema,
+  promptPermissionsSchema,
+  runCodePermissionsSchema,
+  bookmarkPermissionsSchema,
+  multiConvoPermissionsSchema,
+  temporaryChatPermissionsSchema,
 } = require('librechat-data-provider');
-const { logger } = require('@librechat/data-schemas');
 const getLogStores = require('~/cache/getLogStores');
-
-const Role = require('~/db/models').Role;
+const Role = require('~/models/schema/roleSchema');
+const { logger } = require('~/config');

 /**
 * Retrieve a role by name and convert the found role document to a plain object.
- * If the role with the given name doesn't exist and the name is a system defined role,
- * create it and return the lean version.
+ * If the role with the given name doesn't exist and the name is a system defined role, create it and return the lean version.
 *
 * @param {string} roleName - The name of the role to find or create.
 * @param {string|string[]} [fieldsToSelect] - The fields to include or exclude in the returned document.
 * @returns {Promise<Object>} A plain object representing the role document.
 */
 const getRoleByName = async function (roleName, fieldsToSelect = null) {
-  const cache = getLogStores(CacheKeys.ROLES);
  try {
+    const cache = getLogStores(CacheKeys.ROLES);
    const cachedRole = await cache.get(roleName);
    if (cachedRole) {
      return cachedRole;
@@ -34,7 +37,8 @@ const getRoleByName = async function (roleName, fieldsToSelect = null) {
    let role = await query.lean().exec();

    if (!role && SystemRoles[roleName]) {
-      role = await new Role(roleDefaults[roleName]).save();
+      role = roleDefaults[roleName];
+      role = await new Role(role).save();
      await cache.set(roleName, role);
      return role.toObject();
    }
@@ -53,8 +57,8 @@ const getRoleByName = async function (roleName, fieldsToSelect = null) {
 * @returns {Promise<TRole>} Updated role document.
 */
 const updateRoleByName = async function (roleName, updates) {
-  const cache = getLogStores(CacheKeys.ROLES);
  try {
+    const cache = getLogStores(CacheKeys.ROLES);
    const role = await Role.findOneAndUpdate(
      { name: roleName },
      { $set: updates },
@@ -70,20 +74,29 @@ const updateRoleByName = async function (roleName, updates) {
  }
 };

+const permissionSchemas = {
+  [PermissionTypes.AGENTS]: agentPermissionsSchema,
+  [PermissionTypes.PROMPTS]: promptPermissionsSchema,
+  [PermissionTypes.BOOKMARKS]: bookmarkPermissionsSchema,
+  [PermissionTypes.MULTI_CONVO]: multiConvoPermissionsSchema,
+  [PermissionTypes.TEMPORARY_CHAT]: temporaryChatPermissionsSchema,
+  [PermissionTypes.RUN_CODE]: runCodePermissionsSchema,
+};
+
 /**
 * Updates access permissions for a specific role and multiple permission types.
- * @param {string} roleName - The role to update.
+ * @param {SystemRoles} roleName - The role to update.
 * @param {Object.<PermissionTypes, Object.<Permissions, boolean>>} permissionsUpdate - Permissions to update and their values.
 */
 async function updateAccessPermissions(roleName, permissionsUpdate) {
-  // Filter and clean the permission updates based on our schema definition.
  const updates = {};
  for (const [permissionType, permissions] of Object.entries(permissionsUpdate)) {
-    if (permissionsSchema.shape && permissionsSchema.shape[permissionType]) {
+    if (permissionSchemas[permissionType]) {
      updates[permissionType] = removeNullishValues(permissions);
    }
  }
-  if (!Object.keys(updates).length) {
+
+  if (Object.keys(updates).length === 0) {
    return;
  }

@@ -93,75 +106,26 @@ async function updateAccessPermissions(roleName, permissionsUpdate) {
      return;
    }

-    const currentPermissions = role.permissions || {};
-    const updatedPermissions = { ...currentPermissions };
+    const updatedPermissions = {};
    let hasChanges = false;

-    const unsetFields = {};
-    const permissionTypes = Object.keys(permissionsSchema.shape || {});
-    for (const permType of permissionTypes) {
-      if (role[permType] && typeof role[permType] === 'object') {
-        logger.info(
-          `Migrating '${roleName}' role from old schema: found '${permType}' at top level`,
-        );
-
-        updatedPermissions[permType] = {
-          ...updatedPermissions[permType],
-          ...role[permType],
-        };
-
-        unsetFields[permType] = 1;
-        hasChanges = true;
-      }
-    }
-
-    // Process the current updates
    for (const [permissionType, permissions] of Object.entries(updates)) {
-      const currentTypePermissions = currentPermissions[permissionType] || {};
-      updatedPermissions[permissionType] = { ...currentTypePermissions };
+      const currentPermissions = role[permissionType] || {};
+      updatedPermissions[permissionType] = { ...currentPermissions };

      for (const [permission, value] of Object.entries(permissions)) {
-        if (currentTypePermissions[permission] !== value) {
+        if (currentPermissions[permission] !== value) {
          updatedPermissions[permissionType][permission] = value;
          hasChanges = true;
          logger.info(
-            `Updating '${roleName}' role permission '${permissionType}' '${permission}' from ${currentTypePermissions[permission]} to: ${value}`,
+            `Updating '${roleName}' role ${permissionType} '${permission}' permission from ${currentPermissions[permission]} to: ${value}`,
          );
        }
      }
    }

    if (hasChanges) {
-      const updateObj = { permissions: updatedPermissions };
-
-      if (Object.keys(unsetFields).length > 0) {
-        logger.info(
-          `Unsetting old schema fields for '${roleName}' role: ${Object.keys(unsetFields).join(', ')}`,
-        );
-
-        try {
-          await Role.updateOne(
-            { name: roleName },
-            {
-              $set: updateObj,
-              $unset: unsetFields,
-            },
-          );
-
-          const cache = getLogStores(CacheKeys.ROLES);
-          const updatedRole = await Role.findOne({ name: roleName }).select('-__v').lean().exec();
-          await cache.set(roleName, updatedRole);
-
-          logger.info(`Updated role '${roleName}' and removed old schema fields`);
-        } catch (updateError) {
-          logger.error(`Error during role migration update: ${updateError.message}`);
-          throw updateError;
-        }
-      } else {
-        // Standard update if no migration needed
-        await updateRoleByName(roleName, updateObj);
-      }
-
+      await updateRoleByName(roleName, updatedPermissions);
      logger.info(`Updated '${roleName}' role permissions`);
    } else {
      logger.info(`No changes needed for '${roleName}' role permissions`);
@@ -179,110 +143,33 @@ async function updateAccessPermissions(roleName, permissionsUpdate) {
 * @returns {Promise<void>}
 */
 const initializeRoles = async function () {
-  for (const roleName of [SystemRoles.ADMIN, SystemRoles.USER]) {
+  const defaultRoles = [SystemRoles.ADMIN, SystemRoles.USER];
+
+  for (const roleName of defaultRoles) {
    let role = await Role.findOne({ name: roleName });
-    const defaultPerms = roleDefaults[roleName].permissions;

    if (!role) {
-      // Create new role if it doesn't exist.
+      // Create new role if it doesn't exist
      role = new Role(roleDefaults[roleName]);
    } else {
-      // Ensure role.permissions is defined.
-      role.permissions = role.permissions || {};
-      // For each permission type in defaults, add it if missing.
-      for (const permType of Object.keys(defaultPerms)) {
-        if (role.permissions[permType] == null) {
-          role.permissions[permType] = defaultPerms[permType];
+      // Add missing permission types
+      let isUpdated = false;
+      for (const permType of Object.values(PermissionTypes)) {
+        if (!role[permType]) {
+          role[permType] = roleDefaults[roleName][permType];
+          isUpdated = true;
        }
      }
+      if (isUpdated) {
+        await role.save();
+      }
    }
    await role.save();
  }
 };
-
-/**
- * Migrates roles from old schema to new schema structure.
- * This can be called directly to fix existing roles.
- *
- * @param {string} [roleName] - Optional specific role to migrate. If not provided, migrates all roles.
- * @returns {Promise<number>} Number of roles migrated.
- */
-const migrateRoleSchema = async function (roleName) {
-  try {
-    // Get roles to migrate
-    let roles;
-    if (roleName) {
-      const role = await Role.findOne({ name: roleName });
-      roles = role ? [role] : [];
-    } else {
-      roles = await Role.find({});
-    }
-
-    logger.info(`Migrating ${roles.length} roles to new schema structure`);
-    let migratedCount = 0;
-
-    for (const role of roles) {
-      const permissionTypes = Object.keys(permissionsSchema.shape || {});
-      const unsetFields = {};
-      let hasOldSchema = false;
-
-      // Check for old schema fields
-      for (const permType of permissionTypes) {
-        if (role[permType] && typeof role[permType] === 'object') {
-          hasOldSchema = true;
-
-          // Ensure permissions object exists
-          role.permissions = role.permissions || {};
-
-          // Migrate permissions from old location to new
-          role.permissions[permType] = {
-            ...role.permissions[permType],
-            ...role[permType],
-          };
-
-          // Mark field for removal
-          unsetFields[permType] = 1;
-        }
-      }
-
-      if (hasOldSchema) {
-        try {
-          logger.info(`Migrating role '${role.name}' from old schema structure`);
-
-          // Simple update operation
-          await Role.updateOne(
-            { _id: role._id },
-            {
-              $set: { permissions: role.permissions },
-              $unset: unsetFields,
-            },
-          );
-
-          // Refresh cache
-          const cache = getLogStores(CacheKeys.ROLES);
-          const updatedRole = await Role.findById(role._id).lean().exec();
-          await cache.set(role.name, updatedRole);
-
-          migratedCount++;
-          logger.info(`Migrated role '${role.name}'`);
-        } catch (error) {
-          logger.error(`Failed to migrate role '${role.name}': ${error.message}`);
-        }
-      }
-    }
-
-    logger.info(`Migration complete: ${migratedCount} roles migrated`);
-    return migratedCount;
-  } catch (error) {
-    logger.error(`Role schema migration failed: ${error.message}`);
-    throw error;
-  }
-};
-
 module.exports = {
  getRoleByName,
  initializeRoles,
  updateRoleByName,
  updateAccessPermissions,
-  migrateRoleSchema,
 };
--- a/api/models/Role.spec.js
+++ b/api/models/Role.spec.js
@@ -2,23 +2,22 @@ const mongoose = require('mongoose');
 const { MongoMemoryServer } = require('mongodb-memory-server');
 const {
  SystemRoles,
-  Permissions,
-  roleDefaults,
  PermissionTypes,
+  roleDefaults,
+  Permissions,
 } = require('librechat-data-provider');
-const { getRoleByName, updateAccessPermissions, initializeRoles } = require('~/models/Role');
+const { updateAccessPermissions, initializeRoles } = require('~/models/Role');
 const getLogStores = require('~/cache/getLogStores');
-
-const Role = require('~/db/models').Role;
+const Role = require('~/models/schema/roleSchema');

 // Mock the cache
-jest.mock('~/cache/getLogStores', () =>
-  jest.fn().mockReturnValue({
+jest.mock('~/cache/getLogStores', () => {
+  return jest.fn().mockReturnValue({
    get: jest.fn(),
    set: jest.fn(),
    del: jest.fn(),
-  }),
-);
+  });
+});

 let mongoServer;

@@ -42,12 +41,10 @@ describe('updateAccessPermissions', () => {
  it('should update permissions when changes are needed', async () => {
    await new Role({
      name: SystemRoles.USER,
-      permissions: {
-        [PermissionTypes.PROMPTS]: {
-          CREATE: true,
-          USE: true,
-          SHARED_GLOBAL: false,
-        },
+      [PermissionTypes.PROMPTS]: {
+        CREATE: true,
+        USE: true,
+        SHARED_GLOBAL: false,
      },
    }).save();

@@ -59,8 +56,8 @@ describe('updateAccessPermissions', () => {
      },
    });

-    const updatedRole = await getRoleByName(SystemRoles.USER);
-    expect(updatedRole.permissions[PermissionTypes.PROMPTS]).toEqual({
+    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
      CREATE: true,
      USE: true,
      SHARED_GLOBAL: true,
@@ -70,12 +67,10 @@ describe('updateAccessPermissions', () => {
  it('should not update permissions when no changes are needed', async () => {
    await new Role({
      name: SystemRoles.USER,
-      permissions: {
-        [PermissionTypes.PROMPTS]: {
-          CREATE: true,
-          USE: true,
-          SHARED_GLOBAL: false,
-        },
+      [PermissionTypes.PROMPTS]: {
+        CREATE: true,
+        USE: true,
+        SHARED_GLOBAL: false,
      },
    }).save();

@@ -87,8 +82,8 @@ describe('updateAccessPermissions', () => {
      },
    });

-    const updatedRole = await getRoleByName(SystemRoles.USER);
-    expect(updatedRole.permissions[PermissionTypes.PROMPTS]).toEqual({
+    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
      CREATE: true,
      USE: true,
      SHARED_GLOBAL: false,
@@ -97,8 +92,11 @@ describe('updateAccessPermissions', () => {

  it('should handle non-existent roles', async () => {
    await updateAccessPermissions('NON_EXISTENT_ROLE', {
-      [PermissionTypes.PROMPTS]: { CREATE: true },
+      [PermissionTypes.PROMPTS]: {
+        CREATE: true,
+      },
    });
+
    const role = await Role.findOne({ name: 'NON_EXISTENT_ROLE' });
    expect(role).toBeNull();
  });
@@ -106,21 +104,21 @@ describe('updateAccessPermissions', () => {
  it('should update only specified permissions', async () => {
    await new Role({
      name: SystemRoles.USER,
-      permissions: {
-        [PermissionTypes.PROMPTS]: {
-          CREATE: true,
-          USE: true,
-          SHARED_GLOBAL: false,
-        },
+      [PermissionTypes.PROMPTS]: {
+        CREATE: true,
+        USE: true,
+        SHARED_GLOBAL: false,
      },
    }).save();

    await updateAccessPermissions(SystemRoles.USER, {
-      [PermissionTypes.PROMPTS]: { SHARED_GLOBAL: true },
+      [PermissionTypes.PROMPTS]: {
+        SHARED_GLOBAL: true,
+      },
    });

-    const updatedRole = await getRoleByName(SystemRoles.USER);
-    expect(updatedRole.permissions[PermissionTypes.PROMPTS]).toEqual({
+    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
      CREATE: true,
      USE: true,
      SHARED_GLOBAL: true,
@@ -130,21 +128,21 @@ describe('updateAccessPermissions', () => {
  it('should handle partial updates', async () => {
    await new Role({
      name: SystemRoles.USER,
-      permissions: {
-        [PermissionTypes.PROMPTS]: {
-          CREATE: true,
-          USE: true,
-          SHARED_GLOBAL: false,
-        },
+      [PermissionTypes.PROMPTS]: {
+        CREATE: true,
+        USE: true,
+        SHARED_GLOBAL: false,
      },
    }).save();

    await updateAccessPermissions(SystemRoles.USER, {
-      [PermissionTypes.PROMPTS]: { USE: false },
+      [PermissionTypes.PROMPTS]: {
+        USE: false,
+      },
    });

-    const updatedRole = await getRoleByName(SystemRoles.USER);
-    expect(updatedRole.permissions[PermissionTypes.PROMPTS]).toEqual({
+    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
      CREATE: true,
      USE: false,
      SHARED_GLOBAL: false,
@@ -154,9 +152,13 @@ describe('updateAccessPermissions', () => {
  it('should update multiple permission types at once', async () => {
    await new Role({
      name: SystemRoles.USER,
-      permissions: {
-        [PermissionTypes.PROMPTS]: { CREATE: true, USE: true, SHARED_GLOBAL: false },
-        [PermissionTypes.BOOKMARKS]: { USE: true },
+      [PermissionTypes.PROMPTS]: {
+        CREATE: true,
+        USE: true,
+        SHARED_GLOBAL: false,
+      },
+      [PermissionTypes.BOOKMARKS]: {
+        USE: true,
      },
    }).save();

@@ -165,20 +167,24 @@ describe('updateAccessPermissions', () => {
      [PermissionTypes.BOOKMARKS]: { USE: false },
    });

-    const updatedRole = await getRoleByName(SystemRoles.USER);
-    expect(updatedRole.permissions[PermissionTypes.PROMPTS]).toEqual({
+    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
      CREATE: true,
      USE: false,
      SHARED_GLOBAL: true,
    });
-    expect(updatedRole.permissions[PermissionTypes.BOOKMARKS]).toEqual({ USE: false });
+    expect(updatedRole[PermissionTypes.BOOKMARKS]).toEqual({
+      USE: false,
+    });
  });

  it('should handle updates for a single permission type', async () => {
    await new Role({
      name: SystemRoles.USER,
-      permissions: {
-        [PermissionTypes.PROMPTS]: { CREATE: true, USE: true, SHARED_GLOBAL: false },
+      [PermissionTypes.PROMPTS]: {
+        CREATE: true,
+        USE: true,
+        SHARED_GLOBAL: false,
      },
    }).save();

@@ -186,8 +192,8 @@ describe('updateAccessPermissions', () => {
      [PermissionTypes.PROMPTS]: { USE: false, SHARED_GLOBAL: true },
    });

-    const updatedRole = await getRoleByName(SystemRoles.USER);
-    expect(updatedRole.permissions[PermissionTypes.PROMPTS]).toEqual({
+    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
      CREATE: true,
      USE: false,
      SHARED_GLOBAL: true,
@@ -197,25 +203,33 @@ describe('updateAccessPermissions', () => {
  it('should update MULTI_CONVO permissions', async () => {
    await new Role({
      name: SystemRoles.USER,
-      permissions: {
-        [PermissionTypes.MULTI_CONVO]: { USE: false },
+      [PermissionTypes.MULTI_CONVO]: {
+        USE: false,
      },
    }).save();

    await updateAccessPermissions(SystemRoles.USER, {
-      [PermissionTypes.MULTI_CONVO]: { USE: true },
+      [PermissionTypes.MULTI_CONVO]: {
+        USE: true,
+      },
    });

-    const updatedRole = await getRoleByName(SystemRoles.USER);
-    expect(updatedRole.permissions[PermissionTypes.MULTI_CONVO]).toEqual({ USE: true });
+    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+    expect(updatedRole[PermissionTypes.MULTI_CONVO]).toEqual({
+      USE: true,
+    });
  });

  it('should update MULTI_CONVO permissions along with other permission types', async () => {
    await new Role({
      name: SystemRoles.USER,
-      permissions: {
-        [PermissionTypes.PROMPTS]: { CREATE: true, USE: true, SHARED_GLOBAL: false },
-        [PermissionTypes.MULTI_CONVO]: { USE: false },
+      [PermissionTypes.PROMPTS]: {
+        CREATE: true,
+        USE: true,
+        SHARED_GLOBAL: false,
+      },
+      [PermissionTypes.MULTI_CONVO]: {
+        USE: false,
      },
    }).save();

@@ -224,29 +238,35 @@ describe('updateAccessPermissions', () => {
      [PermissionTypes.MULTI_CONVO]: { USE: true },
    });

-    const updatedRole = await getRoleByName(SystemRoles.USER);
-    expect(updatedRole.permissions[PermissionTypes.PROMPTS]).toEqual({
+    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
      CREATE: true,
      USE: true,
      SHARED_GLOBAL: true,
    });
-    expect(updatedRole.permissions[PermissionTypes.MULTI_CONVO]).toEqual({ USE: true });
+    expect(updatedRole[PermissionTypes.MULTI_CONVO]).toEqual({
+      USE: true,
+    });
  });

  it('should not update MULTI_CONVO permissions when no changes are needed', async () => {
    await new Role({
      name: SystemRoles.USER,
-      permissions: {
-        [PermissionTypes.MULTI_CONVO]: { USE: true },
+      [PermissionTypes.MULTI_CONVO]: {
+        USE: true,
      },
    }).save();

    await updateAccessPermissions(SystemRoles.USER, {
-      [PermissionTypes.MULTI_CONVO]: { USE: true },
+      [PermissionTypes.MULTI_CONVO]: {
+        USE: true,
+      },
    });

-    const updatedRole = await getRoleByName(SystemRoles.USER);
-    expect(updatedRole.permissions[PermissionTypes.MULTI_CONVO]).toEqual({ USE: true });
+    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+    expect(updatedRole[PermissionTypes.MULTI_CONVO]).toEqual({
+      USE: true,
+    });
  });
 });

@@ -258,69 +278,65 @@ describe('initializeRoles', () => {
  it('should create default roles if they do not exist', async () => {
    await initializeRoles();

-    const adminRole = await getRoleByName(SystemRoles.ADMIN);
-    const userRole = await getRoleByName(SystemRoles.USER);
+    const adminRole = await Role.findOne({ name: SystemRoles.ADMIN }).lean();
+    const userRole = await Role.findOne({ name: SystemRoles.USER }).lean();

    expect(adminRole).toBeTruthy();
    expect(userRole).toBeTruthy();

-    // Check if all permission types exist in the permissions field
+    // Check if all permission types exist
    Object.values(PermissionTypes).forEach((permType) => {
-      expect(adminRole.permissions[permType]).toBeDefined();
-      expect(userRole.permissions[permType]).toBeDefined();
+      expect(adminRole[permType]).toBeDefined();
+      expect(userRole[permType]).toBeDefined();
    });

-    // Example: Check default values for ADMIN role
-    expect(adminRole.permissions[PermissionTypes.PROMPTS].SHARED_GLOBAL).toBe(true);
-    expect(adminRole.permissions[PermissionTypes.BOOKMARKS].USE).toBe(true);
-    expect(adminRole.permissions[PermissionTypes.AGENTS].CREATE).toBe(true);
+    // Check if permissions match defaults (example for ADMIN role)
+    expect(adminRole[PermissionTypes.PROMPTS].SHARED_GLOBAL).toBe(true);
+    expect(adminRole[PermissionTypes.BOOKMARKS].USE).toBe(true);
+    expect(adminRole[PermissionTypes.AGENTS].CREATE).toBe(true);
  });

  it('should not modify existing permissions for existing roles', async () => {
    const customUserRole = {
      name: SystemRoles.USER,
-      permissions: {
-        [PermissionTypes.PROMPTS]: {
-          [Permissions.USE]: false,
-          [Permissions.CREATE]: true,
-          [Permissions.SHARED_GLOBAL]: true,
-        },
-        [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: false },
+      [PermissionTypes.PROMPTS]: {
+        [Permissions.USE]: false,
+        [Permissions.CREATE]: true,
+        [Permissions.SHARED_GLOBAL]: true,
+      },
+      [PermissionTypes.BOOKMARKS]: {
+        [Permissions.USE]: false,
      },
    };

    await new Role(customUserRole).save();
+
    await initializeRoles();

-    const userRole = await getRoleByName(SystemRoles.USER);
-    expect(userRole.permissions[PermissionTypes.PROMPTS]).toEqual(
-      customUserRole.permissions[PermissionTypes.PROMPTS],
-    );
-    expect(userRole.permissions[PermissionTypes.BOOKMARKS]).toEqual(
-      customUserRole.permissions[PermissionTypes.BOOKMARKS],
-    );
-    expect(userRole.permissions[PermissionTypes.AGENTS]).toBeDefined();
+    const userRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+
+    expect(userRole[PermissionTypes.PROMPTS]).toEqual(customUserRole[PermissionTypes.PROMPTS]);
+    expect(userRole[PermissionTypes.BOOKMARKS]).toEqual(customUserRole[PermissionTypes.BOOKMARKS]);
+    expect(userRole[PermissionTypes.AGENTS]).toBeDefined();
  });

  it('should add new permission types to existing roles', async () => {
    const partialUserRole = {
      name: SystemRoles.USER,
-      permissions: {
-        [PermissionTypes.PROMPTS]:
-          roleDefaults[SystemRoles.USER].permissions[PermissionTypes.PROMPTS],
-        [PermissionTypes.BOOKMARKS]:
-          roleDefaults[SystemRoles.USER].permissions[PermissionTypes.BOOKMARKS],
-      },
+      [PermissionTypes.PROMPTS]: roleDefaults[SystemRoles.USER][PermissionTypes.PROMPTS],
+      [PermissionTypes.BOOKMARKS]: roleDefaults[SystemRoles.USER][PermissionTypes.BOOKMARKS],
    };

    await new Role(partialUserRole).save();
+
    await initializeRoles();

-    const userRole = await getRoleByName(SystemRoles.USER);
-    expect(userRole.permissions[PermissionTypes.AGENTS]).toBeDefined();
-    expect(userRole.permissions[PermissionTypes.AGENTS].CREATE).toBeDefined();
-    expect(userRole.permissions[PermissionTypes.AGENTS].USE).toBeDefined();
-    expect(userRole.permissions[PermissionTypes.AGENTS].SHARED_GLOBAL).toBeDefined();
+    const userRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+
+    expect(userRole[PermissionTypes.AGENTS]).toBeDefined();
+    expect(userRole[PermissionTypes.AGENTS].CREATE).toBeDefined();
+    expect(userRole[PermissionTypes.AGENTS].USE).toBeDefined();
+    expect(userRole[PermissionTypes.AGENTS].SHARED_GLOBAL).toBeDefined();
  });

  it('should handle multiple runs without duplicating or modifying data', async () => {
@@ -333,73 +349,72 @@ describe('initializeRoles', () => {
    expect(adminRoles).toHaveLength(1);
    expect(userRoles).toHaveLength(1);

-    const adminPerms = adminRoles[0].toObject().permissions;
-    const userPerms = userRoles[0].toObject().permissions;
+    const adminRole = adminRoles[0].toObject();
+    const userRole = userRoles[0].toObject();
+
+    // Check if all permission types exist
    Object.values(PermissionTypes).forEach((permType) => {
-      expect(adminPerms[permType]).toBeDefined();
-      expect(userPerms[permType]).toBeDefined();
+      expect(adminRole[permType]).toBeDefined();
+      expect(userRole[permType]).toBeDefined();
    });
  });

  it('should update roles with missing permission types from roleDefaults', async () => {
    const partialAdminRole = {
      name: SystemRoles.ADMIN,
-      permissions: {
-        [PermissionTypes.PROMPTS]: {
-          [Permissions.USE]: false,
-          [Permissions.CREATE]: false,
-          [Permissions.SHARED_GLOBAL]: false,
-        },
-        [PermissionTypes.BOOKMARKS]:
-          roleDefaults[SystemRoles.ADMIN].permissions[PermissionTypes.BOOKMARKS],
+      [PermissionTypes.PROMPTS]: {
+        [Permissions.USE]: false,
+        [Permissions.CREATE]: false,
+        [Permissions.SHARED_GLOBAL]: false,
      },
+      [PermissionTypes.BOOKMARKS]: roleDefaults[SystemRoles.ADMIN][PermissionTypes.BOOKMARKS],
    };

    await new Role(partialAdminRole).save();
+
    await initializeRoles();

-    const adminRole = await getRoleByName(SystemRoles.ADMIN);
-    expect(adminRole.permissions[PermissionTypes.PROMPTS]).toEqual(
-      partialAdminRole.permissions[PermissionTypes.PROMPTS],
-    );
-    expect(adminRole.permissions[PermissionTypes.AGENTS]).toBeDefined();
-    expect(adminRole.permissions[PermissionTypes.AGENTS].CREATE).toBeDefined();
-    expect(adminRole.permissions[PermissionTypes.AGENTS].USE).toBeDefined();
-    expect(adminRole.permissions[PermissionTypes.AGENTS].SHARED_GLOBAL).toBeDefined();
+    const adminRole = await Role.findOne({ name: SystemRoles.ADMIN }).lean();
+
+    expect(adminRole[PermissionTypes.PROMPTS]).toEqual(partialAdminRole[PermissionTypes.PROMPTS]);
+    expect(adminRole[PermissionTypes.AGENTS]).toBeDefined();
+    expect(adminRole[PermissionTypes.AGENTS].CREATE).toBeDefined();
+    expect(adminRole[PermissionTypes.AGENTS].USE).toBeDefined();
+    expect(adminRole[PermissionTypes.AGENTS].SHARED_GLOBAL).toBeDefined();
  });

  it('should include MULTI_CONVO permissions when creating default roles', async () => {
    await initializeRoles();

-    const adminRole = await getRoleByName(SystemRoles.ADMIN);
-    const userRole = await getRoleByName(SystemRoles.USER);
+    const adminRole = await Role.findOne({ name: SystemRoles.ADMIN }).lean();
+    const userRole = await Role.findOne({ name: SystemRoles.USER }).lean();

-    expect(adminRole.permissions[PermissionTypes.MULTI_CONVO]).toBeDefined();
-    expect(userRole.permissions[PermissionTypes.MULTI_CONVO]).toBeDefined();
-    expect(adminRole.permissions[PermissionTypes.MULTI_CONVO].USE).toBe(
-      roleDefaults[SystemRoles.ADMIN].permissions[PermissionTypes.MULTI_CONVO].USE,
+    expect(adminRole[PermissionTypes.MULTI_CONVO]).toBeDefined();
+    expect(userRole[PermissionTypes.MULTI_CONVO]).toBeDefined();
+
+    // Check if MULTI_CONVO permissions match defaults
+    expect(adminRole[PermissionTypes.MULTI_CONVO].USE).toBe(
+      roleDefaults[SystemRoles.ADMIN][PermissionTypes.MULTI_CONVO].USE,
    );
-    expect(userRole.permissions[PermissionTypes.MULTI_CONVO].USE).toBe(
-      roleDefaults[SystemRoles.USER].permissions[PermissionTypes.MULTI_CONVO].USE,
+    expect(userRole[PermissionTypes.MULTI_CONVO].USE).toBe(
+      roleDefaults[SystemRoles.USER][PermissionTypes.MULTI_CONVO].USE,
    );
  });

  it('should add MULTI_CONVO permissions to existing roles without them', async () => {
    const partialUserRole = {
      name: SystemRoles.USER,
-      permissions: {
-        [PermissionTypes.PROMPTS]:
-          roleDefaults[SystemRoles.USER].permissions[PermissionTypes.PROMPTS],
-        [PermissionTypes.BOOKMARKS]:
-          roleDefaults[SystemRoles.USER].permissions[PermissionTypes.BOOKMARKS],
-      },
+      [PermissionTypes.PROMPTS]: roleDefaults[SystemRoles.USER][PermissionTypes.PROMPTS],
+      [PermissionTypes.BOOKMARKS]: roleDefaults[SystemRoles.USER][PermissionTypes.BOOKMARKS],
    };

    await new Role(partialUserRole).save();
+
    await initializeRoles();

-    const userRole = await getRoleByName(SystemRoles.USER);
-    expect(userRole.permissions[PermissionTypes.MULTI_CONVO]).toBeDefined();
-    expect(userRole.permissions[PermissionTypes.MULTI_CONVO].USE).toBeDefined();
+    const userRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+
+    expect(userRole[PermissionTypes.MULTI_CONVO]).toBeDefined();
+    expect(userRole[PermissionTypes.MULTI_CONVO].USE).toBeDefined();
  });
 });
--- a/api/models/Session.js
+++ b/api/models/Session.js
@@ -0,0 +1,275 @@
+const mongoose = require('mongoose');
+const signPayload = require('~/server/services/signPayload');
+const { hashToken } = require('~/server/utils/crypto');
+const sessionSchema = require('./schema/session');
+const { logger } = require('~/config');
+
+const Session = mongoose.model('Session', sessionSchema);
+
+const { REFRESH_TOKEN_EXPIRY } = process.env ?? {};
+const expires = eval(REFRESH_TOKEN_EXPIRY) ?? 1000 * 60 * 60 * 24 * 7; // 7 days default
+
+/**
+ * Error class for Session-related errors
+ */
+class SessionError extends Error {
+  constructor(message, code = 'SESSION_ERROR') {
+    super(message);
+    this.name = 'SessionError';
+    this.code = code;
+  }
+}
+
+/**
+ * Creates a new session for a user
+ * @param {string} userId - The ID of the user
+ * @param {Object} options - Additional options for session creation
+ * @param {Date} options.expiration - Custom expiration date
+ * @returns {Promise<{session: Session, refreshToken: string}>}
+ * @throws {SessionError}
+ */
+const createSession = async (userId, options = {}) => {
+  if (!userId) {
+    throw new SessionError('User ID is required', 'INVALID_USER_ID');
+  }
+
+  try {
+    const session = new Session({
+      user: userId,
+      expiration: options.expiration || new Date(Date.now() + expires),
+    });
+    const refreshToken = await generateRefreshToken(session);
+    return { session, refreshToken };
+  } catch (error) {
+    logger.error('[createSession] Error creating session:', error);
+    throw new SessionError('Failed to create session', 'CREATE_SESSION_FAILED');
+  }
+};
+
+/**
+ * Finds a session by various parameters
+ * @param {Object} params - Search parameters
+ * @param {string} [params.refreshToken] - The refresh token to search by
+ * @param {string} [params.userId] - The user ID to search by
+ * @param {string} [params.sessionId] - The session ID to search by
+ * @param {Object} [options] - Additional options
+ * @param {boolean} [options.lean=true] - Whether to return plain objects instead of documents
+ * @returns {Promise<Session|null>}
+ * @throws {SessionError}
+ */
+const findSession = async (params, options = { lean: true }) => {
+  try {
+    const query = {};
+
+    if (!params.refreshToken && !params.userId && !params.sessionId) {
+      throw new SessionError('At least one search parameter is required', 'INVALID_SEARCH_PARAMS');
+    }
+
+    if (params.refreshToken) {
+      const tokenHash = await hashToken(params.refreshToken);
+      query.refreshTokenHash = tokenHash;
+    }
+
+    if (params.userId) {
+      query.user = params.userId;
+    }
+
+    if (params.sessionId) {
+      const sessionId = params.sessionId.sessionId || params.sessionId;
+      if (!mongoose.Types.ObjectId.isValid(sessionId)) {
+        throw new SessionError('Invalid session ID format', 'INVALID_SESSION_ID');
+      }
+      query._id = sessionId;
+    }
+
+    // Add expiration check to only return valid sessions
+    query.expiration = { $gt: new Date() };
+
+    const sessionQuery = Session.findOne(query);
+
+    if (options.lean) {
+      return await sessionQuery.lean();
+    }
+
+    return await sessionQuery.exec();
+  } catch (error) {
+    logger.error('[findSession] Error finding session:', error);
+    throw new SessionError('Failed to find session', 'FIND_SESSION_FAILED');
+  }
+};
+
+/**
+ * Updates session expiration
+ * @param {Session|string} session - The session or session ID to update
+ * @param {Date} [newExpiration] - Optional new expiration date
+ * @returns {Promise<Session>}
+ * @throws {SessionError}
+ */
+const updateExpiration = async (session, newExpiration) => {
+  try {
+    const sessionDoc = typeof session === 'string' ? await Session.findById(session) : session;
+
+    if (!sessionDoc) {
+      throw new SessionError('Session not found', 'SESSION_NOT_FOUND');
+    }
+
+    sessionDoc.expiration = newExpiration || new Date(Date.now() + expires);
+    return await sessionDoc.save();
+  } catch (error) {
+    logger.error('[updateExpiration] Error updating session:', error);
+    throw new SessionError('Failed to update session expiration', 'UPDATE_EXPIRATION_FAILED');
+  }
+};
+
+/**
+ * Deletes a session by refresh token or session ID
+ * @param {Object} params - Delete parameters
+ * @param {string} [params.refreshToken] - The refresh token of the session to delete
+ * @param {string} [params.sessionId] - The ID of the session to delete
+ * @returns {Promise<Object>}
+ * @throws {SessionError}
+ */
+const deleteSession = async (params) => {
+  try {
+    if (!params.refreshToken && !params.sessionId) {
+      throw new SessionError(
+        'Either refreshToken or sessionId is required',
+        'INVALID_DELETE_PARAMS',
+      );
+    }
+
+    const query = {};
+
+    if (params.refreshToken) {
+      query.refreshTokenHash = await hashToken(params.refreshToken);
+    }
+
+    if (params.sessionId) {
+      query._id = params.sessionId;
+    }
+
+    const result = await Session.deleteOne(query);
+
+    if (result.deletedCount === 0) {
+      logger.warn('[deleteSession] No session found to delete');
+    }
+
+    return result;
+  } catch (error) {
+    logger.error('[deleteSession] Error deleting session:', error);
+    throw new SessionError('Failed to delete session', 'DELETE_SESSION_FAILED');
+  }
+};
+
+/**
+ * Deletes all sessions for a user
+ * @param {string} userId - The ID of the user
+ * @param {Object} [options] - Additional options
+ * @param {boolean} [options.excludeCurrentSession] - Whether to exclude the current session
+ * @param {string} [options.currentSessionId] - The ID of the current session to exclude
+ * @returns {Promise<Object>}
+ * @throws {SessionError}
+ */
+const deleteAllUserSessions = async (userId, options = {}) => {
+  try {
+    if (!userId) {
+      throw new SessionError('User ID is required', 'INVALID_USER_ID');
+    }
+
+    // Extract userId if it's passed as an object
+    const userIdString = userId.userId || userId;
+
+    if (!mongoose.Types.ObjectId.isValid(userIdString)) {
+      throw new SessionError('Invalid user ID format', 'INVALID_USER_ID_FORMAT');
+    }
+
+    const query = { user: userIdString };
+
+    if (options.excludeCurrentSession && options.currentSessionId) {
+      query._id = { $ne: options.currentSessionId };
+    }
+
+    const result = await Session.deleteMany(query);
+
+    if (result.deletedCount > 0) {
+      logger.debug(
+        `[deleteAllUserSessions] Deleted ${result.deletedCount} sessions for user ${userIdString}.`,
+      );
+    }
+
+    return result;
+  } catch (error) {
+    logger.error('[deleteAllUserSessions] Error deleting user sessions:', error);
+    throw new SessionError('Failed to delete user sessions', 'DELETE_ALL_SESSIONS_FAILED');
+  }
+};
+
+/**
+ * Generates a refresh token for a session
+ * @param {Session} session - The session to generate a token for
+ * @returns {Promise<string>}
+ * @throws {SessionError}
+ */
+const generateRefreshToken = async (session) => {
+  if (!session || !session.user) {
+    throw new SessionError('Invalid session object', 'INVALID_SESSION');
+  }
+
+  try {
+    const expiresIn = session.expiration ? session.expiration.getTime() : Date.now() + expires;
+
+    if (!session.expiration) {
+      session.expiration = new Date(expiresIn);
+    }
+
+    const refreshToken = await signPayload({
+      payload: {
+        id: session.user,
+        sessionId: session._id,
+      },
+      secret: process.env.JWT_REFRESH_SECRET,
+      expirationTime: Math.floor((expiresIn - Date.now()) / 1000),
+    });
+
+    session.refreshTokenHash = await hashToken(refreshToken);
+    await session.save();
+
+    return refreshToken;
+  } catch (error) {
+    logger.error('[generateRefreshToken] Error generating refresh token:', error);
+    throw new SessionError('Failed to generate refresh token', 'GENERATE_TOKEN_FAILED');
+  }
+};
+
+/**
+ * Counts active sessions for a user
+ * @param {string} userId - The ID of the user
+ * @returns {Promise<number>}
+ * @throws {SessionError}
+ */
+const countActiveSessions = async (userId) => {
+  try {
+    if (!userId) {
+      throw new SessionError('User ID is required', 'INVALID_USER_ID');
+    }
+
+    return await Session.countDocuments({
+      user: userId,
+      expiration: { $gt: new Date() },
+    });
+  } catch (error) {
+    logger.error('[countActiveSessions] Error counting active sessions:', error);
+    throw new SessionError('Failed to count active sessions', 'COUNT_SESSIONS_FAILED');
+  }
+};
+
+module.exports = {
+  createSession,
+  findSession,
+  updateExpiration,
+  deleteSession,
+  deleteAllUserSessions,
+  generateRefreshToken,
+  countActiveSessions,
+  SessionError,
+};
--- a/api/models/Share.js
+++ b/api/models/Share.js
@@ -1,11 +1,9 @@
 const { nanoid } = require('nanoid');
-const mongoose = require('mongoose');
 const { Constants } = require('librechat-data-provider');
-const { logger } = require('@librechat/data-schemas');
+const { Conversation } = require('~/models/Conversation');
+const SharedLink = require('./schema/shareSchema');
 const { getMessages } = require('./Message');
-
-const Conversation = require('~/db/models').Conversation;
-const SharedLink = require('~/db/models').SharedLink;
+const logger = require('~/config/winston');

 class ShareServiceError extends Error {
  constructor(message, code) {
@@ -52,14 +50,6 @@ function anonymizeMessages(messages, newConvoId) {
    const newMessageId = anonymizeMessageId(message.messageId);
    idMap.set(message.messageId, newMessageId);

-    const anonymizedAttachments = message.attachments?.map((attachment) => {
-      return {
-        ...attachment,
-        messageId: newMessageId,
-        conversationId: newConvoId,
-      };
-    });
-
    return {
      ...message,
      messageId: newMessageId,
@@ -69,7 +59,6 @@ function anonymizeMessages(messages, newConvoId) {
      model: message.model?.startsWith('asst_')
        ? anonymizeAssistantId(message.model)
        : message.model,
-      attachments: anonymizedAttachments,
    };
  });
 }
@@ -202,6 +191,7 @@ async function createSharedLink(user, conversationId) {
  if (!user || !conversationId) {
    throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
  }
+
  try {
    const [existingShare, conversationMessages] = await Promise.all([
      SharedLink.findOne({ conversationId, isPublic: true }).select('-_id -__v -user').lean(),
@@ -339,6 +329,7 @@ async function deleteSharedLink(user, shareId) {
 }

 module.exports = {
+  SharedLink,
  getSharedLink,
  getSharedLinks,
  createSharedLink,
--- a/api/models/Token.js
+++ b/api/models/Token.js
@@ -1,5 +1,158 @@
-const { findToken, updateToken, createToken } = require('~/models');
+const mongoose = require('mongoose');
 const { encryptV2 } = require('~/server/utils/crypto');
+const tokenSchema = require('./schema/tokenSchema');
+const { logger } = require('~/config');
+
+/**
+ * Token model.
+ * @type {mongoose.Model}
+ */
+const Token = mongoose.model('Token', tokenSchema);
+/**
+ * Fixes the indexes for the Token collection from legacy TTL indexes to the new expiresAt index.
+ */
+async function fixIndexes() {
+  try {
+    if (
+      process.env.NODE_ENV === 'CI' ||
+      process.env.NODE_ENV === 'development' ||
+      process.env.NODE_ENV === 'test'
+    ) {
+      return;
+    }
+    const indexes = await Token.collection.indexes();
+    logger.debug('Existing Token Indexes:', JSON.stringify(indexes, null, 2));
+    const unwantedTTLIndexes = indexes.filter(
+      (index) => index.key.createdAt === 1 && index.expireAfterSeconds !== undefined,
+    );
+    if (unwantedTTLIndexes.length === 0) {
+      logger.debug('No unwanted Token indexes found.');
+      return;
+    }
+    for (const index of unwantedTTLIndexes) {
+      logger.debug(`Dropping unwanted Token index: ${index.name}`);
+      await Token.collection.dropIndex(index.name);
+      logger.debug(`Dropped Token index: ${index.name}`);
+    }
+    logger.debug('Token index cleanup completed successfully.');
+  } catch (error) {
+    logger.error('An error occurred while fixing Token indexes:', error);
+  }
+}
+
+fixIndexes();
+
+/**
+ * Creates a new Token instance.
+ * @param {Object} tokenData - The data for the new Token.
+ * @param {mongoose.Types.ObjectId} tokenData.userId - The user's ID. It is required.
+ * @param {String} tokenData.email - The user's email.
+ * @param {String} tokenData.token - The token. It is required.
+ * @param {Number} tokenData.expiresIn - The number of seconds until the token expires.
+ * @returns {Promise<mongoose.Document>} The new Token instance.
+ * @throws Will throw an error if token creation fails.
+ */
+async function createToken(tokenData) {
+  try {
+    const currentTime = new Date();
+    const expiresAt = new Date(currentTime.getTime() + tokenData.expiresIn * 1000);
+
+    const newTokenData = {
+      ...tokenData,
+      createdAt: currentTime,
+      expiresAt,
+    };
+
+    return await Token.create(newTokenData);
+  } catch (error) {
+    logger.debug('An error occurred while creating token:', error);
+    throw error;
+  }
+}
+
+/**
+ * Finds a Token document that matches the provided query.
+ * @param {Object} query - The query to match against.
+ * @param {mongoose.Types.ObjectId|String} query.userId - The ID of the user.
+ * @param {String} query.token - The token value.
+ * @param {String} [query.email] - The email of the user.
+ * @param {String} [query.identifier] - Unique, alternative identifier for the token.
+ * @returns {Promise<Object|null>} The matched Token document, or null if not found.
+ * @throws Will throw an error if the find operation fails.
+ */
+async function findToken(query) {
+  try {
+    const conditions = [];
+
+    if (query.userId) {
+      conditions.push({ userId: query.userId });
+    }
+    if (query.token) {
+      conditions.push({ token: query.token });
+    }
+    if (query.email) {
+      conditions.push({ email: query.email });
+    }
+    if (query.identifier) {
+      conditions.push({ identifier: query.identifier });
+    }
+
+    const token = await Token.findOne({
+      $and: conditions,
+    }).lean();
+
+    return token;
+  } catch (error) {
+    logger.debug('An error occurred while finding token:', error);
+    throw error;
+  }
+}
+
+/**
+ * Updates a Token document that matches the provided query.
+ * @param {Object} query - The query to match against.
+ * @param {mongoose.Types.ObjectId|String} query.userId - The ID of the user.
+ * @param {String} query.token - The token value.
+ * @param {String} [query.email] - The email of the user.
+ * @param {String} [query.identifier] - Unique, alternative identifier for the token.
+ * @param {Object} updateData - The data to update the Token with.
+ * @returns {Promise<mongoose.Document|null>} The updated Token document, or null if not found.
+ * @throws Will throw an error if the update operation fails.
+ */
+async function updateToken(query, updateData) {
+  try {
+    return await Token.findOneAndUpdate(query, updateData, { new: true });
+  } catch (error) {
+    logger.debug('An error occurred while updating token:', error);
+    throw error;
+  }
+}
+
+/**
+ * Deletes all Token documents that match the provided token, user ID, or email.
+ * @param {Object} query - The query to match against.
+ * @param {mongoose.Types.ObjectId|String} query.userId - The ID of the user.
+ * @param {String} query.token - The token value.
+ * @param {String} [query.email] - The email of the user.
+ * @param {String} [query.identifier] - Unique, alternative identifier for the token.
+ * @returns {Promise<Object>} The result of the delete operation.
+ * @throws Will throw an error if the delete operation fails.
+ */
+async function deleteTokens(query) {
+  try {
+    return await Token.deleteMany({
+      $or: [
+        { userId: query.userId },
+        { token: query.token },
+        { email: query.email },
+        { identifier: query.identifier },
+      ],
+    });
+  } catch (error) {
+    logger.debug('An error occurred while deleting tokens:', error);
+    throw error;
+  }
+}

 /**
 * Handles the OAuth token by creating or updating the token.
@@ -38,5 +191,9 @@ async function handleOAuthToken({
 }

 module.exports = {
+  findToken,
+  createToken,
+  updateToken,
+  deleteTokens,
  handleOAuthToken,
 };
--- a/api/models/ToolCall.js
+++ b/api/models/ToolCall.js
@@ -1,11 +1,9 @@
-const mongoose = require('mongoose');
-
-const ToolCall = require('~/db/models').ToolCall;
+const ToolCall = require('./schema/toolCallSchema');

 /**
 * Create a new tool call
- * @param {IToolCallData} toolCallData - The tool call data
- * @returns {Promise<IToolCallData>} The created tool call document
+ * @param {ToolCallData} toolCallData - The tool call data
+ * @returns {Promise<ToolCallData>} The created tool call document
 */
 async function createToolCall(toolCallData) {
  try {
@@ -18,7 +16,7 @@ async function createToolCall(toolCallData) {
 /**
 * Get a tool call by ID
 * @param {string} id - The tool call document ID
- * @returns {Promise<IToolCallData|null>} The tool call document or null if not found
+ * @returns {Promise<ToolCallData|null>} The tool call document or null if not found
 */
 async function getToolCallById(id) {
  try {
@@ -46,7 +44,7 @@ async function getToolCallsByMessage(messageId, userId) {
 * Get tool calls by conversation ID and user
 * @param {string} conversationId - The conversation ID
 * @param {string} userId - The user's ObjectId
- * @returns {Promise<IToolCallData[]>} Array of tool call documents
+ * @returns {Promise<ToolCallData[]>} Array of tool call documents
 */
 async function getToolCallsByConvo(conversationId, userId) {
  try {
@@ -59,8 +57,8 @@ async function getToolCallsByConvo(conversationId, userId) {
 /**
 * Update a tool call
 * @param {string} id - The tool call document ID
- * @param {Partial<IToolCallData>} updateData - The data to update
- * @returns {Promise<IToolCallData|null>} The updated tool call document or null if not found
+ * @param {Partial<ToolCallData>} updateData - The data to update
+ * @returns {Promise<ToolCallData|null>} The updated tool call document or null if not found
 */
 async function updateToolCall(id, updateData) {
  try {
--- a/api/models/Transaction.js
+++ b/api/models/Transaction.js
@@ -1,322 +1,171 @@
 const mongoose = require('mongoose');
-const { logger } = require('@librechat/data-schemas');
-const { getBalanceConfig } = require('~/server/services/Config');
+const { isEnabled } = require('~/server/utils/handleText');
+const transactionSchema = require('./schema/transaction');
 const { getMultiplier, getCacheMultiplier } = require('./tx');
-
-const Transaction = require('~/db/models').Transaction;
-const Balance = require('~/db/models').Balance;
-
+const { logger } = require('~/config');
+const Balance = require('./Balance');
 const cancelRate = 1.15;

-/**
- * Updates a user's token balance based on a transaction using optimistic concurrency control
- * without schema changes. Compatible with DocumentDB.
- * @async
- * @function
- * @param {Object} params - The function parameters.
- * @param {string|mongoose.Types.ObjectId} params.user - The user ID.
- * @param {number} params.incrementValue - The value to increment the balance by (can be negative).
- * @param {import('mongoose').UpdateQuery<import('@librechat/data-schemas').IBalance>['$set']} [params.setValues] - Optional additional fields to set.
- * @returns {Promise<Object>} Returns the updated balance document (lean).
- * @throws {Error} Throws an error if the update fails after multiple retries.
- */
-const updateBalance = async ({ user, incrementValue, setValues }) => {
-  let maxRetries = 10; // Number of times to retry on conflict
-  let delay = 50; // Initial retry delay in ms
-  let lastError = null;
-
-  for (let attempt = 1; attempt <= maxRetries; attempt++) {
-    let currentBalanceDoc;
-    try {
-      // 1. Read the current document state
-      currentBalanceDoc = await Balance.findOne({ user }).lean();
-      const currentCredits = currentBalanceDoc ? currentBalanceDoc.tokenCredits : 0;
-
-      // 2. Calculate the desired new state
-      const potentialNewCredits = currentCredits + incrementValue;
-      const newCredits = Math.max(0, potentialNewCredits); // Ensure balance doesn't go below zero
-
-      // 3. Prepare the update payload
-      const updatePayload = {
-        $set: {
-          tokenCredits: newCredits,
-          ...(setValues || {}), // Merge other values to set
-        },
-      };
-
-      // 4. Attempt the conditional update or upsert
-      let updatedBalance = null;
-      if (currentBalanceDoc) {
-        // --- Document Exists: Perform Conditional Update ---
-        // Try to update only if the tokenCredits match the value we read (currentCredits)
-        updatedBalance = await Balance.findOneAndUpdate(
-          {
-            user: user,
-            tokenCredits: currentCredits, // Optimistic lock: condition based on the read value
-          },
-          updatePayload,
-          {
-            new: true, // Return the modified document
-            // lean: true, // .lean() is applied after query execution in Mongoose >= 6
-          },
-        ).lean(); // Use lean() for plain JS object
-
-        if (updatedBalance) {
-          // Success! The update was applied based on the expected current state.
-          return updatedBalance;
-        }
-        // If updatedBalance is null, it means tokenCredits changed between read and write (conflict).
-        lastError = new Error(`Concurrency conflict for user ${user} on attempt ${attempt}.`);
-        // Proceed to retry logic below.
-      } else {
-        // --- Document Does Not Exist: Perform Conditional Upsert ---
-        // Try to insert the document, but only if it still doesn't exist.
-        // Using tokenCredits: {$exists: false} helps prevent race conditions where
-        // another process creates the doc between our findOne and findOneAndUpdate.
-        try {
-          updatedBalance = await Balance.findOneAndUpdate(
-            {
-              user: user,
-              // Attempt to match only if the document doesn't exist OR was just created
-              // without tokenCredits (less likely but possible). A simple { user } filter
-              // might also work, relying on the retry for conflicts.
-              // Let's use a simpler filter and rely on retry for races.
-              // tokenCredits: { $exists: false } // This condition might be too strict if doc exists with 0 credits
-            },
-            updatePayload,
-            {
-              upsert: true, // Create if doesn't exist
-              new: true, // Return the created/updated document
-              // setDefaultsOnInsert: true, // Ensure schema defaults are applied on insert
-              // lean: true,
-            },
-          ).lean();
-
-          if (updatedBalance) {
-            // Upsert succeeded (likely created the document)
-            return updatedBalance;
-          }
-          // If null, potentially a rare race condition during upsert. Retry should handle it.
-          lastError = new Error(
-            `Upsert race condition suspected for user ${user} on attempt ${attempt}.`,
-          );
-        } catch (error) {
-          if (error.code === 11000) {
-            // E11000 duplicate key error on index
-            // This means another process created the document *just* before our upsert.
-            // It's a concurrency conflict during creation. We should retry.
-            lastError = error; // Store the error
-            // Proceed to retry logic below.
-          } else {
-            // Different error, rethrow
-            throw error;
-          }
-        }
-      } // End if/else (document exists?)
-    } catch (error) {
-      // Catch errors from findOne or unexpected findOneAndUpdate errors
-      logger.error(`[updateBalance] Error during attempt ${attempt} for user ${user}:`, error);
-      lastError = error; // Store the error
-      // Consider stopping retries for non-transient errors, but for now, we retry.
-    }
-
-    // If we reached here, it means the update failed (conflict or error), wait and retry
-    if (attempt < maxRetries) {
-      const jitter = Math.random() * delay * 0.5; // Add jitter to delay
-      await new Promise((resolve) => setTimeout(resolve, delay + jitter));
-      delay = Math.min(delay * 2, 2000); // Exponential backoff with cap
-    }
-  } // End for loop (retries)
-
-  // If loop finishes without success, throw the last encountered error or a generic one
-  logger.error(
-    `[updateBalance] Failed to update balance for user ${user} after ${maxRetries} attempts.`,
-  );
-  throw (
-    lastError ||
-    new Error(
-      `Failed to update balance for user ${user} after maximum retries due to persistent conflicts.`,
-    )
-  );
-};
-
 /** Method to calculate and set the tokenValue for a transaction */
-function calculateTokenValue(txn) {
-  if (!txn.valueKey || !txn.tokenType) {
-    txn.tokenValue = txn.rawAmount;
+transactionSchema.methods.calculateTokenValue = function () {
+  if (!this.valueKey || !this.tokenType) {
+    this.tokenValue = this.rawAmount;
  }
-  const { valueKey, tokenType, model, endpointTokenConfig } = txn;
+  const { valueKey, tokenType, model, endpointTokenConfig } = this;
  const multiplier = Math.abs(getMultiplier({ valueKey, tokenType, model, endpointTokenConfig }));
-  txn.rate = multiplier;
-  txn.tokenValue = txn.rawAmount * multiplier;
-  if (txn.context && txn.tokenType === 'completion' && txn.context === 'incomplete') {
-    txn.tokenValue = Math.ceil(txn.tokenValue * cancelRate);
-    txn.rate *= cancelRate;
+  this.rate = multiplier;
+  this.tokenValue = this.rawAmount * multiplier;
+  if (this.context && this.tokenType === 'completion' && this.context === 'incomplete') {
+    this.tokenValue = Math.ceil(this.tokenValue * cancelRate);
+    this.rate *= cancelRate;
  }
-}
-
-/**
- * New static method to create an auto-refill transaction that does NOT trigger a balance update.
- * @param {object} txData - Transaction data.
- * @param {string} txData.user - The user ID.
- * @param {string} txData.tokenType - The type of token.
- * @param {string} txData.context - The context of the transaction.
- * @param {number} txData.rawAmount - The raw amount of tokens.
- * @returns {Promise<object>} - The created transaction.
- */
-async function createAutoRefillTransaction(txData) {
-  if (txData.rawAmount != null && isNaN(txData.rawAmount)) {
-    return;
-  }
-  const transaction = new Transaction(txData);
-  transaction.endpointTokenConfig = txData.endpointTokenConfig;
-  calculateTokenValue(transaction);
-  await transaction.save();
-
-  const balanceResponse = await updateBalance({
-    user: transaction.user,
-    incrementValue: txData.rawAmount,
-    setValues: { lastRefill: new Date() },
-  });
-  const result = {
-    rate: transaction.rate,
-    user: transaction.user.toString(),
-    balance: balanceResponse.tokenCredits,
-  };
-  logger.debug('[Balance.check] Auto-refill performed', result);
-  result.transaction = transaction;
-  return result;
-}
+};

 /**
 * Static method to create a transaction and update the balance
 * @param {txData} txData - Transaction data.
 */
-async function createTransaction(txData) {
+transactionSchema.statics.create = async function (txData) {
+  const Transaction = this;
  if (txData.rawAmount != null && isNaN(txData.rawAmount)) {
    return;
  }

  const transaction = new Transaction(txData);
  transaction.endpointTokenConfig = txData.endpointTokenConfig;
-  calculateTokenValue(transaction);
+  transaction.calculateTokenValue();

  await transaction.save();

-  const balance = await getBalanceConfig();
-  if (!balance?.enabled) {
+  if (!isEnabled(process.env.CHECK_BALANCE)) {
    return;
  }

+  let balance = await Balance.findOne({ user: transaction.user }).lean();
  let incrementValue = transaction.tokenValue;
-  const balanceResponse = await updateBalance({
-    user: transaction.user,
-    incrementValue,
-  });
+
+  if (balance && balance?.tokenCredits + incrementValue < 0) {
+    incrementValue = -balance.tokenCredits;
+  }
+
+  balance = await Balance.findOneAndUpdate(
+    { user: transaction.user },
+    { $inc: { tokenCredits: incrementValue } },
+    { upsert: true, new: true },
+  ).lean();

  return {
    rate: transaction.rate,
    user: transaction.user.toString(),
-    balance: balanceResponse.tokenCredits,
+    balance: balance.tokenCredits,
    [transaction.tokenType]: incrementValue,
  };
-}
+};

 /**
 * Static method to create a structured transaction and update the balance
 * @param {txData} txData - Transaction data.
 */
-async function createStructuredTransaction(txData) {
+transactionSchema.statics.createStructured = async function (txData) {
+  const Transaction = this;
+
  const transaction = new Transaction({
    ...txData,
    endpointTokenConfig: txData.endpointTokenConfig,
  });

-  calculateStructuredTokenValue(transaction);
+  transaction.calculateStructuredTokenValue();

  await transaction.save();

-  const balance = await getBalanceConfig();
-  if (!balance?.enabled) {
+  if (!isEnabled(process.env.CHECK_BALANCE)) {
    return;
  }

+  let balance = await Balance.findOne({ user: transaction.user }).lean();
  let incrementValue = transaction.tokenValue;

-  const balanceResponse = await updateBalance({
-    user: transaction.user,
-    incrementValue,
-  });
+  if (balance && balance?.tokenCredits + incrementValue < 0) {
+    incrementValue = -balance.tokenCredits;
+  }
+
+  balance = await Balance.findOneAndUpdate(
+    { user: transaction.user },
+    { $inc: { tokenCredits: incrementValue } },
+    { upsert: true, new: true },
+  ).lean();

  return {
    rate: transaction.rate,
    user: transaction.user.toString(),
-    balance: balanceResponse.tokenCredits,
+    balance: balance.tokenCredits,
    [transaction.tokenType]: incrementValue,
  };
-}
+};

 /** Method to calculate token value for structured tokens */
-function calculateStructuredTokenValue(txn) {
-  if (!txn.tokenType) {
-    txn.tokenValue = txn.rawAmount;
+transactionSchema.methods.calculateStructuredTokenValue = function () {
+  if (!this.tokenType) {
+    this.tokenValue = this.rawAmount;
    return;
  }

-  const { model, endpointTokenConfig } = txn;
+  const { model, endpointTokenConfig } = this;

-  if (txn.tokenType === 'prompt') {
+  if (this.tokenType === 'prompt') {
    const inputMultiplier = getMultiplier({ tokenType: 'prompt', model, endpointTokenConfig });
    const writeMultiplier =
      getCacheMultiplier({ cacheType: 'write', model, endpointTokenConfig }) ?? inputMultiplier;
    const readMultiplier =
      getCacheMultiplier({ cacheType: 'read', model, endpointTokenConfig }) ?? inputMultiplier;

-    txn.rateDetail = {
+    this.rateDetail = {
      input: inputMultiplier,
      write: writeMultiplier,
      read: readMultiplier,
    };

    const totalPromptTokens =
-      Math.abs(txn.inputTokens || 0) +
-      Math.abs(txn.writeTokens || 0) +
-      Math.abs(txn.readTokens || 0);
+      Math.abs(this.inputTokens || 0) +
+      Math.abs(this.writeTokens || 0) +
+      Math.abs(this.readTokens || 0);

    if (totalPromptTokens > 0) {
-      txn.rate =
-        (Math.abs(inputMultiplier * (txn.inputTokens || 0)) +
-          Math.abs(writeMultiplier * (txn.writeTokens || 0)) +
-          Math.abs(readMultiplier * (txn.readTokens || 0))) /
+      this.rate =
+        (Math.abs(inputMultiplier * (this.inputTokens || 0)) +
+          Math.abs(writeMultiplier * (this.writeTokens || 0)) +
+          Math.abs(readMultiplier * (this.readTokens || 0))) /
        totalPromptTokens;
    } else {
-      txn.rate = Math.abs(inputMultiplier); // Default to input rate if no tokens
+      this.rate = Math.abs(inputMultiplier); // Default to input rate if no tokens
    }

-    txn.tokenValue = -(
-      Math.abs(txn.inputTokens || 0) * inputMultiplier +
-      Math.abs(txn.writeTokens || 0) * writeMultiplier +
-      Math.abs(txn.readTokens || 0) * readMultiplier
+    this.tokenValue = -(
+      Math.abs(this.inputTokens || 0) * inputMultiplier +
+      Math.abs(this.writeTokens || 0) * writeMultiplier +
+      Math.abs(this.readTokens || 0) * readMultiplier
    );

-    txn.rawAmount = -totalPromptTokens;
-  } else if (txn.tokenType === 'completion') {
-    const multiplier = getMultiplier({ tokenType: txn.tokenType, model, endpointTokenConfig });
-    txn.rate = Math.abs(multiplier);
-    txn.tokenValue = -Math.abs(txn.rawAmount) * multiplier;
-    txn.rawAmount = -Math.abs(txn.rawAmount);
+    this.rawAmount = -totalPromptTokens;
+  } else if (this.tokenType === 'completion') {
+    const multiplier = getMultiplier({ tokenType: this.tokenType, model, endpointTokenConfig });
+    this.rate = Math.abs(multiplier);
+    this.tokenValue = -Math.abs(this.rawAmount) * multiplier;
+    this.rawAmount = -Math.abs(this.rawAmount);
  }

-  if (txn.context && txn.tokenType === 'completion' && txn.context === 'incomplete') {
-    txn.tokenValue = Math.ceil(txn.tokenValue * cancelRate);
-    txn.rate *= cancelRate;
-    if (txn.rateDetail) {
-      txn.rateDetail = Object.fromEntries(
-        Object.entries(txn.rateDetail).map(([k, v]) => [k, v * cancelRate]),
+  if (this.context && this.tokenType === 'completion' && this.context === 'incomplete') {
+    this.tokenValue = Math.ceil(this.tokenValue * cancelRate);
+    this.rate *= cancelRate;
+    if (this.rateDetail) {
+      this.rateDetail = Object.fromEntries(
+        Object.entries(this.rateDetail).map(([k, v]) => [k, v * cancelRate]),
      );
    }
  }
-}
+};
+
+const Transaction = mongoose.model('Transaction', transactionSchema);

 /**
 * Queries and retrieves transactions based on a given filter.
@@ -335,9 +184,4 @@ async function getTransactions(filter) {
  }
 }

-module.exports = {
-  getTransactions,
-  createTransaction,
-  createAutoRefillTransaction,
-  createStructuredTransaction,
-};
+module.exports = { Transaction, getTransactions };
--- a/api/models/Transaction.spec.js
+++ b/api/models/Transaction.spec.js
@@ -1,15 +1,12 @@
 const mongoose = require('mongoose');
 const { MongoMemoryServer } = require('mongodb-memory-server');
+const { Transaction } = require('./Transaction');
+const Balance = require('./Balance');
 const { spendTokens, spendStructuredTokens } = require('./spendTokens');
-const { getBalanceConfig } = require('~/server/services/Config');
 const { getMultiplier, getCacheMultiplier } = require('./tx');
-const { createTransaction } = require('./Transaction');
-const Balance = require('~/db/models').Balance;
-
-// Mock the custom config module so we can control the balance flag.
-jest.mock('~/server/services/Config');

 let mongoServer;
+
 beforeAll(async () => {
  mongoServer = await MongoMemoryServer.create();
  const mongoUri = mongoServer.getUri();
@@ -23,8 +20,6 @@ afterAll(async () => {

 beforeEach(async () => {
  await mongoose.connection.dropDatabase();
-  // Default: enable balance updates in tests.
-  getBalanceConfig.mockResolvedValue({ enabled: true });
 });

 describe('Regular Token Spending Tests', () => {
@@ -49,22 +44,34 @@ describe('Regular Token Spending Tests', () => {
    };

    // Act
+    process.env.CHECK_BALANCE = 'true';
    await spendTokens(txData, tokenUsage);

    // Assert
+    console.log('Initial Balance:', initialBalance);
+
    const updatedBalance = await Balance.findOne({ user: userId });
+    console.log('Updated Balance:', updatedBalance.tokenCredits);
+
    const promptMultiplier = getMultiplier({ model, tokenType: 'prompt' });
    const completionMultiplier = getMultiplier({ model, tokenType: 'completion' });
-    const expectedTotalCost = 100 * promptMultiplier + 50 * completionMultiplier;
+
+    const expectedPromptCost = tokenUsage.promptTokens * promptMultiplier;
+    const expectedCompletionCost = tokenUsage.completionTokens * completionMultiplier;
+    const expectedTotalCost = expectedPromptCost + expectedCompletionCost;
    const expectedBalance = initialBalance - expectedTotalCost;

+    expect(updatedBalance.tokenCredits).toBeLessThan(initialBalance);
    expect(updatedBalance.tokenCredits).toBeCloseTo(expectedBalance, 0);
+
+    console.log('Expected Total Cost:', expectedTotalCost);
+    console.log('Actual Balance Decrease:', initialBalance - updatedBalance.tokenCredits);
  });

  test('spendTokens should handle zero completion tokens', async () => {
    // Arrange
    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 10000000;
+    const initialBalance = 10000000; // $10.00
    await Balance.create({ user: userId, tokenCredits: initialBalance });

    const model = 'gpt-3.5-turbo';
@@ -82,19 +89,24 @@ describe('Regular Token Spending Tests', () => {
    };

    // Act
+    process.env.CHECK_BALANCE = 'true';
    await spendTokens(txData, tokenUsage);

    // Assert
    const updatedBalance = await Balance.findOne({ user: userId });
+
    const promptMultiplier = getMultiplier({ model, tokenType: 'prompt' });
-    const expectedCost = 100 * promptMultiplier;
+    const expectedCost = tokenUsage.promptTokens * promptMultiplier;
    expect(updatedBalance.tokenCredits).toBeCloseTo(initialBalance - expectedCost, 0);
+
+    console.log('Initial Balance:', initialBalance);
+    console.log('Updated Balance:', updatedBalance.tokenCredits);
+    console.log('Expected Cost:', expectedCost);
  });

  test('spendTokens should handle undefined token counts', async () => {
-    // Arrange
    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 10000000;
+    const initialBalance = 10000000; // $10.00
    await Balance.create({ user: userId, tokenCredits: initialBalance });

    const model = 'gpt-3.5-turbo';
@@ -108,17 +120,14 @@ describe('Regular Token Spending Tests', () => {

    const tokenUsage = {};

-    // Act
    const result = await spendTokens(txData, tokenUsage);

-    // Assert: No transaction should be created
    expect(result).toBeUndefined();
  });

  test('spendTokens should handle only prompt tokens', async () => {
-    // Arrange
    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 10000000;
+    const initialBalance = 10000000; // $10.00
    await Balance.create({ user: userId, tokenCredits: initialBalance });

    const model = 'gpt-3.5-turbo';
@@ -132,44 +141,14 @@ describe('Regular Token Spending Tests', () => {

    const tokenUsage = { promptTokens: 100 };

-    // Act
    await spendTokens(txData, tokenUsage);

-    // Assert
    const updatedBalance = await Balance.findOne({ user: userId });
+
    const promptMultiplier = getMultiplier({ model, tokenType: 'prompt' });
    const expectedCost = 100 * promptMultiplier;
    expect(updatedBalance.tokenCredits).toBeCloseTo(initialBalance - expectedCost, 0);
  });
-
-  test('spendTokens should not update balance when balance feature is disabled', async () => {
-    // Arrange: Override the config to disable balance updates.
-    getBalanceConfig.mockResolvedValue({ balance: { enabled: false } });
-    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 10000000;
-    await Balance.create({ user: userId, tokenCredits: initialBalance });
-
-    const model = 'gpt-3.5-turbo';
-    const txData = {
-      user: userId,
-      conversationId: 'test-conversation-id',
-      model,
-      context: 'test',
-      endpointTokenConfig: null,
-    };
-
-    const tokenUsage = {
-      promptTokens: 100,
-      completionTokens: 50,
-    };
-
-    // Act
-    await spendTokens(txData, tokenUsage);
-
-    // Assert: Balance should remain unchanged.
-    const updatedBalance = await Balance.findOne({ user: userId });
-    expect(updatedBalance.tokenCredits).toBe(initialBalance);
-  });
 });

 describe('Structured Token Spending Tests', () => {
@@ -185,7 +164,7 @@ describe('Structured Token Spending Tests', () => {
      conversationId: 'c23a18da-706c-470a-ac28-ec87ed065199',
      model,
      context: 'message',
-      endpointTokenConfig: null,
+      endpointTokenConfig: null, // We'll use the default rates
    };

    const tokenUsage = {
@@ -197,15 +176,28 @@ describe('Structured Token Spending Tests', () => {
      completionTokens: 5,
    };

+    // Get the actual multipliers
    const promptMultiplier = getMultiplier({ model, tokenType: 'prompt' });
    const completionMultiplier = getMultiplier({ model, tokenType: 'completion' });
    const writeMultiplier = getCacheMultiplier({ model, cacheType: 'write' });
    const readMultiplier = getCacheMultiplier({ model, cacheType: 'read' });

+    console.log('Multipliers:', {
+      promptMultiplier,
+      completionMultiplier,
+      writeMultiplier,
+      readMultiplier,
+    });
+
    // Act
+    process.env.CHECK_BALANCE = 'true';
    const result = await spendStructuredTokens(txData, tokenUsage);

-    // Calculate expected costs.
+    // Assert
+    console.log('Initial Balance:', initialBalance);
+    console.log('Updated Balance:', result.completion.balance);
+    console.log('Transaction Result:', result);
+
    const expectedPromptCost =
      tokenUsage.promptTokens.input * promptMultiplier +
      tokenUsage.promptTokens.write * writeMultiplier +
@@ -214,21 +206,37 @@ describe('Structured Token Spending Tests', () => {
    const expectedTotalCost = expectedPromptCost + expectedCompletionCost;
    const expectedBalance = initialBalance - expectedTotalCost;

-    // Assert
+    console.log('Expected Cost:', expectedTotalCost);
+    console.log('Expected Balance:', expectedBalance);
+
    expect(result.completion.balance).toBeLessThan(initialBalance);
+
+    // Allow for a small difference (e.g., 100 token credits, which is $0.0001)
    const allowedDifference = 100;
    expect(Math.abs(result.completion.balance - expectedBalance)).toBeLessThan(allowedDifference);
+
+    // Check if the decrease is approximately as expected
    const balanceDecrease = initialBalance - result.completion.balance;
    expect(balanceDecrease).toBeCloseTo(expectedTotalCost, 0);

-    const expectedPromptTokenValue = -expectedPromptCost;
-    const expectedCompletionTokenValue = -expectedCompletionCost;
+    // Check token values
+    const expectedPromptTokenValue = -(
+      tokenUsage.promptTokens.input * promptMultiplier +
+      tokenUsage.promptTokens.write * writeMultiplier +
+      tokenUsage.promptTokens.read * readMultiplier
+    );
+    const expectedCompletionTokenValue = -tokenUsage.completionTokens * completionMultiplier;
+
    expect(result.prompt.prompt).toBeCloseTo(expectedPromptTokenValue, 1);
    expect(result.completion.completion).toBe(expectedCompletionTokenValue);
+
+    console.log('Expected prompt tokenValue:', expectedPromptTokenValue);
+    console.log('Actual prompt tokenValue:', result.prompt.prompt);
+    console.log('Expected completion tokenValue:', expectedCompletionTokenValue);
+    console.log('Actual completion tokenValue:', result.completion.completion);
  });

  test('should handle zero completion tokens in structured spending', async () => {
-    // Arrange
    const userId = new mongoose.Types.ObjectId();
    const initialBalance = 17613154.55;
    await Balance.create({ user: userId, tokenCredits: initialBalance });
@@ -250,17 +258,15 @@ describe('Structured Token Spending Tests', () => {
      completionTokens: 0,
    };

-    // Act
+    process.env.CHECK_BALANCE = 'true';
    const result = await spendStructuredTokens(txData, tokenUsage);

-    // Assert
    expect(result.prompt).toBeDefined();
    expect(result.completion).toBeUndefined();
    expect(result.prompt.prompt).toBeLessThan(0);
  });

  test('should handle only prompt tokens in structured spending', async () => {
-    // Arrange
    const userId = new mongoose.Types.ObjectId();
    const initialBalance = 17613154.55;
    await Balance.create({ user: userId, tokenCredits: initialBalance });
@@ -281,17 +287,15 @@ describe('Structured Token Spending Tests', () => {
      },
    };

-    // Act
+    process.env.CHECK_BALANCE = 'true';
    const result = await spendStructuredTokens(txData, tokenUsage);

-    // Assert
    expect(result.prompt).toBeDefined();
    expect(result.completion).toBeUndefined();
    expect(result.prompt.prompt).toBeLessThan(0);
  });

  test('should handle undefined token counts in structured spending', async () => {
-    // Arrange
    const userId = new mongoose.Types.ObjectId();
    const initialBalance = 17613154.55;
    await Balance.create({ user: userId, tokenCredits: initialBalance });
@@ -306,10 +310,9 @@ describe('Structured Token Spending Tests', () => {

    const tokenUsage = {};

-    // Act
+    process.env.CHECK_BALANCE = 'true';
    const result = await spendStructuredTokens(txData, tokenUsage);

-    // Assert
    expect(result).toEqual({
      prompt: undefined,
      completion: undefined,
@@ -317,7 +320,6 @@ describe('Structured Token Spending Tests', () => {
  });

  test('should handle incomplete context for completion tokens', async () => {
-    // Arrange
    const userId = new mongoose.Types.ObjectId();
    const initialBalance = 17613154.55;
    await Balance.create({ user: userId, tokenCredits: initialBalance });
@@ -339,18 +341,15 @@ describe('Structured Token Spending Tests', () => {
      completionTokens: 50,
    };

-    // Act
+    process.env.CHECK_BALANCE = 'true';
    const result = await spendStructuredTokens(txData, tokenUsage);

-    // Assert:
-    // (Assuming a multiplier for completion of 15 and a cancel rate of 1.15 as noted in the original test.)
-    expect(result.completion.completion).toBeCloseTo(-50 * 15 * 1.15, 0);
+    expect(result.completion.completion).toBeCloseTo(-50 * 15 * 1.15, 0); // Assuming multiplier is 15 and cancelRate is 1.15
  });
 });

 describe('NaN Handling Tests', () => {
  test('should skip transaction creation when rawAmount is NaN', async () => {
-    // Arrange
    const userId = new mongoose.Types.ObjectId();
    const initialBalance = 10000000;
    await Balance.create({ user: userId, tokenCredits: initialBalance });
@@ -366,11 +365,9 @@ describe('NaN Handling Tests', () => {
      tokenType: 'prompt',
    };

-    // Act
-    const result = await createTransaction(txData);
-
-    // Assert: No transaction should be created and balance remains unchanged.
+    const result = await Transaction.create(txData);
    expect(result).toBeUndefined();
+
    const balance = await Balance.findOne({ user: userId });
    expect(balance.tokenCredits).toBe(initialBalance);
  });
--- a/api/models/User.js
+++ b/api/models/User.js
@@ -0,0 +1,6 @@
+const mongoose = require('mongoose');
+const userSchema = require('~/models/schema/userSchema');
+
+const User = mongoose.model('User', userSchema);
+
+module.exports = User;
--- a/api/models/balanceMethods.js
+++ b/api/models/balanceMethods.js
@@ -1,158 +0,0 @@
-const mongoose = require('mongoose');
-const { logger } = require('@librechat/data-schemas');
-const { ViolationTypes } = require('librechat-data-provider');
-const { createAutoRefillTransaction } = require('./Transaction');
-const { logViolation } = require('~/cache');
-const { getMultiplier } = require('./tx');
-
-const Balance = require('~/db/models').Balance;
-
-function isInvalidDate(date) {
-  return isNaN(date);
-}
-
-/**
- * Simple check method that calculates token cost and returns balance info.
- * The auto-refill logic has been moved to balanceMethods.js to prevent circular dependencies.
- */
-const checkBalanceRecord = async function ({
-  user,
-  model,
-  endpoint,
-  valueKey,
-  tokenType,
-  amount,
-  endpointTokenConfig,
-}) {
-  const multiplier = getMultiplier({ valueKey, tokenType, model, endpoint, endpointTokenConfig });
-  const tokenCost = amount * multiplier;
-
-  // Retrieve the balance record
-  let record = await Balance.findOne({ user }).lean();
-  if (!record) {
-    logger.debug('[Balance.check] No balance record found for user', { user });
-    return {
-      canSpend: false,
-      balance: 0,
-      tokenCost,
-    };
-  }
-  let balance = record.tokenCredits;
-
-  logger.debug('[Balance.check] Initial state', {
-    user,
-    model,
-    endpoint,
-    valueKey,
-    tokenType,
-    amount,
-    balance,
-    multiplier,
-    endpointTokenConfig: !!endpointTokenConfig,
-  });
-
-  // Only perform auto-refill if spending would bring the balance to 0 or below
-  if (balance - tokenCost <= 0 && record.autoRefillEnabled && record.refillAmount > 0) {
-    const lastRefillDate = new Date(record.lastRefill);
-    const now = new Date();
-    if (
-      isInvalidDate(lastRefillDate) ||
-      now >=
-        addIntervalToDate(lastRefillDate, record.refillIntervalValue, record.refillIntervalUnit)
-    ) {
-      try {
-        /** @type {{ rate: number, user: string, balance: number, transaction: import('@librechat/data-schemas').ITransaction}} */
-        const result = await createAutoRefillTransaction({
-          user: user,
-          tokenType: 'credits',
-          context: 'autoRefill',
-          rawAmount: record.refillAmount,
-        });
-        balance = result.balance;
-      } catch (error) {
-        logger.error('[Balance.check] Failed to record transaction for auto-refill', error);
-      }
-    }
-  }
-
-  logger.debug('[Balance.check] Token cost', { tokenCost });
-  return { canSpend: balance >= tokenCost, balance, tokenCost };
-};
-
-/**
- * Adds a time interval to a given date.
- * @param {Date} date - The starting date.
- * @param {number} value - The numeric value of the interval.
- * @param {'seconds'|'minutes'|'hours'|'days'|'weeks'|'months'} unit - The unit of time.
- * @returns {Date} A new Date representing the starting date plus the interval.
- */
-const addIntervalToDate = (date, value, unit) => {
-  const result = new Date(date);
-  switch (unit) {
-    case 'seconds':
-      result.setSeconds(result.getSeconds() + value);
-      break;
-    case 'minutes':
-      result.setMinutes(result.getMinutes() + value);
-      break;
-    case 'hours':
-      result.setHours(result.getHours() + value);
-      break;
-    case 'days':
-      result.setDate(result.getDate() + value);
-      break;
-    case 'weeks':
-      result.setDate(result.getDate() + value * 7);
-      break;
-    case 'months':
-      result.setMonth(result.getMonth() + value);
-      break;
-    default:
-      break;
-  }
-  return result;
-};
-
-/**
- * Checks the balance for a user and determines if they can spend a certain amount.
- * If the user cannot spend the amount, it logs a violation and denies the request.
- *
- * @async
- * @function
- * @param {Object} params - The function parameters.
- * @param {Express.Request} params.req - The Express request object.
- * @param {Express.Response} params.res - The Express response object.
- * @param {Object} params.txData - The transaction data.
- * @param {string} params.txData.user - The user ID or identifier.
- * @param {('prompt' | 'completion')} params.txData.tokenType - The type of token.
- * @param {number} params.txData.amount - The amount of tokens.
- * @param {string} params.txData.model - The model name or identifier.
- * @param {string} [params.txData.endpointTokenConfig] - The token configuration for the endpoint.
- * @returns {Promise<boolean>} Throws error if the user cannot spend the amount.
- * @throws {Error} Throws an error if there's an issue with the balance check.
- */
-const checkBalance = async ({ req, res, txData }) => {
-  const { canSpend, balance, tokenCost } = await checkBalanceRecord(txData);
-  if (canSpend) {
-    return true;
-  }
-
-  const type = ViolationTypes.TOKEN_BALANCE;
-  const errorMessage = {
-    type,
-    balance,
-    tokenCost,
-    promptTokens: txData.amount,
-  };
-
-  if (txData.generations && txData.generations.length > 0) {
-    errorMessage.generations = txData.generations;
-  }
-
-  await logViolation(req, res, type, errorMessage, 0);
-  throw new Error(JSON.stringify(errorMessage));
-};
-
-module.exports = {
-  checkBalance,
-};
--- a/api/models/checkBalance.js
+++ b/api/models/checkBalance.js
@@ -0,0 +1,45 @@
+const { ViolationTypes } = require('librechat-data-provider');
+const { logViolation } = require('~/cache');
+const Balance = require('./Balance');
+/**
+ * Checks the balance for a user and determines if they can spend a certain amount.
+ * If the user cannot spend the amount, it logs a violation and denies the request.
+ *
+ * @async
+ * @function
+ * @param {Object} params - The function parameters.
+ * @param {Express.Request} params.req - The Express request object.
+ * @param {Express.Response} params.res - The Express response object.
+ * @param {Object} params.txData - The transaction data.
+ * @param {string} params.txData.user - The user ID or identifier.
+ * @param {('prompt' | 'completion')} params.txData.tokenType - The type of token.
+ * @param {number} params.txData.amount - The amount of tokens.
+ * @param {string} params.txData.model - The model name or identifier.
+ * @param {string} [params.txData.endpointTokenConfig] - The token configuration for the endpoint.
+ * @returns {Promise<boolean>} Returns true if the user can spend the amount, otherwise denies the request.
+ * @throws {Error} Throws an error if there's an issue with the balance check.
+ */
+const checkBalance = async ({ req, res, txData }) => {
+  const { canSpend, balance, tokenCost } = await Balance.check(txData);
+
+  if (canSpend) {
+    return true;
+  }
+
+  const type = ViolationTypes.TOKEN_BALANCE;
+  const errorMessage = {
+    type,
+    balance,
+    tokenCost,
+    promptTokens: txData.amount,
+  };
+
+  if (txData.generations && txData.generations.length > 0) {
+    errorMessage.generations = txData.generations;
+  }
+
+  await logViolation(req, res, type, errorMessage, 0);
+  throw new Error(JSON.stringify(errorMessage));
+};
+
+module.exports = checkBalance;
--- a/api/models/convoStructure.spec.js
+++ b/api/models/convoStructure.spec.js
@@ -1,8 +1,6 @@
 const mongoose = require('mongoose');
 const { MongoMemoryServer } = require('mongodb-memory-server');
-const { getMessages, bulkSaveMessages } = require('./Message');
-
-const Message = require('~/db/models').Message;
+const { Message, getMessages, bulkSaveMessages } = require('./Message');

 // Original version of buildTree function
 function buildTree({ messages, fileMap }) {
@@ -44,6 +42,7 @@ function buildTree({ messages, fileMap }) {
 }

 let mongod;
+
 beforeAll(async () => {
  mongod = await MongoMemoryServer.create();
  const uri = mongod.getUri();
--- a/api/models/index.js
+++ b/api/models/index.js
@@ -1,7 +1,13 @@
-const mongoose = require('mongoose');
-const { createMethods } = require('@librechat/data-schemas');
-const methods = createMethods(mongoose);
-const { comparePassword } = require('./userMethods');
+const {
+  comparePassword,
+  deleteUserById,
+  generateToken,
+  getUserById,
+  updateUser,
+  createUser,
+  countUsers,
+  findUser,
+} = require('./userMethods');
 const {
  findFileById,
  createFile,
@@ -20,12 +26,32 @@ const {
  deleteMessagesSince,
  deleteMessages,
 } = require('./Message');
+const {
+  createSession,
+  findSession,
+  updateExpiration,
+  deleteSession,
+  deleteAllUserSessions,
+  generateRefreshToken,
+  countActiveSessions,
+} = require('./Session');
 const { getConvoTitle, getConvo, saveConvo, deleteConvos } = require('./Conversation');
 const { getPreset, getPresets, savePreset, deletePresets } = require('./Preset');
+const { createToken, findToken, updateToken, deleteTokens } = require('./Token');
+const Balance = require('./Balance');
+const User = require('./User');
+const Key = require('./Key');

 module.exports = {
-  ...methods,
  comparePassword,
+  deleteUserById,
+  generateToken,
+  getUserById,
+  updateUser,
+  createUser,
+  countUsers,
+  findUser,
+
  findFileById,
  createFile,
  updateFile,
@@ -51,4 +77,21 @@ module.exports = {
  getPresets,
  savePreset,
  deletePresets,
+
+  createToken,
+  findToken,
+  updateToken,
+  deleteTokens,
+
+  createSession,
+  findSession,
+  updateExpiration,
+  deleteSession,
+  deleteAllUserSessions,
+  generateRefreshToken,
+  countActiveSessions,
+
+  User,
+  Key,
+  Balance,
 };
--- a/api/models/inviteUser.js
+++ b/api/models/inviteUser.js
@@ -1,7 +1,7 @@
 const mongoose = require('mongoose');
-const { logger, hashToken } = require('@librechat/data-schemas');
-const { getRandomValues } = require('~/server/utils/crypto');
-const { createToken, findToken } = require('~/models');
+const { getRandomValues, hashToken } = require('~/server/utils/crypto');
+const { createToken, findToken } = require('./Token');
+const logger = require('~/config/winston');

 /**
 * @module inviteUser
--- a/api/models/plugins/mongoMeili.js
+++ b/api/models/plugins/mongoMeili.js
@@ -0,0 +1,365 @@
+const _ = require('lodash');
+const mongoose = require('mongoose');
+const { MeiliSearch } = require('meilisearch');
+const { cleanUpPrimaryKeyValue } = require('~/lib/utils/misc');
+const logger = require('~/config/meiliLogger');
+
+const searchEnabled = process.env.SEARCH && process.env.SEARCH.toLowerCase() === 'true';
+const meiliEnabled = process.env.MEILI_HOST && process.env.MEILI_MASTER_KEY && searchEnabled;
+
+const validateOptions = function (options) {
+  const requiredKeys = ['host', 'apiKey', 'indexName'];
+  requiredKeys.forEach((key) => {
+    if (!options[key]) {
+      throw new Error(`Missing mongoMeili Option: ${key}`);
+    }
+  });
+};
+
+// const createMeiliMongooseModel = function ({ index, indexName, client, attributesToIndex }) {
+const createMeiliMongooseModel = function ({ index, attributesToIndex }) {
+  const primaryKey = attributesToIndex[0];
+  // MeiliMongooseModel is of type Mongoose.Model
+  class MeiliMongooseModel {
+    /**
+     * `syncWithMeili`: synchronizes the data between a MongoDB collection and a MeiliSearch index,
+     * only triggered if there's ever a discrepancy determined by `api\lib\db\indexSync.js`.
+     *
+     * 1. Fetches all documents from the MongoDB collection and the MeiliSearch index.
+     * 2. Compares the documents from both sources.
+     * 3. If a document exists in MeiliSearch but not in MongoDB, it's deleted from MeiliSearch.
+     * 4. If a document exists in MongoDB but not in MeiliSearch, it's added to MeiliSearch.
+     * 5. If a document exists in both but has different `text` or `title` fields (depending on the `primaryKey`), it's updated in MeiliSearch.
+     * 6. After all operations, it updates the `_meiliIndex` field in MongoDB to indicate whether the document is indexed in MeiliSearch.
+     *
+     * Note: This strategy does not use batch operations for Meilisearch as the `index.addDocuments` will discard
+     * the entire batch if there's an error with one document, and will not throw an error if there's an issue.
+     * Also, `index.getDocuments` needs an exact limit on the amount of documents to return, so we build the map in batches.
+     *
+     * @returns {Promise} A promise that resolves when the synchronization is complete.
+     *
+     * @throws {Error} Throws an error if there's an issue with adding a document to MeiliSearch.
+     */
+    static async syncWithMeili() {
+      try {
+        let moreDocuments = true;
+        const mongoDocuments = await this.find().lean();
+        const format = (doc) => _.pick(doc, attributesToIndex);
+
+        // Prepare for comparison
+        const mongoMap = new Map(mongoDocuments.map((doc) => [doc[primaryKey], format(doc)]));
+        const indexMap = new Map();
+        let offset = 0;
+        const batchSize = 1000;
+
+        while (moreDocuments) {
+          const batch = await index.getDocuments({ limit: batchSize, offset });
+
+          if (batch.results.length === 0) {
+            moreDocuments = false;
+          }
+
+          for (const doc of batch.results) {
+            indexMap.set(doc[primaryKey], format(doc));
+          }
+
+          offset += batchSize;
+        }
+
+        logger.debug('[syncWithMeili]', { indexMap: indexMap.size, mongoMap: mongoMap.size });
+
+        const updateOps = [];
+
+        // Iterate over Meili index documents
+        for (const [id, doc] of indexMap) {
+          const update = {};
+          update[primaryKey] = id;
+          if (mongoMap.has(id)) {
+            // Case: Update
+            // If document also exists in MongoDB, would be update case
+            if (
+              (doc.text && doc.text !== mongoMap.get(id).text) ||
+              (doc.title && doc.title !== mongoMap.get(id).title)
+            ) {
+              logger.debug(
+                `[syncWithMeili] ${id} had document discrepancy in ${
+                  doc.text ? 'text' : 'title'
+                } field`,
+              );
+              updateOps.push({
+                updateOne: { filter: update, update: { $set: { _meiliIndex: true } } },
+              });
+              await index.addDocuments([doc]);
+            }
+          } else {
+            // Case: Delete
+            // If document does not exist in MongoDB, its a delete case from meili index
+            await index.deleteDocument(id);
+            updateOps.push({
+              updateOne: { filter: update, update: { $set: { _meiliIndex: false } } },
+            });
+          }
+        }
+
+        // Iterate over MongoDB documents
+        for (const [id, doc] of mongoMap) {
+          const update = {};
+          update[primaryKey] = id;
+          // Case: Insert
+          // If document does not exist in Meili Index, Its an insert case
+          if (!indexMap.has(id)) {
+            await index.addDocuments([doc]);
+            updateOps.push({
+              updateOne: { filter: update, update: { $set: { _meiliIndex: true } } },
+            });
+          } else if (doc._meiliIndex === false) {
+            updateOps.push({
+              updateOne: { filter: update, update: { $set: { _meiliIndex: true } } },
+            });
+          }
+        }
+
+        if (updateOps.length > 0) {
+          await this.collection.bulkWrite(updateOps);
+          logger.debug(
+            `[syncWithMeili] Finished indexing ${
+              primaryKey === 'messageId' ? 'messages' : 'conversations'
+            }`,
+          );
+        }
+      } catch (error) {
+        logger.error('[syncWithMeili] Error adding document to Meili', error);
+      }
+    }
+
+    // Set one or more settings of the meili index
+    static async setMeiliIndexSettings(settings) {
+      return await index.updateSettings(settings);
+    }
+
+    // Search the index
+    static async meiliSearch(q, params, populate) {
+      const data = await index.search(q, params);
+
+      // Populate hits with content from mongodb
+      if (populate) {
+        // Find objects into mongodb matching `objectID` from Meili search
+        const query = {};
+        // query[primaryKey] = { $in: _.map(data.hits, primaryKey) };
+        query[primaryKey] = _.map(data.hits, (hit) => cleanUpPrimaryKeyValue(hit[primaryKey]));
+        // logger.debug('query', query);
+        const hitsFromMongoose = await this.find(
+          query,
+          _.reduce(
+            this.schema.obj,
+            function (results, value, key) {
+              return { ...results, [key]: 1 };
+            },
+            { _id: 1, __v: 1 },
+          ),
+        ).lean();
+
+        // Add additional data from mongodb into Meili search hits
+        const populatedHits = data.hits.map(function (hit) {
+          const query = {};
+          query[primaryKey] = hit[primaryKey];
+          const originalHit = _.find(hitsFromMongoose, query);
+
+          return {
+            ...(originalHit ?? {}),
+            ...hit,
+          };
+        });
+        data.hits = populatedHits;
+      }
+
+      return data;
+    }
+
+    preprocessObjectForIndex() {
+      const object = _.pick(this.toJSON(), attributesToIndex);
+      // NOTE: MeiliSearch does not allow | in primary key, so we replace it with - for Bing convoIds
+      // object.conversationId = object.conversationId.replace(/\|/g, '-');
+      if (object.conversationId && object.conversationId.includes('|')) {
+        object.conversationId = object.conversationId.replace(/\|/g, '--');
+      }
+
+      if (object.content && Array.isArray(object.content)) {
+        object.text = object.content
+          .filter((item) => item.type === 'text' && item.text && item.text.value)
+          .map((item) => item.text.value)
+          .join(' ');
+        delete object.content;
+      }
+
+      return object;
+    }
+
+    // Push new document to Meili
+    async addObjectToMeili() {
+      const object = this.preprocessObjectForIndex();
+      try {
+        // logger.debug('Adding document to Meili', object);
+        await index.addDocuments([object]);
+      } catch (error) {
+        // logger.debug('Error adding document to Meili');
+        // logger.error(error);
+      }
+
+      await this.collection.updateMany({ _id: this._id }, { $set: { _meiliIndex: true } });
+    }
+
+    // Update an existing document in Meili
+    async updateObjectToMeili() {
+      const object = _.pick(this.toJSON(), attributesToIndex);
+      await index.updateDocuments([object]);
+    }
+
+    // Delete a document from Meili
+    async deleteObjectFromMeili() {
+      await index.deleteDocument(this._id);
+    }
+
+    // * schema.post('save')
+    postSaveHook() {
+      if (this._meiliIndex) {
+        this.updateObjectToMeili();
+      } else {
+        this.addObjectToMeili();
+      }
+    }
+
+    // * schema.post('update')
+    postUpdateHook() {
+      if (this._meiliIndex) {
+        this.updateObjectToMeili();
+      }
+    }
+
+    // * schema.post('remove')
+    postRemoveHook() {
+      if (this._meiliIndex) {
+        this.deleteObjectFromMeili();
+      }
+    }
+  }
+
+  return MeiliMongooseModel;
+};
+
+module.exports = function mongoMeili(schema, options) {
+  // Vaidate Options for mongoMeili
+  validateOptions(options);
+
+  // Add meiliIndex to schema
+  schema.add({
+    _meiliIndex: {
+      type: Boolean,
+      required: false,
+      select: false,
+      default: false,
+    },
+  });
+
+  const { host, apiKey, indexName, primaryKey } = options;
+
+  // Setup MeiliSearch Client
+  const client = new MeiliSearch({ host, apiKey });
+
+  // Asynchronously create the index
+  client.createIndex(indexName, { primaryKey });
+
+  // Setup the index to search for this schema
+  const index = client.index(indexName);
+
+  const attributesToIndex = [
+    ..._.reduce(
+      schema.obj,
+      function (results, value, key) {
+        return value.meiliIndex ? [...results, key] : results;
+        // }, []), '_id'];
+      },
+      [],
+    ),
+  ];
+
+  schema.loadClass(createMeiliMongooseModel({ index, indexName, client, attributesToIndex }));
+
+  // Register hooks
+  schema.post('save', function (doc) {
+    doc.postSaveHook();
+  });
+  schema.post('update', function (doc) {
+    doc.postUpdateHook();
+  });
+  schema.post('remove', function (doc) {
+    doc.postRemoveHook();
+  });
+
+  schema.pre('deleteMany', async function (next) {
+    if (!meiliEnabled) {
+      next();
+    }
+
+    try {
+      if (Object.prototype.hasOwnProperty.call(schema.obj, 'messages')) {
+        const convoIndex = client.index('convos');
+        const deletedConvos = await mongoose.model('Conversation').find(this._conditions).lean();
+        let promises = [];
+        for (const convo of deletedConvos) {
+          promises.push(convoIndex.deleteDocument(convo.conversationId));
+        }
+        await Promise.all(promises);
+      }
+
+      if (Object.prototype.hasOwnProperty.call(schema.obj, 'messageId')) {
+        const messageIndex = client.index('messages');
+        const deletedMessages = await mongoose.model('Message').find(this._conditions).lean();
+        let promises = [];
+        for (const message of deletedMessages) {
+          promises.push(messageIndex.deleteDocument(message.messageId));
+        }
+        await Promise.all(promises);
+      }
+      return next();
+    } catch (error) {
+      if (meiliEnabled) {
+        logger.error(
+          '[MeiliMongooseModel.deleteMany] There was an issue deleting conversation indexes upon deletion, next startup may be slow due to syncing',
+          error,
+        );
+      }
+      return next();
+    }
+  });
+
+  schema.post('findOneAndUpdate', async function (doc) {
+    if (!meiliEnabled) {
+      return;
+    }
+
+    if (doc.unfinished) {
+      return;
+    }
+
+    let meiliDoc;
+    // Doc is a Conversation
+    if (doc.messages) {
+      try {
+        meiliDoc = await client.index('convos').getDocument(doc.conversationId);
+      } catch (error) {
+        logger.debug(
+          '[MeiliMongooseModel.findOneAndUpdate] Convo not found in MeiliSearch and will index ' +
+            doc.conversationId,
+          error,
+        );
+      }
+    }
+
+    if (meiliDoc && meiliDoc.title === doc.title) {
+      return;
+    }
+
+    doc.postSaveHook();
+  });
+};
--- a/api/models/schema/action.js
+++ b/api/models/schema/action.js
@@ -0,0 +1,60 @@
+const mongoose = require('mongoose');
+
+const { Schema } = mongoose;
+
+const AuthSchema = new Schema(
+  {
+    authorization_type: String,
+    custom_auth_header: String,
+    type: {
+      type: String,
+      enum: ['service_http', 'oauth', 'none'],
+    },
+    authorization_content_type: String,
+    authorization_url: String,
+    client_url: String,
+    scope: String,
+    token_exchange_method: {
+      type: String,
+      enum: ['default_post', 'basic_auth_header', null],
+    },
+  },
+  { _id: false },
+);
+
+const actionSchema = new Schema({
+  user: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'User',
+    index: true,
+    required: true,
+  },
+  action_id: {
+    type: String,
+    index: true,
+    required: true,
+  },
+  type: {
+    type: String,
+    default: 'action_prototype',
+  },
+  settings: Schema.Types.Mixed,
+  agent_id: String,
+  assistant_id: String,
+  metadata: {
+    api_key: String, // private, encrypted
+    auth: AuthSchema,
+    domain: {
+      type: String,
+      required: true,
+    },
+    // json_schema: Schema.Types.Mixed,
+    privacy_policy_url: String,
+    raw_spec: String,
+    oauth_client_id: String, // private, encrypted
+    oauth_client_secret: String, // private, encrypted
+  },
+});
+// }, { minimize: false }); // Prevent removal of empty objects
+
+module.exports = actionSchema;
--- a/packages/data-schemas/src/schema/agent.ts
+++ b/packages/data-schemas/src/schema/agent.ts
@@ -1,7 +1,6 @@
-import { Schema } from 'mongoose';
-import type { IAgent } from '~/types';
+const mongoose = require('mongoose');

-const agentSchema = new Schema<IAgent>(
+const agentSchema = mongoose.Schema(
  {
    id: {
      type: String,
@@ -19,7 +18,10 @@ const agentSchema = new Schema<IAgent>(
      type: String,
    },
    avatar: {
-      type: Schema.Types.Mixed,
+      type: {
+        filepath: String,
+        source: String,
+      },
      default: undefined,
    },
    provider: {
@@ -39,22 +41,19 @@ const agentSchema = new Schema<IAgent>(
    access_level: {
      type: Number,
    },
-    recursion_limit: {
-      type: Number,
-    },
    tools: {
      type: [String],
      default: undefined,
    },
    tool_kwargs: {
-      type: [{ type: Schema.Types.Mixed }],
+      type: [{ type: mongoose.Schema.Types.Mixed }],
    },
    actions: {
      type: [String],
      default: undefined,
    },
    author: {
-      type: Schema.Types.ObjectId,
+      type: mongoose.Schema.Types.ObjectId,
      ref: 'User',
      required: true,
    },
@@ -80,22 +79,18 @@ const agentSchema = new Schema<IAgent>(
      default: [],
    },
    tool_resources: {
-      type: Schema.Types.Mixed,
+      type: mongoose.Schema.Types.Mixed,
      default: {},
    },
    projectIds: {
-      type: [Schema.Types.ObjectId],
+      type: [mongoose.Schema.Types.ObjectId],
      ref: 'Project',
      index: true,
    },
-    versions: {
-      type: [Schema.Types.Mixed],
-      default: [],
-    },
  },
  {
    timestamps: true,
  },
 );

-export default agentSchema;
+module.exports = agentSchema;
--- a/packages/data-schemas/src/schema/assistant.ts
+++ b/packages/data-schemas/src/schema/assistant.ts
@@ -1,10 +1,9 @@
-import { Schema } from 'mongoose';
-import type { IAssistant } from '~/types';
+const mongoose = require('mongoose');

-const assistantSchema = new Schema<IAssistant>(
+const assistantSchema = mongoose.Schema(
  {
    user: {
-      type: Schema.Types.ObjectId,
+      type: mongoose.Schema.Types.ObjectId,
      ref: 'User',
      required: true,
    },
@@ -14,7 +13,10 @@ const assistantSchema = new Schema<IAssistant>(
      required: true,
    },
    avatar: {
-      type: Schema.Types.Mixed,
+      type: {
+        filepath: String,
+        source: String,
+      },
      default: undefined,
    },
    conversation_starters: {
@@ -36,4 +38,4 @@ const assistantSchema = new Schema<IAssistant>(
  },
 );

-export default assistantSchema;
+module.exports = assistantSchema;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ruben Talstra	c2cdc869b7	🔧 chore: Comment out unused font family configurations and typography plugin in Tailwind CSS config	2025-02-27 16:36:14 +01:00
Ruben Talstra	2fa8d40d11	🔧 chore: Enhance Vite configuration with improved environment variable handling and chunking strategies	2025-02-27 16:34:16 +01:00
Ruben Talstra	b46c0ed43f	🔧 chore: Update ESLint and related dependencies in package.json and package-lock.json	2025-02-27 16:30:10 +01:00
Ruben Talstra	68c13ec610	Merge remote-tracking branch 'origin/chore/package-bumps-and-refactor' into chore/package-bumps-and-refactor # Conflicts: # client/package.json # client/vite.config.ts # package-lock.json	2025-02-27 16:16:56 +01:00
Ruben Talstra	5e6b8f979c	🔧 chore: Update Tailwind CSS configuration and dependencies in package.json	2025-02-27 16:15:42 +01:00
Ruben Talstra	c1032fe819	🔧 chore: Update Tailwind CSS configuration and dependencies in package.json	2025-02-27 15:56:22 +01:00
Ruben Talstra	27df7fa7c1	🔧 chore: Update Tailwind CSS configuration and dependencies in package.json	2025-02-27 13:43:10 +01:00
Ruben Talstra	5f131c0132	🔧 chore: Update Tailwind CSS configuration and dependencies in package.json	2025-02-27 13:41:22 +01:00
Ruben Talstra	85d044b7cd	🔧 chore: Update Tailwind CSS configuration and dependencies in package.json	2025-02-27 13:40:41 +01:00
Ruben Talstra	ac58be68e7	🔧 chore: Update Tailwind CSS configuration and dependencies in package.json	2025-02-27 13:39:37 +01:00
Ruben Talstra	1e067150ac	🔧 chore: Update Tailwind CSS configuration and dependencies in package.json	2025-02-27 13:36:42 +01:00
Ruben Talstra	4c598e4b16	🔧 chore: Update Tailwind CSS configuration and dependencies in package.json	2025-02-27 13:35:38 +01:00
Ruben Talstra	b65c8ef9e2	🔧 chore: Update Tailwind CSS configuration and dependencies in package.json	2025-02-27 13:14:00 +01:00
Ruben Talstra	0261b253e1	🔧 chore: Update Tailwind CSS configuration and dependencies in package.json	2025-02-27 13:10:57 +01:00
Ruben Talstra	2e205b9186	🔧 chore: Update Tailwind CSS configuration and dependencies in package.json	2025-02-27 13:10:39 +01:00
Ruben Talstra	4b36bd088e	🔧 chore: Update Tailwind CSS configuration and dependencies in package.json	2025-02-27 13:08:22 +01:00
Ruben Talstra	67c50ff11f	🔧 chore: Update Tailwind CSS configuration and dependencies in package.json	2025-02-27 13:06:31 +01:00
Ruben Talstra	fcb1cf2eca	🔧 chore: Add Tailwind CSS configuration reference in style.css	2025-02-27 12:00:24 +01:00
Ruben Talstra	1741225f48	🔧 chore: Update dependencies in `package.json` and clean up ESLint config	2025-02-27 11:58:31 +01:00