✨ feat: Add subfolder support for model specs (#9165 )

- Add optional `folder` field to TModelSpec type and schema - Create ModelSpecFolder component for hierarchical display - Implement expand/collapse functionality for folders - Update search results to show folder context - Sort folders alphabetically and specs by order/label - Maintain backward compatibility (specs without folders appear at root) This enhancement allows organizing model specs into categories/folders for better organization and improved user experience when dealing with many model configurations. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-08-24 23:37:53 +05:30
540 changed files with 8027 additions and 26166 deletions
--- a/.env.example
+++ b/.env.example
@@ -40,13 +40,6 @@ NO_INDEX=true
 # Defaulted to 1.
 TRUST_PROXY=1

-# Minimum password length for user authentication
-# Default: 8
-# Note: When using LDAP authentication, you may want to set this to 1 
-# to bypass local password validation, as LDAP servers handle their own
-# password policies.
-# MIN_PASSWORD_LENGTH=8
-
 #===============#
 # JSON Logging  #
 #===============#
@@ -667,10 +660,6 @@ HELP_AND_FAQ_URL=https://librechat.ai
 # REDIS_URI=rediss://127.0.0.1:6380
 # REDIS_CA=/path/to/ca-cert.pem

-# Elasticache may need to use an alternate dnsLookup for TLS connections.  see "Special Note: Aws Elasticache Clusters with TLS" on this webpage: https://www.npmjs.com/package/ioredis
-# Enable alternative dnsLookup for redis
-# REDIS_USE_ALTERNATIVE_DNS_LOOKUP=true
-
 # Redis authentication (if required)
 # REDIS_USERNAME=your_redis_username
 # REDIS_PASSWORD=your_redis_password
@@ -690,8 +679,8 @@ HELP_AND_FAQ_URL=https://librechat.ai
 # REDIS_PING_INTERVAL=300

 # Force specific cache namespaces to use in-memory storage even when Redis is enabled
-# Comma-separated list of CacheKeys (e.g., ROLES,MESSAGES)
-# FORCED_IN_MEMORY_CACHE_NAMESPACES=ROLES,MESSAGES
+# Comma-separated list of CacheKeys (e.g., STATIC_CONFIG,ROLES,MESSAGES)
+# FORCED_IN_MEMORY_CACHE_NAMESPACES=STATIC_CONFIG,ROLES

 #==================================================#
 #                      Others                      #
--- a/.github/workflows/i18n-unused-keys.yml
+++ b/.github/workflows/i18n-unused-keys.yml
@@ -1,10 +1,5 @@
 name: Detect Unused i18next Strings

-# This workflow checks for unused i18n keys in translation files.
-# It has special handling for:
-# - com_ui_special_var_* keys that are dynamically constructed
-# - com_agents_category_* keys that are stored in the database and used dynamically
-
 on:
  pull_request:
    paths:
@@ -12,7 +7,6 @@ on:
      - "api/**"
      - "packages/data-provider/src/**"
      - "packages/client/**"
-      - "packages/data-schemas/src/**"

 jobs:
  detect-unused-i18n-keys:
@@ -30,7 +24,7 @@ jobs:

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

          # Check if translation file exists
          if [[ ! -f "$I18N_FILE" ]]; then
@@ -58,31 +52,6 @@ jobs:
                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
-              fi
-            # Special case for agent category keys that are dynamically used from database
-            elif [[ "$KEY" == com_agents_category_* ]]; then
-              # Check if agent category localization is being used
-              for DIR in "${SOURCE_DIRS[@]}"; do
-                # Check for dynamic category label/description usage
-                if grep -r --include=\*.{js,jsx,ts,tsx} -E "category\.(label|description).*startsWith.*['\"]com_" "$DIR" > /dev/null 2>&1 || \
-                   # Check for the method that defines these keys
-                   grep -r --include=\*.{js,jsx,ts,tsx} "ensureDefaultCategories" "$DIR" > /dev/null 2>&1 || \
-                   # Check for direct usage in agentCategory.ts
-                   grep -r --include=\*.ts -E "label:.*['\"]$KEY['\"]" "$DIR" > /dev/null 2>&1 || \
-                   grep -r --include=\*.ts -E "description:.*['\"]$KEY['\"]" "$DIR" > /dev/null 2>&1; 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
--- a/6
+++ b/6
@@ -1,4 +1,4 @@
-# v0.8.0-rc4
+# v0.8.0-rc2

 # Base node image
 FROM node:20-alpine AS node
@@ -30,7 +30,7 @@ RUN \
    # Allow mounting of these files, which have no default
    touch .env ; \
    # Create directories for the volumes to inherit the correct permissions
-    mkdir -p /app/client/public/images /app/api/logs /app/uploads ; \
+    mkdir -p /app/client/public/images /app/api/logs ; \
    npm config set fetch-retry-maxtimeout 600000 ; \
    npm config set fetch-retries 5 ; \
    npm config set fetch-retry-mintimeout 15000 ; \
@@ -44,6 +44,8 @@ RUN \
    npm prune --production; \
    npm cache clean --force

+RUN mkdir -p /app/client/public/images /app/api/logs
+
 # Node API setup
 EXPOSE 3080
 ENV HOST=0.0.0.0
--- a/Dockerfile.multi
+++ b/Dockerfile.multi
@@ -1,5 +1,5 @@
 # Dockerfile.multi
-# v0.8.0-rc4
+# v0.8.0-rc2

 # Base for all builds
 FROM node:20-alpine AS base-min
--- a/MODEL_SPEC_FOLDERS.md
+++ b/MODEL_SPEC_FOLDERS.md
@@ -0,0 +1,147 @@
+# Model Spec Subfolder Support
+
+This enhancement adds the ability to organize model specs into subfolders/categories for better organization and user experience.
+
+## Feature Overview
+
+Model specs can now be grouped into folders by adding an optional `folder` field to each spec. This helps organize related models together, making it easier for users to find and select the appropriate model for their needs.
+
+## Configuration
+
+### Basic Usage
+
+Add a `folder` field to any model spec in your `librechat.yaml`:
+
+```yaml
+modelSpecs:
+  list:
+    - name: "gpt4_turbo"
+      label: "GPT-4 Turbo"
+      folder: "OpenAI Models"  # This spec will appear under "OpenAI Models" folder
+      preset:
+        endpoint: "openAI"
+        model: "gpt-4-turbo-preview"
+```
+
+### Folder Structure
+
+- **With Folder**: Model specs with the `folder` field will be grouped under that folder name
+- **Without Folder**: Model specs without the `folder` field appear at the root level
+- **Multiple Folders**: You can create as many folders as needed to organize your models
+- **Alphabetical Sorting**: Folders are sorted alphabetically, and specs within folders are sorted by their `order` field or label
+
+### Example Configuration
+
+```yaml
+modelSpecs:
+  list:
+    # OpenAI Models Category
+    - name: "gpt4_turbo"
+      label: "GPT-4 Turbo"
+      folder: "OpenAI Models"
+      preset:
+        endpoint: "openAI"
+        model: "gpt-4-turbo-preview"
+      
+    - name: "gpt35_turbo"
+      label: "GPT-3.5 Turbo"
+      folder: "OpenAI Models"
+      preset:
+        endpoint: "openAI"
+        model: "gpt-3.5-turbo"
+    
+    # Anthropic Models Category
+    - name: "claude3_opus"
+      label: "Claude 3 Opus"
+      folder: "Anthropic Models"
+      preset:
+        endpoint: "anthropic"
+        model: "claude-3-opus-20240229"
+    
+    # Root level model (no folder)
+    - name: "quick_chat"
+      label: "Quick Chat"
+      preset:
+        endpoint: "openAI"
+        model: "gpt-3.5-turbo"
+```
+
+## UI Features
+
+### Folder Display
+- Folders are displayed with expand/collapse functionality
+- Folder icons change between open/closed states
+- Indentation shows the hierarchy clearly
+
+### Search Integration
+- When searching for models, the folder path is shown for context
+- Search works across all models regardless of folder structure
+
+### User Experience
+- Folders start expanded by default for easy access
+- Click on folder header to expand/collapse
+- Selected model is highlighted with a checkmark
+- Folder state is preserved during the session
+
+## Benefits
+
+1. **Better Organization**: Group related models together (e.g., by provider, capability, or use case)
+2. **Improved Navigation**: Users can quickly find models in organized categories
+3. **Scalability**: Handles large numbers of model specs without overwhelming the UI
+4. **Backward Compatible**: Existing configurations without folders continue to work
+5. **Flexible Structure**: Mix foldered and non-foldered specs as needed
+
+## Use Cases
+
+### By Provider
+```yaml
+folder: "OpenAI Models"
+folder: "Anthropic Models"
+folder: "Google Models"
+```
+
+### By Capability
+```yaml
+folder: "Vision Models"
+folder: "Code Models"
+folder: "Creative Writing"
+```
+
+### By Performance Tier
+```yaml
+folder: "Premium Models"
+folder: "Standard Models"
+folder: "Budget Models"
+```
+
+### By Department/Team
+```yaml
+folder: "Engineering Team"
+folder: "Marketing Team"
+folder: "Research Team"
+```
+
+## Implementation Details
+
+### Type Changes
+- Added optional `folder?: string` field to `TModelSpec` type
+- Updated `tModelSpecSchema` to include the folder field validation
+
+### Components
+- Created `ModelSpecFolder` component for rendering folder structure
+- Updated `ModelSelector` to use folder-aware rendering
+- Enhanced search results to show folder context
+
+### Behavior
+- Folders are collapsible with state management
+- Models are sorted within folders by order/label
+- Root-level models appear after all folders
+
+## Migration
+
+No migration needed - the feature is fully backward compatible. Existing model specs without the `folder` field will continue to work and appear at the root level.
+
+## See Also
+
+- `librechat.example.subfolder.yaml` - Complete example configuration
+- GitHub Issue #9165 - Original feature request
--- a/README.md
+++ b/README.md
@@ -65,17 +65,14 @@

 - 🔦 **Agents & Tools Integration**:  
  - **[LibreChat Agents](https://www.librechat.ai/docs/features/agents)**:
-    - No-Code Custom Assistants: Build specialized, AI-driven helpers
-    - Agent Marketplace: Discover and deploy community-built agents
-    - Collaborative Sharing: Share agents with specific users and groups
-    - Flexible & Extensible: Use MCP Servers, tools, file search, code execution, and more
+    - No-Code Custom Assistants: Build specialized, AI-driven helpers without coding  
+    - Flexible & Extensible: Use MCP Servers, tools, file search, code execution, and more  
    - Compatible with Custom Endpoints, OpenAI, Azure, Anthropic, AWS Bedrock, Google, Vertex AI, Responses API, and more
    - [Model Context Protocol (MCP) Support](https://modelcontextprotocol.io/clients#librechat) for Tools

 - 🔍 **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
-  - **Customizable Jina Reranking**: Configure custom Jina API URLs for reranking services
  - **[Learn More →](https://www.librechat.ai/docs/features/web_search)**

 - 🪄 **Generative UI with Code Artifacts**:  
@@ -90,18 +87,15 @@
  - Create, Save, & Share Custom Presets  
  - Switch between AI Endpoints and Presets mid-chat
  - Edit, Resubmit, and Continue Messages with Conversation branching  
-  - Create and share prompts with specific users and groups
  - [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 📸  
  - Chat with Files using Custom Endpoints, OpenAI, Azure, Anthropic, AWS Bedrock, & Google 🗃️

- 🌎 **Multilingual UI**:
-  - English, 中文 (简体), 中文 (繁體), العربية, Deutsch, Español, Français, Italiano
-  - Polski, Português (PT), Português (BR), Русский, 日本語, Svenska, 한국어, Tiếng Việt
-  - Türkçe, Nederlands, עברית, Català, Čeština, Dansk, Eesti, فارسی
-  - Suomi, Magyar, Հայերեն, Bahasa Indonesia, ქართული, Latviešu, ไทย, ئۇيغۇرچە
+- 🌎 **Multilingual UI**:  
+  - English, 中文, Deutsch, Español, Français, Italiano, Polski, Português Brasileiro
+  - Русский, 日本語, Svenska, 한국어, Tiếng Việt, 繁體中文, العربية, Türkçe, Nederlands, עברית

 - 🧠 **Reasoning UI**:  
  - Dynamic Reasoning UI for Chain-of-Thought/Reasoning AI models like DeepSeek-R1
--- a/api/app/clients/AnthropicClient.js
+++ b/api/app/clients/AnthropicClient.js
@@ -10,17 +10,7 @@ const {
  validateVisionModel,
 } = require('librechat-data-provider');
 const { SplitStreamHandler: _Handler } = require('@librechat/agents');
-const {
-  Tokenizer,
-  createFetch,
-  matchModelName,
-  getClaudeHeaders,
-  getModelMaxTokens,
-  configureReasoning,
-  checkPromptCacheSupport,
-  getModelMaxOutputTokens,
-  createStreamEventHandlers,
-} = require('@librechat/api');
+const { Tokenizer, createFetch, createStreamEventHandlers } = require('@librechat/api');
 const {
  truncateText,
  formatMessage,
@@ -29,6 +19,12 @@ const {
  parseParamFromPrompt,
  createContextHandlers,
 } = require('./prompts');
+const {
+  getClaudeHeaders,
+  configureReasoning,
+  checkPromptCacheSupport,
+} = require('~/server/services/Endpoints/anthropic/helpers');
+const { getModelMaxTokens, getModelMaxOutputTokens, matchModelName } = require('~/utils');
 const { spendTokens, spendStructuredTokens } = require('~/models/spendTokens');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
 const { sleep } = require('~/server/utils');
--- a/api/app/clients/BaseClient.js
+++ b/api/app/clients/BaseClient.js
@@ -1,7 +1,5 @@
 const crypto = require('crypto');
 const fetch = require('node-fetch');
-const { logger } = require('@librechat/data-schemas');
-const { getBalanceConfig } = require('@librechat/api');
 const {
  supportsBalanceCheck,
  isAgentsEndpoint,
@@ -17,6 +15,7 @@ const { checkBalance } = require('~/models/balanceMethods');
 const { truncateToolCallOutputs } = require('./prompts');
 const { getFiles } = require('~/models/File');
 const TextStream = require('./TextStream');
+const { logger } = require('~/config');

 class BaseClient {
  constructor(apiKey, options = {}) {
@@ -113,15 +112,13 @@ class BaseClient {
   * If a correction to the token usage is needed, the method should return an object with the corrected token counts.
   * Should only be used if `recordCollectedUsage` was not used instead.
   * @param {string} [model]
-   * @param {AppConfig['balance']} [balance]
   * @param {number} promptTokens
   * @param {number} completionTokens
   * @returns {Promise<void>}
   */
-  async recordTokenUsage({ model, balance, promptTokens, completionTokens }) {
+  async recordTokenUsage({ model, promptTokens, completionTokens }) {
    logger.debug('[BaseClient] `recordTokenUsage` not implemented.', {
      model,
-      balance,
      promptTokens,
      completionTokens,
    });
@@ -233,7 +230,6 @@ class BaseClient {
      sender: 'User',
      text,
      isCreatedByUser: true,
-      targetModel: this.modelOptions?.model ?? this.model,
    };
  }

@@ -575,7 +571,6 @@ class BaseClient {
  }

  async sendMessage(message, opts = {}) {
-    const appConfig = this.options.req?.config;
    /** @type {Promise<TMessage>} */
    let userMessagePromise;
    const { user, head, isEdited, conversationId, responseMessageId, saveOptions, userMessage } =
@@ -662,9 +657,9 @@ class BaseClient {
      }
    }

-    const balanceConfig = getBalanceConfig(appConfig);
+    const balance = this.options.req?.app?.locals?.balance;
    if (
-      balanceConfig?.enabled &&
+      balance?.enabled &&
      supportsBalanceCheck[this.options.endpointType ?? this.options.endpoint]
    ) {
      await checkBalance({
@@ -763,7 +758,6 @@ class BaseClient {
          usage,
          promptTokens,
          completionTokens,
-          balance: balanceConfig,
          model: responseMessage.model,
        });
      }
--- a/api/app/clients/GoogleClient.js
+++ b/api/app/clients/GoogleClient.js
@@ -1,5 +1,4 @@
 const { google } = require('googleapis');
-const { getModelMaxTokens } = require('@librechat/api');
 const { concat } = require('@langchain/core/utils/stream');
 const { ChatVertexAI } = require('@langchain/google-vertexai');
 const { Tokenizer, getSafetySettings } = require('@librechat/api');
@@ -22,6 +21,7 @@ const {
 } = require('librechat-data-provider');
 const { encodeAndFormat } = require('~/server/services/Files/images');
 const { spendTokens } = require('~/models/spendTokens');
+const { getModelMaxTokens } = require('~/utils');
 const { sleep } = require('~/server/utils');
 const { logger } = require('~/config');
 const {
--- a/api/app/clients/OpenAIClient.js
+++ b/api/app/clients/OpenAIClient.js
@@ -7,9 +7,7 @@ const {
  createFetch,
  resolveHeaders,
  constructAzureURL,
-  getModelMaxTokens,
  genAzureChatCompletion,
-  getModelMaxOutputTokens,
  createStreamEventHandlers,
 } = require('@librechat/api');
 const {
@@ -33,16 +31,16 @@ const {
  titleInstruction,
  createContextHandlers,
 } = require('./prompts');
+const { extractBaseURL, getModelMaxTokens, getModelMaxOutputTokens } = require('~/utils');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
 const { addSpaceIfNeeded, sleep } = require('~/server/utils');
 const { spendTokens } = require('~/models/spendTokens');
 const { handleOpenAIErrors } = require('./tools/util');
+const { createLLM, RunManager } = require('./llm');
 const { summaryBuffer } = require('./memory');
 const { runTitleChain } = require('./chains');
-const { extractBaseURL } = require('~/utils');
 const { tokenSplit } = require('./document');
 const BaseClient = require('./BaseClient');
-const { createLLM } = require('./llm');
 const { logger } = require('~/config');

 class OpenAIClient extends BaseClient {
@@ -620,6 +618,10 @@ class OpenAIClient extends BaseClient {
    temperature = 0.2,
    max_tokens,
    streaming,
+    context,
+    tokenBuffer,
+    initialMessageCount,
+    conversationId,
  }) {
    const modelOptions = {
      modelName: modelName ?? model,
@@ -664,12 +666,22 @@ class OpenAIClient extends BaseClient {
      configOptions.httpsAgent = new HttpsProxyAgent(this.options.proxy);
    }

+    const { req, res, debug } = this.options;
+    const runManager = new RunManager({ req, res, debug, abortController: this.abortController });
+    this.runManager = runManager;
+
    const llm = createLLM({
      modelOptions,
      configOptions,
      openAIApiKey: this.apiKey,
      azure: this.azure,
      streaming,
+      callbacks: runManager.createCallbacks({
+        context,
+        tokenBuffer,
+        conversationId: this.conversationId ?? conversationId,
+        initialMessageCount,
+      }),
    });

    return llm;
@@ -690,7 +702,6 @@ class OpenAIClient extends BaseClient {
   *                            In case of failure, it will return the default title, "New Chat".
   */
  async titleConvo({ text, conversationId, responseText = '' }) {
-    const appConfig = this.options.req?.config;
    this.conversationId = conversationId;

    if (this.options.attachments) {
@@ -719,7 +730,8 @@ class OpenAIClient extends BaseClient {
      max_tokens: 16,
    };

-    const azureConfig = appConfig?.endpoints?.[EModelEndpoint.azureOpenAI];
+    /** @type {TAzureConfig | undefined} */
+    const azureConfig = this.options?.req?.app?.locals?.[EModelEndpoint.azureOpenAI];

    const resetTitleOptions = !!(
      (this.azure && azureConfig) ||
@@ -1108,7 +1120,6 @@ ${convo}
  }

  async chatCompletion({ payload, onProgress, abortController = null }) {
-    const appConfig = this.options.req?.config;
    let error = null;
    let intermediateReply = [];
    const errorCallback = (err) => (error = err);
@@ -1154,7 +1165,8 @@ ${convo}
        opts.fetchOptions.agent = new HttpsProxyAgent(this.options.proxy);
      }

-      const azureConfig = appConfig?.endpoints?.[EModelEndpoint.azureOpenAI];
+      /** @type {TAzureConfig | undefined} */
+      const azureConfig = this.options?.req?.app?.locals?.[EModelEndpoint.azureOpenAI];

      if (
        (this.azure && this.isVisionModel && azureConfig) ||
--- a/api/app/clients/callbacks/createStartHandler.js
+++ b/api/app/clients/callbacks/createStartHandler.js
@@ -0,0 +1,95 @@
+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 { logger } = require('~/config');
+
+const createStartHandler = ({
+  context,
+  conversationId,
+  tokenBuffer = 0,
+  initialMessageCount,
+  manager,
+}) => {
+  return async (_llm, _messages, runId, parentRunId, extraParams) => {
+    const { invocation_params } = extraParams;
+    const { model, functions, function_call } = invocation_params;
+    const messages = _messages[0].map(formatFromLangChain);
+
+    logger.debug(`[createStartHandler] handleChatModelStart: ${context}`, {
+      model,
+      function_call,
+    });
+
+    if (context !== 'title') {
+      logger.debug(`[createStartHandler] handleChatModelStart: ${context}`, {
+        functions,
+      });
+    }
+
+    const payload = { messages };
+    let prelimPromptTokens = 1;
+
+    if (functions) {
+      payload.functions = functions;
+      prelimPromptTokens += 2;
+    }
+
+    if (function_call) {
+      payload.function_call = function_call;
+      prelimPromptTokens -= 5;
+    }
+
+    prelimPromptTokens += promptTokensEstimate(payload);
+    logger.debug('[createStartHandler]', {
+      prelimPromptTokens,
+      tokenBuffer,
+    });
+    prelimPromptTokens += tokenBuffer;
+
+    try {
+      const balance = await getBalanceConfig();
+      if (balance?.enabled && supportsBalanceCheck[EModelEndpoint.openAI]) {
+        const generations =
+          initialMessageCount && messages.length > initialMessageCount
+            ? messages.slice(initialMessageCount)
+            : null;
+        await checkBalance({
+          req: manager.req,
+          res: manager.res,
+          txData: {
+            user: manager.user,
+            tokenType: 'prompt',
+            amount: prelimPromptTokens,
+            debug: manager.debug,
+            generations,
+            model,
+            endpoint: EModelEndpoint.openAI,
+          },
+        });
+      }
+    } catch (err) {
+      logger.error(`[createStartHandler][${context}] checkBalance error`, err);
+      manager.abortController.abort();
+      if (context === 'summary' || context === 'plugins') {
+        manager.addRun(runId, { conversationId, error: err.message });
+        throw new Error(err);
+      }
+      return;
+    }
+
+    manager.addRun(runId, {
+      model,
+      messages,
+      functions,
+      function_call,
+      runId,
+      parentRunId,
+      conversationId,
+      prelimPromptTokens,
+    });
+  };
+};
+
+module.exports = createStartHandler;
--- a/api/app/clients/callbacks/index.js
+++ b/api/app/clients/callbacks/index.js
@@ -0,0 +1,5 @@
+const createStartHandler = require('./createStartHandler');
+
+module.exports = {
+  createStartHandler,
+};
--- a/api/app/clients/llm/RunManager.js
+++ b/api/app/clients/llm/RunManager.js
@@ -0,0 +1,105 @@
+const { createStartHandler } = require('~/app/clients/callbacks');
+const { spendTokens } = require('~/models/spendTokens');
+const { logger } = require('~/config');
+
+class RunManager {
+  constructor(fields) {
+    const { req, res, abortController, debug } = fields;
+    this.abortController = abortController;
+    this.user = req.user.id;
+    this.req = req;
+    this.res = res;
+    this.debug = debug;
+    this.runs = new Map();
+    this.convos = new Map();
+  }
+
+  addRun(runId, runData) {
+    if (!this.runs.has(runId)) {
+      this.runs.set(runId, runData);
+      if (runData.conversationId) {
+        this.convos.set(runData.conversationId, runId);
+      }
+      return runData;
+    } else {
+      const existingData = this.runs.get(runId);
+      const update = { ...existingData, ...runData };
+      this.runs.set(runId, update);
+      if (update.conversationId) {
+        this.convos.set(update.conversationId, runId);
+      }
+      return update;
+    }
+  }
+
+  removeRun(runId) {
+    if (this.runs.has(runId)) {
+      this.runs.delete(runId);
+    } else {
+      logger.error(`[api/app/clients/llm/RunManager] Run with ID ${runId} does not exist.`);
+    }
+  }
+
+  getAllRuns() {
+    return Array.from(this.runs.values());
+  }
+
+  getRunById(runId) {
+    return this.runs.get(runId);
+  }
+
+  getRunByConversationId(conversationId) {
+    const runId = this.convos.get(conversationId);
+    return { run: this.runs.get(runId), runId };
+  }
+
+  createCallbacks(metadata) {
+    return [
+      {
+        handleChatModelStart: createStartHandler({ ...metadata, manager: this }),
+        handleLLMEnd: async (output, runId, _parentRunId) => {
+          const { llmOutput, ..._output } = output;
+          logger.debug(`[RunManager] handleLLMEnd: ${JSON.stringify(metadata)}`, {
+            runId,
+            _parentRunId,
+            llmOutput,
+          });
+
+          if (metadata.context !== 'title') {
+            logger.debug('[RunManager] handleLLMEnd:', {
+              output: _output,
+            });
+          }
+
+          const { tokenUsage } = output.llmOutput;
+          const run = this.getRunById(runId);
+          this.removeRun(runId);
+
+          const txData = {
+            user: this.user,
+            model: run?.model ?? 'gpt-3.5-turbo',
+            ...metadata,
+          };
+
+          await spendTokens(txData, tokenUsage);
+        },
+        handleLLMError: async (err) => {
+          logger.error(`[RunManager] handleLLMError: ${JSON.stringify(metadata)}`, err);
+          if (metadata.context === 'title') {
+            return;
+          } else if (metadata.context === 'plugins') {
+            throw new Error(err);
+          }
+          const { conversationId } = metadata;
+          const { run } = this.getRunByConversationId(conversationId);
+          if (run && run.error) {
+            const { error } = run;
+            throw new Error(error);
+          }
+        },
+      },
+    ];
+  }
+}
+
+module.exports = RunManager;
--- a/api/app/clients/llm/index.js
+++ b/api/app/clients/llm/index.js
@@ -1,7 +1,9 @@
 const createLLM = require('./createLLM');
+const RunManager = require('./RunManager');
 const createCoherePayload = require('./createCoherePayload');

 module.exports = {
  createLLM,
+  RunManager,
  createCoherePayload,
 };
--- a/api/app/clients/prompts/createContextHandlers.js
+++ b/api/app/clients/prompts/createContextHandlers.js
@@ -1,6 +1,7 @@
 const axios = require('axios');
+const { isEnabled } = require('@librechat/api');
 const { logger } = require('@librechat/data-schemas');
-const { isEnabled, generateShortLivedToken } = require('@librechat/api');
+const { generateShortLivedToken } = require('~/server/services/AuthService');

 const footer = `Use the context as your learned knowledge to better answer the user.

--- a/api/app/clients/specs/BaseClient.test.js
+++ b/api/app/clients/specs/BaseClient.test.js
@@ -2,14 +2,6 @@ const { Constants } = require('librechat-data-provider');
 const { initializeFakeClient } = require('./FakeClient');

 jest.mock('~/db/connect');
-jest.mock('~/server/services/Config', () => ({
-  getAppConfig: jest.fn().mockResolvedValue({
-    // Default app config for tests
-    paths: { uploads: '/tmp' },
-    fileStrategy: 'local',
-    memory: { disabled: false },
-  }),
-}));
 jest.mock('~/models', () => ({
  User: jest.fn(),
  Key: jest.fn(),
--- a/api/app/clients/specs/FakeClient.js
+++ b/api/app/clients/specs/FakeClient.js
@@ -1,5 +1,5 @@
-const { getModelMaxTokens } = require('@librechat/api');
 const BaseClient = require('../BaseClient');
+const { getModelMaxTokens } = require('../../../utils');

 class FakeClient extends BaseClient {
  constructor(apiKey, options = {}) {
--- a/api/app/clients/tools/index.js
+++ b/api/app/clients/tools/index.js
@@ -1,4 +1,4 @@
-const manifest = require('./manifest');
+const availableTools = require('./manifest.json');

 // Structured Tools
 const DALLE3 = require('./structured/DALLE3');
@@ -13,8 +13,23 @@ const TraversaalSearch = require('./structured/TraversaalSearch');
 const createOpenAIImageTools = require('./structured/OpenAIImageTools');
 const TavilySearchResults = require('./structured/TavilySearchResults');

+/** @type {Record<string, TPlugin | undefined>} */
+const manifestToolMap = {};
+
+/** @type {Array<TPlugin>} */
+const toolkits = [];
+
+availableTools.forEach((tool) => {
+  manifestToolMap[tool.pluginKey] = tool;
+  if (tool.toolkit === true) {
+    toolkits.push(tool);
+  }
+});
+
 module.exports = {
-  ...manifest,
+  toolkits,
+  availableTools,
+  manifestToolMap,
  // Structured Tools
  DALLE3,
  FluxAPI,
--- a/api/app/clients/tools/manifest.js
+++ b/api/app/clients/tools/manifest.js
@@ -1,20 +0,0 @@
-const availableTools = require('./manifest.json');
-
-/** @type {Record<string, TPlugin | undefined>} */
-const manifestToolMap = {};
-
-/** @type {Array<TPlugin>} */
-const toolkits = [];
-
-availableTools.forEach((tool) => {
-  manifestToolMap[tool.pluginKey] = tool;
-  if (tool.toolkit === true) {
-    toolkits.push(tool);
-  }
-});
-
-module.exports = {
-  toolkits,
-  availableTools,
-  manifestToolMap,
-};
--- a/api/app/clients/tools/manifest.json
+++ b/api/app/clients/tools/manifest.json
@@ -49,7 +49,7 @@
    "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",
+    "icon": "/assets/image_gen_oai.png",
    "authConfig": [
      {
        "authField": "IMAGE_GEN_OAI_API_KEY",
@@ -75,7 +75,7 @@
    "name": "Browser",
    "pluginKey": "web-browser",
    "description": "Scrape and summarize webpage data",
-    "icon": "assets/web-browser.svg",
+    "icon": "/assets/web-browser.svg",
    "authConfig": [
      {
        "authField": "OPENAI_API_KEY",
@@ -170,7 +170,7 @@
    "name": "OpenWeather",
    "pluginKey": "open_weather",
    "description": "Get weather forecasts and historical data from the OpenWeather API",
-    "icon": "assets/openweather.png",
+    "icon": "/assets/openweather.png",
    "authConfig": [
      {
        "authField": "OPENWEATHER_API_KEY",
--- a/api/app/clients/tools/structured/DALLE3.js
+++ b/api/app/clients/tools/structured/DALLE3.js
@@ -5,10 +5,10 @@ const fetch = require('node-fetch');
 const { v4: uuidv4 } = require('uuid');
 const { ProxyAgent } = require('undici');
 const { Tool } = require('@langchain/core/tools');
-const { logger } = require('@librechat/data-schemas');
-const { getImageBasename } = require('@librechat/api');
 const { FileContext, ContentTypes } = require('librechat-data-provider');
+const { getImageBasename } = require('~/server/services/Files/images');
 const extractBaseURL = require('~/utils/extractBaseURL');
+const logger = require('~/config/winston');

 const displayMessage =
  "DALL-E displayed an image. All generated images are already plainly visible, so don't repeat the descriptions in detail. Do not list download links as they are available in the UI already. The user may download the images by clicking on them, but do not mention anything about downloading to the user.";
--- a/api/app/clients/tools/structured/OpenAIImageTools.js
+++ b/api/app/clients/tools/structured/OpenAIImageTools.js
@@ -1,16 +1,69 @@
+const { z } = require('zod');
 const axios = require('axios');
 const { v4 } = require('uuid');
 const OpenAI = require('openai');
 const FormData = require('form-data');
 const { ProxyAgent } = require('undici');
 const { tool } = require('@langchain/core/tools');
+const { logAxiosError } = require('@librechat/api');
 const { logger } = require('@librechat/data-schemas');
-const { logAxiosError, oaiToolkit } = require('@librechat/api');
 const { ContentTypes, EImageOutputType } = require('librechat-data-provider');
 const { getStrategyFunctions } = require('~/server/services/Files/strategies');
-const extractBaseURL = require('~/utils/extractBaseURL');
+const { extractBaseURL } = require('~/utils');
 const { getFiles } = require('~/models/File');

+/** 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.";

@@ -38,6 +91,22 @@ function returnValue(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;
+};
+
 function createAbortHandler() {
  return function () {
    logger.debug('[ImageGenOAI] Image generation aborted');
@@ -52,9 +121,7 @@ function createAbortHandler() {
 * @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
- * @param {string} [fields.imageOutputType] - The image output type configuration
- * @param {string} [fields.fileStrategy] - The file storage strategy
- * @returns {Array<ReturnType<tool>>} - Array of image tools
+ * @returns {Array} - Array of image tools
 */
 function createOpenAIImageTools(fields = {}) {
  /** @type {boolean} Used to initialize the Tool without necessary variables. */
@@ -64,8 +131,8 @@ function createOpenAIImageTools(fields = {}) {
    throw new Error('This tool is only available for agents.');
  }
  const { req } = fields;
-  const imageOutputType = fields.imageOutputType || EImageOutputType.PNG;
-  const appFileStrategy = fields.fileStrategy;
+  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 ?? '';
@@ -218,7 +285,46 @@ Error Message: ${error.message}`);
      ];
      return [response, { content, file_ids }];
    },
-    oaiToolkit.image_gen_oai,
+    {
+      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',
+    },
  );

  /**
@@ -411,7 +517,48 @@ Error Message: ${error.message || 'Unknown error'}`);
        }
      }
    },
-    oaiToolkit.image_edit_oai,
+    {
+      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];
--- a/api/app/clients/tools/structured/StableDiffusion.js
+++ b/api/app/clients/tools/structured/StableDiffusion.js
@@ -11,14 +11,14 @@ 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.";
+  '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();
    /** @type {string} User ID */
    this.userId = fields.userId;
-    /** @type {ServerRequest | undefined} Express Request object, only provided by ToolService */
+    /** @type {Express.Request | undefined} Express Request object, only provided by ToolService */
    this.req = fields.req;
    /** @type {boolean} Used to initialize the Tool without necessary variables. */
    this.override = fields.override ?? false;
@@ -44,7 +44,7 @@ class StableDiffusionAPI extends Tool {
 // "negative_prompt":"semi-realistic, cgi, 3d, render, sketch, cartoon, drawing, anime, out of frame, low quality, ugly, mutation, deformed"
 // - Generate images only once per human query unless explicitly requested by the user`;
    this.description =
-      "You can generate images using text with 'stable-diffusion'. This tool is exclusively for visual content.";
+      'You can generate images using text with \'stable-diffusion\'. This tool is exclusively for visual content.';
    this.schema = z.object({
      prompt: z
        .string()
--- a/api/app/clients/tools/structured/YouTube.js
+++ b/api/app/clients/tools/structured/YouTube.js
@@ -1,9 +1,9 @@
-const { ytToolkit } = require('@librechat/api');
+const { z } = require('zod');
 const { tool } = require('@langchain/core/tools');
 const { youtube } = require('@googleapis/youtube');
-const { logger } = require('@librechat/data-schemas');
 const { YoutubeTranscript } = require('youtube-transcript');
 const { getApiKey } = require('./credentials');
+const { logger } = require('~/config');

 function extractVideoId(url) {
  const rawIdRegex = /^[a-zA-Z0-9_-]{11}$/;
@@ -29,7 +29,7 @@ function parseTranscript(transcriptResponse) {
    .map((entry) => entry.text.trim())
    .filter((text) => text)
    .join(' ')
-    .replaceAll('&amp;#39;', "'");
+    .replaceAll('&amp;#39;', '\'');
 }

 function createYouTubeTools(fields = {}) {
@@ -42,94 +42,160 @@ function createYouTubeTools(fields = {}) {
    auth: apiKey,
  });

-  const searchTool = tool(async ({ query, maxResults = 5 }) => {
-    const response = await youtubeClient.search.list({
-      part: 'snippet',
-      q: query,
-      type: 'video',
-      maxResults: maxResults || 5,
-    });
-    const result = response.data.items.map((item) => ({
-      title: item.snippet.title,
-      description: item.snippet.description,
-      url: `https://www.youtube.com/watch?v=${item.id.videoId}`,
-    }));
-    return JSON.stringify(result, null, 2);
-  }, ytToolkit.youtube_search);
+  const searchTool = tool(
+    async ({ query, maxResults = 5 }) => {
+      const response = await youtubeClient.search.list({
+        part: 'snippet',
+        q: query,
+        type: 'video',
+        maxResults: maxResults || 5,
+      });
+      const result = response.data.items.map((item) => ({
+        title: item.snippet.title,
+        description: item.snippet.description,
+        url: `https://www.youtube.com/watch?v=${item.id.videoId}`,
+      }));
+      return JSON.stringify(result, null, 2);
+    },
+    {
+      name: 'youtube_search',
+      description: `Search for YouTube videos by keyword or phrase.
+- Required: query (search terms to find videos)
+- Optional: maxResults (number of videos to return, 1-50, default: 5)
+- Returns: List of videos with titles, descriptions, and URLs
+- Use for: Finding specific videos, exploring content, research
+Example: query="cooking pasta tutorials" maxResults=3`,
+      schema: z.object({
+        query: z.string().describe('Search query terms'),
+        maxResults: z.number().int().min(1).max(50).optional().describe('Number of results (1-50)'),
+      }),
+    },
+  );

-  const infoTool = tool(async ({ url }) => {
-    const videoId = extractVideoId(url);
-    if (!videoId) {
-      throw new Error('Invalid YouTube URL or video ID');
-    }
+  const infoTool = tool(
+    async ({ url }) => {
+      const videoId = extractVideoId(url);
+      if (!videoId) {
+        throw new Error('Invalid YouTube URL or video ID');
+      }

-    const response = await youtubeClient.videos.list({
-      part: 'snippet,statistics',
-      id: videoId,
-    });
+      const response = await youtubeClient.videos.list({
+        part: 'snippet,statistics',
+        id: videoId,
+      });

-    if (!response.data.items?.length) {
-      throw new Error('Video not found');
-    }
-    const video = response.data.items[0];
+      if (!response.data.items?.length) {
+        throw new Error('Video not found');
+      }
+      const video = response.data.items[0];

-    const result = {
-      title: video.snippet.title,
-      description: video.snippet.description,
-      views: video.statistics.viewCount,
-      likes: video.statistics.likeCount,
-      comments: video.statistics.commentCount,
-    };
-    return JSON.stringify(result, null, 2);
-  }, ytToolkit.youtube_info);
+      const result = {
+        title: video.snippet.title,
+        description: video.snippet.description,
+        views: video.statistics.viewCount,
+        likes: video.statistics.likeCount,
+        comments: video.statistics.commentCount,
+      };
+      return JSON.stringify(result, null, 2);
+    },
+    {
+      name: 'youtube_info',
+      description: `Get detailed metadata and statistics for a specific YouTube video.
+- Required: url (full YouTube URL or video ID)
+- Returns: Video title, description, view count, like count, comment count
+- Use for: Getting video metrics and basic metadata
+- DO NOT USE FOR VIDEO SUMMARIES, USE TRANSCRIPTS FOR COMPREHENSIVE ANALYSIS
+- Accepts both full URLs and video IDs
+Example: url="https://youtube.com/watch?v=abc123" or url="abc123"`,
+      schema: z.object({
+        url: z.string().describe('YouTube video URL or ID'),
+      }),
+    },
+  );

-  const commentsTool = tool(async ({ url, maxResults = 10 }) => {
-    const videoId = extractVideoId(url);
-    if (!videoId) {
-      throw new Error('Invalid YouTube URL or video ID');
-    }
+  const commentsTool = tool(
+    async ({ url, maxResults = 10 }) => {
+      const videoId = extractVideoId(url);
+      if (!videoId) {
+        throw new Error('Invalid YouTube URL or video ID');
+      }

-    const response = await youtubeClient.commentThreads.list({
-      part: 'snippet',
-      videoId,
-      maxResults: maxResults || 10,
-    });
+      const response = await youtubeClient.commentThreads.list({
+        part: 'snippet',
+        videoId,
+        maxResults: maxResults || 10,
+      });

-    const result = response.data.items.map((item) => ({
-      author: item.snippet.topLevelComment.snippet.authorDisplayName,
-      text: item.snippet.topLevelComment.snippet.textDisplay,
-      likes: item.snippet.topLevelComment.snippet.likeCount,
-    }));
-    return JSON.stringify(result, null, 2);
-  }, ytToolkit.youtube_comments);
+      const result = response.data.items.map((item) => ({
+        author: item.snippet.topLevelComment.snippet.authorDisplayName,
+        text: item.snippet.topLevelComment.snippet.textDisplay,
+        likes: item.snippet.topLevelComment.snippet.likeCount,
+      }));
+      return JSON.stringify(result, null, 2);
+    },
+    {
+      name: 'youtube_comments',
+      description: `Retrieve top-level comments from a YouTube video.
+- Required: url (full YouTube URL or video ID)
+- Optional: maxResults (number of comments, 1-50, default: 10)
+- Returns: Comment text, author names, like counts
+- Use for: Sentiment analysis, audience feedback, engagement review
+Example: url="abc123" maxResults=20`,
+      schema: z.object({
+        url: z.string().describe('YouTube video URL or ID'),
+        maxResults: z
+          .number()
+          .int()
+          .min(1)
+          .max(50)
+          .optional()
+          .describe('Number of comments to retrieve'),
+      }),
+    },
+  );

-  const transcriptTool = tool(async ({ url }) => {
-    const videoId = extractVideoId(url);
-    if (!videoId) {
-      throw new Error('Invalid YouTube URL or video ID');
-    }
-
-    try {
-      try {
-        const transcript = await YoutubeTranscript.fetchTranscript(videoId, { lang: 'en' });
-        return parseTranscript(transcript);
-      } catch (e) {
-        logger.error(e);
+  const transcriptTool = tool(
+    async ({ url }) => {
+      const videoId = extractVideoId(url);
+      if (!videoId) {
+        throw new Error('Invalid YouTube URL or video ID');
      }

      try {
-        const transcript = await YoutubeTranscript.fetchTranscript(videoId, { lang: 'de' });
-        return parseTranscript(transcript);
-      } catch (e) {
-        logger.error(e);
-      }
+        try {
+          const transcript = await YoutubeTranscript.fetchTranscript(videoId, { lang: 'en' });
+          return parseTranscript(transcript);
+        } catch (e) {
+          logger.error(e);
+        }

-      const transcript = await YoutubeTranscript.fetchTranscript(videoId);
-      return parseTranscript(transcript);
-    } catch (error) {
-      throw new Error(`Failed to fetch transcript: ${error.message}`);
-    }
-  }, ytToolkit.youtube_transcript);
+        try {
+          const transcript = await YoutubeTranscript.fetchTranscript(videoId, { lang: 'de' });
+          return parseTranscript(transcript);
+        } catch (e) {
+          logger.error(e);
+        }
+
+        const transcript = await YoutubeTranscript.fetchTranscript(videoId);
+        return parseTranscript(transcript);
+      } catch (error) {
+        throw new Error(`Failed to fetch transcript: ${error.message}`);
+      }
+    },
+    {
+      name: 'youtube_transcript',
+      description: `Fetch and parse the transcript/captions of a YouTube video.
+- Required: url (full YouTube URL or video ID)
+- Returns: Full video transcript as plain text
+- Use for: Content analysis, summarization, translation reference
+- This is the "Go-to" tool for analyzing actual video content
+- Attempts to fetch English first, then German, then any available language
+Example: url="https://youtube.com/watch?v=abc123"`,
+      schema: z.object({
+        url: z.string().describe('YouTube video URL or ID'),
+      }),
+    },
+  );

  return [searchTool, infoTool, commentsTool, transcriptTool];
 }
--- a/api/app/clients/tools/structured/specs/DALLE3-proxy.spec.js
+++ b/api/app/clients/tools/structured/specs/DALLE3-proxy.spec.js
@@ -1,9 +1,43 @@
 const DALLE3 = require('../DALLE3');
 const { ProxyAgent } = require('undici');

-jest.mock('tiktoken');
 const processFileURL = jest.fn();

+jest.mock('~/server/services/Files/images', () => ({
+  getImageBasename: jest.fn().mockImplementation((url) => {
+    const parts = url.split('/');
+    const lastPart = parts.pop();
+    const imageExtensionRegex = /\.(jpg|jpeg|png|gif|bmp|tiff|svg)$/i;
+    if (imageExtensionRegex.test(lastPart)) {
+      return lastPart;
+    }
+    return '';
+  }),
+}));
+
+jest.mock('fs', () => {
+  return {
+    existsSync: jest.fn(),
+    mkdirSync: jest.fn(),
+    promises: {
+      writeFile: jest.fn(),
+      readFile: jest.fn(),
+      unlink: jest.fn(),
+    },
+  };
+});
+
+jest.mock('path', () => {
+  return {
+    resolve: jest.fn(),
+    join: jest.fn(),
+    relative: jest.fn(),
+    extname: jest.fn().mockImplementation((filename) => {
+      return filename.slice(filename.lastIndexOf('.'));
+    }),
+  };
+});
+
 describe('DALLE3 Proxy Configuration', () => {
  let originalEnv;

--- a/api/app/clients/tools/structured/specs/DALLE3.spec.js
+++ b/api/app/clients/tools/structured/specs/DALLE3.spec.js
@@ -1,8 +1,9 @@
 const OpenAI = require('openai');
-const { logger } = require('@librechat/data-schemas');
 const DALLE3 = require('../DALLE3');
+const logger = require('~/config/winston');

 jest.mock('openai');
+
 jest.mock('@librechat/data-schemas', () => {
  return {
    logger: {
@@ -25,6 +26,25 @@ jest.mock('tiktoken', () => {

 const processFileURL = jest.fn();

+jest.mock('~/server/services/Files/images', () => ({
+  getImageBasename: jest.fn().mockImplementation((url) => {
+    // Split the URL by '/'
+    const parts = url.split('/');
+
+    // Get the last part of the URL
+    const lastPart = parts.pop();
+
+    // Check if the last part of the URL matches the image extension regex
+    const imageExtensionRegex = /\.(jpg|jpeg|png|gif|bmp|tiff|svg)$/i;
+    if (imageExtensionRegex.test(lastPart)) {
+      return lastPart;
+    }
+
+    // If the regex test fails, return an empty string
+    return '';
+  }),
+}));
+
 const generate = jest.fn();
 OpenAI.mockImplementation(() => ({
  images: {
--- a/api/app/clients/tools/util/fileSearch.js
+++ b/api/app/clients/tools/util/fileSearch.js
@@ -2,9 +2,9 @@ const { z } = require('zod');
 const axios = require('axios');
 const { tool } = require('@langchain/core/tools');
 const { logger } = require('@librechat/data-schemas');
-const { generateShortLivedToken } = require('@librechat/api');
 const { Tools, EToolResources } = require('librechat-data-provider');
 const { filterFilesByAgentAccess } = require('~/server/services/Files/permissions');
+const { generateShortLivedToken } = require('~/server/services/AuthService');
 const { getFiles } = require('~/models/File');

 /**
@@ -71,10 +71,9 @@ const primeFiles = async (options) => {
 * @param {ServerRequest} options.req
 * @param {Array<{ file_id: string; filename: string }>} options.files
 * @param {string} [options.entity_id]
- * @param {boolean} [options.fileCitations=false] - Whether to include citation instructions
 * @returns
 */
-const createFileSearchTool = async ({ req, files, entity_id, fileCitations = false }) => {
+const createFileSearchTool = async ({ req, files, entity_id }) => {
  return tool(
    async ({ query }) => {
      if (files.length === 0) {
@@ -143,9 +142,9 @@ const createFileSearchTool = async ({ req, files, entity_id, fileCitations = fal
      const formattedString = formattedResults
        .map(
          (result, index) =>
-            `File: ${result.filename}${
-              fileCitations ? `\nAnchor: \\ue202turn0file${index} (${result.filename})` : ''
-            }\nRelevance: ${(1.0 - result.distance).toFixed(4)}\nContent: ${result.content}\n`,
+            `File: ${result.filename}\nAnchor: \\ue202turn0file${index} (${result.filename})\nRelevance: ${(1.0 - result.distance).toFixed(4)}\nContent: ${
+              result.content
+            }\n`,
        )
        .join('\n---\n');

@@ -159,14 +158,12 @@ const createFileSearchTool = async ({ req, files, entity_id, fileCitations = fal
        pageRelevance: result.page ? { [result.page]: 1.0 - result.distance } : {},
      }));

-      return [formattedString, { [Tools.file_search]: { sources, fileCitations } }];
+      return [formattedString, { [Tools.file_search]: { sources } }];
    },
    {
      name: Tools.file_search,
      responseFormat: 'content_and_artifact',
-      description: `Performs semantic search across attached "${Tools.file_search}" documents using natural language queries. This tool analyzes the content of uploaded files to find relevant information, quotes, and passages that best match your query. Use this to extract specific information or find relevant sections within the available documents.${
-        fileCitations
-          ? `
+      description: `Performs semantic search across attached "${Tools.file_search}" documents using natural language queries. This tool analyzes the content of uploaded files to find relevant information, quotes, and passages that best match your query. Use this to extract specific information or find relevant sections within the available documents.

 **CITE FILE SEARCH RESULTS:**
 Use anchor markers immediately after statements derived from file content. Reference the filename in your text:
@@ -174,9 +171,7 @@ Use anchor markers immediately after statements derived from file content. Refer
 - Page reference: "According to report.docx... \\ue202turn0file1"
 - Multi-file: "Multiple sources confirm... \\ue200\\ue202turn0file0\\ue202turn0file1\\ue201"

-**ALWAYS mention the filename in your text before the citation marker. NEVER use markdown links or footnotes.**`
-          : ''
-      }`,
+**ALWAYS mention the filename in your text before the citation marker. NEVER use markdown links or footnotes.**`,
      schema: z.object({
        query: z
          .string()
--- a/api/app/clients/tools/util/handleTools.js
+++ b/api/app/clients/tools/util/handleTools.js
@@ -1,16 +1,9 @@
 const { logger } = require('@librechat/data-schemas');
 const { SerpAPI } = require('@langchain/community/tools/serpapi');
 const { Calculator } = require('@langchain/community/tools/calculator');
-const { mcpToolPattern, loadWebSearchAuth, checkAccess } = require('@librechat/api');
+const { mcpToolPattern, loadWebSearchAuth } = require('@librechat/api');
 const { EnvVar, createCodeExecutionTool, createSearchTool } = require('@librechat/agents');
-const {
-  Tools,
-  Constants,
-  Permissions,
-  EToolResources,
-  PermissionTypes,
-  replaceSpecialVars,
-} = require('librechat-data-provider');
+const { Tools, Constants, EToolResources, replaceSpecialVars } = require('librechat-data-provider');
 const {
  availableTools,
  manifestToolMap,
@@ -34,7 +27,6 @@ const { getUserPluginAuthValue } = require('~/server/services/PluginService');
 const { createMCPTool, createMCPTools } = require('~/server/services/MCP');
 const { loadAuthValues } = require('~/server/services/Tools/credentials');
 const { getCachedTools } = require('~/server/services/Config');
-const { getRoleByName } = require('~/models/Role');

 /**
 * Validates the availability and authentication of tools for a user based on environment variables or user-specific plugin authentication values.
@@ -129,21 +121,18 @@ const getAuthFields = (toolKey) => {

 /**
 *
- * @param {object} params
- * @param {string} params.user
+ * @param {object} object
+ * @param {string} object.user
 * @param {Record<string, Record<string, string>>} [object.userMCPAuthMap]
 * @param {AbortSignal} [object.signal]
- * @param {Pick<Agent, 'id' | 'provider' | 'model'>} [params.agent]
- * @param {string} [params.model]
- * @param {EModelEndpoint} [params.endpoint]
- * @param {LoadToolOptions} [params.options]
- * @param {boolean} [params.useSpecs]
- * @param {Array<string>} params.tools
- * @param {boolean} [params.functions]
- * @param {boolean} [params.returnMap]
- * @param {AppConfig['webSearch']} [params.webSearch]
- * @param {AppConfig['fileStrategy']} [params.fileStrategy]
- * @param {AppConfig['imageOutputType']} [params.imageOutputType]
+ * @param {Pick<Agent, 'id' | 'provider' | 'model'>} [object.agent]
+ * @param {string} [object.model]
+ * @param {EModelEndpoint} [object.endpoint]
+ * @param {LoadToolOptions} [object.options]
+ * @param {boolean} [object.useSpecs]
+ * @param {Array<string>} object.tools
+ * @param {boolean} [object.functions]
+ * @param {boolean} [object.returnMap]
 * @returns {Promise<{ loadedTools: Tool[], toolContextMap: Object<string, any> } | Record<string,Tool>>}
 */
 const loadTools = async ({
@@ -157,9 +146,6 @@ const loadTools = async ({
  options = {},
  functions = true,
  returnMap = false,
-  webSearch,
-  fileStrategy,
-  imageOutputType,
 }) => {
  const toolConstructors = {
    flux: FluxAPI,
@@ -218,8 +204,6 @@ const loadTools = async ({
        ...authValues,
        isAgent: !!agent,
        req: options.req,
-        imageOutputType,
-        fileStrategy,
        imageFiles,
      });
    },
@@ -235,7 +219,7 @@ const loadTools = async ({
  const imageGenOptions = {
    isAgent: !!agent,
    req: options.req,
-    fileStrategy,
+    fileStrategy: options.fileStrategy,
    processFileURL: options.processFileURL,
    returnMetadata: options.returnMetadata,
    uploadImageBuffer: options.uploadImageBuffer,
@@ -289,36 +273,15 @@ const loadTools = async ({
        if (toolContext) {
          toolContextMap[tool] = toolContext;
        }
-
-        /** @type {boolean | undefined} Check if user has FILE_CITATIONS permission */
-        let fileCitations;
-        if (fileCitations == null && options.req?.user != null) {
-          try {
-            fileCitations = await checkAccess({
-              user: options.req.user,
-              permissionType: PermissionTypes.FILE_CITATIONS,
-              permissions: [Permissions.USE],
-              getRoleByName,
-            });
-          } catch (error) {
-            logger.error('[handleTools] FILE_CITATIONS permission check failed:', error);
-            fileCitations = false;
-          }
-        }
-
-        return createFileSearchTool({
-          req: options.req,
-          files,
-          entity_id: agent?.id,
-          fileCitations,
-        });
+        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: webSearch,
+        webSearchConfig,
      });
      const { onSearchResults, onGetHighlights } = options?.[Tools.web_search] ?? {};
      requestedTools[tool] = async () => {
@@ -342,16 +305,6 @@ Current Date & Time: ${replaceSpecialVars({ text: '{{iso_datetime}}' })}
      continue;
    } else if (tool && cachedTools && mcpToolPattern.test(tool)) {
      const [toolName, serverName] = tool.split(Constants.mcp_delimiter);
-      if (toolName === Constants.mcp_server) {
-        /** Placeholder used for UI purposes */
-        continue;
-      }
-      if (serverName && options.req?.config?.mcpConfig?.[serverName] == null) {
-        logger.warn(
-          `MCP server "${serverName}" for "${toolName}" tool is not configured${agent?.id != null && agent.id ? ` but attached to "${agent.id}"` : ''}`,
-        );
-        continue;
-      }
      if (toolName === Constants.mcp_all) {
        const currentMCPGenerator = async (index) =>
          createMCPTools({
--- a/api/app/clients/tools/util/handleTools.test.js
+++ b/api/app/clients/tools/util/handleTools.test.js
@@ -9,27 +9,6 @@ const mockPluginService = {

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

-jest.mock('~/server/services/Config', () => ({
-  getAppConfig: jest.fn().mockResolvedValue({
-    // Default app config for tool tests
-    paths: { uploads: '/tmp' },
-    fileStrategy: 'local',
-    filteredTools: [],
-    includedTools: [],
-  }),
-  getCachedTools: jest.fn().mockResolvedValue({
-    // Default cached tools for tests
-    dalle: {
-      type: 'function',
-      function: {
-        name: 'dalle',
-        description: 'DALL-E image generation',
-        parameters: {},
-      },
-    },
-  }),
-}));
-
 const { BaseLLM } = require('@langchain/openai');
 const { Calculator } = require('@langchain/community/tools/calculator');

--- a/api/cache/cacheConfig.js
+++ b/api/cache/cacheConfig.js
@@ -52,9 +52,6 @@ const cacheConfig = {
  REDIS_CONNECT_TIMEOUT: math(process.env.REDIS_CONNECT_TIMEOUT, 10000),
  /** Queue commands when disconnected */
  REDIS_ENABLE_OFFLINE_QUEUE: isEnabled(process.env.REDIS_ENABLE_OFFLINE_QUEUE ?? 'true'),
-  /** flag to modify redis connection by adding dnsLookup this is required when connecting to elasticache for ioredis
-   * see "Special Note: Aws Elasticache Clusters with TLS" on this webpage:  https://www.npmjs.com/package/ioredis **/
-  REDIS_USE_ALTERNATIVE_DNS_LOOKUP: isEnabled(process.env.REDIS_USE_ALTERNATIVE_DNS_LOOKUP),
  /** Enable redis cluster without the need of multiple URIs */
  USE_REDIS_CLUSTER: isEnabled(process.env.USE_REDIS_CLUSTER ?? 'false'),
  CI: isEnabled(process.env.CI),
--- a/api/cache/cacheConfig.spec.js
+++ b/api/cache/cacheConfig.spec.js
@@ -157,11 +157,12 @@ describe('cacheConfig', () => {

  describe('FORCED_IN_MEMORY_CACHE_NAMESPACES validation', () => {
    test('should parse comma-separated cache keys correctly', () => {
-      process.env.FORCED_IN_MEMORY_CACHE_NAMESPACES = ' ROLES, MESSAGES ';
+      process.env.FORCED_IN_MEMORY_CACHE_NAMESPACES = ' ROLES, STATIC_CONFIG ,MESSAGES ';

      const { cacheConfig } = require('./cacheConfig');
      expect(cacheConfig.FORCED_IN_MEMORY_CACHE_NAMESPACES).toEqual([
        'ROLES',
+        'STATIC_CONFIG',
        'MESSAGES',
      ]);
    });
--- a/api/cache/getLogStores.js
+++ b/api/cache/getLogStores.js
@@ -31,8 +31,8 @@ const namespaces = {
  [CacheKeys.SAML_SESSION]: sessionCache(CacheKeys.SAML_SESSION),

  [CacheKeys.ROLES]: standardCache(CacheKeys.ROLES),
-  [CacheKeys.APP_CONFIG]: standardCache(CacheKeys.APP_CONFIG),
  [CacheKeys.CONFIG_STORE]: standardCache(CacheKeys.CONFIG_STORE),
+  [CacheKeys.STATIC_CONFIG]: standardCache(CacheKeys.STATIC_CONFIG),
  [CacheKeys.PENDING_REQ]: standardCache(CacheKeys.PENDING_REQ),
  [CacheKeys.ENCODED_DOMAINS]: new Keyv({ store: keyvMongo, namespace: CacheKeys.ENCODED_DOMAINS }),
  [CacheKeys.ABORT_KEYS]: standardCache(CacheKeys.ABORT_KEYS, Time.TEN_MINUTES),
--- a/api/cache/redisClients.js
+++ b/api/cache/redisClients.js
@@ -53,9 +53,6 @@ if (cacheConfig.USE_REDIS) {
      : new IoRedis.Cluster(
          urls.map((url) => ({ host: url.hostname, port: parseInt(url.port, 10) || 6379 })),
          {
-            ...(cacheConfig.REDIS_USE_ALTERNATIVE_DNS_LOOKUP
-              ? { dnsLookup: (address, callback) => callback(null, address) }
-              : {}),
            redisOptions,
            clusterRetryStrategy: (times) => {
              if (
--- a/api/models/Agent.js
+++ b/api/models/Agent.js
@@ -681,7 +681,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 {IUser} params.user - Parameters for updating the agent's projects.
+ * @param {MongoUser} 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.
--- a/api/models/Conversation.js
+++ b/api/models/Conversation.js
@@ -1,5 +1,6 @@
 const { logger } = require('@librechat/data-schemas');
 const { createTempChatExpirationDate } = require('@librechat/api');
+const { getCustomConfig } = require('~/server/services/Config/getCustomConfig');
 const { getMessages, deleteMessages } = require('./Message');
 const { Conversation } = require('~/db/models');

@@ -101,8 +102,8 @@ module.exports = {

      if (req?.body?.isTemporary) {
        try {
-          const appConfig = req.config;
-          update.expiredAt = createTempChatExpirationDate(appConfig?.interfaceConfig);
+          const customConfig = await getCustomConfig();
+          update.expiredAt = createTempChatExpirationDate(customConfig);
        } catch (err) {
          logger.error('Error creating temporary chat expiration date:', err);
          logger.info(`---\`saveConvo\` context: ${metadata?.context}`);
@@ -112,17 +113,8 @@ module.exports = {
        update.expiredAt = null;
      }

-      /** @type {{ $set: Partial<TConversation>; $addToSet?: Record<string, any>; $unset?: Record<keyof TConversation, number> }} */
+      /** @type {{ $set: Partial<TConversation>; $unset?: Record<keyof TConversation, number> }} */
      const updateOperation = { $set: update };
-
-      if (convo.model && convo.endpoint) {
-        updateOperation.$addToSet = {
-          modelHistory: {
-            model: convo.model,
-            endpoint: convo.endpoint,
-          },
-        };
-      }
      if (metadata && metadata.unsetFields && Object.keys(metadata.unsetFields).length > 0) {
        updateOperation.$unset = metadata.unsetFields;
      }
--- a/api/models/Conversation.spec.js
+++ b/api/models/Conversation.spec.js
@@ -13,8 +13,9 @@ const {
  saveConvo,
  getConvo,
 } = require('./Conversation');
-jest.mock('~/server/services/Config/app');
+jest.mock('~/server/services/Config/getCustomConfig');
 jest.mock('./Message');
+const { getCustomConfig } = require('~/server/services/Config/getCustomConfig');
 const { getMessages, deleteMessages } = require('./Message');

 const { Conversation } = require('~/db/models');
@@ -49,11 +50,6 @@ describe('Conversation Operations', () => {
    mockReq = {
      user: { id: 'user123' },
      body: {},
-      config: {
-        interfaceConfig: {
-          temporaryChatRetention: 24, // Default 24 hours
-        },
-      },
    };

    mockConversationData = {
@@ -122,8 +118,12 @@ describe('Conversation Operations', () => {

  describe('isTemporary conversation handling', () => {
    it('should save a conversation with expiredAt when isTemporary is true', async () => {
-      // Mock app config with 24 hour retention
-      mockReq.config.interfaceConfig.temporaryChatRetention = 24;
+      // Mock custom config with 24 hour retention
+      getCustomConfig.mockResolvedValue({
+        interface: {
+          temporaryChatRetention: 24,
+        },
+      });

      mockReq.body = { isTemporary: true };

@@ -167,8 +167,12 @@ describe('Conversation Operations', () => {
    });

    it('should use custom retention period from config', async () => {
-      // Mock app config with 48 hour retention
-      mockReq.config.interfaceConfig.temporaryChatRetention = 48;
+      // Mock custom config with 48 hour retention
+      getCustomConfig.mockResolvedValue({
+        interface: {
+          temporaryChatRetention: 48,
+        },
+      });

      mockReq.body = { isTemporary: true };

@@ -190,8 +194,12 @@ describe('Conversation Operations', () => {
    });

    it('should handle minimum retention period (1 hour)', async () => {
-      // Mock app config with less than minimum retention
-      mockReq.config.interfaceConfig.temporaryChatRetention = 0.5; // Half hour - should be clamped to 1 hour
+      // Mock custom config with less than minimum retention
+      getCustomConfig.mockResolvedValue({
+        interface: {
+          temporaryChatRetention: 0.5, // Half hour - should be clamped to 1 hour
+        },
+      });

      mockReq.body = { isTemporary: true };

@@ -213,8 +221,12 @@ describe('Conversation Operations', () => {
    });

    it('should handle maximum retention period (8760 hours)', async () => {
-      // Mock app config with more than maximum retention
-      mockReq.config.interfaceConfig.temporaryChatRetention = 10000; // Should be clamped to 8760 hours
+      // Mock custom config with more than maximum retention
+      getCustomConfig.mockResolvedValue({
+        interface: {
+          temporaryChatRetention: 10000, // Should be clamped to 8760 hours
+        },
+      });

      mockReq.body = { isTemporary: true };

@@ -235,36 +247,22 @@ describe('Conversation Operations', () => {
      );
    });

-    it('should handle missing config gracefully', async () => {
-      // Simulate missing config - should use default retention period
-      delete mockReq.config;
+    it('should handle getCustomConfig errors gracefully', async () => {
+      // Mock getCustomConfig to throw an error
+      getCustomConfig.mockRejectedValue(new Error('Config service unavailable'));

      mockReq.body = { isTemporary: true };

-      const beforeSave = new Date();
      const result = await saveConvo(mockReq, mockConversationData);
-      const afterSave = new Date();

-      // Should still save the conversation with default retention period (30 days)
+      // Should still save the conversation but with expiredAt as null
      expect(result.conversationId).toBe(mockConversationData.conversationId);
-      expect(result.expiredAt).toBeDefined();
-      expect(result.expiredAt).toBeInstanceOf(Date);
-
-      // Verify expiredAt is approximately 30 days in the future (720 hours)
-      const expectedExpirationTime = new Date(beforeSave.getTime() + 720 * 60 * 60 * 1000);
-      const actualExpirationTime = new Date(result.expiredAt);
-
-      expect(actualExpirationTime.getTime()).toBeGreaterThanOrEqual(
-        expectedExpirationTime.getTime() - 1000,
-      );
-      expect(actualExpirationTime.getTime()).toBeLessThanOrEqual(
-        new Date(afterSave.getTime() + 720 * 60 * 60 * 1000 + 1000).getTime(),
-      );
+      expect(result.expiredAt).toBeNull();
    });

    it('should use default retention when config is not provided', async () => {
-      // Mock getAppConfig to return empty config
-      mockReq.config = {}; // Empty config
+      // Mock getCustomConfig to return empty config
+      getCustomConfig.mockResolvedValue({});

      mockReq.body = { isTemporary: true };

@@ -287,7 +285,11 @@ describe('Conversation Operations', () => {

    it('should update expiredAt when saving existing temporary conversation', async () => {
      // First save a temporary conversation
-      mockReq.config.interfaceConfig.temporaryChatRetention = 24;
+      getCustomConfig.mockResolvedValue({
+        interface: {
+          temporaryChatRetention: 24,
+        },
+      });

      mockReq.body = { isTemporary: true };
      const firstSave = await saveConvo(mockReq, mockConversationData);
--- a/api/models/File.spec.js
+++ b/api/models/File.spec.js
@@ -211,7 +211,7 @@ describe('File Access Control', () => {
      expect(accessMap.get(fileIds[1])).toBe(false);
    });

-    it('should deny access when user only has VIEW permission and needs access for deletion', async () => {
+    it('should deny access when user only has VIEW permission', async () => {
      const userId = new mongoose.Types.ObjectId();
      const authorId = new mongoose.Types.ObjectId();
      const agentId = uuidv4();
@@ -263,71 +263,12 @@ describe('File Access Control', () => {
        role: SystemRoles.USER,
        fileIds,
        agentId,
-        isDelete: true,
      });

      // Should have no access to any files when only VIEW permission
      expect(accessMap.get(fileIds[0])).toBe(false);
      expect(accessMap.get(fileIds[1])).toBe(false);
    });
-
-    it('should grant access when user has VIEW permission', async () => {
-      const userId = new mongoose.Types.ObjectId();
-      const authorId = new mongoose.Types.ObjectId();
-      const agentId = uuidv4();
-      const fileIds = [uuidv4(), uuidv4()];
-
-      // Create users
-      await User.create({
-        _id: userId,
-        email: 'user@example.com',
-        emailVerified: true,
-        provider: 'local',
-      });
-
-      await User.create({
-        _id: authorId,
-        email: 'author@example.com',
-        emailVerified: true,
-        provider: 'local',
-      });
-
-      // Create agent with files
-      const agent = await createAgent({
-        id: agentId,
-        name: 'View-Only Agent',
-        author: authorId,
-        model: 'gpt-4',
-        provider: 'openai',
-        tool_resources: {
-          file_search: {
-            file_ids: fileIds,
-          },
-        },
-      });
-
-      // Grant only VIEW permission to user on the agent
-      await grantPermission({
-        principalType: PrincipalType.USER,
-        principalId: userId,
-        resourceType: ResourceType.AGENT,
-        resourceId: agent._id,
-        accessRoleId: AccessRoleIds.AGENT_VIEWER,
-        grantedBy: authorId,
-      });
-
-      // Check access for files
-      const { hasAccessToFilesViaAgent } = require('~/server/services/Files/permissions');
-      const accessMap = await hasAccessToFilesViaAgent({
-        userId: userId,
-        role: SystemRoles.USER,
-        fileIds,
-        agentId,
-      });
-
-      expect(accessMap.get(fileIds[0])).toBe(true);
-      expect(accessMap.get(fileIds[1])).toBe(true);
-    });
  });

  describe('getFiles with agent access control', () => {
--- a/api/models/Message.js
+++ b/api/models/Message.js
@@ -1,6 +1,7 @@
 const { z } = require('zod');
 const { logger } = require('@librechat/data-schemas');
 const { createTempChatExpirationDate } = require('@librechat/api');
+const { getCustomConfig } = require('~/server/services/Config/getCustomConfig');
 const { Message } = require('~/db/models');

 const idSchema = z.string().uuid();
@@ -10,7 +11,7 @@ const idSchema = z.string().uuid();
 *
 * @async
 * @function saveMessage
- * @param {ServerRequest} req - The request object containing user information.
+ * @param {Express.Request} req - The request object containing user information.
 * @param {Object} params - The message data object.
 * @param {string} params.endpoint - The endpoint where the message originated.
 * @param {string} params.iconURL - The URL of the sender's icon.
@@ -56,8 +57,8 @@ async function saveMessage(req, params, metadata) {

    if (req?.body?.isTemporary) {
      try {
-        const appConfig = req.config;
-        update.expiredAt = createTempChatExpirationDate(appConfig?.interfaceConfig);
+        const customConfig = await getCustomConfig();
+        update.expiredAt = createTempChatExpirationDate(customConfig);
      } catch (err) {
        logger.error('Error creating temporary chat expiration date:', err);
        logger.info(`---\`saveMessage\` context: ${metadata?.context}`);
--- a/api/models/Message.spec.js
+++ b/api/models/Message.spec.js
@@ -13,7 +13,8 @@ const {
  deleteMessagesSince,
 } = require('./Message');

-jest.mock('~/server/services/Config/app');
+jest.mock('~/server/services/Config/getCustomConfig');
+const { getCustomConfig } = require('~/server/services/Config/getCustomConfig');

 /**
 * @type {import('mongoose').Model<import('@librechat/data-schemas').IMessage>}
@@ -43,11 +44,6 @@ describe('Message Operations', () => {

    mockReq = {
      user: { id: 'user123' },
-      config: {
-        interfaceConfig: {
-          temporaryChatRetention: 24, // Default 24 hours
-        },
-      },
    };

    mockMessageData = {
@@ -330,8 +326,12 @@ describe('Message Operations', () => {
    });

    it('should save a message with expiredAt when isTemporary is true', async () => {
-      // Mock app config with 24 hour retention
-      mockReq.config.interfaceConfig.temporaryChatRetention = 24;
+      // Mock custom config with 24 hour retention
+      getCustomConfig.mockResolvedValue({
+        interface: {
+          temporaryChatRetention: 24,
+        },
+      });

      mockReq.body = { isTemporary: true };

@@ -375,8 +375,12 @@ describe('Message Operations', () => {
    });

    it('should use custom retention period from config', async () => {
-      // Mock app config with 48 hour retention
-      mockReq.config.interfaceConfig.temporaryChatRetention = 48;
+      // Mock custom config with 48 hour retention
+      getCustomConfig.mockResolvedValue({
+        interface: {
+          temporaryChatRetention: 48,
+        },
+      });

      mockReq.body = { isTemporary: true };

@@ -398,8 +402,12 @@ describe('Message Operations', () => {
    });

    it('should handle minimum retention period (1 hour)', async () => {
-      // Mock app config with less than minimum retention
-      mockReq.config.interfaceConfig.temporaryChatRetention = 0.5; // Half hour - should be clamped to 1 hour
+      // Mock custom config with less than minimum retention
+      getCustomConfig.mockResolvedValue({
+        interface: {
+          temporaryChatRetention: 0.5, // Half hour - should be clamped to 1 hour
+        },
+      });

      mockReq.body = { isTemporary: true };

@@ -421,8 +429,12 @@ describe('Message Operations', () => {
    });

    it('should handle maximum retention period (8760 hours)', async () => {
-      // Mock app config with more than maximum retention
-      mockReq.config.interfaceConfig.temporaryChatRetention = 10000; // Should be clamped to 8760 hours
+      // Mock custom config with more than maximum retention
+      getCustomConfig.mockResolvedValue({
+        interface: {
+          temporaryChatRetention: 10000, // Should be clamped to 8760 hours
+        },
+      });

      mockReq.body = { isTemporary: true };

@@ -443,36 +455,22 @@ describe('Message Operations', () => {
      );
    });

-    it('should handle missing config gracefully', async () => {
-      // Simulate missing config - should use default retention period
-      delete mockReq.config;
+    it('should handle getCustomConfig errors gracefully', async () => {
+      // Mock getCustomConfig to throw an error
+      getCustomConfig.mockRejectedValue(new Error('Config service unavailable'));

      mockReq.body = { isTemporary: true };

-      const beforeSave = new Date();
      const result = await saveMessage(mockReq, mockMessageData);
-      const afterSave = new Date();

-      // Should still save the message with default retention period (30 days)
+      // Should still save the message but with expiredAt as null
      expect(result.messageId).toBe('msg123');
-      expect(result.expiredAt).toBeDefined();
-      expect(result.expiredAt).toBeInstanceOf(Date);
-
-      // Verify expiredAt is approximately 30 days in the future (720 hours)
-      const expectedExpirationTime = new Date(beforeSave.getTime() + 720 * 60 * 60 * 1000);
-      const actualExpirationTime = new Date(result.expiredAt);
-
-      expect(actualExpirationTime.getTime()).toBeGreaterThanOrEqual(
-        expectedExpirationTime.getTime() - 1000,
-      );
-      expect(actualExpirationTime.getTime()).toBeLessThanOrEqual(
-        new Date(afterSave.getTime() + 720 * 60 * 60 * 1000 + 1000).getTime(),
-      );
+      expect(result.expiredAt).toBeNull();
    });

    it('should use default retention when config is not provided', async () => {
-      // Mock getAppConfig to return empty config
-      mockReq.config = {}; // Empty config
+      // Mock getCustomConfig to return empty config
+      getCustomConfig.mockResolvedValue({});

      mockReq.body = { isTemporary: true };

@@ -495,7 +493,11 @@ describe('Message Operations', () => {

    it('should not update expiredAt on message update', async () => {
      // First save a temporary message
-      mockReq.config.interfaceConfig.temporaryChatRetention = 24;
+      getCustomConfig.mockResolvedValue({
+        interface: {
+          temporaryChatRetention: 24,
+        },
+      });

      mockReq.body = { isTemporary: true };
      const savedMessage = await saveMessage(mockReq, mockMessageData);
@@ -518,7 +520,11 @@ describe('Message Operations', () => {

    it('should preserve expiredAt when saving existing temporary message', async () => {
      // First save a temporary message
-      mockReq.config.interfaceConfig.temporaryChatRetention = 24;
+      getCustomConfig.mockResolvedValue({
+        interface: {
+          temporaryChatRetention: 24,
+        },
+      });

      mockReq.body = { isTemporary: true };
      const firstSave = await saveMessage(mockReq, mockMessageData);
--- a/api/models/Prompt.js
+++ b/api/models/Prompt.js
@@ -269,7 +269,7 @@ async function getListPromptGroupsByAccess({
  const baseQuery = { ...otherParams, _id: { $in: accessibleIds } };

  // Add cursor condition
-  if (after && typeof after === 'string' && after !== 'undefined' && after !== 'null') {
+  if (after) {
    try {
      const cursor = JSON.parse(Buffer.from(after, 'base64').toString('utf8'));
      const { updatedAt, _id } = cursor;
--- a/api/models/Transaction.js
+++ b/api/models/Transaction.js
@@ -1,4 +1,5 @@
 const { logger } = require('@librechat/data-schemas');
+const { getBalanceConfig } = require('~/server/services/Config');
 const { getMultiplier, getCacheMultiplier } = require('./tx');
 const { Transaction, Balance } = require('~/db/models');

@@ -186,23 +187,20 @@ async function createAutoRefillTransaction(txData) {

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

-  if (transactions?.enabled === false) {
-    return;
-  }
-
  const transaction = new Transaction(txData);
  transaction.endpointTokenConfig = txData.endpointTokenConfig;
  calculateTokenValue(transaction);

  await transaction.save();
+
+  const balance = await getBalanceConfig();
  if (!balance?.enabled) {
    return;
  }
@@ -223,14 +221,9 @@ async function createTransaction(_txData) {

 /**
 * Static method to create a structured transaction and update the balance
- * @param {txData} _txData - Transaction data.
+ * @param {txData} txData - Transaction data.
 */
-async function createStructuredTransaction(_txData) {
-  const { balance, transactions, ...txData } = _txData;
-  if (transactions?.enabled === false) {
-    return;
-  }
-
+async function createStructuredTransaction(txData) {
  const transaction = new Transaction({
    ...txData,
    endpointTokenConfig: txData.endpointTokenConfig,
@@ -240,6 +233,7 @@ async function createStructuredTransaction(_txData) {

  await transaction.save();

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

 let mongoServer;
 beforeAll(async () => {
@@ -19,6 +23,8 @@ afterAll(async () => {

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

 describe('Regular Token Spending Tests', () => {
@@ -35,7 +41,6 @@ describe('Regular Token Spending Tests', () => {
      model,
      context: 'test',
      endpointTokenConfig: null,
-      balance: { enabled: true },
    };

    const tokenUsage = {
@@ -69,7 +74,6 @@ describe('Regular Token Spending Tests', () => {
      model,
      context: 'test',
      endpointTokenConfig: null,
-      balance: { enabled: true },
    };

    const tokenUsage = {
@@ -100,7 +104,6 @@ describe('Regular Token Spending Tests', () => {
      model,
      context: 'test',
      endpointTokenConfig: null,
-      balance: { enabled: true },
    };

    const tokenUsage = {};
@@ -125,7 +128,6 @@ describe('Regular Token Spending Tests', () => {
      model,
      context: 'test',
      endpointTokenConfig: null,
-      balance: { enabled: true },
    };

    const tokenUsage = { promptTokens: 100 };
@@ -141,7 +143,8 @@ describe('Regular Token Spending Tests', () => {
  });

  test('spendTokens should not update balance when balance feature is disabled', async () => {
-    // Arrange: Balance config is now passed directly in txData
+    // 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 });
@@ -153,7 +156,6 @@ describe('Regular Token Spending Tests', () => {
      model,
      context: 'test',
      endpointTokenConfig: null,
-      balance: { enabled: false },
    };

    const tokenUsage = {
@@ -184,7 +186,6 @@ describe('Structured Token Spending Tests', () => {
      model,
      context: 'message',
      endpointTokenConfig: null,
-      balance: { enabled: true },
    };

    const tokenUsage = {
@@ -238,7 +239,6 @@ describe('Structured Token Spending Tests', () => {
      conversationId: 'test-convo',
      model,
      context: 'message',
-      balance: { enabled: true },
    };

    const tokenUsage = {
@@ -271,7 +271,6 @@ describe('Structured Token Spending Tests', () => {
      conversationId: 'test-convo',
      model,
      context: 'message',
-      balance: { enabled: true },
    };

    const tokenUsage = {
@@ -303,7 +302,6 @@ describe('Structured Token Spending Tests', () => {
      conversationId: 'test-convo',
      model,
      context: 'message',
-      balance: { enabled: true },
    };

    const tokenUsage = {};
@@ -330,7 +328,6 @@ describe('Structured Token Spending Tests', () => {
      conversationId: 'test-convo',
      model,
      context: 'incomplete',
-      balance: { enabled: true },
    };

    const tokenUsage = {
@@ -367,7 +364,6 @@ describe('NaN Handling Tests', () => {
      endpointTokenConfig: null,
      rawAmount: NaN,
      tokenType: 'prompt',
-      balance: { enabled: true },
    };

    // Act
@@ -379,188 +375,3 @@ describe('NaN Handling Tests', () => {
    expect(balance.tokenCredits).toBe(initialBalance);
  });
 });
-
-describe('Transactions Config Tests', () => {
-  test('createTransaction should not save when transactions.enabled is false', async () => {
-    // Arrange
-    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,
-      rawAmount: -100,
-      tokenType: 'prompt',
-      transactions: { enabled: false },
-    };
-
-    // Act
-    const result = await createTransaction(txData);
-
-    // Assert: No transaction should be created
-    expect(result).toBeUndefined();
-    const transactions = await Transaction.find({ user: userId });
-    expect(transactions).toHaveLength(0);
-    const balance = await Balance.findOne({ user: userId });
-    expect(balance.tokenCredits).toBe(initialBalance);
-  });
-
-  test('createTransaction should save when transactions.enabled is true', async () => {
-    // Arrange
-    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,
-      rawAmount: -100,
-      tokenType: 'prompt',
-      transactions: { enabled: true },
-      balance: { enabled: true },
-    };
-
-    // Act
-    const result = await createTransaction(txData);
-
-    // Assert: Transaction should be created
-    expect(result).toBeDefined();
-    expect(result.balance).toBeLessThan(initialBalance);
-    const transactions = await Transaction.find({ user: userId });
-    expect(transactions).toHaveLength(1);
-    expect(transactions[0].rawAmount).toBe(-100);
-  });
-
-  test('createTransaction should save when balance.enabled is true even if transactions config is missing', async () => {
-    // Arrange
-    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,
-      rawAmount: -100,
-      tokenType: 'prompt',
-      balance: { enabled: true },
-      // No transactions config provided
-    };
-
-    // Act
-    const result = await createTransaction(txData);
-
-    // Assert: Transaction should be created (backward compatibility)
-    expect(result).toBeDefined();
-    expect(result.balance).toBeLessThan(initialBalance);
-    const transactions = await Transaction.find({ user: userId });
-    expect(transactions).toHaveLength(1);
-  });
-
-  test('createTransaction should save transaction but not update balance when balance is disabled but transactions enabled', async () => {
-    // Arrange
-    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,
-      rawAmount: -100,
-      tokenType: 'prompt',
-      transactions: { enabled: true },
-      balance: { enabled: false },
-    };
-
-    // Act
-    const result = await createTransaction(txData);
-
-    // Assert: Transaction should be created but balance unchanged
-    expect(result).toBeUndefined();
-    const transactions = await Transaction.find({ user: userId });
-    expect(transactions).toHaveLength(1);
-    expect(transactions[0].rawAmount).toBe(-100);
-    const balance = await Balance.findOne({ user: userId });
-    expect(balance.tokenCredits).toBe(initialBalance);
-  });
-
-  test('createStructuredTransaction should not save when transactions.enabled is false', async () => {
-    // Arrange
-    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 10000000;
-    await Balance.create({ user: userId, tokenCredits: initialBalance });
-
-    const model = 'claude-3-5-sonnet';
-    const txData = {
-      user: userId,
-      conversationId: 'test-conversation-id',
-      model,
-      context: 'message',
-      tokenType: 'prompt',
-      inputTokens: -10,
-      writeTokens: -100,
-      readTokens: -5,
-      transactions: { enabled: false },
-    };
-
-    // Act
-    const result = await createStructuredTransaction(txData);
-
-    // Assert: No transaction should be created
-    expect(result).toBeUndefined();
-    const transactions = await Transaction.find({ user: userId });
-    expect(transactions).toHaveLength(0);
-    const balance = await Balance.findOne({ user: userId });
-    expect(balance.tokenCredits).toBe(initialBalance);
-  });
-
-  test('createStructuredTransaction should save transaction but not update balance when balance is disabled but transactions enabled', async () => {
-    // Arrange
-    const userId = new mongoose.Types.ObjectId();
-    const initialBalance = 10000000;
-    await Balance.create({ user: userId, tokenCredits: initialBalance });
-
-    const model = 'claude-3-5-sonnet';
-    const txData = {
-      user: userId,
-      conversationId: 'test-conversation-id',
-      model,
-      context: 'message',
-      tokenType: 'prompt',
-      inputTokens: -10,
-      writeTokens: -100,
-      readTokens: -5,
-      transactions: { enabled: true },
-      balance: { enabled: false },
-    };
-
-    // Act
-    const result = await createStructuredTransaction(txData);
-
-    // Assert: Transaction should be created but balance unchanged
-    expect(result).toBeUndefined();
-    const transactions = await Transaction.find({ user: userId });
-    expect(transactions).toHaveLength(1);
-    expect(transactions[0].inputTokens).toBe(-10);
-    expect(transactions[0].writeTokens).toBe(-100);
-    expect(transactions[0].readTokens).toBe(-5);
-    const balance = await Balance.findOne({ user: userId });
-    expect(balance.tokenCredits).toBe(initialBalance);
-  });
-});
--- a/api/models/balanceMethods.js
+++ b/api/models/balanceMethods.js
@@ -118,7 +118,7 @@ const addIntervalToDate = (date, value, unit) => {
 * @async
 * @function
 * @param {Object} params - The function parameters.
- * @param {ServerRequest} params.req - The Express request object.
+ * @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.
--- a/api/models/convoStructure.spec.js
+++ b/api/models/convoStructure.spec.js
@@ -1,9 +1,47 @@
 const mongoose = require('mongoose');
-const { buildTree } = require('librechat-data-provider');
 const { MongoMemoryServer } = require('mongodb-memory-server');
 const { getMessages, bulkSaveMessages } = require('./Message');
 const { Message } = require('~/db/models');

+// Original version of buildTree function
+function buildTree({ messages, fileMap }) {
+  if (messages === null) {
+    return null;
+  }
+
+  const messageMap = {};
+  const rootMessages = [];
+  const childrenCount = {};
+
+  messages.forEach((message) => {
+    const parentId = message.parentMessageId ?? '';
+    childrenCount[parentId] = (childrenCount[parentId] || 0) + 1;
+
+    const extendedMessage = {
+      ...message,
+      children: [],
+      depth: 0,
+      siblingIndex: childrenCount[parentId] - 1,
+    };
+
+    if (message.files && fileMap) {
+      extendedMessage.files = message.files.map((file) => fileMap[file.file_id ?? ''] ?? file);
+    }
+
+    messageMap[message.messageId] = extendedMessage;
+
+    const parentMessage = messageMap[parentId];
+    if (parentMessage) {
+      parentMessage.children.push(extendedMessage);
+      extendedMessage.depth = parentMessage.depth + 1;
+    } else {
+      rootMessages.push(extendedMessage);
+    }
+  });
+
+  return rootMessages;
+}
+
 let mongod;
 beforeAll(async () => {
  mongod = await MongoMemoryServer.create();
--- a/api/models/index.js
+++ b/api/models/index.js
@@ -24,15 +24,8 @@ const { getConvoTitle, getConvo, saveConvo, deleteConvos } = require('./Conversa
 const { getPreset, getPresets, savePreset, deletePresets } = require('./Preset');
 const { File } = require('~/db/models');

-const seedDatabase = async () => {
-  await methods.initializeRoles();
-  await methods.seedDefaultRoles();
-  await methods.ensureDefaultCategories();
-};
-
 module.exports = {
  ...methods,
-  seedDatabase,
  comparePassword,
  findFileById,
  createFile,
--- a/api/models/interface.js
+++ b/api/models/interface.js
@@ -1,24 +0,0 @@
-const { logger } = require('@librechat/data-schemas');
-const { updateInterfacePermissions: updateInterfacePerms } = require('@librechat/api');
-const { getRoleByName, updateAccessPermissions } = require('./Role');
-
-/**
- * Update interface permissions based on app configuration.
- * Must be done independently from loading the app config.
- * @param {AppConfig} appConfig
- */
-async function updateInterfacePermissions(appConfig) {
-  try {
-    await updateInterfacePerms({
-      appConfig,
-      getRoleByName,
-      updateAccessPermissions,
-    });
-  } catch (error) {
-    logger.error('Error updating interface permissions:', error);
-  }
-}
-
-module.exports = {
-  updateInterfacePermissions,
-};
--- a/api/models/spendTokens.js
+++ b/api/models/spendTokens.js
@@ -5,7 +5,13 @@ const { createTransaction, createStructuredTransaction } = require('./Transactio
 *
 * @function
 * @async
- * @param {txData} txData - Transaction data.
+ * @param {Object} txData - Transaction data.
+ * @param {mongoose.Schema.Types.ObjectId} txData.user - The user ID.
+ * @param {String} txData.conversationId - The ID of the conversation.
+ * @param {String} txData.model - The model name.
+ * @param {String} txData.context - The context in which the transaction is made.
+ * @param {EndpointTokenConfig} [txData.endpointTokenConfig] - The current endpoint token config.
+ * @param {String} [txData.valueKey] - The value key (optional).
 * @param {Object} tokenUsage - The number of tokens used.
 * @param {Number} tokenUsage.promptTokens - The number of prompt tokens used.
 * @param {Number} tokenUsage.completionTokens - The number of completion tokens used.
@@ -63,7 +69,13 @@ const spendTokens = async (txData, tokenUsage) => {
 *
 * @function
 * @async
- * @param {txData} txData - Transaction data.
+ * @param {Object} txData - Transaction data.
+ * @param {mongoose.Schema.Types.ObjectId} txData.user - The user ID.
+ * @param {String} txData.conversationId - The ID of the conversation.
+ * @param {String} txData.model - The model name.
+ * @param {String} txData.context - The context in which the transaction is made.
+ * @param {EndpointTokenConfig} [txData.endpointTokenConfig] - The current endpoint token config.
+ * @param {String} [txData.valueKey] - The value key (optional).
 * @param {Object} tokenUsage - The number of tokens used.
 * @param {Object} tokenUsage.promptTokens - The number of prompt tokens used.
 * @param {Number} tokenUsage.promptTokens.input - The number of input tokens.
--- a/api/models/spendTokens.spec.js
+++ b/api/models/spendTokens.spec.js
@@ -5,6 +5,7 @@ const { createTransaction, createAutoRefillTransaction } = require('./Transactio

 require('~/db/models');

+// Mock the logger to prevent console output during tests
 jest.mock('~/config', () => ({
  logger: {
    debug: jest.fn(),
@@ -12,6 +13,10 @@ jest.mock('~/config', () => ({
  },
 }));

+// Mock the Config service
+const { getBalanceConfig } = require('~/server/services/Config');
+jest.mock('~/server/services/Config');
+
 describe('spendTokens', () => {
  let mongoServer;
  let userId;
@@ -39,7 +44,8 @@ describe('spendTokens', () => {
    // Create a new user ID for each test
    userId = new mongoose.Types.ObjectId();

-    // Balance config is now passed directly in txData
+    // Mock the balance config to be enabled by default
+    getBalanceConfig.mockResolvedValue({ enabled: true });
  });

  it('should create transactions for both prompt and completion tokens', async () => {
@@ -54,7 +60,6 @@ describe('spendTokens', () => {
      conversationId: 'test-convo',
      model: 'gpt-3.5-turbo',
      context: 'test',
-      balance: { enabled: true },
    };
    const tokenUsage = {
      promptTokens: 100,
@@ -93,7 +98,6 @@ describe('spendTokens', () => {
      conversationId: 'test-convo',
      model: 'gpt-3.5-turbo',
      context: 'test',
-      balance: { enabled: true },
    };
    const tokenUsage = {
      promptTokens: 100,
@@ -123,7 +127,6 @@ describe('spendTokens', () => {
      conversationId: 'test-convo',
      model: 'gpt-3.5-turbo',
      context: 'test',
-      balance: { enabled: true },
    };
    const tokenUsage = {};

@@ -135,7 +138,8 @@ describe('spendTokens', () => {
  });

  it('should not update balance when the balance feature is disabled', async () => {
-    // Balance is now passed directly in txData
+    // Override configuration: disable balance updates
+    getBalanceConfig.mockResolvedValue({ enabled: false });
    // Create a balance for the user
    await Balance.create({
      user: userId,
@@ -147,7 +151,6 @@ describe('spendTokens', () => {
      conversationId: 'test-convo',
      model: 'gpt-3.5-turbo',
      context: 'test',
-      balance: { enabled: false },
    };
    const tokenUsage = {
      promptTokens: 100,
@@ -177,7 +180,6 @@ describe('spendTokens', () => {
      conversationId: 'test-convo',
      model: 'gpt-4', // Using a more expensive model
      context: 'test',
-      balance: { enabled: true },
    };

    // Spending more tokens than the user has balance for
@@ -231,7 +233,6 @@ describe('spendTokens', () => {
      conversationId: 'test-convo-1',
      model: 'gpt-4',
      context: 'test',
-      balance: { enabled: true },
    };

    const tokenUsage1 = {
@@ -251,7 +252,6 @@ describe('spendTokens', () => {
      conversationId: 'test-convo-2',
      model: 'gpt-4',
      context: 'test',
-      balance: { enabled: true },
    };

    const tokenUsage2 = {
@@ -292,7 +292,6 @@ describe('spendTokens', () => {
      tokenType: 'completion',
      rawAmount: -100,
      context: 'test',
-      balance: { enabled: true },
    });

    console.log('Direct Transaction.create result:', directResult);
@@ -317,7 +316,6 @@ describe('spendTokens', () => {
        conversationId: `test-convo-${model}`,
        model,
        context: 'test',
-        balance: { enabled: true },
      };

      const tokenUsage = {
@@ -354,7 +352,6 @@ describe('spendTokens', () => {
      conversationId: 'test-convo-1',
      model: 'claude-3-5-sonnet',
      context: 'test',
-      balance: { enabled: true },
    };

    const tokenUsage1 = {
@@ -378,7 +375,6 @@ describe('spendTokens', () => {
      conversationId: 'test-convo-2',
      model: 'claude-3-5-sonnet',
      context: 'test',
-      balance: { enabled: true },
    };

    const tokenUsage2 = {
@@ -430,7 +426,6 @@ describe('spendTokens', () => {
      conversationId: 'test-convo',
      model: 'claude-3-5-sonnet', // Using a model that supports structured tokens
      context: 'test',
-      balance: { enabled: true },
    };

    // Spending more tokens than the user has balance for
@@ -510,7 +505,6 @@ describe('spendTokens', () => {
        conversationId,
        user: userId,
        model: usage.model,
-        balance: { enabled: true },
      };

      // Calculate expected spend for this transaction
@@ -623,7 +617,6 @@ describe('spendTokens', () => {
          tokenType: 'credits',
          context: 'concurrent-refill-test',
          rawAmount: refillAmount,
-          balance: { enabled: true },
        }),
      );
    }
@@ -690,7 +683,6 @@ describe('spendTokens', () => {
      conversationId: 'test-convo',
      model: 'claude-3-5-sonnet',
      context: 'test',
-      balance: { enabled: true },
    };
    const tokenUsage = {
      promptTokens: {
--- a/api/models/tx.js
+++ b/api/models/tx.js
@@ -1,4 +1,4 @@
-const { matchModelName } = require('@librechat/api');
+const { matchModelName } = require('../utils/tokens');
 const defaultRate = 6;

 /**
--- a/api/models/userMethods.js
+++ b/api/models/userMethods.js
@@ -3,7 +3,7 @@ const bcrypt = require('bcryptjs');
 /**
 * Compares the provided password with the user's password.
 *
- * @param {IUser} user - The user to compare the password for.
+ * @param {MongoUser} user - The user to compare the password for.
 * @param {string} candidatePassword - The password to test against the user's password.
 * @returns {Promise<boolean>} A promise that resolves to a boolean indicating if the password matches.
 */
--- a/api/package.json
+++ b/api/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@librechat/backend",
-  "version": "v0.8.0-rc4",
+  "version": "v0.8.0-rc2",
  "description": "",
  "scripts": {
    "start": "echo 'please run this from the root directory'",
@@ -49,14 +49,14 @@
    "@langchain/google-vertexai": "^0.2.13",
    "@langchain/openai": "^0.5.18",
    "@langchain/textsplitters": "^0.1.0",
-    "@librechat/agents": "^2.4.79",
+    "@librechat/agents": "^2.4.76",
    "@librechat/api": "*",
    "@librechat/data-schemas": "*",
    "@microsoft/microsoft-graph-client": "^3.0.7",
    "@modelcontextprotocol/sdk": "^1.17.1",
    "@node-saml/passport-saml": "^5.1.0",
    "@waylaidwanderer/fetch-event-source": "^3.0.1",
-    "axios": "^1.12.1",
+    "axios": "^1.8.2",
    "bcryptjs": "^2.4.3",
    "compression": "^1.8.1",
    "connect-redis": "^8.1.0",
@@ -97,6 +97,7 @@
    "nodemailer": "^6.9.15",
    "ollama": "^0.5.0",
    "openai": "^5.10.1",
+    "openai-chat-tokens": "^0.2.8",
    "openid-client": "^6.5.0",
    "passport": "^0.6.0",
    "passport-apple": "^2.0.2",
--- a/api/server/controllers/AuthController.js
+++ b/api/server/controllers/AuthController.js
@@ -75,7 +75,7 @@ const refreshController = async (req, res) => {
      if (!user) {
        return res.status(401).redirect('/login');
      }
-      const token = setOpenIDAuthTokens(tokenset, res, user._id.toString());
+      const token = setOpenIDAuthTokens(tokenset, res);
      return res.status(200).send({ token, user });
    } catch (error) {
      logger.error('[refreshController] OpenID token refresh error', error);
--- a/api/server/controllers/OverrideController.js
+++ b/api/server/controllers/OverrideController.js
@@ -0,0 +1,27 @@
+const { CacheKeys } = require('librechat-data-provider');
+const { loadOverrideConfig } = require('~/server/services/Config');
+const { getLogStores } = require('~/cache');
+
+async function overrideController(req, res) {
+  const cache = getLogStores(CacheKeys.CONFIG_STORE);
+  let overrideConfig = await cache.get(CacheKeys.OVERRIDE_CONFIG);
+  if (overrideConfig) {
+    res.send(overrideConfig);
+    return;
+  } else if (overrideConfig === false) {
+    res.send(false);
+    return;
+  }
+  overrideConfig = await loadOverrideConfig();
+  const { endpointsConfig, modelsConfig } = overrideConfig;
+  if (endpointsConfig) {
+    await cache.set(CacheKeys.ENDPOINT_CONFIG, endpointsConfig);
+  }
+  if (modelsConfig) {
+    await cache.set(CacheKeys.MODELS_CONFIG, modelsConfig);
+  }
+  await cache.set(CacheKeys.OVERRIDE_CONFIG, overrideConfig);
+  res.send(JSON.stringify(overrideConfig));
+}
+
+module.exports = overrideController;
--- a/api/server/controllers/PluginController.js
+++ b/api/server/controllers/PluginController.js
@@ -7,9 +7,14 @@ const {
  convertMCPToolToPlugin,
  convertMCPToolsToPlugins,
 } = require('@librechat/api');
-const { getCachedTools, setCachedTools, mergeUserTools } = require('~/server/services/Config');
+const {
+  getCachedTools,
+  setCachedTools,
+  mergeUserTools,
+  getCustomConfig,
+} = require('~/server/services/Config');
+const { loadAndFormatTools } = require('~/server/services/ToolService');
 const { availableTools, toolkits } = require('~/app/clients/tools');
-const { getAppConfig } = require('~/server/services/Config');
 const { getMCPManager } = require('~/config');
 const { getLogStores } = require('~/cache');

@@ -22,9 +27,8 @@ const getAvailablePluginsController = async (req, res) => {
      return;
    }

-    const appConfig = await getAppConfig({ role: req.user?.role });
    /** @type {{ filteredTools: string[], includedTools: string[] }} */
-    const { filteredTools = [], includedTools = [] } = appConfig;
+    const { filteredTools = [], includedTools = [] } = req.app.locals;
    /** @type {import('@librechat/api').LCManifestTool[]} */
    const pluginManifest = availableTools;

@@ -70,27 +74,17 @@ const getAvailableTools = async (req, res) => {
      logger.warn('[getAvailableTools] User ID not found in request');
      return res.status(401).json({ message: 'Unauthorized' });
    }
+    const customConfig = await getCustomConfig();
    const cache = getLogStores(CacheKeys.CONFIG_STORE);
    const cachedToolsArray = await cache.get(CacheKeys.TOOLS);
    const cachedUserTools = await getCachedTools({ userId });
+    const userPlugins =
+      cachedUserTools != null
+        ? convertMCPToolsToPlugins({ functionTools: cachedUserTools, customConfig })
+        : undefined;

-    const appConfig = req.config ?? (await getAppConfig({ role: req.user?.role }));
-
-    /** @type {TPlugin[]} */
-    let mcpPlugins;
-    if (appConfig?.mcpConfig) {
-      const mcpManager = getMCPManager();
-      mcpPlugins =
-        cachedUserTools != null
-          ? convertMCPToolsToPlugins({ functionTools: cachedUserTools, mcpManager })
-          : undefined;
-    }
-
-    if (
-      cachedToolsArray != null &&
-      (appConfig?.mcpConfig != null ? mcpPlugins != null && mcpPlugins.length > 0 : true)
-    ) {
-      const dedupedTools = filterUniquePlugins([...(mcpPlugins ?? []), ...cachedToolsArray]);
+    if (cachedToolsArray != null && userPlugins != null) {
+      const dedupedTools = filterUniquePlugins([...userPlugins, ...cachedToolsArray]);
      res.status(200).json(dedupedTools);
      return;
    }
@@ -99,10 +93,19 @@ const getAvailableTools = async (req, res) => {
    let toolDefinitions = await getCachedTools({ includeGlobal: true });
    let prelimCachedTools;

+    // TODO: this is a temp fix until app config is refactored
+    if (!toolDefinitions) {
+      toolDefinitions = loadAndFormatTools({
+        adminFilter: req.app.locals?.filteredTools,
+        adminIncluded: req.app.locals?.includedTools,
+        directory: req.app.locals?.paths.structuredTools,
+      });
+      prelimCachedTools = toolDefinitions;
+    }
+
    /** @type {import('@librechat/api').LCManifestTool[]} */
    let pluginManifest = availableTools;
-
-    if (appConfig?.mcpConfig != null) {
+    if (customConfig?.mcpServers != null) {
      try {
        const mcpManager = getMCPManager();
        const mcpTools = await mcpManager.getAllToolFunctions(userId);
@@ -111,7 +114,7 @@ const getAvailableTools = async (req, res) => {
          const plugin = convertMCPToolToPlugin({
            toolKey,
            toolData,
-            mcpManager,
+            customConfig,
          });
          if (plugin) {
            pluginManifest.push(plugin);
@@ -158,7 +161,7 @@ const getAvailableTools = async (req, res) => {
      if (plugin.pluginKey.includes(Constants.mcp_delimiter)) {
        const parts = plugin.pluginKey.split(Constants.mcp_delimiter);
        const serverName = parts[parts.length - 1];
-        const serverConfig = appConfig?.mcpConfig?.[serverName];
+        const serverConfig = customConfig?.mcpServers?.[serverName];

        if (serverConfig?.customUserVars) {
          const customVarKeys = Object.keys(serverConfig.customUserVars);
@@ -184,7 +187,7 @@ const getAvailableTools = async (req, res) => {
    const finalTools = filterUniquePlugins(toolsOutput);
    await cache.set(CacheKeys.TOOLS, finalTools);

-    const dedupedTools = filterUniquePlugins([...(mcpPlugins ?? []), ...finalTools]);
+    const dedupedTools = filterUniquePlugins([...(userPlugins ?? []), ...finalTools]);
    res.status(200).json(dedupedTools);
  } catch (error) {
    logger.error('[getAvailableTools]', error);
--- a/api/server/controllers/PluginController.spec.js
+++ b/api/server/controllers/PluginController.spec.js
@@ -1,31 +1,30 @@
 const { Constants } = require('librechat-data-provider');
-const { getCachedTools, getAppConfig } = require('~/server/services/Config');
+const { getCustomConfig, getCachedTools } = require('~/server/services/Config');
 const { getLogStores } = require('~/cache');

+// Mock the dependencies
 jest.mock('@librechat/data-schemas', () => ({
  logger: {
    debug: jest.fn(),
    error: jest.fn(),
-    warn: jest.fn(),
  },
 }));

 jest.mock('~/server/services/Config', () => ({
+  getCustomConfig: jest.fn(),
  getCachedTools: jest.fn(),
-  getAppConfig: jest.fn().mockResolvedValue({
-    filteredTools: [],
-    includedTools: [],
-  }),
  setCachedTools: jest.fn(),
  mergeUserTools: jest.fn(),
 }));

-// loadAndFormatTools mock removed - no longer used in PluginController
+jest.mock('~/server/services/ToolService', () => ({
+  getToolkitKey: jest.fn(),
+  loadAndFormatTools: jest.fn(),
+}));

 jest.mock('~/config', () => ({
  getMCPManager: jest.fn(() => ({
-    getAllToolFunctions: jest.fn().mockResolvedValue({}),
-    getRawConfig: jest.fn().mockReturnValue({}),
+    loadAllManifestTools: jest.fn().mockResolvedValue([]),
  })),
  getFlowStateManager: jest.fn(),
 }));
@@ -40,6 +39,7 @@ jest.mock('~/cache', () => ({
 }));

 const { getAvailableTools, getAvailablePluginsController } = require('./PluginController');
+const { loadAndFormatTools } = require('~/server/services/ToolService');

 describe('PluginController', () => {
  let mockReq, mockRes, mockCache;
@@ -48,9 +48,12 @@ describe('PluginController', () => {
    jest.clearAllMocks();
    mockReq = {
      user: { id: 'test-user-id' },
-      config: {
-        filteredTools: [],
-        includedTools: [],
+      app: {
+        locals: {
+          paths: { structuredTools: '/mock/path' },
+          filteredTools: null,
+          includedTools: null,
+        },
      },
    };
    mockRes = { status: jest.fn().mockReturnThis(), json: jest.fn() };
@@ -60,19 +63,13 @@ describe('PluginController', () => {
    // Clear availableTools and toolkits arrays before each test
    require('~/app/clients/tools').availableTools.length = 0;
    require('~/app/clients/tools').toolkits.length = 0;
-
-    // Reset getCachedTools mock to ensure clean state
-    getCachedTools.mockReset();
-
-    // Reset getAppConfig mock to ensure clean state with default values
-    getAppConfig.mockReset();
-    getAppConfig.mockResolvedValue({
-      filteredTools: [],
-      includedTools: [],
-    });
  });

  describe('getAvailablePluginsController', () => {
+    beforeEach(() => {
+      mockReq.app = { locals: { filteredTools: [], includedTools: [] } };
+    });
+
    it('should use filterUniquePlugins to remove duplicate plugins', async () => {
      // Add plugins with duplicates to availableTools
      const mockPlugins = [
@@ -85,17 +82,10 @@ describe('PluginController', () => {

      mockCache.get.mockResolvedValue(null);

-      // Configure getAppConfig to return the expected config
-      getAppConfig.mockResolvedValueOnce({
-        filteredTools: [],
-        includedTools: [],
-      });
-
      await getAvailablePluginsController(mockReq, mockRes);

      expect(mockRes.status).toHaveBeenCalledWith(200);
      const responseData = mockRes.json.mock.calls[0][0];
-      // The real filterUniquePlugins should have removed the duplicate
      expect(responseData).toHaveLength(2);
      expect(responseData[0].pluginKey).toBe('key1');
      expect(responseData[1].pluginKey).toBe('key2');
@@ -109,16 +99,10 @@ describe('PluginController', () => {
      require('~/app/clients/tools').availableTools.push(mockPlugin);
      mockCache.get.mockResolvedValue(null);

-      // Configure getAppConfig to return the expected config
-      getAppConfig.mockResolvedValueOnce({
-        filteredTools: [],
-        includedTools: [],
-      });
-
      await getAvailablePluginsController(mockReq, mockRes);

      const responseData = mockRes.json.mock.calls[0][0];
-      // The real checkPluginAuth returns false for plugins without authConfig, so authenticated property is not added
+      // checkPluginAuth returns false, so authenticated property is not added
      expect(responseData[0].authenticated).toBeUndefined();
    });

@@ -142,14 +126,9 @@ describe('PluginController', () => {
      ];

      require('~/app/clients/tools').availableTools.push(...mockPlugins);
+      mockReq.app.locals.includedTools = ['key1'];
      mockCache.get.mockResolvedValue(null);

-      // Configure getAppConfig to return config with includedTools
-      getAppConfig.mockResolvedValueOnce({
-        filteredTools: [],
-        includedTools: ['key1'],
-      });
-
      await getAvailablePluginsController(mockReq, mockRes);

      const responseData = mockRes.json.mock.calls[0][0];
@@ -173,35 +152,20 @@ describe('PluginController', () => {

      mockCache.get.mockResolvedValue(null);
      getCachedTools.mockResolvedValueOnce(mockUserTools);
-      mockReq.config = {
-        mcpConfig: {
-          server1: {},
-        },
-        paths: { structuredTools: '/mock/path' },
-      };
+      getCustomConfig.mockResolvedValue(null);

-      // Mock MCP manager to return empty tools initially (since getAllToolFunctions is called)
-      const mockMCPManager = {
-        getAllToolFunctions: jest.fn().mockResolvedValue({}),
-        getRawConfig: jest.fn().mockReturnValue({}),
-      };
-      require('~/config').getMCPManager.mockReturnValue(mockMCPManager);
-
-      // Mock second call to return tool definitions (includeGlobal: true)
+      // Mock second call to return tool definitions
      getCachedTools.mockResolvedValueOnce(mockUserTools);

      await getAvailableTools(mockReq, mockRes);

-      expect(mockRes.status).toHaveBeenCalledWith(200);
      const responseData = mockRes.json.mock.calls[0][0];
-      expect(responseData).toBeDefined();
-      expect(Array.isArray(responseData)).toBe(true);
+      // convertMCPToolsToPlugins should have converted the tool
      expect(responseData.length).toBeGreaterThan(0);
      const convertedTool = responseData.find(
        (tool) => tool.pluginKey === `tool1${Constants.mcp_delimiter}server1`,
      );
      expect(convertedTool).toBeDefined();
-      // The real convertMCPToolsToPlugins extracts the name from the delimiter
      expect(convertedTool.name).toBe('tool1');
    });

@@ -224,20 +188,15 @@ describe('PluginController', () => {

      mockCache.get.mockResolvedValue(mockCachedPlugins);
      getCachedTools.mockResolvedValueOnce(mockUserTools);
-      mockReq.config = {
-        mcpConfig: null,
-        paths: { structuredTools: '/mock/path' },
-      };
+      getCustomConfig.mockResolvedValue(null);

      // Mock second call to return tool definitions
      getCachedTools.mockResolvedValueOnce(mockUserTools);

      await getAvailableTools(mockReq, mockRes);

-      expect(mockRes.status).toHaveBeenCalledWith(200);
      const responseData = mockRes.json.mock.calls[0][0];
-      expect(Array.isArray(responseData)).toBe(true);
-      // The real filterUniquePlugins should have deduplicated tools with same pluginKey
+      // Should have deduplicated tools with same pluginKey
      const userToolCount = responseData.filter((tool) => tool.pluginKey === 'user-tool').length;
      expect(userToolCount).toBe(1);
    });
@@ -254,15 +213,11 @@ describe('PluginController', () => {
      require('~/app/clients/tools').availableTools.push(mockPlugin);

      mockCache.get.mockResolvedValue(null);
-      // First call returns null for user tools
-      getCachedTools.mockResolvedValueOnce(null);
-      mockReq.config = {
-        mcpConfig: null,
-        paths: { structuredTools: '/mock/path' },
-      };
+      getCachedTools.mockResolvedValue(null);
+      getCustomConfig.mockResolvedValue(null);

-      // Second call (with includeGlobal: true) returns the tool definitions
-      getCachedTools.mockResolvedValueOnce({
+      // Mock loadAndFormatTools to return tool definitions including our tool
+      loadAndFormatTools.mockReturnValue({
        tool1: {
          type: 'function',
          function: {
@@ -280,7 +235,7 @@ describe('PluginController', () => {
      expect(Array.isArray(responseData)).toBe(true);
      const tool = responseData.find((t) => t.pluginKey === 'tool1');
      expect(tool).toBeDefined();
-      // The real checkPluginAuth returns false for plugins without authConfig, so authenticated property is not added
+      // checkPluginAuth returns false, so authenticated property is not added
      expect(tool.authenticated).toBeUndefined();
    });

@@ -302,15 +257,11 @@ describe('PluginController', () => {
      });

      mockCache.get.mockResolvedValue(null);
-      // First call returns null for user tools
-      getCachedTools.mockResolvedValueOnce(null);
-      mockReq.config = {
-        mcpConfig: null,
-        paths: { structuredTools: '/mock/path' },
-      };
+      getCachedTools.mockResolvedValue(null);
+      getCustomConfig.mockResolvedValue(null);

-      // Second call (with includeGlobal: true) returns the tool definitions
-      getCachedTools.mockResolvedValueOnce({
+      // Mock loadAndFormatTools to return tool definitions
+      loadAndFormatTools.mockReturnValue({
        toolkit1_function: {
          type: 'function',
          function: {
@@ -332,8 +283,9 @@ describe('PluginController', () => {
  });

  describe('plugin.icon behavior', () => {
-    const callGetAvailableToolsWithMCPServer = async (serverConfig) => {
+    const callGetAvailableToolsWithMCPServer = async (mcpServers) => {
      mockCache.get.mockResolvedValue(null);
+      getCustomConfig.mockResolvedValue({ mcpServers });

      const functionTools = {
        [`test-tool${Constants.mcp_delimiter}test-server`]: {
@@ -346,24 +298,17 @@ describe('PluginController', () => {
        },
      };

-      // Mock the MCP manager to return tools and server config
+      // Mock the MCP manager to return tools
      const mockMCPManager = {
        getAllToolFunctions: jest.fn().mockResolvedValue(functionTools),
-        getRawConfig: jest.fn().mockReturnValue(serverConfig),
      };
      require('~/config').getMCPManager.mockReturnValue(mockMCPManager);

-      // First call returns empty user tools
      getCachedTools.mockResolvedValueOnce({});

-      // Mock getAppConfig to return the mcpConfig
-      mockReq.config = {
-        mcpConfig: {
-          'test-server': serverConfig,
-        },
-      };
+      // Mock loadAndFormatTools to return empty object since these are MCP tools
+      loadAndFormatTools.mockReturnValue({});

-      // Second call (with includeGlobal: true) returns the tool definitions
      getCachedTools.mockResolvedValueOnce(functionTools);

      await getAvailableTools(mockReq, mockRes);
@@ -374,24 +319,28 @@ describe('PluginController', () => {
    };

    it('should set plugin.icon when iconPath is defined', async () => {
-      const serverConfig = {
-        iconPath: '/path/to/icon.png',
+      const mcpServers = {
+        'test-server': {
+          iconPath: '/path/to/icon.png',
+        },
      };
-      const testTool = await callGetAvailableToolsWithMCPServer(serverConfig);
+      const testTool = await callGetAvailableToolsWithMCPServer(mcpServers);
      expect(testTool.icon).toBe('/path/to/icon.png');
    });

    it('should set plugin.icon to undefined when iconPath is not defined', async () => {
-      const serverConfig = {};
-      const testTool = await callGetAvailableToolsWithMCPServer(serverConfig);
+      const mcpServers = {
+        'test-server': {},
+      };
+      const testTool = await callGetAvailableToolsWithMCPServer(mcpServers);
      expect(testTool.icon).toBeUndefined();
    });
  });

  describe('helper function integration', () => {
    it('should properly handle MCP tools with custom user variables', async () => {
-      const appConfig = {
-        mcpConfig: {
+      const customConfig = {
+        mcpServers: {
          'test-server': {
            customUserVars: {
              API_KEY: { title: 'API Key', description: 'Your API key' },
@@ -415,28 +364,24 @@ describe('PluginController', () => {
      // Mock the MCP manager to return tools
      const mockMCPManager = {
        getAllToolFunctions: jest.fn().mockResolvedValue(mcpToolFunctions),
-        getRawConfig: jest.fn().mockReturnValue({
-          customUserVars: {
-            API_KEY: { title: 'API Key', description: 'Your API key' },
-          },
-        }),
      };
      require('~/config').getMCPManager.mockReturnValue(mockMCPManager);

      mockCache.get.mockResolvedValue(null);
-      mockReq.config = appConfig;
+      getCustomConfig.mockResolvedValue(customConfig);

      // First call returns user tools (empty in this case)
      getCachedTools.mockResolvedValueOnce({});

-      // Second call (with includeGlobal: true) returns tool definitions including our MCP tool
+      // Mock loadAndFormatTools to return empty object for MCP tools
+      loadAndFormatTools.mockReturnValue({});
+
+      // Second call returns tool definitions including our MCP tool
      getCachedTools.mockResolvedValueOnce(mcpToolFunctions);

      await getAvailableTools(mockReq, mockRes);

-      expect(mockRes.status).toHaveBeenCalledWith(200);
      const responseData = mockRes.json.mock.calls[0][0];
-      expect(Array.isArray(responseData)).toBe(true);

      // Find the MCP tool in the response
      const mcpTool = responseData.find(
@@ -472,36 +417,24 @@ describe('PluginController', () => {

    it('should handle null cachedTools and cachedUserTools', async () => {
      mockCache.get.mockResolvedValue(null);
-      // First call returns null for user tools
-      getCachedTools.mockResolvedValueOnce(null);
-      mockReq.config = {
-        mcpConfig: null,
-        paths: { structuredTools: '/mock/path' },
-      };
+      getCachedTools.mockResolvedValue(null);
+      getCustomConfig.mockResolvedValue(null);

-      // Mock MCP manager to return no tools
-      const mockMCPManager = {
-        getAllToolFunctions: jest.fn().mockResolvedValue({}),
-        getRawConfig: jest.fn().mockReturnValue({}),
-      };
-      require('~/config').getMCPManager.mockReturnValue(mockMCPManager);
-
-      // Second call (with includeGlobal: true) returns empty object instead of null
-      getCachedTools.mockResolvedValueOnce({});
+      // Mock loadAndFormatTools to return empty object when getCachedTools returns null
+      loadAndFormatTools.mockReturnValue({});

      await getAvailableTools(mockReq, mockRes);

      // Should handle null values gracefully
      expect(mockRes.status).toHaveBeenCalledWith(200);
-      expect(mockRes.json).toHaveBeenCalledWith([]);
    });

    it('should handle when getCachedTools returns undefined', async () => {
      mockCache.get.mockResolvedValue(null);
-      mockReq.config = {
-        mcpConfig: null,
-        paths: { structuredTools: '/mock/path' },
-      };
+      getCustomConfig.mockResolvedValue(null);
+
+      // Mock loadAndFormatTools to return empty object when getCachedTools returns undefined
+      loadAndFormatTools.mockReturnValue({});

      // Mock getCachedTools to return undefined for both calls
      getCachedTools.mockReset();
@@ -511,10 +444,9 @@ describe('PluginController', () => {

      // Should handle undefined values gracefully
      expect(mockRes.status).toHaveBeenCalledWith(200);
-      expect(mockRes.json).toHaveBeenCalledWith([]);
    });

-    it('should handle `cachedToolsArray` and `mcpPlugins` both being defined', async () => {
+    it('should handle cachedToolsArray and userPlugins both being defined', async () => {
      const cachedTools = [{ name: 'CachedTool', pluginKey: 'cached-tool', description: 'Cached' }];
      // Use MCP delimiter for the user tool so convertMCPToolsToPlugins works
      const userTools = {
@@ -529,27 +461,8 @@ describe('PluginController', () => {
      };

      mockCache.get.mockResolvedValue(cachedTools);
-      getCachedTools.mockResolvedValueOnce(userTools);
-      mockReq.config = {
-        mcpConfig: {
-          server1: {},
-        },
-        paths: { structuredTools: '/mock/path' },
-      };
-
-      // Mock MCP manager to return empty tools initially
-      const mockMCPManager = {
-        getAllToolFunctions: jest.fn().mockResolvedValue({}),
-        getRawConfig: jest.fn().mockReturnValue({}),
-      };
-      require('~/config').getMCPManager.mockReturnValue(mockMCPManager);
-
-      // The controller expects a second call to getCachedTools
-      getCachedTools.mockResolvedValueOnce({
-        'cached-tool': { type: 'function', function: { name: 'cached-tool' } },
-        [`user-tool${Constants.mcp_delimiter}server1`]:
-          userTools[`user-tool${Constants.mcp_delimiter}server1`],
-      });
+      getCachedTools.mockResolvedValue(userTools);
+      getCustomConfig.mockResolvedValue(null);

      await getAvailableTools(mockReq, mockRes);

@@ -561,20 +474,8 @@ describe('PluginController', () => {

    it('should handle empty toolDefinitions object', async () => {
      mockCache.get.mockResolvedValue(null);
-      // Reset getCachedTools to ensure clean state
-      getCachedTools.mockReset();
-      getCachedTools.mockResolvedValue({});
-      mockReq.config = {}; // No mcpConfig at all
-
-      // Ensure no plugins are available
-      require('~/app/clients/tools').availableTools.length = 0;
-
-      // Reset MCP manager to default state
-      const mockMCPManager = {
-        getAllToolFunctions: jest.fn().mockResolvedValue({}),
-        getRawConfig: jest.fn().mockReturnValue({}),
-      };
-      require('~/config').getMCPManager.mockReturnValue(mockMCPManager);
+      getCachedTools.mockResolvedValueOnce({}).mockResolvedValueOnce({});
+      getCustomConfig.mockResolvedValue(null);

      await getAvailableTools(mockReq, mockRes);

@@ -583,8 +484,8 @@ describe('PluginController', () => {
    });

    it('should handle MCP tools without customUserVars', async () => {
-      const appConfig = {
-        mcpConfig: {
+      const customConfig = {
+        mcpServers: {
          'test-server': {
            // No customUserVars defined
          },
@@ -593,60 +494,30 @@ describe('PluginController', () => {

      const mockUserTools = {
        [`tool1${Constants.mcp_delimiter}test-server`]: {
-          type: 'function',
-          function: {
-            name: `tool1${Constants.mcp_delimiter}test-server`,
-            description: 'Tool 1',
-            parameters: { type: 'object', properties: {} },
-          },
+          function: { name: 'tool1', description: 'Tool 1' },
        },
      };

-      // Mock the MCP manager to return the tools
-      const mockMCPManager = {
-        getAllToolFunctions: jest.fn().mockResolvedValue(mockUserTools),
-        getRawConfig: jest.fn().mockReturnValue({
-          // No customUserVars defined
-        }),
-      };
-      require('~/config').getMCPManager.mockReturnValue(mockMCPManager);
-
      mockCache.get.mockResolvedValue(null);
-      mockReq.config = appConfig;
-      // First call returns empty user tools
-      getCachedTools.mockResolvedValueOnce({});
-
-      // Second call (with includeGlobal: true) returns the tool definitions
+      getCustomConfig.mockResolvedValue(customConfig);
      getCachedTools.mockResolvedValueOnce(mockUserTools);

-      // Ensure no plugins in availableTools for clean test
-      require('~/app/clients/tools').availableTools.length = 0;
+      getCachedTools.mockResolvedValueOnce({
+        [`tool1${Constants.mcp_delimiter}test-server`]: true,
+      });

      await getAvailableTools(mockReq, mockRes);

-      expect(mockRes.status).toHaveBeenCalledWith(200);
      const responseData = mockRes.json.mock.calls[0][0];
-      expect(Array.isArray(responseData)).toBe(true);
-      expect(responseData.length).toBeGreaterThan(0);
-
-      const mcpTool = responseData.find(
-        (tool) => tool.pluginKey === `tool1${Constants.mcp_delimiter}test-server`,
-      );
-
-      expect(mcpTool).toBeDefined();
-      expect(mcpTool.authenticated).toBe(true);
-      // The actual implementation sets authConfig to empty array when no customUserVars
-      expect(mcpTool.authConfig).toEqual([]);
+      expect(responseData[0].authenticated).toBe(true);
+      // The actual implementation doesn't set authConfig on tools without customUserVars
+      expect(responseData[0].authConfig).toEqual([]);
    });

-    it('should handle undefined filteredTools and includedTools', async () => {
-      mockReq.config = {};
+    it('should handle req.app.locals with undefined filteredTools and includedTools', async () => {
+      mockReq.app = { locals: {} };
      mockCache.get.mockResolvedValue(null);

-      // Configure getAppConfig to return config with undefined properties
-      // The controller will use default values [] for filteredTools and includedTools
-      getAppConfig.mockResolvedValueOnce({});
-
      await getAvailablePluginsController(mockReq, mockRes);

      expect(mockRes.status).toHaveBeenCalledWith(200);
@@ -661,21 +532,27 @@ describe('PluginController', () => {
        toolkit: true,
      };

-      // No need to mock app.locals anymore as it's not used
+      // Ensure req.app.locals is properly mocked
+      mockReq.app = {
+        locals: {
+          filteredTools: [],
+          includedTools: [],
+          paths: { structuredTools: '/mock/path' },
+        },
+      };

      // Add the toolkit to availableTools
      require('~/app/clients/tools').availableTools.push(mockToolkit);

      mockCache.get.mockResolvedValue(null);
-      // First call returns empty object
-      getCachedTools.mockResolvedValueOnce({});
-      mockReq.config = {
-        mcpConfig: null,
-        paths: { structuredTools: '/mock/path' },
-      };
+      getCachedTools.mockResolvedValue({});
+      getCustomConfig.mockResolvedValue(null);

-      // Second call (with includeGlobal: true) returns empty object to avoid null reference error
-      getCachedTools.mockResolvedValueOnce({});
+      // Mock loadAndFormatTools to return an empty object when toolDefinitions is null
+      loadAndFormatTools.mockReturnValue({});
+
+      // Mock getCachedTools second call to return null
+      getCachedTools.mockResolvedValueOnce({}).mockResolvedValueOnce(null);

      await getAvailableTools(mockReq, mockRes);

--- a/api/server/controllers/UserController.js
+++ b/api/server/controllers/UserController.js
@@ -1,10 +1,5 @@
 const { logger } = require('@librechat/data-schemas');
-const {
-  webSearchKeys,
-  extractWebSearchEnvVars,
-  normalizeHttpError,
-  MCPTokenStorage,
-} = require('@librechat/api');
+const { webSearchKeys, extractWebSearchEnvVars, normalizeHttpError } = require('@librechat/api');
 const {
  getFiles,
  updateUser,
@@ -21,21 +16,13 @@ const { verifyEmail, resendVerificationEmail } = require('~/server/services/Auth
 const { needsRefresh, getNewS3URL } = require('~/server/services/Files/S3/crud');
 const { Tools, Constants, FileSources } = require('librechat-data-provider');
 const { processDeleteRequest } = require('~/server/services/Files/process');
-const { Transaction, Balance, User, Token } = require('~/db/models');
-const { getAppConfig } = require('~/server/services/Config');
+const { Transaction, Balance, User } = require('~/db/models');
 const { deleteToolCalls } = require('~/models/ToolCall');
 const { deleteAllSharedLinks } = require('~/models');
 const { getMCPManager } = require('~/config');
-const { MCPOAuthHandler } = require('@librechat/api');
-const { getFlowStateManager } = require('~/config');
-const { CacheKeys } = require('librechat-data-provider');
-const { getLogStores } = require('~/cache');
-const { clearMCPServerTools } = require('~/server/services/Config/mcpToolsCache');
-const { findToken } = require('~/models');

 const getUserController = async (req, res) => {
-  const appConfig = await getAppConfig({ role: req.user?.role });
-  /** @type {IUser} */
+  /** @type {MongoUser} */
  const userData = req.user.toObject != null ? req.user.toObject() : { ...req.user };
  /**
   * These fields should not exist due to secure field selection, but deletion
@@ -44,7 +31,7 @@ const getUserController = async (req, res) => {
  delete userData.password;
  delete userData.totpSecret;
  delete userData.backupCodes;
-  if (appConfig.fileStrategy === FileSources.s3 && userData.avatar) {
+  if (req.app.locals.fileStrategy === FileSources.s3 && userData.avatar) {
    const avatarNeedsRefresh = needsRefresh(userData.avatar, 3600);
    if (!avatarNeedsRefresh) {
      return res.status(200).send(userData);
@@ -100,7 +87,6 @@ const deleteUserFiles = async (req) => {
 };

 const updateUserPluginsController = async (req, res) => {
-  const appConfig = await getAppConfig({ role: req.user?.role });
  const { user } = req;
  const { pluginKey, action, auth, isEntityTool } = req.body;
  try {
@@ -145,7 +131,7 @@ const updateUserPluginsController = async (req, res) => {

    if (pluginKey === Tools.web_search) {
      /** @type  {TCustomConfig['webSearch']} */
-      const webSearchConfig = appConfig?.webSearch;
+      const webSearchConfig = req.app.locals?.webSearch;
      keys = extractWebSearchEnvVars({
        keys: action === 'install' ? keys : webSearchKeys,
        config: webSearchConfig,
@@ -173,15 +159,6 @@ const updateUserPluginsController = async (req, res) => {
          );
          ({ status, message } = normalizeHttpError(authService));
        }
-        try {
-          // if the MCP server uses OAuth, perform a full cleanup and token revocation
-          await maybeUninstallOAuthMCP(user.id, pluginKey, appConfig);
-        } catch (error) {
-          logger.error(
-            `[updateUserPluginsController] Error uninstalling OAuth MCP for ${pluginKey}:`,
-            error,
-          );
-        }
      } else {
        // This handles:
        // 1. Web_search uninstall (keys will be populated with all webSearchKeys if auth was {}).
@@ -207,7 +184,7 @@ const updateUserPluginsController = async (req, res) => {
            // Extract server name from pluginKey (format: "mcp_<serverName>")
            const serverName = pluginKey.replace(Constants.mcp_prefix, '');
            logger.info(
-              `[updateUserPluginsController] Attempting disconnect of MCP server "${serverName}" for user ${user.id} after plugin auth update.`,
+              `[updateUserPluginsController] Disconnecting MCP server ${serverName} for user ${user.id} after plugin auth update for ${pluginKey}.`,
            );
            await mcpManager.disconnectUserConnection(user.id, serverName);
          }
@@ -289,97 +266,6 @@ const resendVerificationController = async (req, res) => {
  }
 };

-/**
- * OAuth MCP specific uninstall logic
- */
-const maybeUninstallOAuthMCP = async (userId, pluginKey, appConfig) => {
-  if (!pluginKey.startsWith(Constants.mcp_prefix)) {
-    // this is not an MCP server, so nothing to do here
-    return;
-  }
-
-  const serverName = pluginKey.replace(Constants.mcp_prefix, '');
-  const mcpManager = getMCPManager(userId);
-  const serverConfig = mcpManager.getRawConfig(serverName) ?? appConfig?.mcpServers?.[serverName];
-
-  if (!mcpManager.getOAuthServers().has(serverName)) {
-    // this server does not use OAuth, so nothing to do here as well
-    return;
-  }
-
-  // 1. get client info used for revocation (client id, secret)
-  const clientTokenData = await MCPTokenStorage.getClientInfoAndMetadata({
-    userId,
-    serverName,
-    findToken,
-  });
-  if (clientTokenData == null) {
-    return;
-  }
-  const { clientInfo, clientMetadata } = clientTokenData;
-
-  // 2. get decrypted tokens before deletion
-  const tokens = await MCPTokenStorage.getTokens({
-    userId,
-    serverName,
-    findToken,
-  });
-
-  // 3. revoke OAuth tokens at the provider
-  const revocationEndpoint =
-    serverConfig.oauth?.revocation_endpoint ?? clientMetadata.revocation_endpoint;
-  const revocationEndpointAuthMethodsSupported =
-    serverConfig.oauth?.revocation_endpoint_auth_methods_supported ??
-    clientMetadata.revocation_endpoint_auth_methods_supported;
-
-  if (tokens?.access_token) {
-    try {
-      await MCPOAuthHandler.revokeOAuthToken(serverName, tokens.access_token, 'access', {
-        serverUrl: serverConfig.url,
-        clientId: clientInfo.client_id,
-        clientSecret: clientInfo.client_secret ?? '',
-        revocationEndpoint,
-        revocationEndpointAuthMethodsSupported,
-      });
-    } catch (error) {
-      logger.error(`Error revoking OAuth access token for ${serverName}:`, error);
-    }
-  }
-
-  if (tokens?.refresh_token) {
-    try {
-      await MCPOAuthHandler.revokeOAuthToken(serverName, tokens.refresh_token, 'refresh', {
-        serverUrl: serverConfig.url,
-        clientId: clientInfo.client_id,
-        clientSecret: clientInfo.client_secret ?? '',
-        revocationEndpoint,
-        revocationEndpointAuthMethodsSupported,
-      });
-    } catch (error) {
-      logger.error(`Error revoking OAuth refresh token for ${serverName}:`, error);
-    }
-  }
-
-  // 4. delete tokens from the DB after revocation attempts
-  await MCPTokenStorage.deleteUserTokens({
-    userId,
-    serverName,
-    deleteToken: async (filter) => {
-      await Token.deleteOne(filter);
-    },
-  });
-
-  // 5. clear the flow state for the OAuth tokens
-  const flowsCache = getLogStores(CacheKeys.FLOWS);
-  const flowManager = getFlowStateManager(flowsCache);
-  const flowId = MCPOAuthHandler.generateFlowId(userId, serverName);
-  await flowManager.deleteFlow(flowId, 'mcp_get_tokens');
-  await flowManager.deleteFlow(flowId, 'mcp_oauth');
-
-  // 6. clear the tools cache for the server
-  await clearMCPServerTools({ userId, serverName });
-};
-
 module.exports = {
  getUserController,
  getTermsStatusController,
--- a/api/server/controllers/agents/tests/callbacks.spec.js
+++ b/api/server/controllers/agents/tests/callbacks.spec.js
@@ -1,342 +0,0 @@
-const { Tools } = require('librechat-data-provider');
-
-// Mock all dependencies before requiring the module
-jest.mock('nanoid', () => ({
-  nanoid: jest.fn(() => 'mock-id'),
-}));
-
-jest.mock('@librechat/api', () => ({
-  sendEvent: jest.fn(),
-}));
-
-jest.mock('@librechat/data-schemas', () => ({
-  logger: {
-    error: jest.fn(),
-  },
-}));
-
-jest.mock('@librechat/agents', () => ({
-  EnvVar: { CODE_API_KEY: 'CODE_API_KEY' },
-  Providers: { GOOGLE: 'google' },
-  GraphEvents: {},
-  getMessageId: jest.fn(),
-  ToolEndHandler: jest.fn(),
-  handleToolCalls: jest.fn(),
-  ChatModelStreamHandler: jest.fn(),
-}));
-
-jest.mock('~/server/services/Files/Citations', () => ({
-  processFileCitations: jest.fn(),
-}));
-
-jest.mock('~/server/services/Files/Code/process', () => ({
-  processCodeOutput: jest.fn(),
-}));
-
-jest.mock('~/server/services/Tools/credentials', () => ({
-  loadAuthValues: jest.fn(),
-}));
-
-jest.mock('~/server/services/Files/process', () => ({
-  saveBase64Image: jest.fn(),
-}));
-
-describe('createToolEndCallback', () => {
-  let req, res, artifactPromises, createToolEndCallback;
-  let logger;
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    // Get the mocked logger
-    logger = require('@librechat/data-schemas').logger;
-
-    // Now require the module after all mocks are set up
-    const callbacks = require('../callbacks');
-    createToolEndCallback = callbacks.createToolEndCallback;
-
-    req = {
-      user: { id: 'user123' },
-    };
-    res = {
-      headersSent: false,
-      write: jest.fn(),
-    };
-    artifactPromises = [];
-  });
-
-  describe('ui_resources artifact handling', () => {
-    it('should process ui_resources artifact and return attachment when headers not sent', async () => {
-      const toolEndCallback = createToolEndCallback({ req, res, artifactPromises });
-
-      const output = {
-        tool_call_id: 'tool123',
-        artifact: {
-          [Tools.ui_resources]: {
-            data: {
-              0: { type: 'button', label: 'Click me' },
-              1: { type: 'input', placeholder: 'Enter text' },
-            },
-          },
-        },
-      };
-
-      const metadata = {
-        run_id: 'run456',
-        thread_id: 'thread789',
-      };
-
-      await toolEndCallback({ output }, metadata);
-
-      // Wait for all promises to resolve
-      const results = await Promise.all(artifactPromises);
-
-      // When headers are not sent, it returns attachment without writing
-      expect(res.write).not.toHaveBeenCalled();
-
-      const attachment = results[0];
-      expect(attachment).toEqual({
-        type: Tools.ui_resources,
-        messageId: 'run456',
-        toolCallId: 'tool123',
-        conversationId: 'thread789',
-        [Tools.ui_resources]: {
-          0: { type: 'button', label: 'Click me' },
-          1: { type: 'input', placeholder: 'Enter text' },
-        },
-      });
-    });
-
-    it('should write to response when headers are already sent', async () => {
-      res.headersSent = true;
-      const toolEndCallback = createToolEndCallback({ req, res, artifactPromises });
-
-      const output = {
-        tool_call_id: 'tool123',
-        artifact: {
-          [Tools.ui_resources]: {
-            data: {
-              0: { type: 'carousel', items: [] },
-            },
-          },
-        },
-      };
-
-      const metadata = {
-        run_id: 'run456',
-        thread_id: 'thread789',
-      };
-
-      await toolEndCallback({ output }, metadata);
-      const results = await Promise.all(artifactPromises);
-
-      expect(res.write).toHaveBeenCalled();
-      expect(results[0]).toEqual({
-        type: Tools.ui_resources,
-        messageId: 'run456',
-        toolCallId: 'tool123',
-        conversationId: 'thread789',
-        [Tools.ui_resources]: {
-          0: { type: 'carousel', items: [] },
-        },
-      });
-    });
-
-    it('should handle errors when processing ui_resources', async () => {
-      const toolEndCallback = createToolEndCallback({ req, res, artifactPromises });
-
-      // Mock res.write to throw an error
-      res.headersSent = true;
-      res.write.mockImplementation(() => {
-        throw new Error('Write failed');
-      });
-
-      const output = {
-        tool_call_id: 'tool123',
-        artifact: {
-          [Tools.ui_resources]: {
-            data: {
-              0: { type: 'test' },
-            },
-          },
-        },
-      };
-
-      const metadata = {
-        run_id: 'run456',
-        thread_id: 'thread789',
-      };
-
-      await toolEndCallback({ output }, metadata);
-      const results = await Promise.all(artifactPromises);
-
-      expect(logger.error).toHaveBeenCalledWith(
-        'Error processing artifact content:',
-        expect.any(Error),
-      );
-      expect(results[0]).toBeNull();
-    });
-
-    it('should handle multiple artifacts including ui_resources', async () => {
-      const toolEndCallback = createToolEndCallback({ req, res, artifactPromises });
-
-      const output = {
-        tool_call_id: 'tool123',
-        artifact: {
-          [Tools.ui_resources]: {
-            data: {
-              0: { type: 'chart', data: [] },
-            },
-          },
-          [Tools.web_search]: {
-            results: ['result1', 'result2'],
-          },
-        },
-      };
-
-      const metadata = {
-        run_id: 'run456',
-        thread_id: 'thread789',
-      };
-
-      await toolEndCallback({ output }, metadata);
-      const results = await Promise.all(artifactPromises);
-
-      // Both ui_resources and web_search should be processed
-      expect(artifactPromises).toHaveLength(2);
-      expect(results).toHaveLength(2);
-
-      // Check ui_resources attachment
-      const uiResourceAttachment = results.find((r) => r?.type === Tools.ui_resources);
-      expect(uiResourceAttachment).toBeTruthy();
-      expect(uiResourceAttachment[Tools.ui_resources]).toEqual({
-        0: { type: 'chart', data: [] },
-      });
-
-      // Check web_search attachment
-      const webSearchAttachment = results.find((r) => r?.type === Tools.web_search);
-      expect(webSearchAttachment).toBeTruthy();
-      expect(webSearchAttachment[Tools.web_search]).toEqual({
-        results: ['result1', 'result2'],
-      });
-    });
-
-    it('should not process artifacts when output has no artifacts', async () => {
-      const toolEndCallback = createToolEndCallback({ req, res, artifactPromises });
-
-      const output = {
-        tool_call_id: 'tool123',
-        content: 'Some regular content',
-        // No artifact property
-      };
-
-      const metadata = {
-        run_id: 'run456',
-        thread_id: 'thread789',
-      };
-
-      await toolEndCallback({ output }, metadata);
-
-      expect(artifactPromises).toHaveLength(0);
-      expect(res.write).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('edge cases', () => {
-    it('should handle empty ui_resources data object', async () => {
-      const toolEndCallback = createToolEndCallback({ req, res, artifactPromises });
-
-      const output = {
-        tool_call_id: 'tool123',
-        artifact: {
-          [Tools.ui_resources]: {
-            data: {},
-          },
-        },
-      };
-
-      const metadata = {
-        run_id: 'run456',
-        thread_id: 'thread789',
-      };
-
-      await toolEndCallback({ output }, metadata);
-      const results = await Promise.all(artifactPromises);
-
-      expect(results[0]).toEqual({
-        type: Tools.ui_resources,
-        messageId: 'run456',
-        toolCallId: 'tool123',
-        conversationId: 'thread789',
-        [Tools.ui_resources]: {},
-      });
-    });
-
-    it('should handle ui_resources with complex nested data', async () => {
-      const toolEndCallback = createToolEndCallback({ req, res, artifactPromises });
-
-      const complexData = {
-        0: {
-          type: 'form',
-          fields: [
-            { name: 'field1', type: 'text', required: true },
-            { name: 'field2', type: 'select', options: ['a', 'b', 'c'] },
-          ],
-          nested: {
-            deep: {
-              value: 123,
-              array: [1, 2, 3],
-            },
-          },
-        },
-      };
-
-      const output = {
-        tool_call_id: 'tool123',
-        artifact: {
-          [Tools.ui_resources]: {
-            data: complexData,
-          },
-        },
-      };
-
-      const metadata = {
-        run_id: 'run456',
-        thread_id: 'thread789',
-      };
-
-      await toolEndCallback({ output }, metadata);
-      const results = await Promise.all(artifactPromises);
-
-      expect(results[0][Tools.ui_resources]).toEqual(complexData);
-    });
-
-    it('should handle when output is undefined', async () => {
-      const toolEndCallback = createToolEndCallback({ req, res, artifactPromises });
-
-      const metadata = {
-        run_id: 'run456',
-        thread_id: 'thread789',
-      };
-
-      await toolEndCallback({ output: undefined }, metadata);
-
-      expect(artifactPromises).toHaveLength(0);
-      expect(res.write).not.toHaveBeenCalled();
-    });
-
-    it('should handle when data parameter is undefined', async () => {
-      const toolEndCallback = createToolEndCallback({ req, res, artifactPromises });
-
-      const metadata = {
-        run_id: 'run456',
-        thread_id: 'thread789',
-      };
-
-      await toolEndCallback(undefined, metadata);
-
-      expect(artifactPromises).toHaveLength(0);
-      expect(res.write).not.toHaveBeenCalled();
-    });
-  });
-});
--- a/api/server/controllers/agents/callbacks.js
+++ b/api/server/controllers/agents/callbacks.js
@@ -246,7 +246,6 @@ function createToolEndCallback({ req, res, artifactPromises }) {
          const attachment = await processFileCitations({
            user,
            metadata,
-            appConfig: req.config,
            toolArtifact: output.artifact,
            toolCallId: output.tool_call_id,
          });
@@ -265,30 +264,6 @@ function createToolEndCallback({ req, res, artifactPromises }) {
      );
    }

-    // TODO: a lot of duplicated code in createToolEndCallback
-    // we should refactor this to use a helper function in a follow-up PR
-    if (output.artifact[Tools.ui_resources]) {
-      artifactPromises.push(
-        (async () => {
-          const attachment = {
-            type: Tools.ui_resources,
-            messageId: metadata.run_id,
-            toolCallId: output.tool_call_id,
-            conversationId: metadata.thread_id,
-            [Tools.ui_resources]: output.artifact[Tools.ui_resources].data,
-          };
-          if (!res.headersSent) {
-            return attachment;
-          }
-          res.write(`event: attachment\ndata: ${JSON.stringify(attachment)}\n\n`);
-          return attachment;
-        })().catch((error) => {
-          logger.error('Error processing artifact content:', error);
-          return null;
-        }),
-      );
-    }
-
    if (output.artifact[Tools.web_search]) {
      artifactPromises.push(
        (async () => {
--- a/api/server/controllers/agents/client.js
+++ b/api/server/controllers/agents/client.js
@@ -7,12 +7,8 @@ const {
  createRun,
  Tokenizer,
  checkAccess,
-  logAxiosError,
-  resolveHeaders,
-  getBalanceConfig,
  memoryInstructions,
  formatContentStrings,
-  getTransactionsConfig,
  createMemoryProcessor,
 } = require('@librechat/api');
 const {
@@ -89,10 +85,11 @@ function createTokenCounter(encoding) {
 }

 function logToolError(graph, error, toolId) {
-  logAxiosError({
+  logger.error(
+    '[api/server/controllers/agents/client.js #chatCompletion] Tool Error',
    error,
-    message: `[api/server/controllers/agents/client.js #chatCompletion] Tool Error "${toolId}"`,
-  });
+    toolId,
+  );
 }

 class AgentClient extends BaseClient {
@@ -449,8 +446,8 @@ class AgentClient extends BaseClient {
      );
      return;
    }
-    const appConfig = this.options.req.config;
-    const memoryConfig = appConfig.memory;
+    /** @type {TCustomConfig['memory']} */
+    const memoryConfig = this.options.req?.app?.locals?.memory;
    if (!memoryConfig || memoryConfig.disabled === true) {
      return;
    }
@@ -458,7 +455,7 @@ class AgentClient extends BaseClient {
    /** @type {Agent} */
    let prelimAgent;
    const allowedProviders = new Set(
-      appConfig?.endpoints?.[EModelEndpoint.agents]?.allowedProviders,
+      this.options.req?.app?.locals?.[EModelEndpoint.agents]?.allowedProviders,
    );
    try {
      if (memoryConfig.agent?.id != null && memoryConfig.agent.id !== this.options.agent.id) {
@@ -580,8 +577,8 @@ class AgentClient extends BaseClient {
      if (this.processMemory == null) {
        return;
      }
-      const appConfig = this.options.req.config;
-      const memoryConfig = appConfig.memory;
+      /** @type {TCustomConfig['memory']} */
+      const memoryConfig = this.options.req?.app?.locals?.memory;
      const messageWindowSize = memoryConfig?.messageWindowSize ?? 5;

      let messagesToProcess = [...messages];
@@ -623,17 +620,9 @@ class AgentClient extends BaseClient {
   * @param {Object} params
   * @param {string} [params.model]
   * @param {string} [params.context='message']
-   * @param {AppConfig['balance']} [params.balance]
-   * @param {AppConfig['transactions']} [params.transactions]
   * @param {UsageMetadata[]} [params.collectedUsage=this.collectedUsage]
   */
-  async recordCollectedUsage({
-    model,
-    balance,
-    transactions,
-    context = 'message',
-    collectedUsage = this.collectedUsage,
-  }) {
+  async recordCollectedUsage({ model, context = 'message', collectedUsage = this.collectedUsage }) {
    if (!collectedUsage || !collectedUsage.length) {
      return;
    }
@@ -655,8 +644,6 @@ class AgentClient extends BaseClient {

      const txMetadata = {
        context,
-        balance,
-        transactions,
        conversationId: this.conversationId,
        user: this.user ?? this.options.req.user?.id,
        endpointTokenConfig: this.options.endpointTokenConfig,
@@ -774,9 +761,8 @@ class AgentClient extends BaseClient {
        abortController = new AbortController();
      }

-      const appConfig = this.options.req.config;
-      /** @type {AppConfig['endpoints']['agents']} */
-      const agentsEConfig = appConfig.endpoints?.[EModelEndpoint.agents];
+      /** @type {TCustomConfig['endpoints']['agents']} */
+      const agentsEConfig = this.options.req.app.locals[EModelEndpoint.agents];

      config = {
        configurable: {
@@ -872,10 +858,11 @@ class AgentClient extends BaseClient {
        if (agent.useLegacyContent === true) {
          messages = formatContentStrings(messages);
        }
-        const defaultHeaders =
-          agent.model_parameters?.clientOptions?.defaultHeaders ??
-          agent.model_parameters?.configuration?.defaultHeaders;
-        if (defaultHeaders?.['anthropic-beta']?.includes('prompt-caching')) {
+        if (
+          agent.model_parameters?.clientOptions?.defaultHeaders?.['anthropic-beta']?.includes(
+            'prompt-caching',
+          )
+        ) {
          messages = addCacheControl(messages);
        }

@@ -883,16 +870,6 @@ class AgentClient extends BaseClient {
          memoryPromise = this.runMemory(messages);
        }

-        /** Resolve request-based headers for Custom Endpoints. Note: if this is added to
-         *  non-custom endpoints, needs consideration of varying provider header configs.
-         */
-        if (agent.model_parameters?.configuration?.defaultHeaders != null) {
-          agent.model_parameters.configuration.defaultHeaders = resolveHeaders({
-            headers: agent.model_parameters.configuration.defaultHeaders,
-            body: config.configurable.requestBody,
-          });
-        }
-
        run = await createRun({
          agent,
          req: this.options.req,
@@ -1053,13 +1030,7 @@ class AgentClient extends BaseClient {
          this.artifactPromises.push(...attachments);
        }

-        const balanceConfig = getBalanceConfig(appConfig);
-        const transactionsConfig = getTransactionsConfig(appConfig);
-        await this.recordCollectedUsage({
-          context: 'message',
-          balance: balanceConfig,
-          transactions: transactionsConfig,
-        });
+        await this.recordCollectedUsage({ context: 'message' });
      } catch (err) {
        logger.error(
          '[api/server/controllers/agents/client.js #chatCompletion] Error recording collected usage',
@@ -1100,7 +1071,6 @@ class AgentClient extends BaseClient {
    }
    const { handleLLMEnd, collected: collectedMetadata } = createMetadataAggregator();
    const { req, res, agent } = this.options;
-    const appConfig = req.config;
    let endpoint = agent.endpoint;

    /** @type {import('@librechat/agents').ClientOptions} */
@@ -1108,13 +1078,11 @@ class AgentClient extends BaseClient {
      model: agent.model || agent.model_parameters.model,
    };

-    let titleProviderConfig = getProviderConfig({ provider: endpoint, appConfig });
+    let titleProviderConfig = await getProviderConfig(endpoint);

    /** @type {TEndpoint | undefined} */
    const endpointConfig =
-      appConfig.endpoints?.all ??
-      appConfig.endpoints?.[endpoint] ??
-      titleProviderConfig.customEndpointConfig;
+      req.app.locals.all ?? req.app.locals[endpoint] ?? titleProviderConfig.customEndpointConfig;
    if (!endpointConfig) {
      logger.warn(
        '[api/server/controllers/agents/client.js #titleConvo] Error getting endpoint config',
@@ -1123,10 +1091,7 @@ class AgentClient extends BaseClient {

    if (endpointConfig?.titleEndpoint && endpointConfig.titleEndpoint !== endpoint) {
      try {
-        titleProviderConfig = getProviderConfig({
-          provider: endpointConfig.titleEndpoint,
-          appConfig,
-        });
+        titleProviderConfig = await getProviderConfig(endpointConfig.titleEndpoint);
        endpoint = endpointConfig.titleEndpoint;
      } catch (error) {
        logger.warn(
@@ -1135,7 +1100,7 @@ class AgentClient extends BaseClient {
        );
        // Fall back to original provider config
        endpoint = agent.endpoint;
-        titleProviderConfig = getProviderConfig({ provider: endpoint, appConfig });
+        titleProviderConfig = await getProviderConfig(endpoint);
      }
    }

@@ -1200,20 +1165,6 @@ class AgentClient extends BaseClient {
      clientOptions.json = true;
    }

-    /** Resolve request-based headers for Custom Endpoints. Note: if this is added to
-     *  non-custom endpoints, needs consideration of varying provider header configs.
-     */
-    if (clientOptions?.configuration?.defaultHeaders != null) {
-      clientOptions.configuration.defaultHeaders = resolveHeaders({
-        headers: clientOptions.configuration.defaultHeaders,
-        body: {
-          messageId: this.responseMessageId,
-          conversationId: this.conversationId,
-          parentMessageId: this.parentMessageId,
-        },
-      });
-    }
-
    try {
      const titleResult = await this.run.generateTitle({
        provider,
@@ -1252,14 +1203,10 @@ class AgentClient extends BaseClient {
        };
      });

-      const balanceConfig = getBalanceConfig(appConfig);
-      const transactionsConfig = getTransactionsConfig(appConfig);
      await this.recordCollectedUsage({
-        collectedUsage,
-        context: 'title',
        model: clientOptions.model,
-        balance: balanceConfig,
-        transactions: transactionsConfig,
+        context: 'title',
+        collectedUsage,
      }).catch((err) => {
        logger.error(
          '[api/server/controllers/agents/client.js #titleConvo] Error recording collected usage',
@@ -1278,26 +1225,17 @@ class AgentClient extends BaseClient {
   * @param {object} params
   * @param {number} params.promptTokens
   * @param {number} params.completionTokens
-   * @param {string} [params.model]
   * @param {OpenAIUsageMetadata} [params.usage]
-   * @param {AppConfig['balance']} [params.balance]
+   * @param {string} [params.model]
   * @param {string} [params.context='message']
   * @returns {Promise<void>}
   */
-  async recordTokenUsage({
-    model,
-    usage,
-    balance,
-    promptTokens,
-    completionTokens,
-    context = 'message',
-  }) {
+  async recordTokenUsage({ model, promptTokens, completionTokens, usage, context = 'message' }) {
    try {
      await spendTokens(
        {
          model,
          context,
-          balance,
          conversationId: this.conversationId,
          user: this.user ?? this.options.req.user?.id,
          endpointTokenConfig: this.options.endpointTokenConfig,
@@ -1314,7 +1252,6 @@ class AgentClient extends BaseClient {
        await spendTokens(
          {
            model,
-            balance,
            context: 'reasoning',
            conversationId: this.conversationId,
            user: this.user ?? this.options.req.user?.id,
--- a/api/server/controllers/agents/client.test.js
+++ b/api/server/controllers/agents/client.test.js
@@ -41,16 +41,8 @@ describe('AgentClient - titleConvo', () => {

    // Mock request and response
    mockReq = {
-      user: {
-        id: 'user-123',
-      },
-      body: {
-        model: 'gpt-4',
-        endpoint: EModelEndpoint.openAI,
-        key: null,
-      },
-      config: {
-        endpoints: {
+      app: {
+        locals: {
          [EModelEndpoint.openAI]: {
            // Match the agent endpoint
            titleModel: 'gpt-3.5-turbo',
@@ -60,6 +52,14 @@ describe('AgentClient - titleConvo', () => {
          },
        },
      },
+      user: {
+        id: 'user-123',
+      },
+      body: {
+        model: 'gpt-4',
+        endpoint: EModelEndpoint.openAI,
+        key: null,
+      },
    };

    mockRes = {};
@@ -143,7 +143,7 @@ describe('AgentClient - titleConvo', () => {

    it('should handle missing endpoint config gracefully', async () => {
      // Remove endpoint config
-      mockReq.config = { endpoints: {} };
+      mockReq.app.locals[EModelEndpoint.openAI] = undefined;

      const text = 'Test conversation text';
      const abortController = new AbortController();
@@ -161,16 +161,7 @@ describe('AgentClient - titleConvo', () => {

    it('should use agent model when titleModel is not provided', async () => {
      // Remove titleModel from config
-      mockReq.config = {
-        endpoints: {
-          [EModelEndpoint.openAI]: {
-            titlePrompt: 'Custom title prompt',
-            titleMethod: 'structured',
-            titlePromptTemplate: 'Template: {{content}}',
-            // titleModel is omitted
-          },
-        },
-      };
+      delete mockReq.app.locals[EModelEndpoint.openAI].titleModel;

      const text = 'Test conversation text';
      const abortController = new AbortController();
@@ -182,16 +173,7 @@ describe('AgentClient - titleConvo', () => {
    });

    it('should not use titleModel when it equals CURRENT_MODEL constant', async () => {
-      mockReq.config = {
-        endpoints: {
-          [EModelEndpoint.openAI]: {
-            titleModel: Constants.CURRENT_MODEL,
-            titlePrompt: 'Custom title prompt',
-            titleMethod: 'structured',
-            titlePromptTemplate: 'Template: {{content}}',
-          },
-        },
-      };
+      mockReq.app.locals[EModelEndpoint.openAI].titleModel = Constants.CURRENT_MODEL;

      const text = 'Test conversation text';
      const abortController = new AbortController();
@@ -234,12 +216,6 @@ describe('AgentClient - titleConvo', () => {
        model: 'gpt-3.5-turbo',
        context: 'title',
        collectedUsage: expect.any(Array),
-        balance: {
-          enabled: false,
-        },
-        transactions: {
-          enabled: true,
-        },
      });
    });

@@ -269,17 +245,10 @@ describe('AgentClient - titleConvo', () => {
      process.env.ANTHROPIC_API_KEY = 'test-api-key';

      // Add titleEndpoint to the config
-      mockReq.config = {
-        endpoints: {
-          [EModelEndpoint.openAI]: {
-            titleModel: 'gpt-3.5-turbo',
-            titleEndpoint: EModelEndpoint.anthropic,
-            titleMethod: 'structured',
-            titlePrompt: 'Custom title prompt',
-            titlePromptTemplate: 'Custom template',
-          },
-        },
-      };
+      mockReq.app.locals[EModelEndpoint.openAI].titleEndpoint = EModelEndpoint.anthropic;
+      mockReq.app.locals[EModelEndpoint.openAI].titleMethod = 'structured';
+      mockReq.app.locals[EModelEndpoint.openAI].titlePrompt = 'Custom title prompt';
+      mockReq.app.locals[EModelEndpoint.openAI].titlePromptTemplate = 'Custom template';

      const text = 'Test conversation text';
      const abortController = new AbortController();
@@ -305,16 +274,18 @@ describe('AgentClient - titleConvo', () => {
    });

    it('should use all config when endpoint config is missing', async () => {
-      // Set 'all' config without endpoint-specific config
-      mockReq.config = {
-        endpoints: {
-          all: {
-            titleModel: 'gpt-4o-mini',
-            titlePrompt: 'All config title prompt',
-            titleMethod: 'completion',
-            titlePromptTemplate: 'All config template: {{content}}',
-          },
-        },
+      // Remove endpoint-specific config
+      delete mockReq.app.locals[EModelEndpoint.openAI].titleModel;
+      delete mockReq.app.locals[EModelEndpoint.openAI].titlePrompt;
+      delete mockReq.app.locals[EModelEndpoint.openAI].titleMethod;
+      delete mockReq.app.locals[EModelEndpoint.openAI].titlePromptTemplate;
+
+      // Set 'all' config
+      mockReq.app.locals.all = {
+        titleModel: 'gpt-4o-mini',
+        titlePrompt: 'All config title prompt',
+        titleMethod: 'completion',
+        titlePromptTemplate: 'All config template: {{content}}',
      };

      const text = 'Test conversation text';
@@ -338,21 +309,17 @@ describe('AgentClient - titleConvo', () => {

    it('should prioritize all config over endpoint config for title settings', async () => {
      // Set both endpoint and 'all' config
-      mockReq.config = {
-        endpoints: {
-          [EModelEndpoint.openAI]: {
-            titleModel: 'gpt-3.5-turbo',
-            titlePrompt: 'Endpoint title prompt',
-            titleMethod: 'structured',
-            // titlePromptTemplate is omitted to test fallback
-          },
-          all: {
-            titleModel: 'gpt-4o-mini',
-            titlePrompt: 'All config title prompt',
-            titleMethod: 'completion',
-            titlePromptTemplate: 'All config template',
-          },
-        },
+      mockReq.app.locals[EModelEndpoint.openAI].titleModel = 'gpt-3.5-turbo';
+      mockReq.app.locals[EModelEndpoint.openAI].titlePrompt = 'Endpoint title prompt';
+      mockReq.app.locals[EModelEndpoint.openAI].titleMethod = 'structured';
+      // Remove titlePromptTemplate from endpoint config to test fallback
+      delete mockReq.app.locals[EModelEndpoint.openAI].titlePromptTemplate;
+
+      mockReq.app.locals.all = {
+        titleModel: 'gpt-4o-mini',
+        titlePrompt: 'All config title prompt',
+        titleMethod: 'completion',
+        titlePromptTemplate: 'All config template',
      };

      const text = 'Test conversation text';
@@ -379,18 +346,17 @@ describe('AgentClient - titleConvo', () => {
      const originalApiKey = process.env.ANTHROPIC_API_KEY;
      process.env.ANTHROPIC_API_KEY = 'test-anthropic-key';

+      // Remove endpoint-specific config to test 'all' config
+      delete mockReq.app.locals[EModelEndpoint.openAI];
+
      // Set comprehensive 'all' config with all new title options
-      mockReq.config = {
-        endpoints: {
-          all: {
-            titleConvo: true,
-            titleModel: 'claude-3-haiku-20240307',
-            titleMethod: 'completion', // Testing the new default method
-            titlePrompt: 'Generate a concise, descriptive title for this conversation',
-            titlePromptTemplate: 'Conversation summary: {{content}}',
-            titleEndpoint: EModelEndpoint.anthropic, // Should switch provider to Anthropic
-          },
-        },
+      mockReq.app.locals.all = {
+        titleConvo: true,
+        titleModel: 'claude-3-haiku-20240307',
+        titleMethod: 'completion', // Testing the new default method
+        titlePrompt: 'Generate a concise, descriptive title for this conversation',
+        titlePromptTemplate: 'Conversation summary: {{content}}',
+        titleEndpoint: EModelEndpoint.anthropic, // Should switch provider to Anthropic
      };

      const text = 'Test conversation about AI and machine learning';
@@ -436,16 +402,15 @@ describe('AgentClient - titleConvo', () => {
        // Clear previous calls
        mockRun.generateTitle.mockClear();

+        // Remove endpoint config
+        delete mockReq.app.locals[EModelEndpoint.openAI];
+
        // Set 'all' config with specific titleMethod
-        mockReq.config = {
-          endpoints: {
-            all: {
-              titleModel: 'gpt-4o-mini',
-              titleMethod: method,
-              titlePrompt: `Testing ${method} method`,
-              titlePromptTemplate: `Template for ${method}: {{content}}`,
-            },
-          },
+        mockReq.app.locals.all = {
+          titleModel: 'gpt-4o-mini',
+          titleMethod: method,
+          titlePrompt: `Testing ${method} method`,
+          titlePromptTemplate: `Template for ${method}: {{content}}`,
        };

        const text = `Test conversation for ${method} method`;
@@ -490,33 +455,29 @@ describe('AgentClient - titleConvo', () => {
        // Set up Azure endpoint with serverless config
        mockAgent.endpoint = EModelEndpoint.azureOpenAI;
        mockAgent.provider = EModelEndpoint.azureOpenAI;
-        mockReq.config = {
-          endpoints: {
-            [EModelEndpoint.azureOpenAI]: {
-              titleConvo: true,
-              titleModel: 'grok-3',
-              titleMethod: 'completion',
-              titlePrompt: 'Azure serverless title prompt',
-              streamRate: 35,
-              modelGroupMap: {
+        mockReq.app.locals[EModelEndpoint.azureOpenAI] = {
+          titleConvo: true,
+          titleModel: 'grok-3',
+          titleMethod: 'completion',
+          titlePrompt: 'Azure serverless title prompt',
+          streamRate: 35,
+          modelGroupMap: {
+            'grok-3': {
+              group: 'Azure AI Foundry',
+              deploymentName: 'grok-3',
+            },
+          },
+          groupMap: {
+            'Azure AI Foundry': {
+              apiKey: '${AZURE_API_KEY}',
+              baseURL: 'https://test.services.ai.azure.com/models',
+              version: '2024-05-01-preview',
+              serverless: true,
+              models: {
                'grok-3': {
-                  group: 'Azure AI Foundry',
                  deploymentName: 'grok-3',
                },
              },
-              groupMap: {
-                'Azure AI Foundry': {
-                  apiKey: '${AZURE_API_KEY}',
-                  baseURL: 'https://test.services.ai.azure.com/models',
-                  version: '2024-05-01-preview',
-                  serverless: true,
-                  models: {
-                    'grok-3': {
-                      deploymentName: 'grok-3',
-                    },
-                  },
-                },
-              },
            },
          },
        };
@@ -542,32 +503,28 @@ describe('AgentClient - titleConvo', () => {
        // Set up Azure endpoint
        mockAgent.endpoint = EModelEndpoint.azureOpenAI;
        mockAgent.provider = EModelEndpoint.azureOpenAI;
-        mockReq.config = {
-          endpoints: {
-            [EModelEndpoint.azureOpenAI]: {
-              titleConvo: true,
-              titleModel: 'gpt-4o',
-              titleMethod: 'structured',
-              titlePrompt: 'Azure instance title prompt',
-              streamRate: 35,
-              modelGroupMap: {
+        mockReq.app.locals[EModelEndpoint.azureOpenAI] = {
+          titleConvo: true,
+          titleModel: 'gpt-4o',
+          titleMethod: 'structured',
+          titlePrompt: 'Azure instance title prompt',
+          streamRate: 35,
+          modelGroupMap: {
+            'gpt-4o': {
+              group: 'eastus',
+              deploymentName: 'gpt-4o',
+            },
+          },
+          groupMap: {
+            eastus: {
+              apiKey: '${EASTUS_API_KEY}',
+              instanceName: 'region-instance',
+              version: '2024-02-15-preview',
+              models: {
                'gpt-4o': {
-                  group: 'eastus',
                  deploymentName: 'gpt-4o',
                },
              },
-              groupMap: {
-                eastus: {
-                  apiKey: '${EASTUS_API_KEY}',
-                  instanceName: 'region-instance',
-                  version: '2024-02-15-preview',
-                  models: {
-                    'gpt-4o': {
-                      deploymentName: 'gpt-4o',
-                    },
-                  },
-                },
-              },
            },
          },
        };
@@ -594,33 +551,29 @@ describe('AgentClient - titleConvo', () => {
        mockAgent.endpoint = EModelEndpoint.azureOpenAI;
        mockAgent.provider = EModelEndpoint.azureOpenAI;
        mockAgent.model_parameters.model = 'gpt-4o-latest';
-        mockReq.config = {
-          endpoints: {
-            [EModelEndpoint.azureOpenAI]: {
-              titleConvo: true,
-              titleModel: Constants.CURRENT_MODEL,
-              titleMethod: 'functions',
-              streamRate: 35,
-              modelGroupMap: {
+        mockReq.app.locals[EModelEndpoint.azureOpenAI] = {
+          titleConvo: true,
+          titleModel: Constants.CURRENT_MODEL,
+          titleMethod: 'functions',
+          streamRate: 35,
+          modelGroupMap: {
+            'gpt-4o-latest': {
+              group: 'region-eastus',
+              deploymentName: 'gpt-4o-mini',
+              version: '2024-02-15-preview',
+            },
+          },
+          groupMap: {
+            'region-eastus': {
+              apiKey: '${EASTUS2_API_KEY}',
+              instanceName: 'test-instance',
+              version: '2024-12-01-preview',
+              models: {
                'gpt-4o-latest': {
-                  group: 'region-eastus',
                  deploymentName: 'gpt-4o-mini',
                  version: '2024-02-15-preview',
                },
              },
-              groupMap: {
-                'region-eastus': {
-                  apiKey: '${EASTUS2_API_KEY}',
-                  instanceName: 'test-instance',
-                  version: '2024-12-01-preview',
-                  models: {
-                    'gpt-4o-latest': {
-                      deploymentName: 'gpt-4o-mini',
-                      version: '2024-02-15-preview',
-                    },
-                  },
-                },
-              },
            },
          },
        };
@@ -645,58 +598,54 @@ describe('AgentClient - titleConvo', () => {
        // Set up Azure endpoint
        mockAgent.endpoint = EModelEndpoint.azureOpenAI;
        mockAgent.provider = EModelEndpoint.azureOpenAI;
-        mockReq.config = {
-          endpoints: {
-            [EModelEndpoint.azureOpenAI]: {
-              titleConvo: true,
-              titleModel: 'o1-mini',
-              titleMethod: 'completion',
-              streamRate: 35,
-              modelGroupMap: {
+        mockReq.app.locals[EModelEndpoint.azureOpenAI] = {
+          titleConvo: true,
+          titleModel: 'o1-mini',
+          titleMethod: 'completion',
+          streamRate: 35,
+          modelGroupMap: {
+            'gpt-4o': {
+              group: 'eastus',
+              deploymentName: 'gpt-4o',
+            },
+            'o1-mini': {
+              group: 'region-eastus',
+              deploymentName: 'o1-mini',
+            },
+            'codex-mini': {
+              group: 'codex-mini',
+              deploymentName: 'codex-mini',
+            },
+          },
+          groupMap: {
+            eastus: {
+              apiKey: '${EASTUS_API_KEY}',
+              instanceName: 'region-eastus',
+              version: '2024-02-15-preview',
+              models: {
                'gpt-4o': {
-                  group: 'eastus',
                  deploymentName: 'gpt-4o',
                },
+              },
+            },
+            'region-eastus': {
+              apiKey: '${EASTUS2_API_KEY}',
+              instanceName: 'region-eastus2',
+              version: '2024-12-01-preview',
+              models: {
                'o1-mini': {
-                  group: 'region-eastus',
                  deploymentName: 'o1-mini',
                },
-                'codex-mini': {
-                  group: 'codex-mini',
-                  deploymentName: 'codex-mini',
-                },
              },
-              groupMap: {
-                eastus: {
-                  apiKey: '${EASTUS_API_KEY}',
-                  instanceName: 'region-eastus',
-                  version: '2024-02-15-preview',
-                  models: {
-                    'gpt-4o': {
-                      deploymentName: 'gpt-4o',
-                    },
-                  },
-                },
-                'region-eastus': {
-                  apiKey: '${EASTUS2_API_KEY}',
-                  instanceName: 'region-eastus2',
-                  version: '2024-12-01-preview',
-                  models: {
-                    'o1-mini': {
-                      deploymentName: 'o1-mini',
-                    },
-                  },
-                },
+            },
+            'codex-mini': {
+              apiKey: '${AZURE_API_KEY}',
+              baseURL: 'https://example.cognitiveservices.azure.com/openai/',
+              version: '2025-04-01-preview',
+              serverless: true,
+              models: {
                'codex-mini': {
-                  apiKey: '${AZURE_API_KEY}',
-                  baseURL: 'https://example.cognitiveservices.azure.com/openai/',
-                  version: '2025-04-01-preview',
-                  serverless: true,
-                  models: {
-                    'codex-mini': {
-                      deploymentName: 'codex-mini',
-                    },
-                  },
+                  deploymentName: 'codex-mini',
                },
              },
            },
@@ -730,34 +679,33 @@ describe('AgentClient - titleConvo', () => {
        mockReq.body.endpoint = EModelEndpoint.azureOpenAI;
        mockReq.body.model = 'gpt-4';

+        // Remove Azure-specific config
+        delete mockReq.app.locals[EModelEndpoint.azureOpenAI];
+
        // Set 'all' config as fallback with a serverless Azure config
-        mockReq.config = {
-          endpoints: {
-            all: {
-              titleConvo: true,
-              titleModel: 'gpt-4',
-              titleMethod: 'structured',
-              titlePrompt: 'Fallback title prompt from all config',
-              titlePromptTemplate: 'Template: {{content}}',
-              modelGroupMap: {
+        mockReq.app.locals.all = {
+          titleConvo: true,
+          titleModel: 'gpt-4',
+          titleMethod: 'structured',
+          titlePrompt: 'Fallback title prompt from all config',
+          titlePromptTemplate: 'Template: {{content}}',
+          modelGroupMap: {
+            'gpt-4': {
+              group: 'default-group',
+              deploymentName: 'gpt-4',
+            },
+          },
+          groupMap: {
+            'default-group': {
+              apiKey: '${AZURE_API_KEY}',
+              baseURL: 'https://default.openai.azure.com/',
+              version: '2024-02-15-preview',
+              serverless: true,
+              models: {
                'gpt-4': {
-                  group: 'default-group',
                  deploymentName: 'gpt-4',
                },
              },
-              groupMap: {
-                'default-group': {
-                  apiKey: '${AZURE_API_KEY}',
-                  baseURL: 'https://default.openai.azure.com/',
-                  version: '2024-02-15-preview',
-                  serverless: true,
-                  models: {
-                    'gpt-4': {
-                      deploymentName: 'gpt-4',
-                    },
-                  },
-                },
-              },
            },
          },
        };
@@ -1034,6 +982,13 @@ describe('AgentClient - titleConvo', () => {
      };

      mockReq = {
+        app: {
+          locals: {
+            memory: {
+              messageWindowSize: 3,
+            },
+          },
+        },
        user: {
          id: 'user-123',
          personalization: {
@@ -1042,13 +997,6 @@ describe('AgentClient - titleConvo', () => {
        },
      };

-      // Mock getAppConfig for memory tests
-      mockReq.config = {
-        memory: {
-          messageWindowSize: 3,
-        },
-      };
-
      mockRes = {};

      mockOptions = {
--- a/api/server/controllers/agents/errors.js
+++ b/api/server/controllers/agents/errors.js
@@ -21,7 +21,7 @@ const getLogStores = require('~/cache/getLogStores');

 /**
 * @typedef {Object} ErrorHandlerDependencies
- * @property {ServerRequest} req - The Express request object
+ * @property {Express.Request} req - The Express request object
 * @property {Express.Response} res - The Express response object
 * @property {() => ErrorHandlerContext} getContext - Function to get the current context
 * @property {string} [originPath] - The origin path for the error handler
--- a/api/server/controllers/agents/v1.js
+++ b/api/server/controllers/agents/v1.js
@@ -5,7 +5,6 @@ const { logger } = require('@librechat/data-schemas');
 const { agentCreateSchema, agentUpdateSchema } = require('@librechat/api');
 const {
  Tools,
-  Constants,
  SystemRoles,
  FileSources,
  ResourceType,
@@ -70,9 +69,9 @@ const createAgentHandler = async (req, res) => {
    for (const tool of tools) {
      if (availableTools[tool]) {
        agentData.tools.push(tool);
-      } else if (systemTools[tool]) {
-        agentData.tools.push(tool);
-      } else if (tool.includes(Constants.mcp_delimiter)) {
+      }
+
+      if (systemTools[tool]) {
        agentData.tools.push(tool);
      }
    }
@@ -488,7 +487,6 @@ const getListAgentsHandler = async (req, res) => {
 */
 const uploadAgentAvatarHandler = async (req, res) => {
  try {
-    const appConfig = req.config;
    filterFile({ req, file: req.file, image: true, isAvatar: true });
    const { agent_id } = req.params;
    if (!agent_id) {
@@ -512,7 +510,9 @@ const uploadAgentAvatarHandler = async (req, res) => {
    }

    const buffer = await fs.readFile(req.file.path);
-    const fileStrategy = getFileStrategy(appConfig, { isAvatar: true });
+
+    const fileStrategy = getFileStrategy(req.app.locals, { isAvatar: true });
+
    const resizedBuffer = await resizeAvatar({
      userId: req.user.id,
      input: buffer,
--- a/api/server/controllers/assistants/chatV1.js
+++ b/api/server/controllers/assistants/chatV1.js
@@ -1,7 +1,7 @@
 const { v4 } = require('uuid');
 const { sleep } = require('@librechat/agents');
+const { sendEvent } = require('@librechat/api');
 const { logger } = require('@librechat/data-schemas');
-const { sendEvent, getBalanceConfig, getModelMaxTokens } = require('@librechat/api');
 const {
  Time,
  Constants,
@@ -34,6 +34,7 @@ const { checkBalance } = require('~/models/balanceMethods');
 const { getConvo } = require('~/models/Conversation');
 const getLogStores = require('~/cache/getLogStores');
 const { countTokens } = require('~/server/utils');
+const { getModelMaxTokens } = require('~/utils');
 const { getOpenAIClient } = require('./helpers');

 /**
@@ -46,7 +47,6 @@ const { getOpenAIClient } = require('./helpers');
 * @returns {void}
 */
 const chatV1 = async (req, res) => {
-  const appConfig = req.config;
  logger.debug('[/assistants/chat/] req.body', req.body);

  const {
@@ -251,8 +251,8 @@ const chatV1 = async (req, res) => {
    }

    const checkBalanceBeforeRun = async () => {
-      const balanceConfig = getBalanceConfig(appConfig);
-      if (!balanceConfig?.enabled) {
+      const balance = req.app?.locals?.balance;
+      if (!balance?.enabled) {
        return;
      }
      const transactions =
--- a/api/server/controllers/assistants/chatV2.js
+++ b/api/server/controllers/assistants/chatV2.js
@@ -1,7 +1,7 @@
 const { v4 } = require('uuid');
 const { sleep } = require('@librechat/agents');
+const { sendEvent } = require('@librechat/api');
 const { logger } = require('@librechat/data-schemas');
-const { sendEvent, getBalanceConfig, getModelMaxTokens } = require('@librechat/api');
 const {
  Time,
  Constants,
@@ -31,19 +31,19 @@ const { checkBalance } = require('~/models/balanceMethods');
 const { getConvo } = require('~/models/Conversation');
 const getLogStores = require('~/cache/getLogStores');
 const { countTokens } = require('~/server/utils');
+const { getModelMaxTokens } = require('~/utils');
 const { getOpenAIClient } = require('./helpers');

 /**
 * @route POST /
 * @desc Chat with an assistant
 * @access Public
- * @param {ServerRequest} req - The request object, containing the request data.
+ * @param {Express.Request} req - The request object, containing the request data.
 * @param {Express.Response} res - The response object, used to send back a response.
 * @returns {void}
 */
 const chatV2 = async (req, res) => {
  logger.debug('[/assistants/chat/] req.body', req.body);
-  const appConfig = req.config;

  /** @type {{files: MongoFile[]}} */
  const {
@@ -126,8 +126,8 @@ const chatV2 = async (req, res) => {
    }

    const checkBalanceBeforeRun = async () => {
-      const balanceConfig = getBalanceConfig(appConfig);
-      if (!balanceConfig?.enabled) {
+      const balance = req.app?.locals?.balance;
+      if (!balance?.enabled) {
        return;
      }
      const transactions =
@@ -374,9 +374,9 @@ const chatV2 = async (req, res) => {
      };

      /** @type {undefined | TAssistantEndpoint} */
-      const config = appConfig.endpoints?.[endpoint] ?? {};
+      const config = req.app.locals[endpoint] ?? {};
      /** @type {undefined | TBaseEndpoint} */
-      const allConfig = appConfig.endpoints?.all;
+      const allConfig = req.app.locals.all;

      const streamRunManager = new StreamRunManager({
        req,
--- a/api/server/controllers/assistants/errors.js
+++ b/api/server/controllers/assistants/errors.js
@@ -22,7 +22,7 @@ const getLogStores = require('~/cache/getLogStores');

 /**
 * @typedef {Object} ErrorHandlerDependencies
- * @property {ServerRequest} req - The Express request object
+ * @property {Express.Request} req - The Express request object
 * @property {Express.Response} res - The Express response object
 * @property {() => ErrorHandlerContext} getContext - Function to get the current context
 * @property {string} [originPath] - The origin path for the error handler
--- a/api/server/controllers/assistants/helpers.js
+++ b/api/server/controllers/assistants/helpers.js
@@ -11,7 +11,7 @@ const { initializeClient } = require('~/server/services/Endpoints/assistants');
 const { getEndpointsConfig } = require('~/server/services/Config');

 /**
- * @param {ServerRequest} req
+ * @param {Express.Request} req
 * @param {string} [endpoint]
 * @returns {Promise<string>}
 */
@@ -210,7 +210,6 @@ async function getOpenAIClient({ req, res, endpointOption, initAppClient, overri
 * @returns {Promise<AssistantListResponse>} 200 - success response - application/json
 */
 const fetchAssistants = async ({ req, res, overrideEndpoint }) => {
-  const appConfig = req.config;
  const {
    limit = 100,
    order = 'desc',
@@ -231,20 +230,20 @@ const fetchAssistants = async ({ req, res, overrideEndpoint }) => {
  if (endpoint === EModelEndpoint.assistants) {
    ({ body } = await listAllAssistants({ req, res, version, query }));
  } else if (endpoint === EModelEndpoint.azureAssistants) {
-    const azureConfig = appConfig.endpoints?.[EModelEndpoint.azureOpenAI];
+    const azureConfig = req.app.locals[EModelEndpoint.azureOpenAI];
    body = await listAssistantsForAzure({ req, res, version, azureConfig, query });
  }

  if (req.user.role === SystemRoles.ADMIN) {
    return body;
-  } else if (!appConfig.endpoints?.[endpoint]) {
+  } else if (!req.app.locals[endpoint]) {
    return body;
  }

  body.data = filterAssistants({
    userId: req.user.id,
    assistants: body.data,
-    assistantsConfig: appConfig.endpoints?.[endpoint],
+    assistantsConfig: req.app.locals[endpoint],
  });
  return body;
 };
--- a/api/server/controllers/assistants/v1.js
+++ b/api/server/controllers/assistants/v1.js
@@ -258,9 +258,8 @@ function filterAssistantDocs({ documents, userId, assistantsConfig = {} }) {
 */
 const getAssistantDocuments = async (req, res) => {
  try {
-    const appConfig = req.config;
    const endpoint = req.query;
-    const assistantsConfig = appConfig.endpoints?.[endpoint];
+    const assistantsConfig = req.app.locals[endpoint];
    const documents = await getAssistants(
      {},
      {
@@ -297,7 +296,6 @@ const getAssistantDocuments = async (req, res) => {
 */
 const uploadAssistantAvatar = async (req, res) => {
  try {
-    const appConfig = req.config;
    filterFile({ req, file: req.file, image: true, isAvatar: true });
    const { assistant_id } = req.params;
    if (!assistant_id) {
@@ -339,7 +337,7 @@ const uploadAssistantAvatar = async (req, res) => {
    const metadata = {
      ..._metadata,
      avatar: image.filepath,
-      avatar_source: appConfig.fileStrategy,
+      avatar_source: req.app.locals.fileStrategy,
    };

    const promises = [];
@@ -349,7 +347,7 @@ const uploadAssistantAvatar = async (req, res) => {
        {
          avatar: {
            filepath: image.filepath,
-            source: appConfig.fileStrategy,
+            source: req.app.locals.fileStrategy,
          },
          user: req.user.id,
        },
--- a/api/server/controllers/assistants/v2.js
+++ b/api/server/controllers/assistants/v2.js
@@ -94,7 +94,7 @@ const createAssistant = async (req, res) => {
 /**
 * Modifies an assistant.
 * @param {object} params
- * @param {ServerRequest} params.req
+ * @param {Express.Request} params.req
 * @param {OpenAIClient} params.openai
 * @param {string} params.assistant_id
 * @param {AssistantUpdateParams} params.updateData
@@ -199,7 +199,7 @@ const updateAssistant = async ({ req, openai, assistant_id, updateData }) => {
 /**
 * Modifies an assistant with the resource file id.
 * @param {object} params
- * @param {ServerRequest} params.req
+ * @param {Express.Request} params.req
 * @param {OpenAIClient} params.openai
 * @param {string} params.assistant_id
 * @param {string} params.tool_resource
@@ -227,7 +227,7 @@ const addResourceFileId = async ({ req, openai, assistant_id, tool_resource, fil
 /**
 * Deletes a file ID from an assistant's resource.
 * @param {object} params
- * @param {ServerRequest} params.req
+ * @param {Express.Request} params.req
 * @param {OpenAIClient} params.openai
 * @param {string} params.assistant_id
 * @param {string} [params.tool_resource]
--- a/api/server/controllers/tools.js
+++ b/api/server/controllers/tools.js
@@ -35,10 +35,9 @@ const toolAccessPermType = {
 */
 const verifyWebSearchAuth = async (req, res) => {
  try {
-    const appConfig = req.config;
    const userId = req.user.id;
    /** @type {TCustomConfig['webSearch']} */
-    const webSearchConfig = appConfig?.webSearch || {};
+    const webSearchConfig = req.app.locals?.webSearch || {};
    const result = await loadWebSearchAuth({
      userId,
      loadAuthValues,
@@ -111,7 +110,6 @@ const verifyToolAuth = async (req, res) => {
 */
 const callTool = async (req, res) => {
  try {
-    const appConfig = req.config;
    const { toolId = '' } = req.params;
    if (!fieldsMap[toolId]) {
      logger.warn(`[${toolId}/call] User ${req.user.id} attempted call to invalid tool`);
@@ -157,10 +155,8 @@ const callTool = async (req, res) => {
        returnMetadata: true,
        processFileURL,
        uploadImageBuffer,
+        fileStrategy: req.app.locals.fileStrategy,
      },
-      webSearch: appConfig.webSearch,
-      fileStrategy: appConfig.fileStrategy,
-      imageOutputType: appConfig.imageOutputType,
    });

    const tool = loadedTools[0];
--- a/api/server/index.js
+++ b/api/server/index.js
@@ -12,16 +12,14 @@ const { logger } = require('@librechat/data-schemas');
 const mongoSanitize = require('express-mongo-sanitize');
 const { isEnabled, ErrorController } = require('@librechat/api');
 const { connectDb, indexSync } = require('~/db');
-const createValidateImageRequest = require('./middleware/validateImageRequest');
+const validateImageRequest = require('./middleware/validateImageRequest');
 const { jwtLogin, ldapLogin, passportLogin } = require('~/strategies');
-const { updateInterfacePermissions } = require('~/models/interface');
 const { checkMigrations } = require('./services/start/migration');
 const initializeMCPs = require('./services/initializeMCPs');
 const configureSocialLogins = require('./socialLogins');
-const { getAppConfig } = require('./services/Config');
+const AppService = require('./services/AppService');
 const staticCache = require('./utils/staticCache');
 const noIndex = require('./middleware/noIndex');
-const { seedDatabase } = require('~/models');
 const routes = require('./routes');

 const { PORT, HOST, ALLOW_SOCIAL_LOGIN, DISABLE_COMPRESSION, TRUST_PROXY } = process.env ?? {};
@@ -47,25 +45,10 @@ const startServer = async () => {
  app.disable('x-powered-by');
  app.set('trust proxy', trusted_proxy);

-  await seedDatabase();
+  await AppService(app);

-  const appConfig = await getAppConfig();
-  await updateInterfacePermissions(appConfig);
-  const indexPath = path.join(appConfig.paths.dist, 'index.html');
-  let indexHTML = fs.readFileSync(indexPath, 'utf8');
-
-  // In order to provide support to serving the application in a sub-directory
-  // We need to update the base href if the DOMAIN_CLIENT is specified and not the root path
-  if (process.env.DOMAIN_CLIENT) {
-    const clientUrl = new URL(process.env.DOMAIN_CLIENT);
-    const baseHref = clientUrl.pathname.endsWith('/')
-      ? clientUrl.pathname
-      : `${clientUrl.pathname}/`;
-    if (baseHref !== '/') {
-      logger.info(`Setting base href to ${baseHref}`);
-      indexHTML = indexHTML.replace(/base href="\/"/, `base href="${baseHref}"`);
-    }
-  }
+  const indexPath = path.join(app.locals.paths.dist, 'index.html');
+  const indexHTML = fs.readFileSync(indexPath, 'utf8');

  app.get('/health', (_req, res) => res.status(200).send('OK'));

@@ -83,9 +66,10 @@ const startServer = async () => {
    console.warn('Response compression has been disabled via DISABLE_COMPRESSION.');
  }

-  app.use(staticCache(appConfig.paths.dist));
-  app.use(staticCache(appConfig.paths.fonts));
-  app.use(staticCache(appConfig.paths.assets));
+  // Serve static assets with aggressive caching
+  app.use(staticCache(app.locals.paths.dist));
+  app.use(staticCache(app.locals.paths.fonts));
+  app.use(staticCache(app.locals.paths.assets));

  if (!ALLOW_SOCIAL_LOGIN) {
    console.warn('Social logins are disabled. Set ALLOW_SOCIAL_LOGIN=true to enable them.');
@@ -126,7 +110,7 @@ const startServer = async () => {
  app.use('/api/config', routes.config);
  app.use('/api/assistants', routes.assistants);
  app.use('/api/files', await routes.files.initialize());
-  app.use('/images/', createValidateImageRequest(appConfig.secureImageLinks), routes.staticRoute);
+  app.use('/images/', validateImageRequest, routes.staticRoute);
  app.use('/api/share', routes.share);
  app.use('/api/roles', routes.roles);
  app.use('/api/agents', routes.agents);
@@ -148,8 +132,7 @@ const startServer = async () => {

    const lang = req.cookies.lang || req.headers['accept-language']?.split(',')[0] || 'en-US';
    const saneLang = lang.replace(/"/g, '&quot;');
-    let updatedIndexHtml = indexHTML.replace(/lang="en-US"/g, `lang="${saneLang}"`);
-
+    const updatedIndexHtml = indexHTML.replace(/lang="en-US"/g, `lang="${saneLang}"`);
    res.type('html');
    res.send(updatedIndexHtml);
  });
@@ -163,7 +146,7 @@ const startServer = async () => {
      logger.info(`Server listening at http://${host == '0.0.0.0' ? 'localhost' : host}:${port}`);
    }

-    initializeMCPs().then(() => checkMigrations());
+    initializeMCPs(app).then(() => checkMigrations());
  });
 };

--- a/api/server/index.spec.js
+++ b/api/server/index.spec.js
@@ -3,27 +3,9 @@ const request = require('supertest');
 const { MongoMemoryServer } = require('mongodb-memory-server');
 const mongoose = require('mongoose');

-jest.mock('~/server/services/Config', () => ({
-  loadCustomConfig: jest.fn(() => Promise.resolve({})),
-  getAppConfig: jest.fn().mockResolvedValue({
-    paths: {
-      uploads: '/tmp',
-      dist: '/tmp/dist',
-      fonts: '/tmp/fonts',
-      assets: '/tmp/assets',
-    },
-    fileStrategy: 'local',
-    imageOutputType: 'PNG',
-  }),
-  setCachedTools: jest.fn(),
-}));
-
-jest.mock('~/app/clients/tools', () => ({
-  createOpenAIImageTools: jest.fn(() => []),
-  createYouTubeTools: jest.fn(() => []),
-  manifestToolMap: {},
-  toolkits: [],
-}));
+jest.mock('~/server/services/Config/loadCustomConfig', () => {
+  return jest.fn(() => Promise.resolve({}));
+});

 describe('Server Configuration', () => {
  // Increase the default timeout to allow for Mongo cleanup
@@ -49,22 +31,6 @@ describe('Server Configuration', () => {
  });

  beforeAll(async () => {
-    // Create the required directories and files for the test
-    const fs = require('fs');
-    const path = require('path');
-
-    const dirs = ['/tmp/dist', '/tmp/fonts', '/tmp/assets'];
-    dirs.forEach((dir) => {
-      if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
-      }
-    });
-
-    fs.writeFileSync(
-      path.join('/tmp/dist', 'index.html'),
-      '<!DOCTYPE html><html><head><title>LibreChat</title></head><body><div id="root"></div></body></html>',
-    );
-
    mongoServer = await MongoMemoryServer.create();
    process.env.MONGO_URI = mongoServer.getUri();
    process.env.PORT = '0'; // Use a random available port
--- a/api/server/middleware/assistants/validate.js
+++ b/api/server/middleware/assistants/validate.js
@@ -12,9 +12,8 @@ const { handleAbortError } = require('~/server/middleware/abortMiddleware');
 const validateAssistant = async (req, res, next) => {
  const { endpoint, conversationId, assistant_id, messageId } = req.body;

-  const appConfig = req.config;
  /** @type {Partial<TAssistantEndpoint>} */
-  const assistantsConfig = appConfig.endpoints?.[endpoint];
+  const assistantsConfig = req.app.locals?.[endpoint];
  if (!assistantsConfig) {
    return next();
  }
--- a/api/server/middleware/assistants/validateAuthor.js
+++ b/api/server/middleware/assistants/validateAuthor.js
@@ -20,9 +20,8 @@ const validateAuthor = async ({ req, openai, overrideEndpoint, overrideAssistant
  const assistant_id =
    overrideAssistantId ?? req.params.id ?? req.body.assistant_id ?? req.query.assistant_id;

-  const appConfig = req.config;
  /** @type {Partial<TAssistantEndpoint>} */
-  const assistantsConfig = appConfig.endpoints?.[endpoint];
+  const assistantsConfig = req.app.locals?.[endpoint];
  if (!assistantsConfig) {
    return;
  }
--- a/api/server/middleware/buildEndpointOption.js
+++ b/api/server/middleware/buildEndpointOption.js
@@ -40,10 +40,9 @@ async function buildEndpointOption(req, res, next) {
    return handleError(res, { text: 'Error parsing conversation' });
  }

-  const appConfig = req.config;
-  if (appConfig.modelSpecs?.list && appConfig.modelSpecs?.enforce) {
+  if (req.app.locals.modelSpecs?.list && req.app.locals.modelSpecs?.enforce) {
    /** @type {{ list: TModelSpec[] }}*/
-    const { list } = appConfig.modelSpecs;
+    const { list } = req.app.locals.modelSpecs;
    const { spec } = parsedBody;

    if (!spec) {
--- a/api/server/middleware/checkDomainAllowed.js
+++ b/api/server/middleware/checkDomainAllowed.js
@@ -1,6 +1,5 @@
-const { logger } = require('@librechat/data-schemas');
 const { isEmailDomainAllowed } = require('~/server/services/domains');
-const { getAppConfig } = require('~/server/services/Config');
+const { logger } = require('~/config');

 /**
 * Checks the domain's social login is allowed
@@ -11,25 +10,15 @@ const { getAppConfig } = require('~/server/services/Config');
 * @param {Object} res - Express response object.
 * @param {Function} next - Next middleware function.
 *
- * @returns {Promise<void>} - Calls next middleware if the domain's email is allowed, otherwise redirects to login
+ * @returns {Promise<function|Object>} - Returns a Promise which when resolved calls next middleware if the domain's email is allowed
 */
-const checkDomainAllowed = async (req, res, next) => {
-  try {
-    const email = req?.user?.email;
-    const appConfig = await getAppConfig({
-      role: req?.user?.role,
-    });
-
-    if (email && !isEmailDomainAllowed(email, appConfig?.registration?.allowedDomains)) {
-      logger.error(`[Social Login] [Social Login not allowed] [Email: ${email}]`);
-      res.redirect('/login');
-      return;
-    }
-
-    next();
-  } catch (error) {
-    logger.error('[checkDomainAllowed] Error checking domain:', error);
-    res.redirect('/login');
+const checkDomainAllowed = async (req, res, next = () => {}) => {
+  const email = req?.user?.email;
+  if (email && !(await isEmailDomainAllowed(email))) {
+    logger.error(`[Social Login] [Social Login not allowed] [Email: ${email}]`);
+    return res.redirect('/login');
+  } else {
+    return next();
  }
 };

--- a/api/server/middleware/config/app.js
+++ b/api/server/middleware/config/app.js
@@ -1,27 +0,0 @@
-const { logger } = require('@librechat/data-schemas');
-const { getAppConfig } = require('~/server/services/Config');
-
-const configMiddleware = async (req, res, next) => {
-  try {
-    const userRole = req.user?.role;
-    req.config = await getAppConfig({ role: userRole });
-
-    next();
-  } catch (error) {
-    logger.error('Config middleware error:', {
-      error: error.message,
-      userRole: req.user?.role,
-      path: req.path,
-    });
-
-    try {
-      req.config = await getAppConfig();
-      next();
-    } catch (fallbackError) {
-      logger.error('Fallback config middleware error:', fallbackError);
-      next(fallbackError);
-    }
-  }
-};
-
-module.exports = configMiddleware;
--- a/api/server/middleware/error.js
+++ b/api/server/middleware/error.js
@@ -82,7 +82,7 @@ const sendError = async (req, res, options, callback) => {

 /**
 * Sends the response based on whether headers have been sent or not.
- * @param {ServerRequest} req - The server response.
+ * @param {Express.Request} req - The server response.
 * @param {Express.Response} res - The server response.
 * @param {Object} data - The data to be sent.
 * @param {string} [errorMessage] - The error message, if any.
--- a/api/server/middleware/index.js
+++ b/api/server/middleware/index.js
@@ -1,5 +1,6 @@
 const validatePasswordReset = require('./validatePasswordReset');
 const validateRegistration = require('./validateRegistration');
+const validateImageRequest = require('./validateImageRequest');
 const buildEndpointOption = require('./buildEndpointOption');
 const validateMessageReq = require('./validateMessageReq');
 const checkDomainAllowed = require('./checkDomainAllowed');
@@ -12,7 +13,6 @@ const requireLdapAuth = require('./requireLdapAuth');
 const abortMiddleware = require('./abortMiddleware');
 const checkInviteUser = require('./checkInviteUser');
 const requireJwtAuth = require('./requireJwtAuth');
-const configMiddleware = require('./config/app');
 const validateModel = require('./validateModel');
 const moderateText = require('./moderateText');
 const logHeaders = require('./logHeaders');
@@ -43,11 +43,11 @@ module.exports = {
  requireLocalAuth,
  canDeleteAccount,
  validateEndpoint,
-  configMiddleware,
  concurrentLimiter,
  checkDomainAllowed,
  validateMessageReq,
  buildEndpointOption,
  validateRegistration,
+  validateImageRequest,
  validatePasswordReset,
 };
--- a/api/server/middleware/spec/validateImages.spec.js
+++ b/api/server/middleware/spec/validateImages.spec.js
@@ -1,18 +1,13 @@
 const jwt = require('jsonwebtoken');
-const { isEnabled } = require('@librechat/api');
-const createValidateImageRequest = require('~/server/middleware/validateImageRequest');
-
-jest.mock('@librechat/api', () => ({
-  isEnabled: jest.fn(),
-}));
+const validateImageRequest = require('~/server/middleware/validateImageRequest');

 describe('validateImageRequest middleware', () => {
-  let req, res, next, validateImageRequest;
+  let req, res, next;
  const validObjectId = '65cfb246f7ecadb8b1e8036b';

  beforeEach(() => {
-    jest.clearAllMocks();
    req = {
+      app: { locals: { secureImageLinks: true } },
      headers: {},
      originalUrl: '',
    };
@@ -22,278 +17,109 @@ describe('validateImageRequest middleware', () => {
    };
    next = jest.fn();
    process.env.JWT_REFRESH_SECRET = 'test-secret';
-    process.env.OPENID_REUSE_TOKENS = 'false';
-
-    // Default: OpenID token reuse disabled
-    isEnabled.mockReturnValue(false);
  });

  afterEach(() => {
    jest.clearAllMocks();
  });

-  describe('Factory function', () => {
-    test('should return a pass-through middleware if secureImageLinks is false', async () => {
-      const middleware = createValidateImageRequest(false);
-      await middleware(req, res, next);
-      expect(next).toHaveBeenCalled();
-      expect(res.status).not.toHaveBeenCalled();
-    });
+  test('should call next() if secureImageLinks is false', () => {
+    req.app.locals.secureImageLinks = false;
+    validateImageRequest(req, res, next);
+    expect(next).toHaveBeenCalled();
+  });

-    test('should return validation middleware if secureImageLinks is true', async () => {
-      validateImageRequest = createValidateImageRequest(true);
-      await validateImageRequest(req, res, next);
-      expect(res.status).toHaveBeenCalledWith(401);
-      expect(res.send).toHaveBeenCalledWith('Unauthorized');
+  test('should return 401 if refresh token is not provided', () => {
+    validateImageRequest(req, res, next);
+    expect(res.status).toHaveBeenCalledWith(401);
+    expect(res.send).toHaveBeenCalledWith('Unauthorized');
+  });
+
+  test('should return 403 if refresh token is invalid', () => {
+    req.headers.cookie = 'refreshToken=invalid-token';
+    validateImageRequest(req, res, next);
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(res.send).toHaveBeenCalledWith('Access Denied');
+  });
+
+  test('should return 403 if refresh token is expired', () => {
+    const expiredToken = jwt.sign(
+      { id: validObjectId, exp: Math.floor(Date.now() / 1000) - 3600 },
+      process.env.JWT_REFRESH_SECRET,
+    );
+    req.headers.cookie = `refreshToken=${expiredToken}`;
+    validateImageRequest(req, res, next);
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(res.send).toHaveBeenCalledWith('Access Denied');
+  });
+
+  test('should call next() for valid image path', () => {
+    const validToken = jwt.sign(
+      { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
+      process.env.JWT_REFRESH_SECRET,
+    );
+    req.headers.cookie = `refreshToken=${validToken}`;
+    req.originalUrl = `/images/${validObjectId}/example.jpg`;
+    validateImageRequest(req, res, next);
+    expect(next).toHaveBeenCalled();
+  });
+
+  test('should return 403 for invalid image path', () => {
+    const validToken = jwt.sign(
+      { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
+      process.env.JWT_REFRESH_SECRET,
+    );
+    req.headers.cookie = `refreshToken=${validToken}`;
+    req.originalUrl = '/images/65cfb246f7ecadb8b1e8036c/example.jpg'; // Different ObjectId
+    validateImageRequest(req, res, next);
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(res.send).toHaveBeenCalledWith('Access Denied');
+  });
+
+  test('should return 403 for invalid ObjectId format', () => {
+    const validToken = jwt.sign(
+      { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
+      process.env.JWT_REFRESH_SECRET,
+    );
+    req.headers.cookie = `refreshToken=${validToken}`;
+    req.originalUrl = '/images/123/example.jpg'; // Invalid ObjectId
+    validateImageRequest(req, res, next);
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(res.send).toHaveBeenCalledWith('Access Denied');
+  });
+
+  // File traversal tests
+  test('should prevent file traversal attempts', () => {
+    const validToken = jwt.sign(
+      { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
+      process.env.JWT_REFRESH_SECRET,
+    );
+    req.headers.cookie = `refreshToken=${validToken}`;
+
+    const traversalAttempts = [
+      `/images/${validObjectId}/../../../etc/passwd`,
+      `/images/${validObjectId}/..%2F..%2F..%2Fetc%2Fpasswd`,
+      `/images/${validObjectId}/image.jpg/../../../etc/passwd`,
+      `/images/${validObjectId}/%2e%2e%2f%2e%2e%2f%2e%2e%2fetc%2fpasswd`,
+    ];
+
+    traversalAttempts.forEach((attempt) => {
+      req.originalUrl = attempt;
+      validateImageRequest(req, res, next);
+      expect(res.status).toHaveBeenCalledWith(403);
+      expect(res.send).toHaveBeenCalledWith('Access Denied');
+      jest.clearAllMocks();
    });
  });

-  describe('Standard LibreChat token flow', () => {
-    beforeEach(() => {
-      validateImageRequest = createValidateImageRequest(true);
-    });
-
-    test('should return 401 if refresh token is not provided', async () => {
-      await validateImageRequest(req, res, next);
-      expect(res.status).toHaveBeenCalledWith(401);
-      expect(res.send).toHaveBeenCalledWith('Unauthorized');
-    });
-
-    test('should return 403 if refresh token is invalid', async () => {
-      req.headers.cookie = 'refreshToken=invalid-token';
-      await validateImageRequest(req, res, next);
-      expect(res.status).toHaveBeenCalledWith(403);
-      expect(res.send).toHaveBeenCalledWith('Access Denied');
-    });
-
-    test('should return 403 if refresh token is expired', async () => {
-      const expiredToken = jwt.sign(
-        { id: validObjectId, exp: Math.floor(Date.now() / 1000) - 3600 },
-        process.env.JWT_REFRESH_SECRET,
-      );
-      req.headers.cookie = `refreshToken=${expiredToken}`;
-      await validateImageRequest(req, res, next);
-      expect(res.status).toHaveBeenCalledWith(403);
-      expect(res.send).toHaveBeenCalledWith('Access Denied');
-    });
-
-    test('should call next() for valid image path', async () => {
-      const validToken = jwt.sign(
-        { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
-        process.env.JWT_REFRESH_SECRET,
-      );
-      req.headers.cookie = `refreshToken=${validToken}`;
-      req.originalUrl = `/images/${validObjectId}/example.jpg`;
-      await validateImageRequest(req, res, next);
-      expect(next).toHaveBeenCalled();
-    });
-
-    test('should return 403 for invalid image path', async () => {
-      const validToken = jwt.sign(
-        { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
-        process.env.JWT_REFRESH_SECRET,
-      );
-      req.headers.cookie = `refreshToken=${validToken}`;
-      req.originalUrl = '/images/65cfb246f7ecadb8b1e8036c/example.jpg'; // Different ObjectId
-      await validateImageRequest(req, res, next);
-      expect(res.status).toHaveBeenCalledWith(403);
-      expect(res.send).toHaveBeenCalledWith('Access Denied');
-    });
-
-    test('should allow agent avatar pattern for any valid ObjectId', async () => {
-      const validToken = jwt.sign(
-        { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
-        process.env.JWT_REFRESH_SECRET,
-      );
-      req.headers.cookie = `refreshToken=${validToken}`;
-      req.originalUrl = '/images/65cfb246f7ecadb8b1e8036c/agent-avatar-12345.png';
-      await validateImageRequest(req, res, next);
-      expect(next).toHaveBeenCalled();
-    });
-
-    test('should prevent file traversal attempts', async () => {
-      const validToken = jwt.sign(
-        { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
-        process.env.JWT_REFRESH_SECRET,
-      );
-      req.headers.cookie = `refreshToken=${validToken}`;
-
-      const traversalAttempts = [
-        `/images/${validObjectId}/../../../etc/passwd`,
-        `/images/${validObjectId}/..%2F..%2F..%2Fetc%2Fpasswd`,
-        `/images/${validObjectId}/image.jpg/../../../etc/passwd`,
-        `/images/${validObjectId}/%2e%2e%2f%2e%2e%2f%2e%2e%2fetc%2fpasswd`,
-      ];
-
-      for (const attempt of traversalAttempts) {
-        req.originalUrl = attempt;
-        await validateImageRequest(req, res, next);
-        expect(res.status).toHaveBeenCalledWith(403);
-        expect(res.send).toHaveBeenCalledWith('Access Denied');
-        jest.clearAllMocks();
-        // Reset mocks for next iteration
-        res.status = jest.fn().mockReturnThis();
-        res.send = jest.fn();
-      }
-    });
-
-    test('should handle URL encoded characters in valid paths', async () => {
-      const validToken = jwt.sign(
-        { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
-        process.env.JWT_REFRESH_SECRET,
-      );
-      req.headers.cookie = `refreshToken=${validToken}`;
-      req.originalUrl = `/images/${validObjectId}/image%20with%20spaces.jpg`;
-      await validateImageRequest(req, res, next);
-      expect(next).toHaveBeenCalled();
-    });
-  });
-
-  describe('OpenID token flow', () => {
-    beforeEach(() => {
-      validateImageRequest = createValidateImageRequest(true);
-      // Enable OpenID token reuse
-      isEnabled.mockReturnValue(true);
-      process.env.OPENID_REUSE_TOKENS = 'true';
-    });
-
-    test('should return 403 if no OpenID user ID cookie when token_provider is openid', async () => {
-      req.headers.cookie = 'refreshToken=dummy-token; token_provider=openid';
-      await validateImageRequest(req, res, next);
-      expect(res.status).toHaveBeenCalledWith(403);
-      expect(res.send).toHaveBeenCalledWith('Access Denied');
-    });
-
-    test('should validate JWT-signed user ID for OpenID flow', async () => {
-      const signedUserId = jwt.sign(
-        { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
-        process.env.JWT_REFRESH_SECRET,
-      );
-      req.headers.cookie = `refreshToken=dummy-token; token_provider=openid; openid_user_id=${signedUserId}`;
-      req.originalUrl = `/images/${validObjectId}/example.jpg`;
-      await validateImageRequest(req, res, next);
-      expect(next).toHaveBeenCalled();
-    });
-
-    test('should return 403 for invalid JWT-signed user ID', async () => {
-      req.headers.cookie =
-        'refreshToken=dummy-token; token_provider=openid; openid_user_id=invalid-jwt';
-      await validateImageRequest(req, res, next);
-      expect(res.status).toHaveBeenCalledWith(403);
-      expect(res.send).toHaveBeenCalledWith('Access Denied');
-    });
-
-    test('should return 403 for expired JWT-signed user ID', async () => {
-      const expiredSignedUserId = jwt.sign(
-        { id: validObjectId, exp: Math.floor(Date.now() / 1000) - 3600 },
-        process.env.JWT_REFRESH_SECRET,
-      );
-      req.headers.cookie = `refreshToken=dummy-token; token_provider=openid; openid_user_id=${expiredSignedUserId}`;
-      await validateImageRequest(req, res, next);
-      expect(res.status).toHaveBeenCalledWith(403);
-      expect(res.send).toHaveBeenCalledWith('Access Denied');
-    });
-
-    test('should validate image path against JWT-signed user ID', async () => {
-      const signedUserId = jwt.sign(
-        { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
-        process.env.JWT_REFRESH_SECRET,
-      );
-      const differentObjectId = '65cfb246f7ecadb8b1e8036c';
-      req.headers.cookie = `refreshToken=dummy-token; token_provider=openid; openid_user_id=${signedUserId}`;
-      req.originalUrl = `/images/${differentObjectId}/example.jpg`;
-      await validateImageRequest(req, res, next);
-      expect(res.status).toHaveBeenCalledWith(403);
-      expect(res.send).toHaveBeenCalledWith('Access Denied');
-    });
-
-    test('should allow agent avatars in OpenID flow', async () => {
-      const signedUserId = jwt.sign(
-        { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
-        process.env.JWT_REFRESH_SECRET,
-      );
-      req.headers.cookie = `refreshToken=dummy-token; token_provider=openid; openid_user_id=${signedUserId}`;
-      req.originalUrl = '/images/65cfb246f7ecadb8b1e8036c/agent-avatar-12345.png';
-      await validateImageRequest(req, res, next);
-      expect(next).toHaveBeenCalled();
-    });
-  });
-
-  describe('Security edge cases', () => {
-    let validToken;
-
-    beforeEach(() => {
-      validateImageRequest = createValidateImageRequest(true);
-      validToken = jwt.sign(
-        { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
-        process.env.JWT_REFRESH_SECRET,
-      );
-    });
-
-    test('should handle very long image filenames', async () => {
-      const longFilename = 'a'.repeat(1000) + '.jpg';
-      req.headers.cookie = `refreshToken=${validToken}`;
-      req.originalUrl = `/images/${validObjectId}/${longFilename}`;
-      await validateImageRequest(req, res, next);
-      expect(next).toHaveBeenCalled();
-    });
-
-    test('should handle URLs with maximum practical length', async () => {
-      // Most browsers support URLs up to ~2000 characters
-      const longFilename = 'x'.repeat(1900) + '.jpg';
-      req.headers.cookie = `refreshToken=${validToken}`;
-      req.originalUrl = `/images/${validObjectId}/${longFilename}`;
-      await validateImageRequest(req, res, next);
-      expect(next).toHaveBeenCalled();
-    });
-
-    test('should accept URLs just under the 2048 limit', async () => {
-      // Create a URL exactly 2047 characters long
-      const baseLength = `/images/${validObjectId}/`.length + '.jpg'.length;
-      const filenameLength = 2047 - baseLength;
-      const filename = 'a'.repeat(filenameLength) + '.jpg';
-      req.headers.cookie = `refreshToken=${validToken}`;
-      req.originalUrl = `/images/${validObjectId}/${filename}`;
-      await validateImageRequest(req, res, next);
-      expect(next).toHaveBeenCalled();
-    });
-
-    test('should handle malformed URL encoding gracefully', async () => {
-      req.headers.cookie = `refreshToken=${validToken}`;
-      req.originalUrl = `/images/${validObjectId}/test%ZZinvalid.jpg`;
-      await validateImageRequest(req, res, next);
-      expect(res.status).toHaveBeenCalledWith(403);
-      expect(res.send).toHaveBeenCalledWith('Access Denied');
-    });
-
-    test('should reject URLs with null bytes', async () => {
-      req.headers.cookie = `refreshToken=${validToken}`;
-      req.originalUrl = `/images/${validObjectId}/test\x00.jpg`;
-      await validateImageRequest(req, res, next);
-      expect(res.status).toHaveBeenCalledWith(403);
-      expect(res.send).toHaveBeenCalledWith('Access Denied');
-    });
-
-    test('should handle URLs with repeated slashes', async () => {
-      req.headers.cookie = `refreshToken=${validToken}`;
-      req.originalUrl = `/images/${validObjectId}//test.jpg`;
-      await validateImageRequest(req, res, next);
-      expect(res.status).toHaveBeenCalledWith(403);
-      expect(res.send).toHaveBeenCalledWith('Access Denied');
-    });
-
-    test('should reject extremely long URLs as potential DoS', async () => {
-      // Create a URL longer than 2048 characters
-      const baseLength = `/images/${validObjectId}/`.length + '.jpg'.length;
-      const filenameLength = 2049 - baseLength; // Ensure total length exceeds 2048
-      const extremelyLongFilename = 'x'.repeat(filenameLength) + '.jpg';
-      req.headers.cookie = `refreshToken=${validToken}`;
-      req.originalUrl = `/images/${validObjectId}/${extremelyLongFilename}`;
-      // Verify our test URL is actually too long
-      expect(req.originalUrl.length).toBeGreaterThan(2048);
-      await validateImageRequest(req, res, next);
-      expect(res.status).toHaveBeenCalledWith(403);
-      expect(res.send).toHaveBeenCalledWith('Access Denied');
-    });
+  test('should handle URL encoded characters in valid paths', () => {
+    const validToken = jwt.sign(
+      { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
+      process.env.JWT_REFRESH_SECRET,
+    );
+    req.headers.cookie = `refreshToken=${validToken}`;
+    req.originalUrl = `/images/${validObjectId}/image%20with%20spaces.jpg`;
+    validateImageRequest(req, res, next);
+    expect(next).toHaveBeenCalled();
  });
 });
--- a/api/server/middleware/validate/convoAccess.js
+++ b/api/server/middleware/validate/convoAccess.js
@@ -15,7 +15,7 @@ const { USE_REDIS, CONVO_ACCESS_VIOLATION_SCORE: score = 0 } = process.env ?? {}
 * If the `cache` store is not available, the middleware will skip its logic.
 *
 * @function
- * @param {ServerRequest} req - Express request object containing user information.
+ * @param {Express.Request} req - Express request object containing user information.
 * @param {Express.Response} res - Express response object.
 * @param {function} next - Express next middleware function.
 * @throws {Error} Throws an error if the user doesn't have access to the conversation.
--- a/api/server/middleware/validateImageRequest.js
+++ b/api/server/middleware/validateImageRequest.js
@@ -1,7 +1,6 @@
 const cookies = require('cookie');
 const jwt = require('jsonwebtoken');
-const { isEnabled } = require('@librechat/api');
-const { logger } = require('@librechat/data-schemas');
+const { logger } = require('~/config');

 const OBJECT_ID_LENGTH = 24;
 const OBJECT_ID_PATTERN = /^[0-9a-f]{24}$/i;
@@ -22,129 +21,49 @@ function isValidObjectId(id) {
 }

 /**
- * Validates a LibreChat refresh token
- * @param {string} refreshToken - The refresh token to validate
- * @returns {{valid: boolean, userId?: string, error?: string}} - Validation result
+ * Middleware to validate image request.
+ * Must be set by `secureImageLinks` via custom config file.
 */
-function validateToken(refreshToken) {
+function validateImageRequest(req, res, next) {
+  if (!req.app.locals.secureImageLinks) {
+    return next();
+  }
+
+  const refreshToken = req.headers.cookie ? cookies.parse(req.headers.cookie).refreshToken : null;
+  if (!refreshToken) {
+    logger.warn('[validateImageRequest] Refresh token not provided');
+    return res.status(401).send('Unauthorized');
+  }
+
+  let payload;
  try {
-    const payload = jwt.verify(refreshToken, process.env.JWT_REFRESH_SECRET);
-
-    if (!isValidObjectId(payload.id)) {
-      return { valid: false, error: 'Invalid User ID' };
-    }
-
-    const currentTimeInSeconds = Math.floor(Date.now() / 1000);
-    if (payload.exp < currentTimeInSeconds) {
-      return { valid: false, error: 'Refresh token expired' };
-    }
-
-    return { valid: true, userId: payload.id };
+    payload = jwt.verify(refreshToken, process.env.JWT_REFRESH_SECRET);
  } catch (err) {
-    logger.warn('[validateToken]', err);
-    return { valid: false, error: 'Invalid token' };
+    logger.warn('[validateImageRequest]', err);
+    return res.status(403).send('Access Denied');
+  }
+
+  if (!isValidObjectId(payload.id)) {
+    logger.warn('[validateImageRequest] Invalid User ID');
+    return res.status(403).send('Access Denied');
+  }
+
+  const currentTimeInSeconds = Math.floor(Date.now() / 1000);
+  if (payload.exp < currentTimeInSeconds) {
+    logger.warn('[validateImageRequest] Refresh token expired');
+    return res.status(403).send('Access Denied');
+  }
+
+  const fullPath = decodeURIComponent(req.originalUrl);
+  const pathPattern = new RegExp(`^/images/${payload.id}/[^/]+$`);
+
+  if (pathPattern.test(fullPath)) {
+    logger.debug('[validateImageRequest] Image request validated');
+    next();
+  } else {
+    logger.warn('[validateImageRequest] Invalid image path');
+    res.status(403).send('Access Denied');
  }
 }

-/**
- * Factory to create the `validateImageRequest` middleware with configured secureImageLinks
- * @param {boolean} [secureImageLinks] - Whether secure image links are enabled
- */
-function createValidateImageRequest(secureImageLinks) {
-  if (!secureImageLinks) {
-    return (_req, _res, next) => next();
-  }
-  /**
-   * Middleware to validate image request.
-   * Supports both LibreChat refresh tokens and OpenID JWT tokens.
-   * Must be set by `secureImageLinks` via custom config file.
-   */
-  return async function validateImageRequest(req, res, next) {
-    try {
-      const cookieHeader = req.headers.cookie;
-      if (!cookieHeader) {
-        logger.warn('[validateImageRequest] No cookies provided');
-        return res.status(401).send('Unauthorized');
-      }
-
-      const parsedCookies = cookies.parse(cookieHeader);
-      const refreshToken = parsedCookies.refreshToken;
-
-      if (!refreshToken) {
-        logger.warn('[validateImageRequest] Token not provided');
-        return res.status(401).send('Unauthorized');
-      }
-
-      const tokenProvider = parsedCookies.token_provider;
-      let userIdForPath;
-
-      if (tokenProvider === 'openid' && isEnabled(process.env.OPENID_REUSE_TOKENS)) {
-        const openidUserId = parsedCookies.openid_user_id;
-        if (!openidUserId) {
-          logger.warn('[validateImageRequest] No OpenID user ID cookie found');
-          return res.status(403).send('Access Denied');
-        }
-
-        const validationResult = validateToken(openidUserId);
-        if (!validationResult.valid) {
-          logger.warn(`[validateImageRequest] ${validationResult.error}`);
-          return res.status(403).send('Access Denied');
-        }
-        userIdForPath = validationResult.userId;
-      } else {
-        const validationResult = validateToken(refreshToken);
-        if (!validationResult.valid) {
-          logger.warn(`[validateImageRequest] ${validationResult.error}`);
-          return res.status(403).send('Access Denied');
-        }
-        userIdForPath = validationResult.userId;
-      }
-
-      if (!userIdForPath) {
-        logger.warn('[validateImageRequest] No user ID available for path validation');
-        return res.status(403).send('Access Denied');
-      }
-
-      const MAX_URL_LENGTH = 2048;
-      if (req.originalUrl.length > MAX_URL_LENGTH) {
-        logger.warn('[validateImageRequest] URL too long');
-        return res.status(403).send('Access Denied');
-      }
-
-      if (req.originalUrl.includes('\x00')) {
-        logger.warn('[validateImageRequest] URL contains null byte');
-        return res.status(403).send('Access Denied');
-      }
-
-      let fullPath;
-      try {
-        fullPath = decodeURIComponent(req.originalUrl);
-      } catch {
-        logger.warn('[validateImageRequest] Invalid URL encoding');
-        return res.status(403).send('Access Denied');
-      }
-
-      const agentAvatarPattern = /^\/images\/[a-f0-9]{24}\/agent-[^/]*$/;
-      if (agentAvatarPattern.test(fullPath)) {
-        logger.debug('[validateImageRequest] Image request validated');
-        return next();
-      }
-
-      const escapedUserId = userIdForPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-      const pathPattern = new RegExp(`^/images/${escapedUserId}/[^/]+$`);
-
-      if (pathPattern.test(fullPath)) {
-        logger.debug('[validateImageRequest] Image request validated');
-        next();
-      } else {
-        logger.warn('[validateImageRequest] Invalid image path');
-        res.status(403).send('Access Denied');
-      }
-    } catch (error) {
-      logger.error('[validateImageRequest] Error:', error);
-      res.status(500).send('Internal Server Error');
-    }
-  };
-}
-
-module.exports = createValidateImageRequest;
+module.exports = validateImageRequest;
--- a/api/server/middleware/validateModel.js
+++ b/api/server/middleware/validateModel.js
@@ -6,7 +6,7 @@ const { logViolation } = require('~/cache');
 * Validates the model of the request.
 *
 * @async
- * @param {ServerRequest} req - The Express request object.
+ * @param {Express.Request} req - The Express request object.
 * @param {Express.Response} res - The Express response object.
 * @param {Function} next - The Express next function.
 */
--- a/api/server/routes/tests/costs.spec.js
+++ b/api/server/routes/tests/costs.spec.js
@@ -1,680 +0,0 @@
-const express = require('express');
-const request = require('supertest');
-const mongoose = require('mongoose');
-const { MongoMemoryServer } = require('mongodb-memory-server');
-
-jest.mock('@librechat/data-schemas', () => ({
-  logger: {
-    debug: jest.fn(),
-    info: jest.fn(),
-    warn: jest.fn(),
-    error: jest.fn(),
-  },
-  createMethods: jest.fn(() => ({})),
-  createModels: jest.fn(() => ({})),
-}));
-
-jest.mock('~/server/middleware', () => ({
-  requireJwtAuth: (req, res, next) => next(),
-  validateMessageReq: (req, res, next) => next(),
-}));
-
-jest.mock('~/models', () => ({
-  getConvo: jest.fn(),
-  saveConvo: jest.fn(),
-  saveMessage: jest.fn(),
-  getMessage: jest.fn(),
-  getMessages: jest.fn(),
-  updateMessage: jest.fn(),
-  deleteMessages: jest.fn(),
-}));
-
-jest.mock('~/db/models', () => {
-  let User, Message, Transaction, Conversation;
-
-  return {
-    get User() {
-      return User;
-    },
-    get Message() {
-      return Message;
-    },
-    get Transaction() {
-      return Transaction;
-    },
-    get Conversation() {
-      return Conversation;
-    },
-    setUser: (model) => {
-      User = model;
-    },
-    setMessage: (model) => {
-      Message = model;
-    },
-    setTransaction: (model) => {
-      Transaction = model;
-    },
-    setConversation: (model) => {
-      Conversation = model;
-    },
-  };
-});
-
-describe('Costs Endpoint', () => {
-  let app;
-  let mongoServer;
-  let messagesRouter;
-  let User, Message, Transaction, Conversation;
-
-  beforeAll(async () => {
-    mongoServer = await MongoMemoryServer.create();
-    await mongoose.connect(mongoServer.getUri());
-
-    const userSchema = new mongoose.Schema({
-      _id: String,
-      name: String,
-      email: String,
-    });
-
-    const conversationSchema = new mongoose.Schema({
-      conversationId: String,
-      user: String,
-      title: String,
-      createdAt: Date,
-    });
-
-    const messageSchema = new mongoose.Schema({
-      messageId: String,
-      conversationId: String,
-      user: String,
-      isCreatedByUser: Boolean,
-      tokenCount: Number,
-      createdAt: Date,
-    });
-
-    const transactionSchema = new mongoose.Schema({
-      conversationId: String,
-      user: String,
-      tokenType: String,
-      tokenValue: Number,
-      createdAt: Date,
-    });
-
-    User = mongoose.model('User', userSchema);
-    Conversation = mongoose.model('Conversation', conversationSchema);
-    Message = mongoose.model('Message', messageSchema);
-    Transaction = mongoose.model('Transaction', transactionSchema);
-
-    const dbModels = require('~/db/models');
-    dbModels.setUser(User);
-    dbModels.setMessage(Message);
-    dbModels.setTransaction(Transaction);
-    dbModels.setConversation(Conversation);
-
-    require('~/db/models');
-
-    try {
-      messagesRouter = require('../messages');
-    } catch (error) {
-      console.error('Error loading messages router:', error);
-      throw error;
-    }
-
-    app = express();
-    app.use(express.json());
-    app.use((req, res, next) => {
-      req.user = { id: 'test-user-id' };
-      next();
-    });
-    app.use('/api/messages', messagesRouter);
-  });
-
-  afterAll(async () => {
-    await mongoose.disconnect();
-    await mongoServer.stop();
-  });
-
-  beforeEach(async () => {
-    await User.deleteMany({});
-    await Conversation.deleteMany({});
-    await Message.deleteMany({});
-    await Transaction.deleteMany({});
-  });
-
-  describe('GET /:conversationId/costs', () => {
-    const conversationId = 'test-conversation-123';
-    const userId = 'test-user-id';
-
-    it('should return cost data for valid conversation', async () => {
-      const { getConvo } = require('~/models');
-      getConvo.mockResolvedValue({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-      });
-
-      const conversation = new Conversation({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-        createdAt: new Date('2024-01-01T09:00:00Z'),
-      });
-
-      await conversation.save();
-
-      const userMessage = new Message({
-        messageId: 'user-msg-1',
-        conversationId,
-        user: userId,
-        isCreatedByUser: true,
-        tokenCount: 100,
-        createdAt: new Date('2024-01-01T10:00:00Z'),
-      });
-
-      const aiMessage = new Message({
-        messageId: 'ai-msg-1',
-        conversationId,
-        user: userId,
-        isCreatedByUser: false,
-        tokenCount: 150,
-        createdAt: new Date('2024-01-01T10:01:00Z'),
-      });
-
-      await Promise.all([userMessage.save(), aiMessage.save()]);
-
-      const promptTransaction = new Transaction({
-        conversationId,
-        user: userId,
-        tokenType: 'prompt',
-        tokenValue: 500000,
-        createdAt: new Date('2024-01-01T10:00:30Z'),
-      });
-
-      const completionTransaction = new Transaction({
-        conversationId,
-        user: userId,
-        tokenType: 'completion',
-        tokenValue: 750000,
-        createdAt: new Date('2024-01-01T10:01:30Z'),
-      });
-
-      await Promise.all([promptTransaction.save(), completionTransaction.save()]);
-
-      const response = await request(app).get(`/api/messages/${conversationId}/costs`);
-
-      expect(response.status).toBe(200);
-      expect(response.body).toMatchObject({
-        conversationId,
-        totals: {
-          prompt: { usd: 0.5, tokenCount: 100 },
-          completion: { usd: 0.75, tokenCount: 150 },
-          total: { usd: 1.25, tokenCount: 250 },
-        },
-        perMessage: [
-          { messageId: 'user-msg-1', tokenType: 'prompt', tokenCount: 100, usd: 0.5 },
-          { messageId: 'ai-msg-1', tokenType: 'completion', tokenCount: 150, usd: 0.75 },
-        ],
-      });
-    });
-
-    it('should return empty data for conversation with no messages', async () => {
-      const { getConvo } = require('~/models');
-      getConvo.mockResolvedValue({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-      });
-
-      const conversation = new Conversation({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-        createdAt: new Date('2024-01-01T09:00:00Z'),
-      });
-
-      await conversation.save();
-
-      const response = await request(app).get(`/api/messages/${conversationId}/costs`);
-
-      expect(response.status).toBe(200);
-      expect(response.body).toMatchObject({
-        conversationId,
-        totals: {
-          prompt: { usd: 0, tokenCount: 0 },
-          completion: { usd: 0, tokenCount: 0 },
-          total: { usd: 0, tokenCount: 0 },
-        },
-        perMessage: [],
-      });
-    });
-
-    it('should handle messages without transactions', async () => {
-      const { getConvo } = require('~/models');
-      getConvo.mockResolvedValue({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-      });
-
-      const conversation = new Conversation({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-        createdAt: new Date('2024-01-01T09:00:00Z'),
-      });
-
-      await conversation.save();
-
-      const userMessage = new Message({
-        messageId: 'user-msg-1',
-        conversationId,
-        user: userId,
-        isCreatedByUser: true,
-        tokenCount: 100,
-        createdAt: new Date('2024-01-01T10:00:00Z'),
-      });
-
-      const aiMessage = new Message({
-        messageId: 'ai-msg-1',
-        conversationId,
-        user: userId,
-        isCreatedByUser: false,
-        tokenCount: 150,
-        createdAt: new Date('2024-01-01T10:01:00Z'),
-      });
-
-      await Promise.all([userMessage.save(), aiMessage.save()]);
-
-      const response = await request(app).get(`/api/messages/${conversationId}/costs`);
-
-      expect(response.status).toBe(200);
-      expect(response.body.totals.prompt.usd).toBe(0);
-      expect(response.body.totals.completion.usd).toBe(0);
-      expect(response.body.totals.total.usd).toBe(0);
-    });
-
-    it('should aggregate multiple transactions correctly', async () => {
-      const { getConvo } = require('~/models');
-      getConvo.mockResolvedValue({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-      });
-
-      const conversation = new Conversation({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-        createdAt: new Date('2024-01-01T09:00:00Z'),
-      });
-
-      await conversation.save();
-
-      const userMessage = new Message({
-        messageId: 'user-msg-1',
-        conversationId,
-        user: userId,
-        isCreatedByUser: true,
-        tokenCount: 100,
-        createdAt: new Date('2024-01-01T10:00:00Z'),
-      });
-
-      await userMessage.save();
-
-      const promptTransaction1 = new Transaction({
-        conversationId,
-        user: userId,
-        tokenType: 'prompt',
-        tokenValue: 300000,
-        createdAt: new Date('2024-01-01T10:00:30Z'),
-      });
-
-      const promptTransaction2 = new Transaction({
-        conversationId,
-        user: userId,
-        tokenType: 'prompt',
-        tokenValue: 200000,
-        createdAt: new Date('2024-01-01T10:00:45Z'),
-      });
-
-      await Promise.all([promptTransaction1.save(), promptTransaction2.save()]);
-
-      const response = await request(app).get(`/api/messages/${conversationId}/costs`);
-
-      expect(response.status).toBe(200);
-      expect(response.body.totals.prompt.usd).toBe(0.5);
-      expect(response.body.perMessage[0].usd).toBe(0.5);
-    });
-
-    it('should handle null tokenCount values', async () => {
-      const { getConvo } = require('~/models');
-      getConvo.mockResolvedValue({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-      });
-
-      const conversation = new Conversation({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-        createdAt: new Date('2024-01-01T09:00:00Z'),
-      });
-
-      await conversation.save();
-
-      const userMessage = new Message({
-        messageId: 'user-msg-1',
-        conversationId,
-        user: userId,
-        isCreatedByUser: true,
-        tokenCount: null,
-        createdAt: new Date('2024-01-01T10:00:00Z'),
-      });
-
-      await userMessage.save();
-
-      const response = await request(app).get(`/api/messages/${conversationId}/costs`);
-
-      expect(response.status).toBe(200);
-      expect(response.body.totals.prompt.tokenCount).toBe(0);
-    });
-
-    it('should handle null tokenValue in transactions', async () => {
-      const { getConvo } = require('~/models');
-      getConvo.mockResolvedValue({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-      });
-
-      const conversation = new Conversation({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-        createdAt: new Date('2024-01-01T09:00:00Z'),
-      });
-
-      await conversation.save();
-
-      const userMessage = new Message({
-        messageId: 'user-msg-1',
-        conversationId,
-        user: userId,
-        isCreatedByUser: true,
-        tokenCount: 100,
-        createdAt: new Date('2024-01-01T10:00:00Z'),
-      });
-
-      await userMessage.save();
-
-      const promptTransaction = new Transaction({
-        conversationId,
-        user: userId,
-        tokenType: 'prompt',
-        tokenValue: null,
-        createdAt: new Date('2024-01-01T10:00:30Z'),
-      });
-
-      await promptTransaction.save();
-
-      const response = await request(app).get(`/api/messages/${conversationId}/costs`);
-
-      expect(response.status).toBe(200);
-      expect(response.body.totals.prompt.usd).toBe(0);
-    });
-
-    it('should handle negative tokenValue using Math.abs', async () => {
-      const { getConvo } = require('~/models');
-      getConvo.mockResolvedValue({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-      });
-
-      const conversation = new Conversation({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-        createdAt: new Date('2024-01-01T09:00:00Z'),
-      });
-
-      await conversation.save();
-
-      const userMessage = new Message({
-        messageId: 'user-msg-1',
-        conversationId,
-        user: userId,
-        isCreatedByUser: true,
-        tokenCount: 100,
-        createdAt: new Date('2024-01-01T10:00:00Z'),
-      });
-
-      await userMessage.save();
-
-      const promptTransaction = new Transaction({
-        conversationId,
-        user: userId,
-        tokenType: 'prompt',
-        tokenValue: -500000,
-        createdAt: new Date('2024-01-01T10:00:30Z'),
-      });
-
-      await promptTransaction.save();
-
-      const response = await request(app).get(`/api/messages/${conversationId}/costs`);
-
-      expect(response.status).toBe(200);
-      expect(response.body.totals.prompt.usd).toBe(0.5);
-    });
-
-    it('should filter by user correctly', async () => {
-      const { getConvo } = require('~/models');
-      getConvo.mockResolvedValue({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-      });
-
-      const conversation = new Conversation({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-        createdAt: new Date('2024-01-01T09:00:00Z'),
-      });
-
-      await conversation.save();
-
-      const otherUserId = 'other-user-id';
-
-      const userMessage = new Message({
-        messageId: 'user-msg-1',
-        conversationId,
-        user: userId,
-        isCreatedByUser: true,
-        tokenCount: 100,
-        createdAt: new Date('2024-01-01T10:00:00Z'),
-      });
-
-      const otherUserMessage = new Message({
-        messageId: 'other-user-msg-1',
-        conversationId,
-        user: otherUserId,
-        isCreatedByUser: true,
-        tokenCount: 200,
-        createdAt: new Date('2024-01-01T10:00:00Z'),
-      });
-
-      await Promise.all([userMessage.save(), otherUserMessage.save()]);
-
-      const userTransaction = new Transaction({
-        conversationId,
-        user: userId,
-        tokenType: 'prompt',
-        tokenValue: 500000,
-        createdAt: new Date('2024-01-01T10:00:30Z'),
-      });
-
-      const otherUserTransaction = new Transaction({
-        conversationId,
-        user: otherUserId,
-        tokenType: 'prompt',
-        tokenValue: 1000000,
-        createdAt: new Date('2024-01-01T10:00:30Z'),
-      });
-
-      await Promise.all([userTransaction.save(), otherUserTransaction.save()]);
-
-      const response = await request(app).get(`/api/messages/${conversationId}/costs`);
-
-      expect(response.status).toBe(200);
-      expect(response.body.totals.prompt.usd).toBe(0.5);
-      expect(response.body.perMessage).toHaveLength(1);
-      expect(response.body.perMessage[0].messageId).toBe('user-msg-1');
-    });
-
-    it('should filter transactions by tokenType', async () => {
-      const { getConvo } = require('~/models');
-      getConvo.mockResolvedValue({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-      });
-
-      const conversation = new Conversation({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-        createdAt: new Date('2024-01-01T09:00:00Z'),
-      });
-
-      await conversation.save();
-
-      const userMessage = new Message({
-        messageId: 'user-msg-1',
-        conversationId,
-        user: userId,
-        isCreatedByUser: true,
-        tokenCount: 100,
-        createdAt: new Date('2024-01-01T10:00:00Z'),
-      });
-
-      await userMessage.save();
-
-      const promptTransaction = new Transaction({
-        conversationId,
-        user: userId,
-        tokenType: 'prompt',
-        tokenValue: 500000,
-        createdAt: new Date('2024-01-01T10:00:30Z'),
-      });
-
-      const otherTransaction = new Transaction({
-        conversationId,
-        user: userId,
-        tokenType: 'other',
-        tokenValue: 1000000,
-        createdAt: new Date('2024-01-01T10:00:30Z'),
-      });
-
-      await Promise.all([promptTransaction.save(), otherTransaction.save()]);
-
-      const response = await request(app).get(`/api/messages/${conversationId}/costs`);
-
-      expect(response.status).toBe(200);
-      expect(response.body.totals.prompt.usd).toBe(0.5);
-      expect(response.body.totals.completion.usd).toBe(0);
-      expect(response.body.totals.total.usd).toBe(0.5);
-    });
-
-    it('should map transactions to messages chronologically', async () => {
-      const { getConvo } = require('~/models');
-      getConvo.mockResolvedValue({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-      });
-
-      const conversation = new Conversation({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-        createdAt: new Date('2024-01-01T09:00:00Z'),
-      });
-
-      await conversation.save();
-
-      const userMessage1 = new Message({
-        messageId: 'user-msg-1',
-        conversationId,
-        user: userId,
-        isCreatedByUser: true,
-        tokenCount: 100,
-        createdAt: new Date('2024-01-01T10:00:00Z'),
-      });
-
-      const userMessage2 = new Message({
-        messageId: 'user-msg-2',
-        conversationId,
-        user: userId,
-        isCreatedByUser: true,
-        tokenCount: 200,
-        createdAt: new Date('2024-01-01T10:01:00Z'),
-      });
-
-      await Promise.all([userMessage1.save(), userMessage2.save()]);
-
-      const promptTransaction1 = new Transaction({
-        conversationId,
-        user: userId,
-        tokenType: 'prompt',
-        tokenValue: 500000,
-        createdAt: new Date('2024-01-01T10:00:30Z'),
-      });
-
-      const promptTransaction2 = new Transaction({
-        conversationId,
-        user: userId,
-        tokenType: 'prompt',
-        tokenValue: 1000000,
-        createdAt: new Date('2024-01-01T10:01:30Z'),
-      });
-
-      await Promise.all([promptTransaction1.save(), promptTransaction2.save()]);
-
-      const response = await request(app).get(`/api/messages/${conversationId}/costs`);
-
-      expect(response.status).toBe(200);
-      expect(response.body.perMessage).toHaveLength(2);
-      expect(response.body.perMessage[0].messageId).toBe('user-msg-1');
-      expect(response.body.perMessage[0].usd).toBe(0.5);
-      expect(response.body.perMessage[1].messageId).toBe('user-msg-2');
-      expect(response.body.perMessage[1].usd).toBe(1.0);
-    });
-
-    it('should handle database errors', async () => {
-      const { getConvo } = require('~/models');
-      getConvo.mockResolvedValue({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-      });
-
-      const conversation = new Conversation({
-        conversationId,
-        user: userId,
-        title: 'Test Conversation',
-        createdAt: new Date('2024-01-01T09:00:00Z'),
-      });
-
-      await conversation.save();
-
-      await mongoose.connection.close();
-
-      const response = await request(app).get(`/api/messages/${conversationId}/costs`);
-
-      expect(response.status).toBe(500);
-      expect(response.body).toHaveProperty('error');
-    });
-  });
-});
--- a/api/server/routes/agents/actions.js
+++ b/api/server/routes/agents/actions.js
@@ -83,11 +83,7 @@ router.post(
      }

      let metadata = await encryptMetadata(removeNullishValues(_metadata, true));
-      const appConfig = req.config;
-      const isDomainAllowed = await isActionDomainAllowed(
-        metadata.domain,
-        appConfig?.actions?.allowedDomains,
-      );
+      const isDomainAllowed = await isActionDomainAllowed(metadata.domain);
      if (!isDomainAllowed) {
        return res.status(400).json({ message: 'Domain not allowed' });
      }
--- a/api/server/routes/agents/index.js
+++ b/api/server/routes/agents/index.js
@@ -4,7 +4,6 @@ const {
  checkBan,
  requireJwtAuth,
  messageIpLimiter,
-  configMiddleware,
  concurrentLimiter,
  messageUserLimiter,
 } = require('~/server/middleware');
@@ -23,8 +22,6 @@ router.use(uaParser);
 router.use('/', v1);

 const chatRouter = express.Router();
-chatRouter.use(configMiddleware);
-
 if (isEnabled(LIMIT_CONCURRENT_MESSAGES)) {
  chatRouter.use(concurrentLimiter);
 }
@@ -40,4 +37,6 @@ if (isEnabled(LIMIT_MESSAGE_USER)) {
 chatRouter.use('/', chat);
 router.use('/chat', chatRouter);

+// Add marketplace routes
+
 module.exports = router;
--- a/api/server/routes/agents/tools.js
+++ b/api/server/routes/agents/tools.js
@@ -1,7 +1,7 @@
 const express = require('express');
 const { callTool, verifyToolAuth, getToolCalls } = require('~/server/controllers/tools');
 const { getAvailableTools } = require('~/server/controllers/PluginController');
-const { toolCallLimiter } = require('~/server/middleware');
+const { toolCallLimiter } = require('~/server/middleware/limiters');

 const router = express.Router();

--- a/api/server/routes/agents/v1.js
+++ b/api/server/routes/agents/v1.js
@@ -1,7 +1,7 @@
 const express = require('express');
 const { generateCheckAccess } = require('@librechat/api');
 const { PermissionTypes, Permissions, PermissionBits } = require('librechat-data-provider');
-const { requireJwtAuth, configMiddleware, canAccessAgentResource } = require('~/server/middleware');
+const { requireJwtAuth, canAccessAgentResource } = require('~/server/middleware');
 const v1 = require('~/server/controllers/agents/v1');
 const { getRoleByName } = require('~/models/Role');
 const actions = require('./actions');
@@ -36,17 +36,17 @@ router.use(requireJwtAuth);
 * Agent actions route.
 * @route GET|POST /agents/actions
 */
-router.use('/actions', configMiddleware, actions);
+router.use('/actions', actions);

 /**
 * Get a list of available tools for agents.
 * @route GET /agents/tools
 */
-router.use('/tools', configMiddleware, tools);
+router.use('/tools', tools);

 /**
 * Get all agent categories with counts
- * @route GET /agents/categories
+ * @route GET /agents/marketplace/categories
 */
 router.get('/categories', v1.getAgentCategories);
 /**
--- a/api/server/routes/assistants/actions.js
+++ b/api/server/routes/assistants/actions.js
@@ -1,12 +1,12 @@
 const express = require('express');
 const { nanoid } = require('nanoid');
-const { logger } = require('@librechat/data-schemas');
 const { actionDelimiter, EModelEndpoint, removeNullishValues } = require('librechat-data-provider');
 const { encryptMetadata, domainParser } = require('~/server/services/ActionService');
 const { getOpenAIClient } = require('~/server/controllers/assistants/helpers');
 const { updateAction, getActions, deleteAction } = require('~/models/Action');
 const { updateAssistantDoc, getAssistant } = require('~/models/Assistant');
 const { isActionDomainAllowed } = require('~/server/services/domains');
+const { logger } = require('~/config');

 const router = express.Router();

@@ -21,7 +21,6 @@ const router = express.Router();
 */
 router.post('/:assistant_id', async (req, res) => {
  try {
-    const appConfig = req.config;
    const { assistant_id } = req.params;

    /** @type {{ functions: FunctionTool[], action_id: string, metadata: ActionMetadata }} */
@@ -31,10 +30,7 @@ router.post('/:assistant_id', async (req, res) => {
    }

    let metadata = await encryptMetadata(removeNullishValues(_metadata, true));
-    const isDomainAllowed = await isActionDomainAllowed(
-      metadata.domain,
-      appConfig?.actions?.allowedDomains,
-    );
+    const isDomainAllowed = await isActionDomainAllowed(metadata.domain);
    if (!isDomainAllowed) {
      return res.status(400).json({ message: 'Domain not allowed' });
    }
@@ -129,7 +125,7 @@ router.post('/:assistant_id', async (req, res) => {
    }

    /* Map Azure OpenAI model to the assistant as defined by config */
-    if (appConfig.endpoints?.[EModelEndpoint.azureOpenAI]?.assistants) {
+    if (req.app.locals[EModelEndpoint.azureOpenAI]?.assistants) {
      updatedAssistant = {
        ...updatedAssistant,
        model: req.body.model,
--- a/api/server/routes/assistants/index.js
+++ b/api/server/routes/assistants/index.js
@@ -1,6 +1,6 @@
 const express = require('express');
-const { uaParser, checkBan, requireJwtAuth, configMiddleware } = require('~/server/middleware');
 const router = express.Router();
+const { uaParser, checkBan, requireJwtAuth } = require('~/server/middleware');

 const { v1 } = require('./v1');
 const chatV1 = require('./chatV1');
@@ -10,7 +10,6 @@ const chatV2 = require('./chatV2');
 router.use(requireJwtAuth);
 router.use(checkBan);
 router.use(uaParser);
-router.use(configMiddleware);
 router.use('/v1/', v1);
 router.use('/v1/chat', chatV1);
 router.use('/v2/', v2);
--- a/api/server/routes/assistants/v2.js
+++ b/api/server/routes/assistants/v2.js
@@ -1,5 +1,4 @@
 const express = require('express');
-const { configMiddleware } = require('~/server/middleware');
 const v1 = require('~/server/controllers/assistants/v1');
 const v2 = require('~/server/controllers/assistants/v2');
 const documents = require('./documents');
@@ -7,7 +6,6 @@ const actions = require('./actions');
 const tools = require('./tools');

 const router = express.Router();
-router.use(configMiddleware);

 /**
 * Assistant actions route.
--- a/api/server/routes/auth.js
+++ b/api/server/routes/auth.js
@@ -17,12 +17,12 @@ const {
 const { verify2FAWithTempToken } = require('~/server/controllers/auth/TwoFactorAuthController');
 const { logoutController } = require('~/server/controllers/auth/LogoutController');
 const { loginController } = require('~/server/controllers/auth/LoginController');
-const { getAppConfig } = require('~/server/services/Config');
+const { getBalanceConfig } = require('~/server/services/Config');
 const middleware = require('~/server/middleware');
 const { Balance } = require('~/db/models');

 const setBalanceConfig = createSetBalanceConfig({
-  getAppConfig,
+  getBalanceConfig,
  Balance,
 });

--- a/api/server/routes/config.js
+++ b/api/server/routes/config.js
@@ -1,14 +1,9 @@
 const express = require('express');
+const { isEnabled } = require('@librechat/api');
 const { logger } = require('@librechat/data-schemas');
-const { isEnabled, getBalanceConfig } = require('@librechat/api');
-const {
-  Constants,
-  CacheKeys,
-  removeNullishValues,
-  defaultSocialLogins,
-} = require('librechat-data-provider');
+const { CacheKeys, defaultSocialLogins, Constants } = require('librechat-data-provider');
+const { getCustomConfig } = require('~/server/services/Config/getCustomConfig');
 const { getLdapConfig } = require('~/server/services/Config/ldap');
-const { getAppConfig } = require('~/server/services/Config/app');
 const { getProjectByName } = require('~/models/Project');
 const { getMCPManager } = require('~/config');
 const { getLogStores } = require('~/cache');
@@ -48,8 +43,6 @@ router.get('/', async function (req, res) {
  const ldap = getLdapConfig();

  try {
-    const appConfig = await getAppConfig({ role: req.user?.role });
-
    const isOpenIdEnabled =
      !!process.env.OPENID_CLIENT_ID &&
      !!process.env.OPENID_CLIENT_SECRET &&
@@ -62,12 +55,10 @@ router.get('/', async function (req, res) {
      !!process.env.SAML_CERT &&
      !!process.env.SAML_SESSION_SECRET;

-    const balanceConfig = getBalanceConfig(appConfig);
-
    /** @type {TStartupConfig} */
    const payload = {
      appTitle: process.env.APP_TITLE || 'LibreChat',
-      socialLogins: appConfig?.registration?.socialLogins ?? defaultSocialLogins,
+      socialLogins: req.app.locals.socialLogins ?? defaultSocialLogins,
      discordLoginEnabled: !!process.env.DISCORD_CLIENT_ID && !!process.env.DISCORD_CLIENT_SECRET,
      facebookLoginEnabled:
        !!process.env.FACEBOOK_CLIENT_ID && !!process.env.FACEBOOK_CLIENT_SECRET,
@@ -100,10 +91,10 @@ router.get('/', async function (req, res) {
        isEnabled(process.env.SHOW_BIRTHDAY_ICON) ||
        process.env.SHOW_BIRTHDAY_ICON === '',
      helpAndFaqURL: process.env.HELP_AND_FAQ_URL || 'https://librechat.ai',
-      interface: appConfig?.interfaceConfig,
-      turnstile: appConfig?.turnstileConfig,
-      modelSpecs: appConfig?.modelSpecs,
-      balance: balanceConfig,
+      interface: req.app.locals.interfaceConfig,
+      turnstile: req.app.locals.turnstileConfig,
+      modelSpecs: req.app.locals.modelSpecs,
+      balance: req.app.locals.balance,
      sharedLinksEnabled,
      publicSharedLinksEnabled,
      analyticsGtmId: process.env.ANALYTICS_GTM_ID,
@@ -117,42 +108,28 @@ router.get('/', async function (req, res) {
      openidReuseTokens,
    };

-    const minPasswordLength = parseInt(process.env.MIN_PASSWORD_LENGTH, 10);
-    if (minPasswordLength && !isNaN(minPasswordLength)) {
-      payload.minPasswordLength = minPasswordLength;
-    }
-
-    const getMCPServers = () => {
+    payload.mcpServers = {};
+    const config = await getCustomConfig();
+    if (config?.mcpServers != null) {
      try {
-        if (appConfig?.mcpConfig == null) {
-          return;
-        }
        const mcpManager = getMCPManager();
-        if (!mcpManager) {
-          return;
-        }
-        const mcpServers = mcpManager.getAllServers();
-        if (!mcpServers) return;
        const oauthServers = mcpManager.getOAuthServers();
-        for (const serverName in mcpServers) {
-          if (!payload.mcpServers) {
-            payload.mcpServers = {};
-          }
-          const serverConfig = mcpServers[serverName];
-          payload.mcpServers[serverName] = removeNullishValues({
+        for (const serverName in config.mcpServers) {
+          const serverConfig = config.mcpServers[serverName];
+          payload.mcpServers[serverName] = {
            startup: serverConfig?.startup,
            chatMenu: serverConfig?.chatMenu,
            isOAuth: oauthServers?.has(serverName),
-            customUserVars: serverConfig?.customUserVars,
-          });
+            customUserVars: serverConfig?.customUserVars || {},
+          };
        }
-      } catch (error) {
-        logger.error('Error loading MCP servers', error);
+      } catch (err) {
+        logger.error('Error loading MCP servers', err);
      }
-    };
+    }

-    getMCPServers();
-    const webSearchConfig = appConfig?.webSearch;
+    /** @type {TCustomConfig['webSearch']} */
+    const webSearchConfig = req.app.locals.webSearch;
    if (
      webSearchConfig != null &&
      (webSearchConfig.searchProvider ||
--- a/api/server/routes/convos.js
+++ b/api/server/routes/convos.js
@@ -4,13 +4,9 @@ const { sleep } = require('@librechat/agents');
 const { isEnabled } = require('@librechat/api');
 const { logger } = require('@librechat/data-schemas');
 const { CacheKeys, EModelEndpoint } = require('librechat-data-provider');
-const {
-  createImportLimiters,
-  createForkLimiters,
-  configMiddleware,
-} = require('~/server/middleware');
 const { getConvosByCursor, deleteConvos, getConvo, saveConvo } = require('~/models/Conversation');
 const { forkConversation, duplicateConversation } = require('~/server/utils/import/fork');
+const { createImportLimiters, createForkLimiters } = require('~/server/middleware');
 const { storage, importFileFilter } = require('~/server/routes/files/multer');
 const requireJwtAuth = require('~/server/middleware/requireJwtAuth');
 const { importConversations } = require('~/server/utils/import');
@@ -175,7 +171,6 @@ router.post(
  '/import',
  importIpLimiter,
  importUserLimiter,
-  configMiddleware,
  upload.single('file'),
  async (req, res) => {
    try {
--- a/api/server/routes/endpoints.js
+++ b/api/server/routes/endpoints.js
@@ -1,7 +1,9 @@
 const express = require('express');
-const endpointController = require('~/server/controllers/EndpointController');
-
 const router = express.Router();
+const endpointController = require('~/server/controllers/EndpointController');
+const overrideController = require('~/server/controllers/OverrideController');
+
 router.get('/', endpointController);
+router.get('/config/override', overrideController);

 module.exports = router;
--- a/api/server/routes/files/avatar.js
+++ b/api/server/routes/files/avatar.js
@@ -1,16 +1,15 @@
 const fs = require('fs').promises;
 const express = require('express');
-const { logger } = require('@librechat/data-schemas');
 const { getStrategyFunctions } = require('~/server/services/Files/strategies');
 const { resizeAvatar } = require('~/server/services/Files/images/avatar');
-const { getFileStrategy } = require('~/server/utils/getFileStrategy');
 const { filterFile } = require('~/server/services/Files/process');
+const { getFileStrategy } = require('~/server/utils/getFileStrategy');
+const { logger } = require('~/config');

 const router = express.Router();

 router.post('/', async (req, res) => {
  try {
-    const appConfig = req.config;
    filterFile({ req, file: req.file, image: true, isAvatar: true });
    const userId = req.user.id;
    const { manual } = req.body;
@@ -20,8 +19,8 @@ router.post('/', async (req, res) => {
      throw new Error('User ID is undefined');
    }

-    const fileStrategy = getFileStrategy(appConfig, { isAvatar: true });
-    const desiredFormat = appConfig.imageOutputType;
+    const fileStrategy = getFileStrategy(req.app.locals, { isAvatar: true });
+    const desiredFormat = req.app.locals.imageOutputType;
    const resizedBuffer = await resizeAvatar({
      userId,
      input,
@@ -40,7 +39,7 @@ router.post('/', async (req, res) => {
    try {
      await fs.unlink(req.file.path);
      logger.debug('[/files/images/avatar] Temp. image upload file deleted');
-    } catch {
+    } catch (error) {
      logger.debug('[/files/images/avatar] Temp. image upload file already deleted');
    }
  }
--- a/api/server/routes/files/files.js
+++ b/api/server/routes/files/files.js
@@ -31,15 +31,13 @@ const { getAssistant } = require('~/models/Assistant');
 const { getAgent } = require('~/models/Agent');
 const { getLogStores } = require('~/cache');
 const { logger } = require('~/config');
-const { Readable } = require('stream');

 const router = express.Router();

 router.get('/', async (req, res) => {
  try {
-    const appConfig = req.config;
    const files = await getFiles({ user: req.user.id });
-    if (appConfig.fileStrategy === FileSources.s3) {
+    if (req.app.locals.fileStrategy === FileSources.s3) {
      try {
        const cache = getLogStores(CacheKeys.S3_EXPIRY_INTERVAL);
        const alreadyChecked = await cache.get(req.user.id);
@@ -116,8 +114,7 @@ router.get('/agent/:agent_id', async (req, res) => {

 router.get('/config', async (req, res) => {
  try {
-    const appConfig = req.config;
-    res.status(200).json(appConfig.fileConfig);
+    res.status(200).json(req.app.locals.fileConfig);
  } catch (error) {
    logger.error('[/files] Error getting fileConfig', error);
    res.status(400).json({ message: 'Error in request', error: error.message });
@@ -185,7 +182,6 @@ router.delete('/', async (req, res) => {
        role: req.user.role,
        fileIds: nonOwnedFileIds,
        agentId: req.body.agent_id,
-        isDelete: true,
      });

      for (const file of nonOwnedFiles) {
@@ -327,6 +323,11 @@ router.get('/download/:userId/:file_id', fileAccess, async (req, res) => {
      res.setHeader('X-File-Metadata', JSON.stringify(file));
    };

+    /** @type {{ body: import('stream').PassThrough } | undefined} */
+    let passThrough;
+    /** @type {ReadableStream | undefined} */
+    let fileStream;
+
    if (checkOpenAIStorage(file.source)) {
      req.body = { model: file.model };
      const endpointMap = {
@@ -339,19 +340,12 @@ router.get('/download/:userId/:file_id', fileAccess, async (req, res) => {
        overrideEndpoint: endpointMap[file.source],
      });
      logger.debug(`Downloading file ${file_id} from OpenAI`);
-      const passThrough = await getDownloadStream(file_id, openai);
+      passThrough = await getDownloadStream(file_id, openai);
      setHeaders();
      logger.debug(`File ${file_id} downloaded from OpenAI`);
-
-      // Handle both Node.js and Web streams
-      const stream =
-        passThrough.body && typeof passThrough.body.getReader === 'function'
-          ? Readable.fromWeb(passThrough.body)
-          : passThrough.body;
-
-      stream.pipe(res);
+      passThrough.body.pipe(res);
    } else {
-      const fileStream = await getDownloadStream(req, file.filepath);
+      fileStream = await getDownloadStream(req, file.filepath);

      fileStream.on('error', (streamError) => {
        logger.error('[DOWNLOAD ROUTE] Stream error:', streamError);
@@ -391,8 +385,7 @@ router.post('/', async (req, res) => {

    if (
      error.message?.includes('Invalid file format') ||
-      error.message?.includes('No OCR result') ||
-      error.message?.includes('exceeds token limit')
+      error.message?.includes('No OCR result')
    ) {
      message = error.message;
    }
--- a/api/server/routes/files/images.js
+++ b/api/server/routes/files/images.js
@@ -1,19 +1,18 @@
 const path = require('path');
 const fs = require('fs').promises;
 const express = require('express');
-const { logger } = require('@librechat/data-schemas');
 const { isAgentsEndpoint } = require('librechat-data-provider');
 const {
  filterFile,
  processImageFile,
  processAgentFileUpload,
 } = require('~/server/services/Files/process');
+const { logger } = require('~/config');

 const router = express.Router();

 router.post('/', async (req, res) => {
  const metadata = req.body;
-  const appConfig = req.config;

  try {
    filterFile({ req, image: true });
@@ -29,20 +28,9 @@ router.post('/', async (req, res) => {
  } catch (error) {
    // TODO: delete remote file if it exists
    logger.error('[/files/images] Error processing file:', error);
-
-    let message = 'Error processing file';
-
-    if (
-      error.message?.includes('Invalid file format') ||
-      error.message?.includes('No OCR result') ||
-      error.message?.includes('exceeds token limit')
-    ) {
-      message = error.message;
-    }
-
    try {
      const filepath = path.join(
-        appConfig.paths.imageOutput,
+        req.app.locals.paths.imageOutput,
        req.user.id,
        path.basename(req.file.filename),
      );
@@ -50,12 +38,12 @@ router.post('/', async (req, res) => {
    } catch (error) {
      logger.error('[/files/images] Error deleting file:', error);
    }
-    res.status(500).json({ message });
+    res.status(500).json({ message: 'Error processing file' });
  } finally {
    try {
      await fs.unlink(req.file.path);
      logger.debug('[/files/images] Temp. image upload file deleted');
-    } catch {
+    } catch (error) {
      logger.debug('[/files/images] Temp. image upload file already deleted');
    }
  }
--- a/api/server/routes/files/index.js
+++ b/api/server/routes/files/index.js
@@ -1,11 +1,5 @@
 const express = require('express');
-const {
-  createFileLimiters,
-  configMiddleware,
-  requireJwtAuth,
-  uaParser,
-  checkBan,
-} = require('~/server/middleware');
+const { uaParser, checkBan, requireJwtAuth, createFileLimiters } = require('~/server/middleware');
 const { avatar: asstAvatarRouter } = require('~/server/routes/assistants/v1');
 const { avatar: agentAvatarRouter } = require('~/server/routes/agents/v1');
 const { createMulterInstance } = require('./multer');
@@ -18,7 +12,6 @@ const speech = require('./speech');
 const initialize = async () => {
  const router = express.Router();
  router.use(requireJwtAuth);
-  router.use(configMiddleware);
  router.use(checkBan);
  router.use(uaParser);

--- a/api/server/routes/files/multer.js
+++ b/api/server/routes/files/multer.js
@@ -4,12 +4,11 @@ const crypto = require('crypto');
 const multer = require('multer');
 const { sanitizeFilename } = require('@librechat/api');
 const { fileConfig: defaultFileConfig, mergeFileConfig } = require('librechat-data-provider');
-const { getAppConfig } = require('~/server/services/Config');
+const { getCustomConfig } = require('~/server/services/Config');

 const storage = multer.diskStorage({
  destination: function (req, file, cb) {
-    const appConfig = req.config;
-    const outputPath = path.join(appConfig.paths.uploads, 'temp', req.user.id);
+    const outputPath = path.join(req.app.locals.paths.uploads, 'temp', req.user.id);
    if (!fs.existsSync(outputPath)) {
      fs.mkdirSync(outputPath, { recursive: true });
    }
@@ -69,8 +68,8 @@ const createFileFilter = (customFileConfig) => {
 };

 const createMulterInstance = async () => {
-  const appConfig = await getAppConfig();
-  const fileConfig = mergeFileConfig(appConfig?.fileConfig);
+  const customConfig = await getCustomConfig();
+  const fileConfig = mergeFileConfig(customConfig?.fileConfig);
  const fileFilter = createFileFilter(fileConfig);
  return multer({
    storage,
--- a/api/server/routes/files/multer.spec.js
+++ b/api/server/routes/files/multer.spec.js
@@ -8,7 +8,21 @@ const { createMulterInstance, storage, importFileFilter } = require('./multer');

 // Mock only the config service that requires external dependencies
 jest.mock('~/server/services/Config', () => ({
-  getAppConfig: jest.fn(),
+  getCustomConfig: jest.fn(() =>
+    Promise.resolve({
+      fileConfig: {
+        endpoints: {
+          openAI: {
+            supportedMimeTypes: ['image/jpeg', 'image/png', 'application/pdf'],
+          },
+          default: {
+            supportedMimeTypes: ['image/jpeg', 'image/png', 'text/plain'],
+          },
+        },
+        serverFileSizeLimit: 10000000, // 10MB
+      },
+    }),
+  ),
 }));

 describe('Multer Configuration', () => {
@@ -22,13 +36,15 @@ describe('Multer Configuration', () => {

    mockReq = {
      user: { id: 'test-user-123' },
-      body: {},
-      originalUrl: '/api/files/upload',
-      config: {
-        paths: {
-          uploads: tempDir,
+      app: {
+        locals: {
+          paths: {
+            uploads: tempDir,
+          },
        },
      },
+      body: {},
+      originalUrl: '/api/files/upload',
    };

    mockFile = {
@@ -63,7 +79,7 @@ describe('Multer Configuration', () => {

      it("should create directory recursively if it doesn't exist", (done) => {
        const deepPath = path.join(tempDir, 'deep', 'nested', 'path');
-        mockReq.config.paths.uploads = deepPath;
+        mockReq.app.locals.paths.uploads = deepPath;

        const cb = jest.fn((err, destination) => {
          expect(err).toBeNull();
@@ -315,11 +331,11 @@ describe('Multer Configuration', () => {
    });

    it('should use real config merging', async () => {
-      const { getAppConfig } = require('~/server/services/Config');
+      const { getCustomConfig } = require('~/server/services/Config');

      const multerInstance = await createMulterInstance();

-      expect(getAppConfig).toHaveBeenCalled();
+      expect(getCustomConfig).toHaveBeenCalled();
      expect(multerInstance).toBeDefined();
    });

@@ -446,15 +462,26 @@ describe('Multer Configuration', () => {
      }).not.toThrow();
    });

-    it('should handle file system errors when directory creation fails', () => {
+    it('should handle file system errors when directory creation fails', (done) => {
      // Test with a non-existent parent directory to simulate fs issues
      const invalidPath = '/nonexistent/path/that/should/not/exist';
-      mockReq.config.paths.uploads = invalidPath;
+      mockReq.app.locals.paths.uploads = invalidPath;

-      // The current implementation doesn't catch errors, so they're thrown synchronously
-      expect(() => {
-        storage.getDestination(mockReq, mockFile, jest.fn());
-      }).toThrow();
+      try {
+        // Call getDestination which should fail due to permission/path issues
+        storage.getDestination(mockReq, mockFile, (err, destination) => {
+          // If callback is reached, we didn't get the expected error
+          done(new Error('Expected mkdirSync to throw an error but callback was called'));
+        });
+        // If we get here without throwing, something unexpected happened
+        done(new Error('Expected mkdirSync to throw an error but no error was thrown'));
+      } catch (error) {
+        // This is the expected behavior - mkdirSync throws synchronously for invalid paths
+        // On Linux, this typically returns EACCES (permission denied)
+        // On macOS/Darwin, this returns ENOENT (no such file or directory)
+        expect(['EACCES', 'ENOENT']).toContain(error.code);
+        done();
+      }
    });

    it('should handle malformed filenames with real sanitization', (done) => {
@@ -511,10 +538,10 @@ describe('Multer Configuration', () => {

  describe('Real Configuration Testing', () => {
    it('should handle missing custom config gracefully with real mergeFileConfig', async () => {
-      const { getAppConfig } = require('~/server/services/Config');
+      const { getCustomConfig } = require('~/server/services/Config');

-      // Mock getAppConfig to return undefined
-      getAppConfig.mockResolvedValueOnce(undefined);
+      // Mock getCustomConfig to return undefined
+      getCustomConfig.mockResolvedValueOnce(undefined);

      const multerInstance = await createMulterInstance();
      expect(multerInstance).toBeDefined();
@@ -522,28 +549,25 @@ describe('Multer Configuration', () => {
    });

    it('should properly integrate real fileConfig with custom endpoints', async () => {
-      const { getAppConfig } = require('~/server/services/Config');
+      const { getCustomConfig } = require('~/server/services/Config');

-      // Mock appConfig with fileConfig
-      getAppConfig.mockResolvedValueOnce({
-        paths: {
-          uploads: tempDir,
-        },
+      // Mock a custom config with additional endpoints
+      getCustomConfig.mockResolvedValueOnce({
        fileConfig: {
          endpoints: {
            anthropic: {
              supportedMimeTypes: ['text/plain', 'image/png'],
            },
          },
-          serverFileSizeLimit: 20971520, // 20 MB in bytes (mergeFileConfig converts)
+          serverFileSizeLimit: 20, // 20 MB
        },
      });

      const multerInstance = await createMulterInstance();
      expect(multerInstance).toBeDefined();

-      // Verify that getAppConfig was called
-      expect(getAppConfig).toHaveBeenCalled();
+      // Verify that getCustomConfig was called (we can't spy on the actual merge function easily)
+      expect(getCustomConfig).toHaveBeenCalled();
    });
  });
 });
--- a/Show More
+++ b/Show More