🎉 feat: Code Interpreter API and Agents Release (#4860)

* feat: Code Interpreter API & File Search Agent Uploads

chore: add back code files

wip: first pass, abstract key dialog

refactor: influence checkbox on key changes

refactor: update localization keys for 'execute code' to 'run code'

wip: run code button

refactor: add throwError parameter to loadAuthValues and getUserPluginAuthValue functions

feat: first pass, API tool calling

fix: handle missing toolId in callTool function and return 404 for non-existent tools

feat: show code outputs

fix: improve error handling in callTool function and log errors

fix: handle potential null value for filepath in attachment destructuring

fix: normalize language before rendering and prevent null return

fix: add loading indicator in RunCode component while executing code

feat: add support for conditional code execution in Markdown components

feat: attachments

refactor: remove bash

fix: pass abort signal to graph/run

refactor: debounce and rate limit tool call

refactor: increase debounce delay for execute function

feat: set code output attachments

feat: image attachments

refactor: apply message context

refactor: pass `partIndex`

feat: toolCall schema/model/methods

feat: block indexing

feat: get tool calls

chore: imports

chore: typing

chore: condense type imports

feat: get tool calls

fix: block indexing

chore: typing

refactor: update tool calls mapping to support multiple results

fix: add unique key to nav link for rendering

wip: first pass, tool call results

refactor: update query cache from successful tool call mutation

style: improve result switcher styling

chore: note on using \`.toObject()\`

feat: add agent_id field to conversation schema

chore: typing

refactor: rename agentMap to agentsMap for consistency

feat: Agent Name as chat input placeholder

chore: bump agents

📦 chore: update @langchain dependencies to latest versions to match agents package

📦 chore: update @librechat/agents dependency to version 1.8.0

fix: Aborting agent stream removes sender; fix(bedrock): completion removes preset name label

refactor: remove direct file parameter to use req.file, add `processAgentFileUpload` for image uploads

feat: upload menu

feat: prime message_file resources

feat: implement conversation access validation in chat route

refactor: remove file parameter from processFileUpload and use req.file instead

feat: add savedMessageIds set to track saved message IDs in BaseClient, to prevent unnecessary double-write to db

feat: prevent duplicate message saves by checking savedMessageIds in AgentController

refactor: skip legacy RAG API handling for agents

feat: add files field to convoSchema

refactor: update request type annotations from Express.Request to ServerRequest in file processing functions

feat: track conversation files

fix: resendFiles, addPreviousAttachments handling

feat: add ID validation for session_id and file_id in download route

feat: entity_id for code file uploads/downloads

fix: code file edge cases

feat: delete related tool calls

feat: add stream rate handling for LLM configuration

feat: enhance system content with attached file information

fix: improve error logging in resource priming function

* WIP: PoC, sequential agents

WIP: PoC Sequential Agents, first pass content data + bump agents package

fix: package-lock

WIP: PoC, o1 support, refactor bufferString

feat: convertJsonSchemaToZod

fix: form issues and schema defining erroneous model

fix: max length issue on agent form instructions, limit conversation messages to sequential agents

feat: add abort signal support to createRun function and AgentClient

feat: PoC, hide prior sequential agent steps

fix: update parameter naming from config to metadata in event handlers for clarity, add model to usage data

refactor: use only last contentData, track model for usage data

chore: bump agents package

fix: content parts issue

refactor: filter contentParts to include tool calls and relevant indices

feat: show function calls

refactor: filter context messages to exclude tool calls when no tools are available to the agent

fix: ensure tool call content is not undefined in formatMessages

feat: add agent_id field to conversationPreset schema

feat: hide sequential agents

feat: increase upload toast duration to 10 seconds

* refactor: tool context handling & update Code API Key Dialog

feat: toolContextMap

chore: skipSpecs -> useSpecs

ci: fix handleTools tests

feat: API Key Dialog

* feat: Agent Permissions Admin Controls

feat: replace label with button for prompt permission toggle

feat: update agent permissions

feat: enable experimental agents and streamline capability configuration

feat: implement access control for agents and enhance endpoint menu items

feat: add welcome message for agent selection in localization

feat: add agents permission to access control and update version to 0.7.57

* fix: update types in useAssistantListMap and useMentions hooks for better null handling

* feat: mention agents

* fix: agent tool resource race conditions when deleting agent tool resource files

* feat: add error handling for code execution with user feedback

* refactor: rename AdminControls to AdminSettings for clarity

* style: add gap to button in AdminSettings for improved layout

* refactor: separate agent query hooks and check access to enable fetching

* fix: remove unused provider from agent initialization options, creates issue with custom endpoints

* refactor: remove redundant/deprecated modelOptions from AgentClient processes

* chore: update @librechat/agents to version 1.8.5 in package.json and package-lock.json

* fix: minor styling issues + agent panel uniformity

* fix: agent edge cases when set endpoint is no longer defined

* refactor: remove unused cleanup function call from AppService

* fix: update link in ApiKeyDialog to point to pricing page

* fix: improve type handling and layout calculations in SidePanel component

* fix: add missing localization string for agent selection in SidePanel

* chore: form styling and localizations for upload filesearch/code interpreter

* fix: model selection placeholder logic in AgentConfig component

* style: agent capabilities

* fix: add localization for provider selection and improve dropdown styling in ModelPanel

* refactor: use gpt-4o-mini > gpt-3.5-turbo

* fix: agents configuration for loadDefaultInterface and update related tests

* feat: DALLE Agents support

.env.example

@@ -177,10 +177,10 @@ OPENAI_API_KEY=user_provided
 DEBUG_OPENAI=false
 
 # TITLE_CONVO=false
-# OPENAI_TITLE_MODEL=gpt-3.5-turbo
+# OPENAI_TITLE_MODEL=gpt-4o-mini
 
 # OPENAI_SUMMARIZE=true
-# OPENAI_SUMMARY_MODEL=gpt-3.5-turbo
+# OPENAI_SUMMARY_MODEL=gpt-4o-mini
 
 # OPENAI_FORCE_PROMPT=true
 

api/app/clients/BaseClient.js

@@ -50,6 +50,8 @@ class BaseClient {
     /** The key for the usage object's output tokens
      * @type {string} */
     this.outputTokensKey = 'completion_tokens';
+    /** @type {Set<string>} */
+    this.savedMessageIds = new Set();
   }
 
   setOptions() {
@@ -84,7 +86,7 @@ class BaseClient {
       return this.options.agent.id;
     }
 
-    return this.modelOptions.model;
+    return this.modelOptions?.model ?? this.model;
   }
 
   /**
@@ -508,7 +510,7 @@ class BaseClient {
           conversationId,
           parentMessageId: userMessage.messageId,
           isCreatedByUser: false,
-          model: this.modelOptions.model,
+          model: this.modelOptions?.model ?? this.model,
           sender: this.sender,
           text: generation,
         };
@@ -545,6 +547,7 @@ class BaseClient {
 
     if (!isEdited && !this.skipSaveUserMessage) {
       this.userMessagePromise = this.saveMessageToDatabase(userMessage, saveOptions, user);
+      this.savedMessageIds.add(userMessage.messageId);
       if (typeof opts?.getReqData === 'function') {
         opts.getReqData({
           userMessagePromise: this.userMessagePromise,
@@ -563,8 +566,8 @@ class BaseClient {
           user: this.user,
           tokenType: 'prompt',
           amount: promptTokens,
-          model: this.modelOptions.model,
           endpoint: this.options.endpoint,
+          model: this.modelOptions?.model ?? this.model,
           endpointTokenConfig: this.options.endpointTokenConfig,
         },
       });
@@ -574,6 +577,7 @@ class BaseClient {
     const completion = await this.sendCompletion(payload, opts);
     this.abortController.requestCompleted = true;
 
+    /** @type {TMessage} */
     const responseMessage = {
       messageId: responseMessageId,
       conversationId,
@@ -635,7 +639,16 @@ class BaseClient {
       responseMessage.attachments = (await Promise.all(this.artifactPromises)).filter((a) => a);
     }
 
+    if (this.options.attachments) {
+      try {
+        saveOptions.files = this.options.attachments.map((attachments) => attachments.file_id);
+      } catch (error) {
+        logger.error('[BaseClient] Error mapping attachments for conversation', error);
+      }
+    }
+
     this.responsePromise = this.saveMessageToDatabase(responseMessage, saveOptions, user);
+    this.savedMessageIds.add(responseMessage.messageId);
     const messageCache = getLogStores(CacheKeys.MESSAGES);
     messageCache.set(
       responseMessageId,
@@ -902,8 +915,9 @@ class BaseClient {
     // Note: gpt-3.5-turbo and gpt-4 may update over time. Use default for these as well as for unknown models
     let tokensPerMessage = 3;
     let tokensPerName = 1;
+    const model = this.modelOptions?.model ?? this.model;
 
-    if (this.modelOptions.model === 'gpt-3.5-turbo-0301') {
+    if (model === 'gpt-3.5-turbo-0301') {
       tokensPerMessage = 4;
       tokensPerName = -1;
     }
@@ -961,6 +975,15 @@ class BaseClient {
       return _messages;
     }
 
+    const seen = new Set();
+    const attachmentsProcessed =
+      this.options.attachments && !(this.options.attachments instanceof Promise);
+    if (attachmentsProcessed) {
+      for (const attachment of this.options.attachments) {
+        seen.add(attachment.file_id);
+      }
+    }
+
     /**
      *
      * @param {TMessage} message
@@ -971,7 +994,19 @@ class BaseClient {
         this.message_file_map = {};
       }
 
-      const fileIds = message.files.map((file) => file.file_id);
+      const fileIds = [];
+      for (const file of message.files) {
+        if (seen.has(file.file_id)) {
+          continue;
+        }
+        fileIds.push(file.file_id);
+        seen.add(file.file_id);
+      }
+
+      if (fileIds.length === 0) {
+        return message;
+      }
+
       const files = await getFiles({
         file_id: { $in: fileIds },
       });

api/app/clients/OpenAIClient.js

@@ -688,7 +688,7 @@ class OpenAIClient extends BaseClient {
   }
 
   initializeLLM({
-    model = 'gpt-3.5-turbo',
+    model = 'gpt-4o-mini',
     modelName,
     temperature = 0.2,
     presence_penalty = 0,
@@ -793,7 +793,7 @@ class OpenAIClient extends BaseClient {
 
     const { OPENAI_TITLE_MODEL } = process.env ?? {};
 
-    let model = this.options.titleModel ?? OPENAI_TITLE_MODEL ?? 'gpt-3.5-turbo';
+    let model = this.options.titleModel ?? OPENAI_TITLE_MODEL ?? 'gpt-4o-mini';
     if (model === Constants.CURRENT_MODEL) {
       model = this.modelOptions.model;
     }
@@ -982,7 +982,7 @@ ${convo}
     let prompt;
 
     // TODO: remove the gpt fallback and make it specific to endpoint
-    const { OPENAI_SUMMARY_MODEL = 'gpt-3.5-turbo' } = process.env ?? {};
+    const { OPENAI_SUMMARY_MODEL = 'gpt-4o-mini' } = process.env ?? {};
     let model = this.options.summaryModel ?? OPENAI_SUMMARY_MODEL;
     if (model === Constants.CURRENT_MODEL) {
       model = this.modelOptions.model;

api/app/clients/PluginsClient.js

@@ -105,7 +105,7 @@ class PluginsClient extends OpenAIClient {
       chatHistory: new ChatMessageHistory(pastMessages),
     });
 
-    this.tools = await loadTools({
+    const { loadedTools } = await loadTools({
       user,
       model,
       tools: this.options.tools,
@@ -119,12 +119,15 @@ class PluginsClient extends OpenAIClient {
         processFileURL,
         message,
       },
+      useSpecs: true,
     });
 
-    if (this.tools.length === 0) {
+    if (loadedTools.length === 0) {
       return;
     }
 
+    this.tools = loadedTools;
+
     logger.debug('[PluginsClient] Requested Tools', this.options.tools);
     logger.debug(
       '[PluginsClient] Loaded Tools',

api/app/clients/llm/createLLM.js

@@ -17,7 +17,7 @@ const { isEnabled } = require('~/server/utils');
  *
  * @example
  * const llm = createLLM({
- *   modelOptions: { modelName: 'gpt-3.5-turbo', temperature: 0.2 },
+ *   modelOptions: { modelName: 'gpt-4o-mini', temperature: 0.2 },
  *   configOptions: { basePath: 'https://example.api/path' },
  *   callbacks: { onMessage: handleMessage },
  *   openAIApiKey: 'your-api-key'

api/app/clients/memory/summaryBuffer.demo.js

@@ -3,7 +3,7 @@ const { ChatOpenAI } = require('@langchain/openai');
 const { getBufferString, ConversationSummaryBufferMemory } = require('langchain/memory');
 
 const chatPromptMemory = new ConversationSummaryBufferMemory({
-  llm: new ChatOpenAI({ modelName: 'gpt-3.5-turbo', temperature: 0 }),
+  llm: new ChatOpenAI({ modelName: 'gpt-4o-mini', temperature: 0 }),
   maxTokenLimit: 10,
   returnMessages: true,
 });

api/app/clients/prompts/formatMessages.js

@@ -204,7 +204,7 @@ const formatAgentMessages = (payload) => {
           new ToolMessage({
             tool_call_id: tool_call.id,
             name: tool_call.name,
-            content: output,
+            content: output || '',
           }),
         );
       } else {

api/app/clients/specs/BaseClient.test.js

@@ -61,7 +61,7 @@ describe('BaseClient', () => {
   const options = {
     // debug: true,
     modelOptions: {
-      model: 'gpt-3.5-turbo',
+      model: 'gpt-4o-mini',
       temperature: 0,
     },
   };

api/app/clients/specs/OpenAIClient.test.js

@@ -221,7 +221,7 @@ describe('OpenAIClient', () => {
 
     it('should set isChatCompletion based on useOpenRouter, reverseProxyUrl, or model', () => {
       client.setOptions({ reverseProxyUrl: null });
-      // true by default since default model will be gpt-3.5-turbo
+      // true by default since default model will be gpt-4o-mini
       expect(client.isChatCompletion).toBe(true);
       client.isChatCompletion = undefined;
 
@@ -230,7 +230,7 @@ describe('OpenAIClient', () => {
       expect(client.isChatCompletion).toBe(false);
       client.isChatCompletion = undefined;
 
-      client.setOptions({ modelOptions: { model: 'gpt-3.5-turbo' }, reverseProxyUrl: null });
+      client.setOptions({ modelOptions: { model: 'gpt-4o-mini' }, reverseProxyUrl: null });
       expect(client.isChatCompletion).toBe(true);
     });
 

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

@@ -19,6 +19,8 @@ class DALLE3 extends Tool {
 
     this.userId = fields.userId;
     this.fileStrategy = fields.fileStrategy;
+    /** @type {boolean} */
+    this.isAgent = fields.isAgent;
     if (fields.processFileURL) {
       /** @type {processFileURL} Necessary for output to contain all image metadata. */
       this.processFileURL = fields.processFileURL.bind(this);
@@ -108,6 +110,19 @@ class DALLE3 extends Tool {
     return `![generated image](${imageUrl})`;
   }
 
+  returnValue(value) {
+    if (this.isAgent === true && typeof value === 'string') {
+      return [value, {}];
+    } else if (this.isAgent === true && typeof value === 'object') {
+      return [
+        'DALL-E displayed an image. All generated images are already plainly visible, so don\'t repeat the descriptions in detail. Do not list download links as they are available in the UI already. The user may download the images by clicking on them, but do not mention anything about downloading to the user.',
+        value,
+      ];
+    }
+
+    return value;
+  }
+
   async _call(data) {
     const { prompt, quality = 'standard', size = '1024x1024', style = 'vivid' } = data;
     if (!prompt) {
@@ -126,18 +141,23 @@ class DALLE3 extends Tool {
       });
     } catch (error) {
       logger.error('[DALL-E-3] Problem generating the image:', error);
-      return `Something went wrong when trying to generate the image. The DALL-E API may be unavailable:
-Error Message: ${error.message}`;
+      return this
+        .returnValue(`Something went wrong when trying to generate the image. The DALL-E API may be unavailable:
+Error Message: ${error.message}`);
     }
 
     if (!resp) {
-      return 'Something went wrong when trying to generate the image. The DALL-E API may be unavailable';
+      return this.returnValue(
+        'Something went wrong when trying to generate the image. The DALL-E API may be unavailable',
+      );
     }
 
     const theImageUrl = resp.data[0].url;
 
     if (!theImageUrl) {
-      return 'No image URL returned from OpenAI API. There may be a problem with the API or your configuration.';
+      return this.returnValue(
+        'No image URL returned from OpenAI API. There may be a problem with the API or your configuration.',
+      );
     }
 
     const imageBasename = getImageBasename(theImageUrl);
@@ -157,11 +177,11 @@ Error Message: ${error.message}`;
 
     try {
       const result = await this.processFileURL({
-        fileStrategy: this.fileStrategy,
-        userId: this.userId,
         URL: theImageUrl,
-        fileName: imageName,
         basePath: 'images',
+        userId: this.userId,
+        fileName: imageName,
+        fileStrategy: this.fileStrategy,
         context: FileContext.image_generation,
       });
 
@@ -175,7 +195,7 @@ Error Message: ${error.message}`;
       this.result = `Failed to save the image locally. ${error.message}`;
     }
 
-    return this.result;
+    return this.returnValue(this.result);
   }
 }
 

api/app/clients/tools/util/fileSearch.js

@@ -10,20 +10,50 @@ const { logger } = require('~/config');
  * @param {Object} options
  * @param {ServerRequest} options.req
  * @param {Agent['tool_resources']} options.tool_resources
+ * @returns {Promise<{
+ *   files: Array<{ file_id: string; filename: string }>,
+ *   toolContext: string
+ * }>}
+ */
+const primeFiles = async (options) => {
+  const { tool_resources } = options;
+  const file_ids = tool_resources?.[EToolResources.file_search]?.file_ids ?? [];
+  const agentResourceIds = new Set(file_ids);
+  const resourceFiles = tool_resources?.[EToolResources.file_search]?.files ?? [];
+  const dbFiles = ((await getFiles({ file_id: { $in: file_ids } })) ?? []).concat(resourceFiles);
+
+  let toolContext = `- Note: Semantic search is available through the ${Tools.file_search} tool but no files are currently loaded. Request the user to upload documents to search through.`;
+
+  const files = [];
+  for (let i = 0; i < dbFiles.length; i++) {
+    const file = dbFiles[i];
+    if (!file) {
+      continue;
+    }
+    if (i === 0) {
+      toolContext = `- Note: Use the ${Tools.file_search} tool to find relevant information within:`;
+    }
+    toolContext += `\n\t- ${file.filename}${
+      agentResourceIds.has(file.file_id) ? '' : ' (just attached by user)'
+    }`;
+    files.push({
+      file_id: file.file_id,
+      filename: file.filename,
+    });
+  }
+
+  return { files, toolContext };
+};
+
+/**
+ *
+ * @param {Object} options
+ * @param {ServerRequest} options.req
+ * @param {Array<{ file_id: string; filename: string }>} options.files
  * @returns
  */
-const createFileSearchTool = async (options) => {
-  const { req, tool_resources } = options;
-  const file_ids = tool_resources?.[EToolResources.file_search]?.file_ids ?? [];
-  const files = (await getFiles({ file_id: { $in: file_ids } })).map((file) => ({
-    file_id: file.file_id,
-    filename: file.filename,
-  }));
-
-  const fileList = files.map((file) => `- ${file.filename}`).join('\n');
-  const toolDescription = `Performs a semantic search based on a natural language query across the following files:\n${fileList}`;
-
-  const FileSearch = tool(
+const createFileSearchTool = async ({ req, files }) => {
+  return tool(
     async ({ query }) => {
       if (files.length === 0) {
         return 'No files to search. Instruct the user to add files for the search.';
@@ -87,7 +117,7 @@ const createFileSearchTool = async (options) => {
     },
     {
       name: Tools.file_search,
-      description: toolDescription,
+      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.`,
       schema: z.object({
         query: z
           .string()
@@ -97,8 +127,6 @@ const createFileSearchTool = async (options) => {
       }),
     },
   );
-
-  return FileSearch;
 };
 
-module.exports = createFileSearchTool;
+module.exports = { createFileSearchTool, primeFiles };

api/app/clients/tools/util/handleTools.js

@@ -15,8 +15,8 @@ const {
   StructuredWolfram,
   TavilySearchResults,
 } = require('../');
-const { primeFiles } = require('~/server/services/Files/Code/process');
-const createFileSearchTool = require('./createFileSearchTool');
+const { primeFiles: primeCodeFiles } = require('~/server/services/Files/Code/process');
+const { createFileSearchTool, primeFiles: primeSearchFiles } = require('./fileSearch');
 const { loadSpecs } = require('./loadSpecs');
 const { logger } = require('~/config');
 
@@ -83,7 +83,7 @@ const validateTools = async (user, tools = []) => {
   }
 };
 
-const loadAuthValues = async ({ userId, authFields }) => {
+const loadAuthValues = async ({ userId, authFields, throwError = true }) => {
   let authValues = {};
 
   /**
@@ -98,7 +98,7 @@ const loadAuthValues = async ({ userId, authFields }) => {
         return { authField: field, authValue: value };
       }
       try {
-        value = await getUserPluginAuthValue(userId, field);
+        value = await getUserPluginAuthValue(userId, field, throwError);
       } catch (err) {
         if (field === fields[fields.length - 1] && !value) {
           throw err;
@@ -122,15 +122,18 @@ const loadAuthValues = async ({ userId, authFields }) => {
   return authValues;
 };
 
+/** @typedef {typeof import('@langchain/core/tools').Tool} ToolConstructor */
+/** @typedef {import('@langchain/core/tools').Tool} Tool */
+
 /**
  * Initializes a tool with authentication values for the given user, supporting alternate authentication fields.
  * Authentication fields can have alternates separated by "||", and the first defined variable will be used.
  *
  * @param {string} userId The user ID for which the tool is being loaded.
  * @param {Array<string>} authFields Array of strings representing the authentication fields. Supports alternate fields delimited by "||".
- * @param {typeof import('langchain/tools').Tool} ToolConstructor The constructor function for the tool to be initialized.
+ * @param {ToolConstructor} ToolConstructor The constructor function for the tool to be initialized.
  * @param {Object} options Optional parameters to be passed to the tool constructor alongside authentication values.
- * @returns {Function} An Async function that, when called, asynchronously initializes and returns an instance of the tool with authentication.
+ * @returns {() => Promise<Tool>} An Async function that, when called, asynchronously initializes and returns an instance of the tool with authentication.
  */
 const loadToolWithAuth = (userId, authFields, ToolConstructor, options = {}) => {
   return async function () {
@@ -142,11 +145,12 @@ const loadToolWithAuth = (userId, authFields, ToolConstructor, options = {}) =>
 const loadTools = async ({
   user,
   model,
-  functions = true,
-  returnMap = false,
+  isAgent,
+  useSpecs,
   tools = [],
   options = {},
-  skipSpecs = false,
+  functions = true,
+  returnMap = false,
 }) => {
   const toolConstructors = {
     calculator: Calculator,
@@ -174,11 +178,12 @@ const loadTools = async ({
 
   const requestedTools = {};
 
-  if (functions) {
+  if (functions === true) {
     toolConstructors.dalle = DALLE3;
   }
 
   const imageGenOptions = {
+    isAgent,
     req: options.req,
     fileStrategy: options.fileStrategy,
     processFileURL: options.processFileURL,
@@ -189,7 +194,6 @@ const loadTools = async ({
   const toolOptions = {
     serpapi: { location: 'Austin,Texas,United States', hl: 'en', gl: 'us' },
     dalle: imageGenOptions,
-    'dall-e': imageGenOptions,
     'stable-diffusion': imageGenOptions,
   };
 
@@ -203,24 +207,38 @@ const loadTools = async ({
     toolAuthFields[tool.pluginKey] = tool.authConfig.map((auth) => auth.authField);
   });
 
+  const toolContextMap = {};
   const remainingTools = [];
 
   for (const tool of tools) {
     if (tool === Tools.execute_code) {
-      const authValues = await loadAuthValues({
-        userId: user,
-        authFields: [EnvVar.CODE_API_KEY],
-      });
-      const files = await primeFiles(options, authValues[EnvVar.CODE_API_KEY]);
-      requestedTools[tool] = () =>
-        createCodeExecutionTool({
+      requestedTools[tool] = async () => {
+        const authValues = await loadAuthValues({
+          userId: user,
+          authFields: [EnvVar.CODE_API_KEY],
+        });
+        const codeApiKey = authValues[EnvVar.CODE_API_KEY];
+        const { files, toolContext } = await primeCodeFiles(options, codeApiKey);
+        if (toolContext) {
+          toolContextMap[tool] = toolContext;
+        }
+        const CodeExecutionTool = createCodeExecutionTool({
           user_id: user,
           files,
           ...authValues,
         });
+        CodeExecutionTool.apiKey = codeApiKey;
+        return CodeExecutionTool;
+      };
       continue;
     } else if (tool === Tools.file_search) {
-      requestedTools[tool] = () => createFileSearchTool(options);
+      requestedTools[tool] = async () => {
+        const { files, toolContext } = await primeSearchFiles(options);
+        if (toolContext) {
+          toolContextMap[tool] = toolContext;
+        }
+        return createFileSearchTool({ req: options.req, files });
+      };
       continue;
     }
 
@@ -241,13 +259,13 @@ const loadTools = async ({
       continue;
     }
 
-    if (functions) {
+    if (functions === true) {
       remainingTools.push(tool);
     }
   }
 
   let specs = null;
-  if (functions && remainingTools.length > 0 && skipSpecs !== true) {
+  if (useSpecs === true && functions === true && remainingTools.length > 0) {
     specs = await loadSpecs({
       llm: model,
       user,
@@ -270,23 +288,21 @@ const loadTools = async ({
     return requestedTools;
   }
 
-  // load tools
-  let result = [];
+  const toolPromises = [];
   for (const tool of tools) {
     const validTool = requestedTools[tool];
-    if (!validTool) {
-      continue;
-    }
-    const plugin = await validTool();
-
-    if (Array.isArray(plugin)) {
-      result = [...result, ...plugin];
-    } else if (plugin) {
-      result.push(plugin);
+    if (validTool) {
+      toolPromises.push(
+        validTool().catch((error) => {
+          logger.error(`Error loading tool ${tool}:`, error);
+          return null;
+        }),
+      );
     }
   }
 
-  return result;
+  const loadedTools = (await Promise.all(toolPromises)).flatMap((plugin) => plugin || []);
+  return { loadedTools, toolContextMap };
 };
 
 module.exports = {

api/app/clients/tools/util/handleTools.test.js

@@ -128,12 +128,14 @@ describe('Tool Handlers', () => {
     );
 
     beforeAll(async () => {
-      toolFunctions = await loadTools({
+      const toolMap = await loadTools({
         user: fakeUser._id,
         model: BaseLLM,
         tools: sampleTools,
         returnMap: true,
+        useSpecs: true,
       });
+      toolFunctions = toolMap;
       loadTool1 = toolFunctions[sampleTools[0]];
       loadTool2 = toolFunctions[sampleTools[1]];
       loadTool3 = toolFunctions[sampleTools[2]];
@@ -195,6 +197,7 @@ describe('Tool Handlers', () => {
       expect(mockPluginService.getUserPluginAuthValue).toHaveBeenCalledWith(
         'userId',
         'DALLE3_API_KEY',
+        true,
       );
     });
 
@@ -224,6 +227,7 @@ describe('Tool Handlers', () => {
         user: fakeUser._id,
         model: BaseLLM,
         returnMap: true,
+        useSpecs: true,
       });
       expect(toolFunctions).toEqual({});
     });
@@ -235,6 +239,7 @@ describe('Tool Handlers', () => {
         tools: ['stable-diffusion'],
         functions: true,
         returnMap: true,
+        useSpecs: true,
       });
       const structuredTool = await toolFunctions['stable-diffusion']();
       expect(structuredTool).toBeInstanceOf(StructuredSD);

api/cache/getLogStores.js

@@ -70,6 +70,7 @@ const namespaces = {
   [ViolationTypes.TTS_LIMIT]: createViolationInstance(ViolationTypes.TTS_LIMIT),
   [ViolationTypes.STT_LIMIT]: createViolationInstance(ViolationTypes.STT_LIMIT),
   [ViolationTypes.CONVO_ACCESS]: createViolationInstance(ViolationTypes.CONVO_ACCESS),
+  [ViolationTypes.TOOL_CALL_LIMIT]: createViolationInstance(ViolationTypes.TOOL_CALL_LIMIT),
   [ViolationTypes.FILE_UPLOAD_LIMIT]: createViolationInstance(ViolationTypes.FILE_UPLOAD_LIMIT),
   [ViolationTypes.VERIFY_EMAIL_LIMIT]: createViolationInstance(ViolationTypes.VERIFY_EMAIL_LIMIT),
   [ViolationTypes.RESET_PASSWORD_LIMIT]: createViolationInstance(

api/models/Agent.js

@@ -118,36 +118,43 @@ const addAgentResourceFile = async ({ agent_id, tool_resource, file_id }) => {
 };
 
 /**
- * Removes a resource file id from an agent.
+ * Removes multiple resource files from an agent in a single update.
  * @param {object} params
- * @param {ServerRequest} params.req
  * @param {string} params.agent_id
- * @param {string} params.tool_resource
- * @param {string} params.file_id
+ * @param {Array<{tool_resource: string, file_id: string}>} params.files
  * @returns {Promise<Agent>} The updated agent.
  */
-const removeAgentResourceFile = async ({ agent_id, tool_resource, file_id }) => {
+const removeAgentResourceFiles = async ({ agent_id, files }) => {
   const searchParameter = { id: agent_id };
   const agent = await getAgent(searchParameter);
 
   if (!agent) {
-    throw new Error('Agent not found for removing resource file');
+    throw new Error('Agent not found for removing resource files');
   }
 
-  const tool_resources = agent.tool_resources || {};
+  const tool_resources = { ...agent.tool_resources } || {};
 
-  if (tool_resources[tool_resource] && tool_resources[tool_resource].file_ids) {
-    tool_resources[tool_resource].file_ids = tool_resources[tool_resource].file_ids.filter(
-      (id) => id !== file_id,
-    );
-
-    if (tool_resources[tool_resource].file_ids.length === 0) {
-      delete tool_resources[tool_resource];
+  const filesByResource = files.reduce((acc, { tool_resource, file_id }) => {
+    if (!acc[tool_resource]) {
+      acc[tool_resource] = new Set();
     }
-  }
+    acc[tool_resource].add(file_id);
+    return acc;
+  }, {});
+
+  Object.entries(filesByResource).forEach(([resource, fileIds]) => {
+    if (tool_resources[resource] && tool_resources[resource].file_ids) {
+      tool_resources[resource].file_ids = tool_resources[resource].file_ids.filter(
+        (id) => !fileIds.has(id),
+      );
+
+      if (tool_resources[resource].file_ids.length === 0) {
+        delete tool_resources[resource];
+      }
+    }
+  });
 
   const updateData = { tool_resources };
-
   return await updateAgent(searchParameter, updateData);
 };
 
@@ -281,5 +288,5 @@ module.exports = {
   getListAgents,
   updateAgentProjects,
   addAgentResourceFile,
-  removeAgentResourceFile,
+  removeAgentResourceFiles,
 };

api/models/Conversation.js

@@ -15,6 +15,19 @@ const searchConversation = async (conversationId) => {
     throw new Error('Error searching conversation');
   }
 };
+/**
+ * Searches for a conversation by conversationId and returns associated file ids.
+ * @param {string} conversationId - The conversation's ID.
+ * @returns {Promise<string[] | null>}
+ */
+const getConvoFiles = async (conversationId) => {
+  try {
+    return (await Conversation.findOne({ conversationId }, 'files').lean())?.files ?? [];
+  } catch (error) {
+    logger.error('[getConvoFiles] Error getting conversation files', error);
+    throw new Error('Error getting conversation files');
+  }
+};
 
 /**
  * Retrieves a single conversation for a given user and conversation ID.
@@ -62,6 +75,7 @@ const deleteNullOrEmptyConversations = async () => {
 
 module.exports = {
   Conversation,
+  getConvoFiles,
   searchConversation,
   deleteNullOrEmptyConversations,
   /**
@@ -82,6 +96,7 @@ module.exports = {
         update.conversationId = newConversationId;
       }
 
+      /** Note: the resulting Model object is necessary for Meilisearch operations */
       const conversation = await Conversation.findOneAndUpdate(
         { conversationId, user: req.user.id },
         update,

api/models/Message.js

@@ -265,6 +265,26 @@ async function getMessages(filter, select) {
   }
 }
 
+/**
+ * Retrieves a single message from the database.
+ * @async
+ * @function getMessage
+ * @param {{ user: string, messageId: string }} params - The search parameters
+ * @returns {Promise<TMessage | null>} The message that matches the criteria or null if not found
+ * @throws {Error} If there is an error in retrieving the message
+ */
+async function getMessage({ user, messageId }) {
+  try {
+    return await Message.findOne({
+      user,
+      messageId,
+    }).lean();
+  } catch (err) {
+    logger.error('Error getting message:', err);
+    throw err;
+  }
+}
+
 /**
  * Deletes messages from the database.
  *
@@ -292,5 +312,6 @@ module.exports = {
   updateMessage,
   deleteMessagesSince,
   getMessages,
+  getMessage,
   deleteMessages,
 };

api/models/ToolCall.js

@@ -0,0 +1,96 @@
+const ToolCall = require('./schema/toolCallSchema');
+
+/**
+ * Create a new tool call
+ * @param {ToolCallData} toolCallData - The tool call data
+ * @returns {Promise<ToolCallData>} The created tool call document
+ */
+async function createToolCall(toolCallData) {
+  try {
+    return await ToolCall.create(toolCallData);
+  } catch (error) {
+    throw new Error(`Error creating tool call: ${error.message}`);
+  }
+}
+
+/**
+ * Get a tool call by ID
+ * @param {string} id - The tool call document ID
+ * @returns {Promise<ToolCallData|null>} The tool call document or null if not found
+ */
+async function getToolCallById(id) {
+  try {
+    return await ToolCall.findById(id).lean();
+  } catch (error) {
+    throw new Error(`Error fetching tool call: ${error.message}`);
+  }
+}
+
+/**
+ * Get tool calls by message ID and user
+ * @param {string} messageId - The message ID
+ * @param {string} userId - The user's ObjectId
+ * @returns {Promise<Array>} Array of tool call documents
+ */
+async function getToolCallsByMessage(messageId, userId) {
+  try {
+    return await ToolCall.find({ messageId, user: userId }).lean();
+  } catch (error) {
+    throw new Error(`Error fetching tool calls: ${error.message}`);
+  }
+}
+
+/**
+ * Get tool calls by conversation ID and user
+ * @param {string} conversationId - The conversation ID
+ * @param {string} userId - The user's ObjectId
+ * @returns {Promise<ToolCallData[]>} Array of tool call documents
+ */
+async function getToolCallsByConvo(conversationId, userId) {
+  try {
+    return await ToolCall.find({ conversationId, user: userId }).lean();
+  } catch (error) {
+    throw new Error(`Error fetching tool calls: ${error.message}`);
+  }
+}
+
+/**
+ * Update a tool call
+ * @param {string} id - The tool call document ID
+ * @param {Partial<ToolCallData>} updateData - The data to update
+ * @returns {Promise<ToolCallData|null>} The updated tool call document or null if not found
+ */
+async function updateToolCall(id, updateData) {
+  try {
+    return await ToolCall.findByIdAndUpdate(id, updateData, { new: true }).lean();
+  } catch (error) {
+    throw new Error(`Error updating tool call: ${error.message}`);
+  }
+}
+
+/**
+ * Delete a tool call
+ * @param {string} userId - The related user's ObjectId
+ * @param {string} [conversationId] - The tool call conversation ID
+ * @returns {Promise<{ ok?: number; n?: number; deletedCount?: number }>} The result of the delete operation
+ */
+async function deleteToolCalls(userId, conversationId) {
+  try {
+    const query = { user: userId };
+    if (conversationId) {
+      query.conversationId = conversationId;
+    }
+    return await ToolCall.deleteMany(query);
+  } catch (error) {
+    throw new Error(`Error deleting tool call: ${error.message}`);
+  }
+}
+
+module.exports = {
+  createToolCall,
+  updateToolCall,
+  deleteToolCalls,
+  getToolCallById,
+  getToolCallsByConvo,
+  getToolCallsByMessage,
+};

api/models/index.js

@@ -18,6 +18,7 @@ const {
   updateFileUsage,
 } = require('./File');
 const {
+  getMessage,
   getMessages,
   saveMessage,
   recordMessage,
@@ -51,6 +52,7 @@ module.exports = {
   getFiles,
   updateFileUsage,
 
+  getMessage,
   getMessages,
   saveMessage,
   recordMessage,

api/models/schema/agent.js

@@ -58,6 +58,15 @@ const agentSchema = mongoose.Schema(
       type: String,
       default: undefined,
     },
+    hide_sequential_outputs: {
+      type: Boolean,
+    },
+    end_after_tools: {
+      type: Boolean,
+    },
+    agent_ids: {
+      type: [String],
+    },
     isCollaborative: {
       type: Boolean,
       default: undefined,

api/models/schema/convoSchema.js

@@ -26,6 +26,9 @@ const convoSchema = mongoose.Schema(
       type: mongoose.Schema.Types.Mixed,
     },
     ...conversationPreset,
+    agent_id: {
+      type: String,
+    },
     // for bingAI only
     bingConversationId: {
       type: String,
@@ -47,6 +50,9 @@ const convoSchema = mongoose.Schema(
       default: [],
       meiliIndex: true,
     },
+    files: {
+      type: [String],
+    },
   },
   { timestamps: true },
 );

api/models/schema/defaults.js

@@ -93,6 +93,10 @@ const conversationPreset = {
   imageDetail: {
     type: String,
   },
+  /* agents */
+  agent_id: {
+    type: String,
+  },
   /* assistants */
   assistant_id: {
     type: String,

api/models/schema/toolCallSchema.js

@@ -0,0 +1,54 @@
+const mongoose = require('mongoose');
+
+/**
+ * @typedef {Object} ToolCallData
+ * @property {string} conversationId - The ID of the conversation
+ * @property {string} messageId - The ID of the message
+ * @property {string} toolId - The ID of the tool
+ * @property {string | ObjectId} user - The user's ObjectId
+ * @property {unknown} [result] - Optional result data
+ * @property {TAttachment[]} [attachments] - Optional attachments data
+ * @property {number} [blockIndex] - Optional code block index
+ * @property {number} [partIndex] - Optional part index
+ */
+
+/** @type {MongooseSchema<ToolCallData>} */
+const toolCallSchema = mongoose.Schema(
+  {
+    conversationId: {
+      type: String,
+      required: true,
+    },
+    messageId: {
+      type: String,
+      required: true,
+    },
+    toolId: {
+      type: String,
+      required: true,
+    },
+    user: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'User',
+      required: true,
+    },
+    result: {
+      type: mongoose.Schema.Types.Mixed,
+    },
+    attachments: {
+      type: mongoose.Schema.Types.Mixed,
+    },
+    blockIndex: {
+      type: Number,
+    },
+    partIndex: {
+      type: Number,
+    },
+  },
+  { timestamps: true },
+);
+
+toolCallSchema.index({ messageId: 1, user: 1 });
+toolCallSchema.index({ conversationId: 1, user: 1 });
+
+module.exports = mongoose.model('ToolCall', toolCallSchema);

api/package.json

@@ -39,12 +39,12 @@
     "@google/generative-ai": "^0.21.0",
     "@keyv/mongo": "^2.1.8",
     "@keyv/redis": "^2.8.1",
-    "@langchain/community": "^0.3.13",
-    "@langchain/core": "^0.3.17",
+    "@langchain/community": "^0.3.14",
+    "@langchain/core": "^0.3.18",
     "@langchain/google-genai": "^0.1.4",
     "@langchain/google-vertexai": "^0.1.2",
     "@langchain/textsplitters": "^0.1.0",
-    "@librechat/agents": "^1.7.7",
+    "@librechat/agents": "^1.8.5",
     "axios": "^1.7.7",
     "bcryptjs": "^2.4.3",
     "cheerio": "^1.0.0-rc.12",

api/server/controllers/AskController.js

@@ -127,6 +127,7 @@ const AskController = async (req, res, next, initializeClient, addTitle) => {
       },
     };
 
+    /** @type {TMessage} */
     let response = await client.sendMessage(text, messageOptions);
     response.endpoint = endpointOption.endpoint;
 
@@ -150,11 +151,13 @@ const AskController = async (req, res, next, initializeClient, addTitle) => {
       });
       res.end();
 
-      await saveMessage(
-        req,
-        { ...response, user },
-        { context: 'api/server/controllers/AskController.js - response end' },
-      );
+      if (!client.savedMessageIds.has(response.messageId)) {
+        await saveMessage(
+          req,
+          { ...response, user },
+          { context: 'api/server/controllers/AskController.js - response end' },
+        );
+      }
     }
 
     if (!client.skipSaveUserMessage) {

api/server/controllers/UserController.js

@@ -14,6 +14,7 @@ const { updateUserPluginsService, deleteUserKey } = require('~/server/services/U
 const { verifyEmail, resendVerificationEmail } = require('~/server/services/AuthService');
 const { processDeleteRequest } = require('~/server/services/Files/process');
 const { deleteAllSharedLinks } = require('~/models/Share');
+const { deleteToolCalls } = require('~/models/ToolCall');
 const { Transaction } = require('~/models/Transaction');
 const { logger } = require('~/config');
 
@@ -123,6 +124,7 @@ const deleteUserController = async (req, res) => {
     await deleteAllSharedLinks(user.id); // delete user shared links
     await deleteUserFiles(req); // delete user files
     await deleteFiles(null, user.id); // delete database files in case of orphaned files from previous steps
+    await deleteToolCalls(user.id); // delete user tool calls
     /* TODO: queue job for cleaning actions and assistants of non-existant users */
     logger.info(`User deleted account. Email: ${user.email} ID: ${user.id}`);
     res.status(200).send({ message: 'User deleted' });

api/server/controllers/agents/callbacks.js

@@ -1,4 +1,4 @@
-const { Tools } = require('librechat-data-provider');
+const { Tools, StepTypes, imageGenTools } = require('librechat-data-provider');
 const {
   EnvVar,
   GraphEvents,
@@ -57,6 +57,9 @@ class ModelEndHandler {
     }
 
     const usage = data?.output?.usage_metadata;
+    if (metadata?.model) {
+      usage.model = metadata.model;
+    }
 
     if (usage) {
       this.collectedUsage.push(usage);
@@ -89,9 +92,27 @@ function getDefaultHandlers({ res, aggregateContent, toolEndCallback, collectedU
        * Handle ON_RUN_STEP event.
        * @param {string} event - The event name.
        * @param {StreamEventData} data - The event data.
+       * @param {GraphRunnableConfig['configurable']} [metadata] The runnable metadata.
        */
-      handle: (event, data) => {
-        sendEvent(res, { event, data });
+      handle: (event, data, metadata) => {
+        if (data?.stepDetails.type === StepTypes.TOOL_CALLS) {
+          sendEvent(res, { event, data });
+        } else if (metadata?.last_agent_index === metadata?.agent_index) {
+          sendEvent(res, { event, data });
+        } else if (!metadata?.hide_sequential_outputs) {
+          sendEvent(res, { event, data });
+        } else {
+          const agentName = metadata?.name ?? 'Agent';
+          const isToolCall = data?.stepDetails.type === StepTypes.TOOL_CALLS;
+          const action = isToolCall ? 'performing a task...' : 'thinking...';
+          sendEvent(res, {
+            event: 'on_agent_update',
+            data: {
+              runId: metadata?.run_id,
+              message: `${agentName} is ${action}`,
+            },
+          });
+        }
         aggregateContent({ event, data });
       },
     },
@@ -100,9 +121,16 @@ function getDefaultHandlers({ res, aggregateContent, toolEndCallback, collectedU
        * Handle ON_RUN_STEP_DELTA event.
        * @param {string} event - The event name.
        * @param {StreamEventData} data - The event data.
+       * @param {GraphRunnableConfig['configurable']} [metadata] The runnable metadata.
        */
-      handle: (event, data) => {
-        sendEvent(res, { event, data });
+      handle: (event, data, metadata) => {
+        if (data?.delta.type === StepTypes.TOOL_CALLS) {
+          sendEvent(res, { event, data });
+        } else if (metadata?.last_agent_index === metadata?.agent_index) {
+          sendEvent(res, { event, data });
+        } else if (!metadata?.hide_sequential_outputs) {
+          sendEvent(res, { event, data });
+        }
         aggregateContent({ event, data });
       },
     },
@@ -111,9 +139,16 @@ function getDefaultHandlers({ res, aggregateContent, toolEndCallback, collectedU
        * Handle ON_RUN_STEP_COMPLETED event.
        * @param {string} event - The event name.
        * @param {StreamEventData & { result: ToolEndData }} data - The event data.
+       * @param {GraphRunnableConfig['configurable']} [metadata] The runnable metadata.
        */
-      handle: (event, data) => {
-        sendEvent(res, { event, data });
+      handle: (event, data, metadata) => {
+        if (data?.result != null) {
+          sendEvent(res, { event, data });
+        } else if (metadata?.last_agent_index === metadata?.agent_index) {
+          sendEvent(res, { event, data });
+        } else if (!metadata?.hide_sequential_outputs) {
+          sendEvent(res, { event, data });
+        }
         aggregateContent({ event, data });
       },
     },
@@ -122,9 +157,14 @@ function getDefaultHandlers({ res, aggregateContent, toolEndCallback, collectedU
        * Handle ON_MESSAGE_DELTA event.
        * @param {string} event - The event name.
        * @param {StreamEventData} data - The event data.
+       * @param {GraphRunnableConfig['configurable']} [metadata] The runnable metadata.
        */
-      handle: (event, data) => {
-        sendEvent(res, { event, data });
+      handle: (event, data, metadata) => {
+        if (metadata?.last_agent_index === metadata?.agent_index) {
+          sendEvent(res, { event, data });
+        } else if (!metadata?.hide_sequential_outputs) {
+          sendEvent(res, { event, data });
+        }
         aggregateContent({ event, data });
       },
     },
@@ -151,16 +191,41 @@ function createToolEndCallback({ req, res, artifactPromises }) {
       return;
     }
 
+    if (imageGenTools.has(output.name) && output.artifact) {
+      artifactPromises.push(
+        (async () => {
+          const fileMetadata = Object.assign(output.artifact, {
+            messageId: metadata.run_id,
+            toolCallId: output.tool_call_id,
+            conversationId: metadata.thread_id,
+          });
+          if (!res.headersSent) {
+            return fileMetadata;
+          }
+
+          if (!fileMetadata) {
+            return null;
+          }
+
+          res.write(`event: attachment\ndata: ${JSON.stringify(fileMetadata)}\n\n`);
+          return fileMetadata;
+        })().catch((error) => {
+          logger.error('Error processing code output:', error);
+          return null;
+        }),
+      );
+      return;
+    }
+
     if (output.name !== Tools.execute_code) {
       return;
     }
 
-    const { tool_call_id, artifact } = output;
-    if (!artifact.files) {
+    if (!output.artifact.files) {
       return;
     }
 
-    for (const file of artifact.files) {
+    for (const file of output.artifact.files) {
       const { id, name } = file;
       artifactPromises.push(
         (async () => {
@@ -173,10 +238,10 @@ function createToolEndCallback({ req, res, artifactPromises }) {
             id,
             name,
             apiKey: result[EnvVar.CODE_API_KEY],
-            toolCallId: tool_call_id,
             messageId: metadata.run_id,
-            session_id: artifact.session_id,
+            toolCallId: output.tool_call_id,
             conversationId: metadata.thread_id,
+            session_id: output.artifact.session_id,
           });
           if (!res.headersSent) {
             return fileMetadata;

api/server/controllers/agents/client.js

@@ -12,9 +12,11 @@ const {
   Constants,
   VisionModes,
   openAISchema,
+  ContentTypes,
   EModelEndpoint,
   KnownEndpoints,
   anthropicSchema,
+  isAgentsEndpoint,
   bedrockOutputParser,
   removeNullishValues,
 } = require('librechat-data-provider');
@@ -30,10 +32,10 @@ const {
   createContextHandlers,
 } = require('~/app/clients/prompts');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
+const { getBufferString, HumanMessage } = require('@langchain/core/messages');
 const Tokenizer = require('~/server/services/Tokenizer');
 const { spendTokens } = require('~/models/spendTokens');
 const BaseClient = require('~/app/clients/BaseClient');
-// const { sleep } = require('~/server/utils');
 const { createRun } = require('./run');
 const { logger } = require('~/config');
 
@@ -48,6 +50,12 @@ const providerParsers = {
 
 const legacyContentEndpoints = new Set([KnownEndpoints.groq, KnownEndpoints.deepseek]);
 
+const noSystemModelRegex = [/\bo1\b/gi];
+
+// const { processMemory, memoryInstructions } = require('~/server/services/Endpoints/agents/memory');
+// const { getFormattedMemories } = require('~/models/Memory');
+// const { getCurrentDateTime } = require('~/utils');
+
 class AgentClient extends BaseClient {
   constructor(options = {}) {
     super(null, options);
@@ -62,15 +70,15 @@ class AgentClient extends BaseClient {
     this.run;
 
     const {
+      agentConfigs,
       contentParts,
       collectedUsage,
       artifactPromises,
       maxContextTokens,
-      modelOptions = {},
       ...clientOptions
     } = options;
 
-    this.modelOptions = modelOptions;
+    this.agentConfigs = agentConfigs;
     this.maxContextTokens = maxContextTokens;
     /** @type {MessageContentComplex[]} */
     this.contentParts = contentParts;
@@ -80,6 +88,8 @@ class AgentClient extends BaseClient {
     this.artifactPromises = artifactPromises;
     /** @type {AgentClientOptions} */
     this.options = Object.assign({ endpoint: options.endpoint }, clientOptions);
+    /** @type {string} */
+    this.model = this.options.agent.model_parameters.model;
   }
 
   /**
@@ -169,7 +179,7 @@ class AgentClient extends BaseClient {
         : {};
 
     if (parseOptions) {
-      runOptions = parseOptions(this.modelOptions);
+      runOptions = parseOptions(this.options.agent.model_parameters);
     }
 
     return removeNullishValues(
@@ -224,7 +234,28 @@ class AgentClient extends BaseClient {
     let promptTokens;
 
     /** @type {string} */
-    let systemContent = `${instructions ?? ''}${additional_instructions ?? ''}`;
+    let systemContent = [instructions ?? '', additional_instructions ?? '']
+      .filter(Boolean)
+      .join('\n')
+      .trim();
+    // this.systemMessage = getCurrentDateTime();
+    // const { withKeys, withoutKeys } = await getFormattedMemories({
+    //   userId: this.options.req.user.id,
+    // });
+    // processMemory({
+    //   userId: this.options.req.user.id,
+    //   message: this.options.req.body.text,
+    //   parentMessageId,
+    //   memory: withKeys,
+    //   thread_id: this.conversationId,
+    // }).catch((error) => {
+    //   logger.error('Memory Agent failed to process memory', error);
+    // });
+
+    // this.systemMessage += '\n\n' + memoryInstructions;
+    // if (withoutKeys) {
+    //   this.systemMessage += `\n\n# Existing memory about the user:\n${withoutKeys}`;
+    // }
 
     if (this.options.attachments) {
       const attachments = await this.options.attachments;
@@ -245,7 +276,8 @@ class AgentClient extends BaseClient {
       this.options.attachments = files;
     }
 
-    if (this.message_file_map) {
+    /** Note: Bedrock uses legacy RAG API handling */
+    if (this.message_file_map && !isAgentsEndpoint(this.options.endpoint)) {
       this.contextHandlers = createContextHandlers(
         this.options.req,
         orderedMessages[orderedMessages.length - 1].text,
@@ -319,7 +351,6 @@ class AgentClient extends BaseClient {
 
   /** @type {sendCompletion} */
   async sendCompletion(payload, opts = {}) {
-    this.modelOptions.user = this.user;
     await this.chatCompletion({
       payload,
       onProgress: opts.onProgress,
@@ -339,10 +370,10 @@ class AgentClient extends BaseClient {
       await spendTokens(
         {
           context,
-          model: model ?? this.modelOptions.model,
           conversationId: this.conversationId,
           user: this.user ?? this.options.req.user?.id,
           endpointTokenConfig: this.options.endpointTokenConfig,
+          model: usage.model ?? model ?? this.model ?? this.options.agent.model_parameters.model,
         },
         { promptTokens: usage.input_tokens, completionTokens: usage.output_tokens },
       );
@@ -457,43 +488,190 @@ class AgentClient extends BaseClient {
       //   });
       // }
 
-      const run = await createRun({
-        req: this.options.req,
-        agent: this.options.agent,
-        tools: this.options.tools,
-        runId: this.responseMessageId,
-        modelOptions: this.modelOptions,
-        customHandlers: this.options.eventHandlers,
-      });
-
       const config = {
         configurable: {
           thread_id: this.conversationId,
+          last_agent_index: this.agentConfigs?.size ?? 0,
+          hide_sequential_outputs: this.options.agent.hide_sequential_outputs,
         },
         signal: abortController.signal,
         streamMode: 'values',
         version: 'v2',
       };
 
-      if (!run) {
-        throw new Error('Failed to create run');
-      }
-
-      this.run = run;
-
-      const messages = formatAgentMessages(payload);
+      const initialMessages = formatAgentMessages(payload);
       if (legacyContentEndpoints.has(this.options.agent.endpoint)) {
-        formatContentStrings(messages);
+        formatContentStrings(initialMessages);
       }
-      await run.processStream({ messages }, config, {
-        [Callback.TOOL_ERROR]: (graph, error, toolId) => {
-          logger.error(
-            '[api/server/controllers/agents/client.js #chatCompletion] Tool Error',
-            error,
-            toolId,
-          );
-        },
+
+      /** @type {ReturnType<createRun>} */
+      let run;
+
+      /**
+       *
+       * @param {Agent} agent
+       * @param {BaseMessage[]} messages
+       * @param {number} [i]
+       * @param {TMessageContentParts[]} [contentData]
+       */
+      const runAgent = async (agent, messages, i = 0, contentData = []) => {
+        config.configurable.model = agent.model_parameters.model;
+        if (i > 0) {
+          this.model = agent.model_parameters.model;
+        }
+        config.configurable.agent_id = agent.id;
+        config.configurable.name = agent.name;
+        config.configurable.agent_index = i;
+        const noSystemMessages = noSystemModelRegex.some((regex) =>
+          agent.model_parameters.model.match(regex),
+        );
+
+        const systemMessage = Object.values(agent.toolContextMap ?? {})
+          .join('\n')
+          .trim();
+
+        let systemContent = [
+          systemMessage,
+          agent.instructions ?? '',
+          i !== 0 ? agent.additional_instructions ?? '' : '',
+        ]
+          .join('\n')
+          .trim();
+
+        if (noSystemMessages === true) {
+          agent.instructions = undefined;
+          agent.additional_instructions = undefined;
+        } else {
+          agent.instructions = systemContent;
+          agent.additional_instructions = undefined;
+        }
+
+        if (noSystemMessages === true && systemContent?.length) {
+          let latestMessage = messages.pop().content;
+          if (typeof latestMessage !== 'string') {
+            latestMessage = latestMessage[0].text;
+          }
+          latestMessage = [systemContent, latestMessage].join('\n');
+          messages.push(new HumanMessage(latestMessage));
+        }
+
+        run = await createRun({
+          agent,
+          req: this.options.req,
+          runId: this.responseMessageId,
+          signal: abortController.signal,
+          customHandlers: this.options.eventHandlers,
+        });
+
+        if (!run) {
+          throw new Error('Failed to create run');
+        }
+
+        if (i === 0) {
+          this.run = run;
+        }
+
+        if (contentData.length) {
+          run.Graph.contentData = contentData;
+        }
+
+        await run.processStream({ messages }, config, {
+          keepContent: i !== 0,
+          callbacks: {
+            [Callback.TOOL_ERROR]: (graph, error, toolId) => {
+              logger.error(
+                '[api/server/controllers/agents/client.js #chatCompletion] Tool Error',
+                error,
+                toolId,
+              );
+            },
+          },
+        });
+      };
+
+      await runAgent(this.options.agent, initialMessages);
+
+      let finalContentStart = 0;
+      if (this.agentConfigs && this.agentConfigs.size > 0) {
+        let latestMessage = initialMessages.pop().content;
+        if (typeof latestMessage !== 'string') {
+          latestMessage = latestMessage[0].text;
+        }
+        let i = 1;
+        let runMessages = [];
+
+        const lastFiveMessages = initialMessages.slice(-5);
+        for (const [agentId, agent] of this.agentConfigs) {
+          if (abortController.signal.aborted === true) {
+            break;
+          }
+          const currentRun = await run;
+
+          if (
+            i === this.agentConfigs.size &&
+            config.configurable.hide_sequential_outputs === true
+          ) {
+            const content = this.contentParts.filter(
+              (part) => part.type === ContentTypes.TOOL_CALL,
+            );
+
+            this.options.res.write(
+              `event: message\ndata: ${JSON.stringify({
+                event: 'on_content_update',
+                data: {
+                  runId: this.responseMessageId,
+                  content,
+                },
+              })}\n\n`,
+            );
+          }
+          const _runMessages = currentRun.Graph.getRunMessages();
+          finalContentStart = this.contentParts.length;
+          runMessages = runMessages.concat(_runMessages);
+          const contentData = currentRun.Graph.contentData.slice();
+          const bufferString = getBufferString([new HumanMessage(latestMessage), ...runMessages]);
+          if (i === this.agentConfigs.size) {
+            logger.debug(`SEQUENTIAL AGENTS: Last buffer string:\n${bufferString}`);
+          }
+          try {
+            const contextMessages = [];
+            for (const message of lastFiveMessages) {
+              const messageType = message._getType();
+              if (
+                (!agent.tools || agent.tools.length === 0) &&
+                (messageType === 'tool' || (message.tool_calls?.length ?? 0) > 0)
+              ) {
+                continue;
+              }
+
+              contextMessages.push(message);
+            }
+            const currentMessages = [...contextMessages, new HumanMessage(bufferString)];
+            await runAgent(agent, currentMessages, i, contentData);
+          } catch (err) {
+            logger.error(
+              `[api/server/controllers/agents/client.js #chatCompletion] Error running agent ${agentId} (${i})`,
+              err,
+            );
+          }
+          i++;
+        }
+      }
+
+      if (config.configurable.hide_sequential_outputs !== true) {
+        finalContentStart = 0;
+      }
+
+      this.contentParts = this.contentParts.filter((part, index) => {
+        // Include parts that are either:
+        // 1. At or after the finalContentStart index
+        // 2. Of type tool_call
+        // 3. Have tool_call_ids property
+        return (
+          index >= finalContentStart || part.type === ContentTypes.TOOL_CALL || part.tool_call_ids
+        );
       });
+
       this.recordCollectedUsage({ context: 'message' }).catch((err) => {
         logger.error(
           '[api/server/controllers/agents/client.js #chatCompletion] Error recording collected usage',
@@ -586,7 +764,7 @@ class AgentClient extends BaseClient {
   }
 
   getEncoding() {
-    return this.modelOptions.model?.includes('gpt-4o') ? 'o200k_base' : 'cl100k_base';
+    return this.model?.includes('gpt-4o') ? 'o200k_base' : 'cl100k_base';
   }
 
   /**

api/server/controllers/agents/request.js

@@ -94,8 +94,14 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {
     conversation.title =
       conversation && !conversation.title ? null : conversation?.title || 'New Chat';
 
-    if (client.options.attachments) {
-      userMessage.files = client.options.attachments;
+    if (req.body.files && client.options.attachments) {
+      userMessage.files = [];
+      const messageFiles = new Set(req.body.files.map((file) => file.file_id));
+      for (let attachment of client.options.attachments) {
+        if (messageFiles.has(attachment.file_id)) {
+          userMessage.files.push(attachment);
+        }
+      }
       delete userMessage.image_urls;
     }
 
@@ -109,11 +115,13 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {
       });
       res.end();
 
-      await saveMessage(
-        req,
-        { ...response, user },
-        { context: 'api/server/controllers/agents/request.js - response end' },
-      );
+      if (!client.savedMessageIds.has(response.messageId)) {
+        await saveMessage(
+          req,
+          { ...response, user },
+          { context: 'api/server/controllers/agents/request.js - response end' },
+        );
+      }
     }
 
     if (!client.skipSaveUserMessage) {

api/server/controllers/agents/run.js

@@ -3,8 +3,8 @@ const { providerEndpointMap } = require('librechat-data-provider');
 
 /**
  * @typedef {import('@librechat/agents').t} t
+ * @typedef {import('@librechat/agents').StandardGraphConfig} StandardGraphConfig
  * @typedef {import('@librechat/agents').StreamEventData} StreamEventData
- * @typedef {import('@librechat/agents').ClientOptions} ClientOptions
  * @typedef {import('@librechat/agents').EventHandler} EventHandler
  * @typedef {import('@librechat/agents').GraphEvents} GraphEvents
  * @typedef {import('@librechat/agents').IState} IState
@@ -17,18 +17,16 @@ const { providerEndpointMap } = require('librechat-data-provider');
  * @param {ServerRequest} [options.req] - The server request.
  * @param {string | undefined} [options.runId] - Optional run ID; otherwise, a new run ID will be generated.
  * @param {Agent} options.agent - The agent for this run.
- * @param {StructuredTool[] | undefined} [options.tools] - The tools to use in the run.
+ * @param {AbortSignal} options.signal - The signal for this run.
  * @param {Record<GraphEvents, EventHandler> | undefined} [options.customHandlers] - Custom event handlers.
- * @param {ClientOptions} [options.modelOptions] - Optional model to use; if not provided, it will use the default from modelMap.
  * @param {boolean} [options.streaming=true] - Whether to use streaming.
  * @param {boolean} [options.streamUsage=true] - Whether to stream usage information.
  * @returns {Promise<Run<IState>>} A promise that resolves to a new Run instance.
  */
 async function createRun({
   runId,
-  tools,
   agent,
-  modelOptions,
+  signal,
   customHandlers,
   streaming = true,
   streamUsage = true,
@@ -40,14 +38,17 @@ async function createRun({
       streaming,
       streamUsage,
     },
-    modelOptions,
+    agent.model_parameters,
   );
 
+  /** @type {StandardGraphConfig} */
   const graphConfig = {
-    tools,
+    signal,
     llmConfig,
+    tools: agent.tools,
     instructions: agent.instructions,
     additional_instructions: agent.additional_instructions,
+    // toolEnd: agent.end_after_tools,
   };
 
   // TEMPORARY FOR TESTING

api/server/controllers/tools.js

@@ -1,6 +1,12 @@
+const { nanoid } = require('nanoid');
 const { EnvVar } = require('@librechat/agents');
-const { Tools, AuthType } = require('librechat-data-provider');
-const { loadAuthValues } = require('~/app/clients/tools/util');
+const { Tools, AuthType, ToolCallTypes } = require('librechat-data-provider');
+const { processFileURL, uploadImageBuffer } = require('~/server/services/Files/process');
+const { processCodeOutput } = require('~/server/services/Files/Code/process');
+const { loadAuthValues, loadTools } = require('~/app/clients/tools/util');
+const { createToolCall, getToolCallsByConvo } = require('~/models/ToolCall');
+const { getMessage } = require('~/models/Message');
+const { logger } = require('~/config');
 
 const fieldsMap = {
   [Tools.execute_code]: [EnvVar.CODE_API_KEY],
@@ -24,6 +30,7 @@ const verifyToolAuth = async (req, res) => {
       result = await loadAuthValues({
         userId: req.user.id,
         authFields,
+        throwError: false,
       });
     } catch (error) {
       res.status(200).json({ authenticated: false, message: AuthType.USER_PROVIDED });
@@ -48,6 +55,131 @@ const verifyToolAuth = async (req, res) => {
   }
 };
 
+/**
+ * @param {ServerRequest} req - The request object, containing information about the HTTP request.
+ * @param {ServerResponse} res - The response object, used to send back the desired HTTP response.
+ * @returns {Promise<void>} A promise that resolves when the function has completed.
+ */
+const callTool = async (req, res) => {
+  try {
+    const { toolId = '' } = req.params;
+    if (!fieldsMap[toolId]) {
+      logger.warn(`[${toolId}/call] User ${req.user.id} attempted call to invalid tool`);
+      res.status(404).json({ message: 'Tool not found' });
+      return;
+    }
+
+    const { partIndex, blockIndex, messageId, conversationId, ...args } = req.body;
+    if (!messageId) {
+      logger.warn(`[${toolId}/call] User ${req.user.id} attempted call without message ID`);
+      res.status(400).json({ message: 'Message ID required' });
+      return;
+    }
+
+    const message = await getMessage({ user: req.user.id, messageId });
+    if (!message) {
+      logger.debug(`[${toolId}/call] User ${req.user.id} attempted call with invalid message ID`);
+      res.status(404).json({ message: 'Message not found' });
+      return;
+    }
+    logger.debug(`[${toolId}/call] User: ${req.user.id}`);
+    const { loadedTools } = await loadTools({
+      user: req.user.id,
+      tools: [toolId],
+      functions: true,
+      options: {
+        req,
+        returnMetadata: true,
+        processFileURL,
+        uploadImageBuffer,
+        fileStrategy: req.app.locals.fileStrategy,
+      },
+    });
+
+    const tool = loadedTools[0];
+    const toolCallId = `${req.user.id}_${nanoid()}`;
+    const result = await tool.invoke({
+      args,
+      name: toolId,
+      id: toolCallId,
+      type: ToolCallTypes.TOOL_CALL,
+    });
+
+    const { content, artifact } = result;
+    const toolCallData = {
+      toolId,
+      messageId,
+      partIndex,
+      blockIndex,
+      conversationId,
+      result: content,
+      user: req.user.id,
+    };
+
+    if (!artifact || !artifact.files || toolId !== Tools.execute_code) {
+      createToolCall(toolCallData).catch((error) => {
+        logger.error(`Error creating tool call: ${error.message}`);
+      });
+      return res.status(200).json({
+        result: content,
+      });
+    }
+
+    const artifactPromises = [];
+    for (const file of artifact.files) {
+      const { id, name } = file;
+      artifactPromises.push(
+        (async () => {
+          const fileMetadata = await processCodeOutput({
+            req,
+            id,
+            name,
+            apiKey: tool.apiKey,
+            messageId,
+            toolCallId,
+            conversationId,
+            session_id: artifact.session_id,
+          });
+
+          if (!fileMetadata) {
+            return null;
+          }
+
+          return fileMetadata;
+        })().catch((error) => {
+          logger.error('Error processing code output:', error);
+          return null;
+        }),
+      );
+    }
+    const attachments = await Promise.all(artifactPromises);
+    toolCallData.attachments = attachments;
+    createToolCall(toolCallData).catch((error) => {
+      logger.error(`Error creating tool call: ${error.message}`);
+    });
+    res.status(200).json({
+      result: content,
+      attachments,
+    });
+  } catch (error) {
+    logger.error('Error calling tool', error);
+    res.status(500).json({ message: 'Error calling tool' });
+  }
+};
+
+const getToolCalls = async (req, res) => {
+  try {
+    const { conversationId } = req.query;
+    const toolCalls = await getToolCallsByConvo(conversationId, req.user.id);
+    res.status(200).json(toolCalls);
+  } catch (error) {
+    logger.error('Error getting tool calls', error);
+    res.status(500).json({ message: 'Error getting tool calls' });
+  }
+};
+
 module.exports = {
+  callTool,
+  getToolCalls,
   verifyToolAuth,
 };

api/server/middleware/buildEndpointOption.js

@@ -10,6 +10,7 @@ const openAI = require('~/server/services/Endpoints/openAI');
 const agents = require('~/server/services/Endpoints/agents');
 const custom = require('~/server/services/Endpoints/custom');
 const google = require('~/server/services/Endpoints/google');
+const { getConvoFiles } = require('~/models/Conversation');
 const { handleError } = require('~/server/utils');
 
 const buildFunction = {
@@ -72,21 +73,32 @@ async function buildEndpointOption(req, res, next) {
     }
   }
 
-  const endpointFn = buildFunction[endpointType ?? endpoint];
-  const builder = isAgentsEndpoint(endpoint) ? (...args) => endpointFn(req, ...args) : endpointFn;
+  try {
+    const isAgents = isAgentsEndpoint(endpoint);
+    const endpointFn = buildFunction[endpointType ?? endpoint];
+    const builder = isAgents ? (...args) => endpointFn(req, ...args) : endpointFn;
 
-  // TODO: use object params
-  req.body.endpointOption = builder(endpoint, parsedBody, endpointType);
+    // TODO: use object params
+    req.body.endpointOption = builder(endpoint, parsedBody, endpointType);
 
-  // TODO: use `getModelsConfig` only when necessary
-  const modelsConfig = await getModelsConfig(req);
-  req.body.endpointOption.modelsConfig = modelsConfig;
-
-  if (req.body.files) {
-    // hold the promise
-    req.body.endpointOption.attachments = processFiles(req.body.files);
+    // TODO: use `getModelsConfig` only when necessary
+    const modelsConfig = await getModelsConfig(req);
+    const { resendFiles = true } = req.body.endpointOption;
+    req.body.endpointOption.modelsConfig = modelsConfig;
+    if (isAgents && resendFiles && req.body.conversationId) {
+      const fileIds = await getConvoFiles(req.body.conversationId);
+      const requestFiles = req.body.files ?? [];
+      if (requestFiles.length || fileIds.length) {
+        req.body.endpointOption.attachments = processFiles(requestFiles, fileIds);
+      }
+    } else if (req.body.files) {
+      // hold the promise
+      req.body.endpointOption.attachments = processFiles(req.body.files);
+    }
+    next();
+  } catch (error) {
+    return handleError(res, { text: 'Error building endpoint option' });
   }
-  next();
 }
 
 module.exports = buildEndpointOption;

api/server/middleware/limiters/index.js

@@ -5,6 +5,7 @@ const loginLimiter = require('./loginLimiter');
 const importLimiters = require('./importLimiters');
 const uploadLimiters = require('./uploadLimiters');
 const registerLimiter = require('./registerLimiter');
+const toolCallLimiter = require('./toolCallLimiter');
 const messageLimiters = require('./messageLimiters');
 const verifyEmailLimiter = require('./verifyEmailLimiter');
 const resetPasswordLimiter = require('./resetPasswordLimiter');
@@ -15,6 +16,7 @@ module.exports = {
   ...messageLimiters,
   loginLimiter,
   registerLimiter,
+  toolCallLimiter,
   createTTSLimiters,
   createSTTLimiters,
   verifyEmailLimiter,

api/server/middleware/limiters/toolCallLimiter.js

@@ -0,0 +1,25 @@
+const rateLimit = require('express-rate-limit');
+const { ViolationTypes } = require('librechat-data-provider');
+const logViolation = require('~/cache/logViolation');
+
+const toolCallLimiter = rateLimit({
+  windowMs: 1000,
+  max: 1,
+  handler: async (req, res) => {
+    const type = ViolationTypes.TOOL_CALL_LIMIT;
+    const errorMessage = {
+      type,
+      max: 1,
+      limiter: 'user',
+      windowInMinutes: 1,
+    };
+
+    await logViolation(req, res, type, errorMessage, 0);
+    res.status(429).json({ message: 'Too many tool call requests. Try again later' });
+  },
+  keyGenerator: function (req) {
+    return req.user?.id;
+  },
+});
+
+module.exports = toolCallLimiter;

api/server/routes/agents/chat.js

@@ -1,19 +1,23 @@
 const express = require('express');
-
-const router = express.Router();
+const { PermissionTypes, Permissions } = require('librechat-data-provider');
 const {
   setHeaders,
   handleAbort,
   // validateModel,
-  // validateEndpoint,
+  generateCheckAccess,
+  validateConvoAccess,
   buildEndpointOption,
 } = require('~/server/middleware');
 const { initializeClient } = require('~/server/services/Endpoints/agents');
 const AgentController = require('~/server/controllers/agents/request');
 const addTitle = require('~/server/services/Endpoints/agents/title');
 
+const router = express.Router();
+
 router.post('/abort', handleAbort());
 
+const checkAgentAccess = generateCheckAccess(PermissionTypes.AGENTS, [Permissions.USE]);
+
 /**
  * @route POST /
  * @desc Chat with an assistant
@@ -25,7 +29,8 @@ router.post('/abort', handleAbort());
 router.post(
   '/',
   // validateModel,
-  // validateEndpoint,
+  checkAgentAccess,
+  validateConvoAccess,
   buildEndpointOption,
   setHeaders,
   async (req, res, next) => {

api/server/routes/agents/tools.js

@@ -1,6 +1,7 @@
 const express = require('express');
+const { callTool, verifyToolAuth, getToolCalls } = require('~/server/controllers/tools');
 const { getAvailableTools } = require('~/server/controllers/PluginController');
-const { verifyToolAuth } = require('~/server/controllers/tools');
+const { toolCallLimiter } = require('~/server/middleware/limiters');
 
 const router = express.Router();
 
@@ -11,6 +12,13 @@ const router = express.Router();
  */
 router.get('/', getAvailableTools);
 
+/**
+ * Get a list of tool calls.
+ * @route GET /agents/tools/calls
+ * @returns {ToolCallData[]} 200 - application/json
+ */
+router.get('/calls', getToolCalls);
+
 /**
  * Verify authentication for a specific tool
  * @route GET /agents/tools/:toolId/auth
@@ -19,4 +27,13 @@ router.get('/', getAvailableTools);
  */
 router.get('/:toolId/auth', verifyToolAuth);
 
+/**
+ * Execute code for a specific tool
+ * @route POST /agents/tools/:toolId/call
+ * @param {string} toolId - The ID of the tool to execute
+ * @param {object} req.body - Request body
+ * @returns {object} Result of code execution
+ */
+router.post('/:toolId/call', toolCallLimiter, callTool);
+
 module.exports = router;

api/server/routes/convos.js

@@ -7,6 +7,7 @@ const requireJwtAuth = require('~/server/middleware/requireJwtAuth');
 const { forkConversation } = require('~/server/utils/import/fork');
 const { importConversations } = require('~/server/utils/import');
 const { createImportLimiters } = require('~/server/middleware');
+const { deleteToolCalls } = require('~/models/ToolCall');
 const getLogStores = require('~/cache/getLogStores');
 const { sleep } = require('~/server/utils');
 const { logger } = require('~/config');
@@ -105,6 +106,7 @@ router.post('/clear', async (req, res) => {
 
   try {
     const dbResponse = await deleteConvos(req.user.id, filter);
+    await deleteToolCalls(req.user.id, filter.conversationId);
     res.status(201).json(dbResponse);
   } catch (error) {
     logger.error('Error clearing conversations', error);

api/server/routes/files/files.js

@@ -107,6 +107,10 @@ router.delete('/', async (req, res) => {
   }
 });
 
+function isValidID(str) {
+  return /^[A-Za-z0-9_-]{21}$/.test(str);
+}
+
 router.get('/code/download/:session_id/:fileId', async (req, res) => {
   try {
     const { session_id, fileId } = req.params;
@@ -117,6 +121,11 @@ router.get('/code/download/:session_id/:fileId', async (req, res) => {
       return res.status(400).send('Bad request');
     }
 
+    if (!isValidID(session_id) || !isValidID(fileId)) {
+      logger.debug(`${logPrefix} invalid session_id or fileId`);
+      return res.status(400).send('Bad request');
+    }
+
     const { getDownloadStream } = getStrategyFunctions(FileSources.execute_code);
     if (!getDownloadStream) {
       logger.warn(
@@ -213,21 +222,20 @@ router.get('/download/:userId/:file_id', async (req, res) => {
 });
 
 router.post('/', async (req, res) => {
-  const file = req.file;
   const metadata = req.body;
   let cleanup = true;
 
   try {
-    filterFile({ req, file });
+    filterFile({ req });
 
     metadata.temp_file_id = metadata.file_id;
     metadata.file_id = req.file_id;
 
     if (isAgentsEndpoint(metadata.endpoint)) {
-      return await processAgentFileUpload({ req, res, file, metadata });
+      return await processAgentFileUpload({ req, res, metadata });
     }
 
-    await processFileUpload({ req, res, file, metadata });
+    await processFileUpload({ req, res, metadata });
   } catch (error) {
     let message = 'Error processing file';
     logger.error('[/files] Error processing file:', error);
@@ -238,7 +246,7 @@ router.post('/', async (req, res) => {
 
     // TODO: delete remote file if it exists
     try {
-      await fs.unlink(file.path);
+      await fs.unlink(req.file.path);
       cleanup = false;
     } catch (error) {
       logger.error('[/files] Error deleting file:', error);
@@ -248,7 +256,7 @@ router.post('/', async (req, res) => {
 
   if (cleanup) {
     try {
-      await fs.unlink(file.path);
+      await fs.unlink(req.file.path);
     } catch (error) {
       logger.error('[/files] Error deleting file after file processing:', error);
     }

api/server/routes/files/images.js

@@ -1,7 +1,12 @@
 const path = require('path');
 const fs = require('fs').promises;
 const express = require('express');
-const { filterFile, processImageFile } = require('~/server/services/Files/process');
+const { isAgentsEndpoint } = require('librechat-data-provider');
+const {
+  filterFile,
+  processImageFile,
+  processAgentFileUpload,
+} = require('~/server/services/Files/process');
 const { logger } = require('~/config');
 
 const router = express.Router();
@@ -10,12 +15,16 @@ router.post('/', async (req, res) => {
   const metadata = req.body;
 
   try {
-    filterFile({ req, file: req.file, image: true });
+    filterFile({ req, image: true });
 
     metadata.temp_file_id = metadata.file_id;
     metadata.file_id = req.file_id;
 
-    await processImageFile({ req, res, file: req.file, metadata });
+    if (isAgentsEndpoint(metadata.endpoint) && metadata.tool_resource != null) {
+      return await processAgentFileUpload({ req, res, metadata });
+    }
+
+    await processImageFile({ req, res, metadata });
   } catch (error) {
     // TODO: delete remote file if it exists
     logger.error('[/files/images] Error processing file:', error);

api/server/routes/roles.js

@@ -1,6 +1,7 @@
 const express = require('express');
 const {
   promptPermissionsSchema,
+  agentPermissionsSchema,
   PermissionTypes,
   roleDefaults,
   SystemRoles,
@@ -72,4 +73,37 @@ router.put('/:roleName/prompts', checkAdmin, async (req, res) => {
   }
 });
 
+/**
+ * PUT /api/roles/:roleName/agents
+ * Update agent permissions for a specific role
+ */
+router.put('/:roleName/agents', checkAdmin, async (req, res) => {
+  const { roleName: _r } = req.params;
+  // TODO: TEMP, use a better parsing for roleName
+  const roleName = _r.toUpperCase();
+  /** @type {TRole['AGENTS']} */
+  const updates = req.body;
+
+  try {
+    const parsedUpdates = agentPermissionsSchema.partial().parse(updates);
+
+    const role = await getRoleByName(roleName);
+    if (!role) {
+      return res.status(404).send({ message: 'Role not found' });
+    }
+
+    const mergedUpdates = {
+      [PermissionTypes.AGENTS]: {
+        ...role[PermissionTypes.AGENTS],
+        ...parsedUpdates,
+      },
+    };
+
+    const updatedRole = await updateRoleByName(roleName, mergedUpdates);
+    res.status(200).send(updatedRole);
+  } catch (error) {
+    return res.status(400).send({ message: 'Invalid prompt permissions.', error: error.errors });
+  }
+});
+
 module.exports = router;

api/server/services/AppService.js

@@ -8,7 +8,6 @@ const { loadDefaultInterface } = require('./start/interface');
 const { azureConfigSetup } = require('./start/azureOpenAI');
 const { loadAndFormatTools } = require('./ToolService');
 const { initializeRoles } = require('~/models/Role');
-const { cleanup } = require('./cleanup');
 const paths = require('~/config/paths');
 
 /**
@@ -18,7 +17,6 @@ const paths = require('~/config/paths');
  * @param {Express.Application} app - The Express application object.
  */
 const AppService = async (app) => {
-  cleanup();
   await initializeRoles();
   /** @type {TCustomConfig}*/
   const config = (await loadCustomConfig()) ?? {};

api/server/services/Config/EndpointService.js

@@ -49,10 +49,6 @@ module.exports = {
       process.env.BEDROCK_AWS_SECRET_ACCESS_KEY ?? process.env.BEDROCK_AWS_DEFAULT_REGION,
     ),
     /* key will be part of separate config */
-    [EModelEndpoint.agents]: generateConfig(
-      process.env.EXPERIMENTAL_AGENTS,
-      undefined,
-      EModelEndpoint.agents,
-    ),
+    [EModelEndpoint.agents]: generateConfig('true', undefined, EModelEndpoint.agents),
   },
 };

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

@@ -2,8 +2,14 @@ const { loadAgent } = require('~/models/Agent');
 const { logger } = require('~/config');
 
 const buildOptions = (req, endpoint, parsedBody) => {
-  const { agent_id, instructions, spec, ...model_parameters } = parsedBody;
-
+  const {
+    agent_id,
+    instructions,
+    spec,
+    maxContextTokens,
+    resendFiles = true,
+    ...model_parameters
+  } = parsedBody;
   const agentPromise = loadAgent({
     req,
     agent_id,
@@ -13,12 +19,14 @@ const buildOptions = (req, endpoint, parsedBody) => {
   });
 
   const endpointOption = {
-    agent: agentPromise,
+    spec,
     endpoint,
     agent_id,
+    resendFiles,
     instructions,
-    spec,
+    maxContextTokens,
     model_parameters,
+    agent: agentPromise,
   };
 
   return endpointOption;

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

@@ -16,6 +16,8 @@ const { getCustomEndpointConfig } = require('~/server/services/Config');
 const { loadAgentTools } = require('~/server/services/ToolService');
 const AgentClient = require('~/server/controllers/agents/client');
 const { getModelMaxTokens } = require('~/utils');
+const { getAgent } = require('~/models/Agent');
+const { logger } = require('~/config');
 
 const providerConfigMap = {
   [EModelEndpoint.openAI]: initOpenAI,
@@ -25,6 +27,113 @@ const providerConfigMap = {
   [Providers.OLLAMA]: initCustom,
 };
 
+/**
+ *
+ * @param {Promise<Array<MongoFile | null>> | undefined} _attachments
+ * @param {AgentToolResources | undefined} _tool_resources
+ * @returns {Promise<{ attachments: Array<MongoFile | undefined> | undefined, tool_resources: AgentToolResources | undefined }>}
+ */
+const primeResources = async (_attachments, _tool_resources) => {
+  try {
+    if (!_attachments) {
+      return { attachments: undefined, tool_resources: _tool_resources };
+    }
+    /** @type {Array<MongoFile | undefined> | undefined} */
+    const files = await _attachments;
+    const attachments = [];
+    const tool_resources = _tool_resources ?? {};
+
+    for (const file of files) {
+      if (!file) {
+        continue;
+      }
+      if (file.metadata?.fileIdentifier) {
+        const execute_code = tool_resources.execute_code ?? {};
+        if (!execute_code.files) {
+          tool_resources.execute_code = { ...execute_code, files: [] };
+        }
+        tool_resources.execute_code.files.push(file);
+      } else if (file.embedded === true) {
+        const file_search = tool_resources.file_search ?? {};
+        if (!file_search.files) {
+          tool_resources.file_search = { ...file_search, files: [] };
+        }
+        tool_resources.file_search.files.push(file);
+      }
+
+      attachments.push(file);
+    }
+    return { attachments, tool_resources };
+  } catch (error) {
+    logger.error('Error priming resources', error);
+    return { attachments: _attachments, tool_resources: _tool_resources };
+  }
+};
+
+const initializeAgentOptions = async ({
+  req,
+  res,
+  agent,
+  endpointOption,
+  tool_resources,
+  isInitialAgent = false,
+}) => {
+  const { tools, toolContextMap } = await loadAgentTools({
+    req,
+    tools: agent.tools,
+    agent_id: agent.id,
+    tool_resources,
+  });
+
+  const provider = agent.provider;
+  let getOptions = providerConfigMap[provider];
+
+  if (!getOptions) {
+    const customEndpointConfig = await getCustomEndpointConfig(provider);
+    if (!customEndpointConfig) {
+      throw new Error(`Provider ${provider} not supported`);
+    }
+    getOptions = initCustom;
+    agent.provider = Providers.OPENAI;
+    agent.endpoint = provider.toLowerCase();
+  }
+
+  const model_parameters = agent.model_parameters ?? { model: agent.model };
+  const _endpointOption = isInitialAgent
+    ? endpointOption
+    : {
+      model_parameters,
+    };
+
+  const options = await getOptions({
+    req,
+    res,
+    optionsOnly: true,
+    overrideEndpoint: provider,
+    overrideModel: agent.model,
+    endpointOption: _endpointOption,
+  });
+
+  agent.model_parameters = Object.assign(model_parameters, options.llmConfig);
+  if (options.configOptions) {
+    agent.model_parameters.configuration = options.configOptions;
+  }
+
+  if (!agent.model_parameters.model) {
+    agent.model_parameters.model = agent.model;
+  }
+
+  return {
+    ...agent,
+    tools,
+    toolContextMap,
+    maxContextTokens:
+      agent.max_context_tokens ??
+      getModelMaxTokens(agent.model_parameters.model, providerEndpointMap[provider]) ??
+      4000,
+  };
+};
+
 const initializeClient = async ({ req, res, endpointOption }) => {
   if (!endpointOption) {
     throw new Error('Endpoint option not provided');
@@ -48,70 +157,68 @@ const initializeClient = async ({ req, res, endpointOption }) => {
     throw new Error('No agent promise provided');
   }
 
-  /** @type {Agent | null} */
-  const agent = await endpointOption.agent;
-  if (!agent) {
+  // Initialize primary agent
+  const primaryAgent = await endpointOption.agent;
+  if (!primaryAgent) {
     throw new Error('Agent not found');
   }
 
-  const { tools } = await loadAgentTools({
-    req,
-    tools: agent.tools,
-    agent_id: agent.id,
-    tool_resources: agent.tool_resources,
-  });
+  const { attachments, tool_resources } = await primeResources(
+    endpointOption.attachments,
+    primaryAgent.tool_resources,
+  );
 
-  const provider = agent.provider;
-  let modelOptions = { model: agent.model };
-  let getOptions = providerConfigMap[provider];
-  if (!getOptions) {
-    const customEndpointConfig = await getCustomEndpointConfig(provider);
-    if (!customEndpointConfig) {
-      throw new Error(`Provider ${provider} not supported`);
-    }
-    getOptions = initCustom;
-    agent.provider = Providers.OPENAI;
-    agent.endpoint = provider.toLowerCase();
-  }
+  const agentConfigs = new Map();
 
-  // TODO: pass-in override settings that are specific to current run
-  endpointOption.model_parameters.model = agent.model;
-  const options = await getOptions({
+  // Handle primary agent
+  const primaryConfig = await initializeAgentOptions({
     req,
     res,
+    agent: primaryAgent,
     endpointOption,
-    optionsOnly: true,
-    overrideEndpoint: provider,
-    overrideModel: agent.model,
+    tool_resources,
+    isInitialAgent: true,
   });
 
-  modelOptions = Object.assign(modelOptions, options.llmConfig);
-  if (options.configOptions) {
-    modelOptions.configuration = options.configOptions;
+  const agent_ids = primaryConfig.agent_ids;
+  if (agent_ids?.length) {
+    for (const agentId of agent_ids) {
+      const agent = await getAgent({ id: agentId });
+      if (!agent) {
+        throw new Error(`Agent ${agentId} not found`);
+      }
+      const config = await initializeAgentOptions({
+        req,
+        res,
+        agent,
+        endpointOption,
+      });
+      agentConfigs.set(agentId, config);
+    }
   }
 
-  const sender = getResponseSender({
-    ...endpointOption,
-    model: endpointOption.model_parameters.model,
-  });
+  const sender =
+    primaryAgent.name ??
+    getResponseSender({
+      ...endpointOption,
+      model: endpointOption.model_parameters.model,
+    });
 
   const client = new AgentClient({
     req,
-    agent,
-    tools,
+    agent: primaryConfig,
     sender,
+    attachments,
     contentParts,
-    modelOptions,
     eventHandlers,
     collectedUsage,
     artifactPromises,
+    spec: endpointOption.spec,
+    agentConfigs,
     endpoint: EModelEndpoint.agents,
-    attachments: endpointOption.attachments,
-    maxContextTokens:
-      agent.max_context_tokens ??
-      getModelMaxTokens(modelOptions.model, providerEndpointMap[provider]) ??
-      4000,
+    maxContextTokens: primaryConfig.maxContextTokens,
   });
+
   return { client };
 };
 

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

@@ -5,7 +5,6 @@ const {
   getResponseSender,
 } = require('librechat-data-provider');
 const { getDefaultHandlers } = require('~/server/controllers/agents/callbacks');
-// const { loadAgentTools } = require('~/server/services/ToolService');
 const getOptions = require('~/server/services/Endpoints/bedrock/options');
 const AgentClient = require('~/server/controllers/agents/client');
 const { getModelMaxTokens } = require('~/utils');
@@ -20,8 +19,6 @@ const initializeClient = async ({ req, res, endpointOption }) => {
   const { contentParts, aggregateContent } = createContentAggregator();
   const eventHandlers = getDefaultHandlers({ res, aggregateContent, collectedUsage });
 
-  // const tools = [createTavilySearchTool()];
-
   /** @type {Agent} */
   const agent = {
     id: EModelEndpoint.bedrock,
@@ -36,8 +33,6 @@ const initializeClient = async ({ req, res, endpointOption }) => {
     agent.instructions = `${agent.instructions ?? ''}\n${endpointOption.artifactsPrompt}`.trim();
   }
 
-  let modelOptions = { model: agent.model };
-
   // TODO: pass-in override settings that are specific to current run
   const options = await getOptions({
     req,
@@ -45,28 +40,34 @@ const initializeClient = async ({ req, res, endpointOption }) => {
     endpointOption,
   });
 
-  modelOptions = Object.assign(modelOptions, options.llmConfig);
-  const maxContextTokens =
-    agent.max_context_tokens ??
-    getModelMaxTokens(modelOptions.model, providerEndpointMap[agent.provider]);
+  agent.model_parameters = Object.assign(agent.model_parameters, options.llmConfig);
+  if (options.configOptions) {
+    agent.model_parameters.configuration = options.configOptions;
+  }
 
-  const sender = getResponseSender({
-    ...endpointOption,
-    model: endpointOption.model_parameters.model,
-  });
+  const sender =
+    agent.name ??
+    getResponseSender({
+      ...endpointOption,
+      model: endpointOption.model_parameters.model,
+    });
 
   const client = new AgentClient({
     req,
     agent,
     sender,
     // tools,
-    modelOptions,
     contentParts,
     eventHandlers,
     collectedUsage,
-    maxContextTokens,
+    spec: endpointOption.spec,
     endpoint: EModelEndpoint.bedrock,
-    configOptions: options.configOptions,
+    resendFiles: endpointOption.resendFiles,
+    maxContextTokens:
+      endpointOption.maxContextTokens ??
+      agent.max_context_tokens ??
+      getModelMaxTokens(agent.model_parameters.model, providerEndpointMap[agent.provider]) ??
+      4000,
     attachments: endpointOption.attachments,
   });
   return { client };

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

@@ -10,8 +10,8 @@ const { getUserKeyValues, checkUserKeyExpiry } = require('~/server/services/User
 const { getLLMConfig } = require('~/server/services/Endpoints/openAI/llm');
 const { getCustomEndpointConfig } = require('~/server/services/Config');
 const { fetchModels } = require('~/server/services/ModelService');
+const { isUserProvided, sleep } = require('~/server/utils');
 const getLogStores = require('~/cache/getLogStores');
-const { isUserProvided } = require('~/server/utils');
 const { OpenAIClient } = require('~/app');
 
 const { PROXY } = process.env;
@@ -141,7 +141,18 @@ const initializeClient = async ({ req, res, endpointOption, optionsOnly, overrid
         },
         clientOptions,
       );
-      return getLLMConfig(apiKey, requestOptions);
+      const options = getLLMConfig(apiKey, requestOptions);
+      if (!customOptions.streamRate) {
+        return options;
+      }
+      options.llmConfig.callbacks = [
+        {
+          handleLLMNewToken: async () => {
+            await sleep(customOptions.streamRate);
+          },
+        },
+      ];
+      return options;
     }
 
     if (clientOptions.reverseProxyUrl) {

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

@@ -6,7 +6,7 @@ const {
 } = require('librechat-data-provider');
 const { getUserKeyValues, checkUserKeyExpiry } = require('~/server/services/UserService');
 const { getLLMConfig } = require('~/server/services/Endpoints/openAI/llm');
-const { isEnabled, isUserProvided } = require('~/server/utils');
+const { isEnabled, isUserProvided, sleep } = require('~/server/utils');
 const { getAzureCredentials } = require('~/utils');
 const { OpenAIClient } = require('~/app');
 
@@ -140,7 +140,18 @@ const initializeClient = async ({
       },
       clientOptions,
     );
-    return getLLMConfig(apiKey, requestOptions);
+    const options = getLLMConfig(apiKey, requestOptions);
+    if (!clientOptions.streamRate) {
+      return options;
+    }
+    options.llmConfig.callbacks = [
+      {
+        handleLLMNewToken: async () => {
+          await sleep(clientOptions.streamRate);
+        },
+      },
+    ];
+    return options;
   }
 
   const client = new OpenAIClient(apiKey, Object.assign({ req, res }, clientOptions));

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

@@ -40,12 +40,16 @@ async function getCodeOutputDownloadStream(fileIdentifier, apiKey) {
  * @param {import('fs').ReadStream | import('stream').Readable} params.stream - The read stream for the file.
  * @param {string} params.filename - The name of the file.
  * @param {string} params.apiKey - The API key for authentication.
+ * @param {string} [params.entity_id] - Optional entity ID for the file.
  * @returns {Promise<string>}
  * @throws {Error} If there's an error during the upload process.
  */
-async function uploadCodeEnvFile({ req, stream, filename, apiKey }) {
+async function uploadCodeEnvFile({ req, stream, filename, apiKey, entity_id = '' }) {
   try {
     const form = new FormData();
+    if (entity_id.length > 0) {
+      form.append('entity_id', entity_id);
+    }
     form.append('file', stream, filename);
 
     const baseURL = getCodeBaseURL();
@@ -67,7 +71,12 @@ async function uploadCodeEnvFile({ req, stream, filename, apiKey }) {
       throw new Error(`Error uploading file: ${result.message}`);
     }
 
-    return `${result.session_id}/${result.files[0].fileId}`;
+    const fileIdentifier = `${result.session_id}/${result.files[0].fileId}`;
+    if (entity_id.length === 0) {
+      return fileIdentifier;
+    }
+
+    return `${fileIdentifier}?entity_id=${entity_id}`;
   } catch (error) {
     throw new Error(`Error uploading file: ${error.message}`);
   }

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

@@ -3,10 +3,11 @@ const { v4 } = require('uuid');
 const axios = require('axios');
 const { getCodeBaseURL } = require('@librechat/agents');
 const {
-  EToolResources,
+  Tools,
   FileContext,
-  imageExtRegex,
   FileSources,
+  imageExtRegex,
+  EToolResources,
 } = require('librechat-data-provider');
 const { getStrategyFunctions } = require('~/server/services/Files/strategies');
 const { convertImage } = require('~/server/services/Files/images/convert');
@@ -110,12 +111,20 @@ function checkIfActive(dateString) {
 async function getSessionInfo(fileIdentifier, apiKey) {
   try {
     const baseURL = getCodeBaseURL();
-    const session_id = fileIdentifier.split('/')[0];
+    const [path, queryString] = fileIdentifier.split('?');
+    const session_id = path.split('/')[0];
+
+    let queryParams = {};
+    if (queryString) {
+      queryParams = Object.fromEntries(new URLSearchParams(queryString).entries());
+    }
+
     const response = await axios({
       method: 'get',
       url: `${baseURL}/files/${session_id}`,
       params: {
         detail: 'summary',
+        ...queryParams,
       },
       headers: {
         'User-Agent': 'LibreChat/1.0',
@@ -124,7 +133,7 @@ async function getSessionInfo(fileIdentifier, apiKey) {
       timeout: 5000,
     });
 
-    return response.data.find((file) => file.name.startsWith(fileIdentifier))?.lastModified;
+    return response.data.find((file) => file.name.startsWith(path))?.lastModified;
   } catch (error) {
     logger.error(`Error fetching session info: ${error.message}`, error);
     return null;
@@ -137,29 +146,56 @@ async function getSessionInfo(fileIdentifier, apiKey) {
  * @param {ServerRequest} options.req
  * @param {Agent['tool_resources']} options.tool_resources
  * @param {string} apiKey
- * @returns {Promise<Array<{ id: string; session_id: string; name: string }>>}
+ * @returns {Promise<{
+ * files: Array<{ id: string; session_id: string; name: string }>,
+ * toolContext: string,
+ * }>}
  */
 const primeFiles = async (options, apiKey) => {
   const { tool_resources } = options;
   const file_ids = tool_resources?.[EToolResources.execute_code]?.file_ids ?? [];
-  const dbFiles = await getFiles({ file_id: { $in: file_ids } });
+  const agentResourceIds = new Set(file_ids);
+  const resourceFiles = tool_resources?.[EToolResources.execute_code]?.files ?? [];
+  const dbFiles = ((await getFiles({ file_id: { $in: file_ids } })) ?? []).concat(resourceFiles);
 
   const files = [];
   const sessions = new Map();
-  for (const file of dbFiles) {
+  let toolContext = '';
+
+  for (let i = 0; i < dbFiles.length; i++) {
+    const file = dbFiles[i];
+    if (!file) {
+      continue;
+    }
+
     if (file.metadata.fileIdentifier) {
-      const [session_id, id] = file.metadata.fileIdentifier.split('/');
+      const [path, queryString] = file.metadata.fileIdentifier.split('?');
+      const [session_id, id] = path.split('/');
+
       const pushFile = () => {
+        if (!toolContext) {
+          toolContext = `- Note: The following files are available in the "${Tools.execute_code}" tool environment:`;
+        }
+        toolContext += `\n\t- /mnt/data/${file.filename}${
+          agentResourceIds.has(file.file_id) ? '' : ' (just attached by user)'
+        }`;
         files.push({
           id,
           session_id,
           name: file.filename,
         });
       };
+
       if (sessions.has(session_id)) {
         pushFile();
         continue;
       }
+
+      let queryParams = {};
+      if (queryString) {
+        queryParams = Object.fromEntries(new URLSearchParams(queryString).entries());
+      }
+
       const reuploadFile = async () => {
         try {
           const { getDownloadStream } = getStrategyFunctions(file.source);
@@ -171,6 +207,7 @@ const primeFiles = async (options, apiKey) => {
             req: options.req,
             stream,
             filename: file.filename,
+            entity_id: queryParams.entity_id,
             apiKey,
           });
           await updateFile({ file_id: file.file_id, metadata: { fileIdentifier } });
@@ -198,7 +235,7 @@ const primeFiles = async (options, apiKey) => {
     }
   }
 
-  return files;
+  return { files, toolContext };
 };
 
 module.exports = {

api/server/services/Files/images/encode.js

@@ -97,6 +97,7 @@ async function encodeAndFormat(req, files, endpoint, mode) {
       filepath: file.filepath,
       filename: file.filename,
       embedded: !!file.embedded,
+      metadata: file.metadata,
     };
 
     if (file.height && file.width) {

api/server/services/Files/process.js

@@ -20,7 +20,7 @@ const {
 const { EnvVar } = require('@librechat/agents');
 const { addResourceFileId, deleteResourceFileId } = require('~/server/controllers/assistants/v2');
 const { convertImage, resizeAndConvert } = require('~/server/services/Files/images');
-const { addAgentResourceFile, removeAgentResourceFile } = require('~/models/Agent');
+const { addAgentResourceFile, removeAgentResourceFiles } = require('~/models/Agent');
 const { getOpenAIClient } = require('~/server/controllers/assistants/helpers');
 const { createFile, updateFileUsage, deleteFiles } = require('~/models/File');
 const { loadAuthValues } = require('~/app/clients/tools/util');
@@ -29,10 +29,34 @@ const { getStrategyFunctions } = require('./strategies');
 const { determineFileType } = require('~/server/utils');
 const { logger } = require('~/config');
 
-const processFiles = async (files) => {
+/**
+ *
+ * @param {Array<MongoFile>} files
+ * @param {Array<string>} [fileIds]
+ * @returns
+ */
+const processFiles = async (files, fileIds) => {
   const promises = [];
+  const seen = new Set();
+
   for (let file of files) {
     const { file_id } = file;
+    if (seen.has(file_id)) {
+      continue;
+    }
+    seen.add(file_id);
+    promises.push(updateFileUsage({ file_id }));
+  }
+
+  if (!fileIds) {
+    return await Promise.all(promises);
+  }
+
+  for (let file_id of fileIds) {
+    if (seen.has(file_id)) {
+      continue;
+    }
+    seen.add(file_id);
     promises.push(updateFileUsage({ file_id }));
   }
 
@@ -44,7 +68,7 @@ const processFiles = async (files) => {
  * Enqueues the delete operation to the leaky bucket queue if necessary, or adds it directly to promises.
  *
  * @param {object} params - The passed parameters.
- * @param {Express.Request} params.req - The express request object.
+ * @param {ServerRequest} params.req - The express request object.
  * @param {MongoFile} params.file - The file object to delete.
  * @param {Function} params.deleteFile - The delete file function.
  * @param {Promise[]} params.promises - The array of promises to await.
@@ -91,7 +115,7 @@ function enqueueDeleteOperation({ req, file, deleteFile, promises, resolvedFileI
  *
  * @param {Object} params - The params object.
  * @param {MongoFile[]} params.files - The file objects to delete.
- * @param {Express.Request} params.req - The express request object.
+ * @param {ServerRequest} params.req - The express request object.
  * @param {DeleteFilesBody} params.req.body - The request body.
  * @param {string} [params.req.body.agent_id] - The agent ID if file uploaded is associated to an agent.
  * @param {string} [params.req.body.assistant_id] - The assistant ID if file uploaded is associated to an assistant.
@@ -128,18 +152,16 @@ const processDeleteRequest = async ({ req, files }) => {
     await initializeClients();
   }
 
+  const agentFiles = [];
+
   for (const file of files) {
     const source = file.source ?? FileSources.local;
 
     if (req.body.agent_id && req.body.tool_resource) {
-      promises.push(
-        removeAgentResourceFile({
-          req,
-          file_id: file.file_id,
-          agent_id: req.body.agent_id,
-          tool_resource: req.body.tool_resource,
-        }),
-      );
+      agentFiles.push({
+        tool_resource: req.body.tool_resource,
+        file_id: file.file_id,
+      });
     }
 
     if (checkOpenAIStorage(source) && !client[source]) {
@@ -183,6 +205,15 @@ const processDeleteRequest = async ({ req, files }) => {
     enqueueDeleteOperation({ req, file, deleteFile, promises, resolvedFileIds, openai });
   }
 
+  if (agentFiles.length > 0) {
+    promises.push(
+      removeAgentResourceFiles({
+        agent_id: req.body.agent_id,
+        files: agentFiles,
+      }),
+    );
+  }
+
   await Promise.allSettled(promises);
   await deleteFiles(resolvedFileIds);
 };
@@ -242,14 +273,14 @@ const processFileURL = async ({ fileStrategy, userId, URL, fileName, basePath, c
  * Saves file metadata to the database with an expiry TTL.
  *
  * @param {Object} params - The parameters object.
- * @param {Express.Request} params.req - The Express request object.
+ * @param {ServerRequest} params.req - The Express request object.
  * @param {Express.Response} [params.res] - The Express response object.
- * @param {Express.Multer.File} params.file - The uploaded file.
  * @param {ImageMetadata} params.metadata - Additional metadata for the file.
  * @param {boolean} params.returnFile - Whether to return the file metadata or return response as normal.
  * @returns {Promise<void>}
  */
-const processImageFile = async ({ req, res, file, metadata, returnFile = false }) => {
+const processImageFile = async ({ req, res, metadata, returnFile = false }) => {
+  const { file } = req;
   const source = req.app.locals.fileStrategy;
   const { handleImageUpload } = getStrategyFunctions(source);
   const { file_id, temp_file_id, endpoint } = metadata;
@@ -289,7 +320,7 @@ const processImageFile = async ({ req, res, file, metadata, returnFile = false }
  * returns minimal file metadata, without saving to the database.
  *
  * @param {Object} params - The parameters object.
- * @param {Express.Request} params.req - The Express request object.
+ * @param {ServerRequest} params.req - The Express request object.
  * @param {FileContext} params.context - The context of the file (e.g., 'avatar', 'image_generation', etc.)
  * @param {boolean} [params.resize=true] - Whether to resize and convert the image to target format. Default is `true`.
  * @param {{ buffer: Buffer, width: number, height: number, bytes: number, filename: string, type: string, file_id: string }} [params.metadata] - Required metadata for the file if resize is false.
@@ -335,13 +366,12 @@ const uploadImageBuffer = async ({ req, context, metadata = {}, resize = true })
  * Files must be deleted from the server filesystem manually.
  *
  * @param {Object} params - The parameters object.
- * @param {Express.Request} params.req - The Express request object.
+ * @param {ServerRequest} params.req - The Express request object.
  * @param {Express.Response} params.res - The Express response object.
- * @param {Express.Multer.File} params.file - The uploaded file.
  * @param {FileMetadata} params.metadata - Additional metadata for the file.
  * @returns {Promise<void>}
  */
-const processFileUpload = async ({ req, res, file, metadata }) => {
+const processFileUpload = async ({ req, res, metadata }) => {
   const isAssistantUpload = isAssistantsEndpoint(metadata.endpoint);
   const assistantSource =
     metadata.endpoint === EModelEndpoint.azureAssistants ? FileSources.azure : FileSources.openai;
@@ -355,6 +385,7 @@ const processFileUpload = async ({ req, res, file, metadata }) => {
     ({ openai } = await getOpenAIClient({ req }));
   }
 
+  const { file } = req;
   const {
     id,
     bytes,
@@ -422,13 +453,13 @@ const processFileUpload = async ({ req, res, file, metadata }) => {
  * Files must be deleted from the server filesystem manually.
  *
  * @param {Object} params - The parameters object.
- * @param {Express.Request} params.req - The Express request object.
+ * @param {ServerRequest} params.req - The Express request object.
  * @param {Express.Response} params.res - The Express response object.
- * @param {Express.Multer.File} params.file - The uploaded file.
  * @param {FileMetadata} params.metadata - Additional metadata for the file.
  * @returns {Promise<void>}
  */
-const processAgentFileUpload = async ({ req, res, file, metadata }) => {
+const processAgentFileUpload = async ({ req, res, metadata }) => {
+  const { file } = req;
   const { agent_id, tool_resource } = metadata;
   if (agent_id && !tool_resource) {
     throw new Error('No tool resource provided for agent file upload');
@@ -453,6 +484,7 @@ const processAgentFileUpload = async ({ req, res, file, metadata }) => {
       stream,
       filename: file.originalname,
       apiKey: result[EnvVar.CODE_API_KEY],
+      entity_id: messageAttachment === true ? undefined : agent_id,
     });
     fileInfoMetadata = { fileIdentifier };
   }
@@ -576,7 +608,7 @@ const processOpenAIFile = async ({
 /**
  * Process OpenAI image files, convert to target format, save and return file metadata.
  * @param {object} params - The params object.
- * @param {Express.Request} params.req - The Express request object.
+ * @param {ServerRequest} params.req - The Express request object.
  * @param {Buffer} params.buffer - The image buffer.
  * @param {string} params.file_id - The file ID.
  * @param {string} params.filename - The filename.
@@ -708,20 +740,20 @@ async function retrieveAndProcessFile({
  * Filters a file based on its size and the endpoint origin.
  *
  * @param {Object} params - The parameters for the function.
- * @param {object} params.req - The request object from Express.
+ * @param {ServerRequest} params.req - The request object from Express.
  * @param {string} [params.req.endpoint]
  * @param {string} [params.req.file_id]
  * @param {number} [params.req.width]
  * @param {number} [params.req.height]
  * @param {number} [params.req.version]
- * @param {Express.Multer.File} params.file - The file uploaded to the server via multer.
  * @param {boolean} [params.image] - Whether the file expected is an image.
  * @param {boolean} [params.isAvatar] - Whether the file expected is a user or entity avatar.
  * @returns {void}
  *
  * @throws {Error} If a file exception is caught (invalid file size or type, lack of metadata).
  */
-function filterFile({ req, file, image, isAvatar }) {
+function filterFile({ req, image, isAvatar }) {
+  const { file } = req;
   const { endpoint, file_id, width, height } = req.body;
 
   if (!file_id && !isAvatar) {

api/server/services/PluginService.js

@@ -7,6 +7,7 @@ const { logger } = require('~/config');
  *
  * @param {string} userId - The unique identifier of the user for whom the plugin authentication value is to be retrieved.
  * @param {string} authField - The specific authentication field (e.g., 'API_KEY', 'URL') whose value is to be retrieved and decrypted.
+ * @param {boolean} throwError - Whether to throw an error if the authentication value does not exist. Defaults to `true`.
  * @returns {Promise<string|null>} A promise that resolves to the decrypted authentication value if found, or `null` if no such authentication value exists for the given user and field.
  *
  * The function throws an error if it encounters any issue during the retrieval or decryption process, or if the authentication value does not exist.
@@ -22,7 +23,7 @@ const { logger } = require('~/config');
  * @throws {Error} Throws an error if there's an issue during the retrieval or decryption process, or if the authentication value does not exist.
  * @async
  */
-const getUserPluginAuthValue = async (userId, authField) => {
+const getUserPluginAuthValue = async (userId, authField, throwError = true) => {
   try {
     const pluginAuth = await PluginAuth.findOne({ userId, authField }).lean();
     if (!pluginAuth) {
@@ -32,6 +33,9 @@ const getUserPluginAuthValue = async (userId, authField) => {
     const decryptedValue = await decrypt(pluginAuth.value);
     return decryptedValue;
   } catch (err) {
+    if (!throwError) {
+      return null;
+    }
     logger.error('[getUserPluginAuthValue]', err);
     throw err;
   }

api/server/services/ToolService.js

@@ -1,8 +1,8 @@
 const fs = require('fs');
 const path = require('path');
 const { zodToJsonSchema } = require('zod-to-json-schema');
-const { Calculator } = require('@langchain/community/tools/calculator');
 const { tool: toolFn, Tool } = require('@langchain/core/tools');
+const { Calculator } = require('@langchain/community/tools/calculator');
 const {
   Tools,
   ContentTypes,
@@ -170,7 +170,7 @@ async function processRequiredActions(client, requiredActions) {
     requiredActions,
   );
   const tools = requiredActions.map((action) => action.tool);
-  const loadedTools = await loadTools({
+  const { loadedTools } = await loadTools({
     user: client.req.user.id,
     model: client.req.body.model ?? 'gpt-4o-mini',
     tools,
@@ -183,7 +183,6 @@ async function processRequiredActions(client, requiredActions) {
       fileStrategy: client.req.app.locals.fileStrategy,
       returnMetadata: true,
     },
-    skipSpecs: true,
   });
 
   const ToolMap = loadedTools.reduce((map, tool) => {
@@ -378,21 +377,21 @@ async function loadAgentTools({ req, agent_id, tools, tool_resources, openAIApiK
   if (!tools || tools.length === 0) {
     return {};
   }
-  const loadedTools = await loadTools({
+  const { loadedTools, toolContextMap } = await loadTools({
     user: req.user.id,
     // model: req.body.model ?? 'gpt-4o-mini',
     tools,
     functions: true,
+    isAgent: agent_id != null,
     options: {
       req,
       openAIApiKey,
       tool_resources,
-      returnMetadata: true,
       processFileURL,
       uploadImageBuffer,
+      returnMetadata: true,
       fileStrategy: req.app.locals.fileStrategy,
     },
-    skipSpecs: true,
   });
 
   const agentTools = [];
@@ -403,16 +402,19 @@ async function loadAgentTools({ req, agent_id, tools, tool_resources, openAIApiK
       continue;
     }
 
-    const toolInstance = toolFn(
-      async (...args) => {
-        return tool['_call'](...args);
-      },
-      {
-        name: tool.name,
-        description: tool.description,
-        schema: tool.schema,
-      },
-    );
+    const toolDefinition = {
+      name: tool.name,
+      schema: tool.schema,
+      description: tool.description,
+    };
+
+    if (imageGenTools.has(tool.name)) {
+      toolDefinition.responseFormat = 'content_and_artifact';
+    }
+
+    const toolInstance = toolFn(async (...args) => {
+      return tool['_call'](...args);
+    }, toolDefinition);
 
     agentTools.push(toolInstance);
   }
@@ -476,6 +478,7 @@ async function loadAgentTools({ req, agent_id, tools, tool_resources, openAIApiK
 
   return {
     tools: agentTools,
+    toolContextMap,
   };
 }
 

api/server/services/start/interface.js

@@ -32,17 +32,20 @@ async function loadDefaultInterface(config, configDefaults, roleName = SystemRol
     bookmarks: interfaceConfig?.bookmarks ?? defaults.bookmarks,
     prompts: interfaceConfig?.prompts ?? defaults.prompts,
     multiConvo: interfaceConfig?.multiConvo ?? defaults.multiConvo,
+    agents: interfaceConfig?.agents ?? defaults.agents,
   });
 
   await updateAccessPermissions(roleName, {
     [PermissionTypes.PROMPTS]: { [Permissions.USE]: loadedInterface.prompts },
     [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: loadedInterface.bookmarks },
     [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: loadedInterface.multiConvo },
+    [PermissionTypes.AGENTS]: { [Permissions.USE]: loadedInterface.agents },
   });
   await updateAccessPermissions(SystemRoles.ADMIN, {
     [PermissionTypes.PROMPTS]: { [Permissions.USE]: loadedInterface.prompts },
     [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: loadedInterface.bookmarks },
     [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: loadedInterface.multiConvo },
+    [PermissionTypes.AGENTS]: { [Permissions.USE]: loadedInterface.agents },
   });
 
   let i = 0;

api/server/services/start/interface.spec.js

@@ -7,8 +7,15 @@ jest.mock('~/models/Role', () => ({
 }));
 
 describe('loadDefaultInterface', () => {
-  it('should call updateAccessPermissions with the correct parameters when prompts and bookmarks are true', async () => {
-    const config = { interface: { prompts: true, bookmarks: true } };
+  it('should call updateAccessPermissions with the correct parameters when permission types are true', async () => {
+    const config = {
+      interface: {
+        prompts: true,
+        bookmarks: true,
+        multiConvo: true,
+        agents: true,
+      },
+    };
     const configDefaults = { interface: {} };
 
     await loadDefaultInterface(config, configDefaults);
@@ -16,12 +23,20 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: true },
-      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: true },
+      [PermissionTypes.AGENTS]: { [Permissions.USE]: true },
     });
   });
 
-  it('should call updateAccessPermissions with false when prompts and bookmarks are false', async () => {
-    const config = { interface: { prompts: false, bookmarks: false } };
+  it('should call updateAccessPermissions with false when permission types are false', async () => {
+    const config = {
+      interface: {
+        prompts: false,
+        bookmarks: false,
+        multiConvo: false,
+        agents: false,
+      },
+    };
     const configDefaults = { interface: {} };
 
     await loadDefaultInterface(config, configDefaults);
@@ -29,11 +44,12 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: false },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: false },
-      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: false },
+      [PermissionTypes.AGENTS]: { [Permissions.USE]: false },
     });
   });
 
-  it('should call updateAccessPermissions with undefined when prompts and bookmarks are not specified in config', async () => {
+  it('should call updateAccessPermissions with undefined when permission types are not specified in config', async () => {
     const config = {};
     const configDefaults = { interface: {} };
 
@@ -43,11 +59,19 @@ describe('loadDefaultInterface', () => {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
+      [PermissionTypes.AGENTS]: { [Permissions.USE]: undefined },
     });
   });
 
-  it('should call updateAccessPermissions with undefined when prompts and bookmarks are explicitly undefined', async () => {
-    const config = { interface: { prompts: undefined, bookmarks: undefined } };
+  it('should call updateAccessPermissions with undefined when permission types are explicitly undefined', async () => {
+    const config = {
+      interface: {
+        prompts: undefined,
+        bookmarks: undefined,
+        multiConvo: undefined,
+        agents: undefined,
+      },
+    };
     const configDefaults = { interface: {} };
 
     await loadDefaultInterface(config, configDefaults);
@@ -56,11 +80,19 @@ describe('loadDefaultInterface', () => {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
+      [PermissionTypes.AGENTS]: { [Permissions.USE]: undefined },
     });
   });
 
-  it('should call updateAccessPermissions with mixed values for prompts and bookmarks', async () => {
-    const config = { interface: { prompts: true, bookmarks: false } };
+  it('should call updateAccessPermissions with mixed values for permission types', async () => {
+    const config = {
+      interface: {
+        prompts: true,
+        bookmarks: false,
+        multiConvo: undefined,
+        agents: true,
+      },
+    };
     const configDefaults = { interface: {} };
 
     await loadDefaultInterface(config, configDefaults);
@@ -69,19 +101,28 @@ describe('loadDefaultInterface', () => {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: false },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
+      [PermissionTypes.AGENTS]: { [Permissions.USE]: true },
     });
   });
 
   it('should call updateAccessPermissions with true when config is undefined', async () => {
     const config = undefined;
-    const configDefaults = { interface: { prompts: true, bookmarks: true } };
+    const configDefaults = {
+      interface: {
+        prompts: true,
+        bookmarks: true,
+        multiConvo: true,
+        agents: true,
+      },
+    };
 
     await loadDefaultInterface(config, configDefaults);
 
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: true },
-      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: true },
+      [PermissionTypes.AGENTS]: { [Permissions.USE]: true },
     });
   });
 
@@ -95,6 +136,7 @@ describe('loadDefaultInterface', () => {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: true },
+      [PermissionTypes.AGENTS]: { [Permissions.USE]: undefined },
     });
   });
 
@@ -108,6 +150,7 @@ describe('loadDefaultInterface', () => {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: false },
+      [PermissionTypes.AGENTS]: { [Permissions.USE]: undefined },
     });
   });
 
@@ -121,11 +164,19 @@ describe('loadDefaultInterface', () => {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
+      [PermissionTypes.AGENTS]: { [Permissions.USE]: undefined },
     });
   });
 
   it('should call updateAccessPermissions with all interface options including multiConvo', async () => {
-    const config = { interface: { prompts: true, bookmarks: false, multiConvo: true } };
+    const config = {
+      interface: {
+        prompts: true,
+        bookmarks: false,
+        multiConvo: true,
+        agents: false,
+      },
+    };
     const configDefaults = { interface: {} };
 
     await loadDefaultInterface(config, configDefaults);
@@ -134,12 +185,20 @@ describe('loadDefaultInterface', () => {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: false },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: true },
+      [PermissionTypes.AGENTS]: { [Permissions.USE]: false },
     });
   });
 
   it('should use default values for multiConvo when config is undefined', async () => {
     const config = undefined;
-    const configDefaults = { interface: { prompts: true, bookmarks: true, multiConvo: false } };
+    const configDefaults = {
+      interface: {
+        prompts: true,
+        bookmarks: true,
+        multiConvo: false,
+        agents: undefined,
+      },
+    };
 
     await loadDefaultInterface(config, configDefaults);
 
@@ -147,6 +206,7 @@ describe('loadDefaultInterface', () => {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: true },
       [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: false },
+      [PermissionTypes.AGENTS]: { [Permissions.USE]: undefined },
     });
   });
 });

api/server/utils/handleText.js

@@ -196,14 +196,11 @@ function generateConfig(key, baseURL, endpoint) {
 
   if (agents) {
     config.capabilities = [
+      AgentCapabilities.execute_code,
       AgentCapabilities.file_search,
       AgentCapabilities.actions,
       AgentCapabilities.tools,
     ];
-
-    if (key === 'EXPERIMENTAL_RUN_CODE') {
-      config.capabilities.push(AgentCapabilities.execute_code);
-    }
   }
 
   if (assistants && endpoint === EModelEndpoint.azureAssistants) {

api/typedefs.js

@@ -56,12 +56,33 @@
  * @memberof typedefs
  */
 
+/**
+ * @exports BaseMessage
+ * @typedef {import('@langchain/core/messages').BaseMessage} BaseMessage
+ * @memberof typedefs
+ */
+
 /**
  * @exports UsageMetadata
  * @typedef {import('@langchain/core/messages').UsageMetadata} UsageMetadata
  * @memberof typedefs
  */
 
+/**
+ * @exports GraphRunnableConfig
+ * @typedef {import('@langchain/core/runnables').RunnableConfig<{
+ *  req: ServerRequest;
+ * thread_id: string;
+ * run_id: string;
+ * agent_id: string;
+ * name: string;
+ * agent_index: number;
+ * last_agent_index: number;
+ * hide_sequential_outputs: boolean;
+ * }>} GraphRunnableConfig
+ * @memberof typedefs
+ */
+
 /**
  * @exports Ollama
  * @typedef {import('ollama').Ollama} Ollama
@@ -689,6 +710,12 @@
  * @memberof typedefs
  */
 
+/**
+ * @exports ToolCallData
+ * @typedef {import('~/models/schema/toolCallSchema.js').ToolCallData} ToolCallData
+ * @memberof typedefs
+ */
+
 /**
  * @exports MongoUser
  * @typedef {import('~/models/schema/userSchema.js').MongoUser} MongoUser
@@ -803,6 +830,12 @@
  * @memberof typedefs
  */
 
+/**
+ * @exports AgentToolResources
+ * @typedef {import('librechat-data-provider').AgentToolResources} AgentToolResources
+ * @memberof typedefs
+ */
+
 /**
  * @exports AgentCreateParams
  * @typedef {import('librechat-data-provider').AgentCreateParams} AgentCreateParams

client/public/assets/c.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>C</title><path d="M16.5921 9.1962s-.354-3.298-3.627-3.39c-3.2741-.09-4.9552 2.474-4.9552 6.14 0 3.6651 1.858 6.5972 5.0451 6.5972 3.184 0 3.5381-3.665 3.5381-3.665l6.1041.365s.36 3.31-2.196 5.836c-2.552 2.5241-5.6901 2.9371-7.8762 2.9201-2.19-.017-5.2261.034-8.1602-2.97-2.938-3.0101-3.436-5.9302-3.436-8.8002 0-2.8701.556-6.6702 4.047-9.5502C7.444.72 9.849 0 12.254 0c10.0422 0 10.7172 9.2602 10.7172 9.2602z"/></svg>

client/public/assets/cplusplus.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>C++</title><path d="M22.394 6c-.167-.29-.398-.543-.652-.69L12.926.22c-.509-.294-1.34-.294-1.848 0L2.26 5.31c-.508.293-.923 1.013-.923 1.6v10.18c0 .294.104.62.271.91.167.29.398.543.652.69l8.816 5.09c.508.293 1.34.293 1.848 0l8.816-5.09c.254-.147.485-.4.652-.69.167-.29.27-.616.27-.91V6.91c.003-.294-.1-.62-.268-.91zM12 19.11c-3.92 0-7.109-3.19-7.109-7.11 0-3.92 3.19-7.11 7.11-7.11a7.133 7.133 0 016.156 3.553l-3.076 1.78a3.567 3.567 0 00-3.08-1.78A3.56 3.56 0 008.444 12 3.56 3.56 0 0012 15.555a3.57 3.57 0 003.08-1.778l3.078 1.78A7.135 7.135 0 0112 19.11zm7.11-6.715h-.79v.79h-.79v-.79h-.79v-.79h.79v-.79h.79v.79h.79zm2.962 0h-.79v.79h-.79v-.79h-.79v-.79h.79v-.79h.79v.79h.79z"/></svg>

client/public/assets/fortran.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Fortran</title><path d="M19.536 0H4.464A4.463 4.463 0 0 0 0 4.464v15.073A4.463 4.463 0 0 0 4.464 24h15.073A4.463 4.463 0 0 0 24 19.536V4.464A4.463 4.463 0 0 0 19.536 0zm1.193 6.493v3.871l-.922-.005c-.507-.003-.981-.021-1.052-.041-.128-.036-.131-.05-.192-.839-.079-1.013-.143-1.462-.306-2.136-.352-1.457-1.096-2.25-2.309-2.463-.509-.089-2.731-.176-4.558-.177L10.13 4.7v5.82l.662-.033c.757-.038 1.353-.129 1.64-.252.306-.131.629-.462.781-.799.158-.352.262-.815.345-1.542.033-.286.07-.572.083-.636.024-.116.028-.117 1.036-.117h1.012v9.3h-2.062l-.035-.536c-.063-.971-.252-1.891-.479-2.331-.311-.601-.922-.871-2.151-.95a11.422 11.422 0 0 1-.666-.059l-.172-.027.02 2.926c.021 3.086.03 3.206.265 3.465.241.266.381.284 2.827.368.05.002.065.246.065 1.041v1.039H3.271v-1.039c0-.954.007-1.039.091-1.041.05-.001.543-.023 1.097-.049.891-.042 1.033-.061 1.244-.167a.712.712 0 0 0 .345-.328c.106-.206.107-.254.107-6.78 0-6.133-.006-6.584-.09-6.737a.938.938 0 0 0-.553-.436c-.104-.032-.65-.07-1.215-.086l-1.026-.027V2.622h17.458v3.871z"/></svg>

client/public/assets/go.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Go</title><path d="M1.811 10.231c-.047 0-.058-.023-.035-.059l.246-.315c.023-.035.081-.058.128-.058h4.172c.046 0 .058.035.035.07l-.199.303c-.023.036-.082.07-.117.07zM.047 11.306c-.047 0-.059-.023-.035-.058l.245-.316c.023-.035.082-.058.129-.058h5.328c.047 0 .07.035.058.07l-.093.28c-.012.047-.058.07-.105.07zm2.828 1.075c-.047 0-.059-.035-.035-.07l.163-.292c.023-.035.07-.07.117-.07h2.337c.047 0 .07.035.07.082l-.023.28c0 .047-.047.082-.082.082zm12.129-2.36c-.736.187-1.239.327-1.963.514-.176.046-.187.058-.34-.117-.174-.199-.303-.327-.548-.444-.737-.362-1.45-.257-2.115.175-.795.514-1.204 1.274-1.192 2.22.011.935.654 1.706 1.577 1.835.795.105 1.46-.175 1.987-.77.105-.13.198-.27.315-.434H10.47c-.245 0-.304-.152-.222-.35.152-.362.432-.97.596-1.274a.315.315 0 01.292-.187h4.253c-.023.316-.023.631-.07.947a4.983 4.983 0 01-.958 2.29c-.841 1.11-1.94 1.8-3.33 1.986-1.145.152-2.209-.07-3.143-.77-.865-.655-1.356-1.52-1.484-2.595-.152-1.274.222-2.419.993-3.424.83-1.086 1.928-1.776 3.272-2.02 1.098-.2 2.15-.07 3.096.571.62.41 1.063.97 1.356 1.648.07.105.023.164-.117.2m3.868 6.461c-1.064-.024-2.034-.328-2.852-1.029a3.665 3.665 0 01-1.262-2.255c-.21-1.32.152-2.489.947-3.529.853-1.122 1.881-1.706 3.272-1.95 1.192-.21 2.314-.095 3.33.595.923.63 1.496 1.484 1.648 2.605.198 1.578-.257 2.863-1.344 3.962-.771.783-1.718 1.273-2.805 1.495-.315.06-.63.07-.934.106zm2.78-4.72c-.011-.153-.011-.27-.034-.387-.21-1.157-1.274-1.81-2.384-1.554-1.087.245-1.788.935-2.045 2.033-.21.912.234 1.835 1.075 2.21.643.28 1.285.244 1.905-.07.923-.48 1.425-1.228 1.484-2.233z"/></svg>

client/public/assets/nodedotjs.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Node.js</title><path d="M11.998,24c-0.321,0-0.641-0.084-0.922-0.247l-2.936-1.737c-0.438-0.245-0.224-0.332-0.08-0.383 c0.585-0.203,0.703-0.25,1.328-0.604c0.065-0.037,0.151-0.023,0.218,0.017l2.256,1.339c0.082,0.045,0.197,0.045,0.272,0l8.795-5.076 c0.082-0.047,0.134-0.141,0.134-0.238V6.921c0-0.099-0.053-0.192-0.137-0.242l-8.791-5.072c-0.081-0.047-0.189-0.047-0.271,0 L3.075,6.68C2.99,6.729,2.936,6.825,2.936,6.921v10.15c0,0.097,0.054,0.189,0.139,0.235l2.409,1.392 c1.307,0.654,2.108-0.116,2.108-0.89V7.787c0-0.142,0.114-0.253,0.256-0.253h1.115c0.139,0,0.255,0.112,0.255,0.253v10.021 c0,1.745-0.95,2.745-2.604,2.745c-0.508,0-0.909,0-2.026-0.551L2.28,18.675c-0.57-0.329-0.922-0.945-0.922-1.604V6.921 c0-0.659,0.353-1.275,0.922-1.603l8.795-5.082c0.557-0.315,1.296-0.315,1.848,0l8.794,5.082c0.57,0.329,0.924,0.944,0.924,1.603 v10.15c0,0.659-0.354,1.273-0.924,1.604l-8.794,5.078C12.643,23.916,12.324,24,11.998,24z M19.099,13.993 c0-1.9-1.284-2.406-3.987-2.763c-2.731-0.361-3.009-0.548-3.009-1.187c0-0.528,0.235-1.233,2.258-1.233 c1.807,0,2.473,0.389,2.747,1.607c0.024,0.115,0.129,0.199,0.247,0.199h1.141c0.071,0,0.138-0.031,0.186-0.081 c0.048-0.054,0.074-0.123,0.067-0.196c-0.177-2.098-1.571-3.076-4.388-3.076c-2.508,0-4.004,1.058-4.004,2.833 c0,1.925,1.488,2.457,3.895,2.695c2.88,0.282,3.103,0.703,3.103,1.269c0,0.983-0.789,1.402-2.642,1.402 c-2.327,0-2.839-0.584-3.011-1.742c-0.02-0.124-0.126-0.215-0.253-0.215h-1.137c-0.141,0-0.254,0.112-0.254,0.253 c0,1.482,0.806,3.248,4.655,3.248C17.501,17.007,19.099,15.91,19.099,13.993z"/></svg>

client/public/assets/php.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>PHP</title><path d="M7.01 10.207h-.944l-.515 2.648h.838c.556 0 .97-.105 1.242-.314.272-.21.455-.559.55-1.049.092-.47.05-.802-.124-.995-.175-.193-.523-.29-1.047-.29zM12 5.688C5.373 5.688 0 8.514 0 12s5.373 6.313 12 6.313S24 15.486 24 12c0-3.486-5.373-6.312-12-6.312zm-3.26 7.451c-.261.25-.575.438-.917.551-.336.108-.765.164-1.285.164H5.357l-.327 1.681H3.652l1.23-6.326h2.65c.797 0 1.378.209 1.744.628.366.418.476 1.002.33 1.752a2.836 2.836 0 0 1-.305.847c-.143.255-.33.49-.561.703zm4.024.715l.543-2.799c.063-.318.039-.536-.068-.651-.107-.116-.336-.174-.687-.174H11.46l-.704 3.625H9.388l1.23-6.327h1.367l-.327 1.682h1.218c.767 0 1.295.134 1.586.401s.378.7.263 1.299l-.572 2.944h-1.389zm7.597-2.265a2.782 2.782 0 0 1-.305.847c-.143.255-.33.49-.561.703a2.44 2.44 0 0 1-.917.551c-.336.108-.765.164-1.286.164h-1.18l-.327 1.682h-1.378l1.23-6.326h2.649c.797 0 1.378.209 1.744.628.366.417.477 1.001.331 1.751zM17.766 10.207h-.943l-.516 2.648h.838c.557 0 .971-.105 1.242-.314.272-.21.455-.559.551-1.049.092-.47.049-.802-.125-.995s-.524-.29-1.047-.29z"/></svg>

client/public/assets/python.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Python</title><path d="M14.25.18l.9.2.73.26.59.3.45.32.34.34.25.34.16.33.1.3.04.26.02.2-.01.13V8.5l-.05.63-.13.55-.21.46-.26.38-.3.31-.33.25-.35.19-.35.14-.33.1-.3.07-.26.04-.21.02H8.77l-.69.05-.59.14-.5.22-.41.27-.33.32-.27.35-.2.36-.15.37-.1.35-.07.32-.04.27-.02.21v3.06H3.17l-.21-.03-.28-.07-.32-.12-.35-.18-.36-.26-.36-.36-.35-.46-.32-.59-.28-.73-.21-.88-.14-1.05-.05-1.23.06-1.22.16-1.04.24-.87.32-.71.36-.57.4-.44.42-.33.42-.24.4-.16.36-.1.32-.05.24-.01h.16l.06.01h8.16v-.83H6.18l-.01-2.75-.02-.37.05-.34.11-.31.17-.28.25-.26.31-.23.38-.2.44-.18.51-.15.58-.12.64-.1.71-.06.77-.04.84-.02 1.27.05zm-6.3 1.98l-.23.33-.08.41.08.41.23.34.33.22.41.09.41-.09.33-.22.23-.34.08-.41-.08-.41-.23-.33-.33-.22-.41-.09-.41.09zm13.09 3.95l.28.06.32.12.35.18.36.27.36.35.35.47.32.59.28.73.21.88.14 1.04.05 1.23-.06 1.23-.16 1.04-.24.86-.32.71-.36.57-.4.45-.42.33-.42.24-.4.16-.36.09-.32.05-.24.02-.16-.01h-8.22v.82h5.84l.01 2.76.02.36-.05.34-.11.31-.17.29-.25.25-.31.24-.38.2-.44.17-.51.15-.58.13-.64.09-.71.07-.77.04-.84.01-1.27-.04-1.07-.14-.9-.2-.73-.25-.59-.3-.45-.33-.34-.34-.25-.34-.16-.33-.1-.3-.04-.25-.02-.2.01-.13v-5.34l.05-.64.13-.54.21-.46.26-.38.3-.32.33-.24.35-.2.35-.14.33-.1.3-.06.26-.04.21-.02.13-.01h5.84l.69-.05.59-.14.5-.21.41-.28.33-.32.27-.35.2-.36.15-.36.1-.35.07-.32.04-.28.02-.21V6.07h2.09l.14.01zm-6.47 14.25l-.23.33-.08.41.08.41.23.33.33.23.41.08.41-.08.33-.23.23-.33.08-.41-.08-.41-.23-.33-.33-.23-.41-.08-.41.08z"/></svg>

client/public/assets/rust.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Rust</title><path d="M23.8346 11.7033l-1.0073-.6236a13.7268 13.7268 0 00-.0283-.2936l.8656-.8069a.3483.3483 0 00-.1154-.578l-1.1066-.414a8.4958 8.4958 0 00-.087-.2856l.6904-.9587a.3462.3462 0 00-.2257-.5446l-1.1663-.1894a9.3574 9.3574 0 00-.1407-.2622l.49-1.0761a.3437.3437 0 00-.0274-.3361.3486.3486 0 00-.3006-.154l-1.1845.0416a6.7444 6.7444 0 00-.1873-.2268l.2723-1.153a.3472.3472 0 00-.417-.4172l-1.1532.2724a14.0183 14.0183 0 00-.2278-.1873l.0415-1.1845a.3442.3442 0 00-.49-.328l-1.076.491c-.0872-.0476-.1742-.0952-.2623-.1407l-.1903-1.1673A.3483.3483 0 0016.256.955l-.9597.6905a8.4867 8.4867 0 00-.2855-.086l-.414-1.1066a.3483.3483 0 00-.5781-.1154l-.8069.8666a9.2936 9.2936 0 00-.2936-.0284L12.2946.1683a.3462.3462 0 00-.5892 0l-.6236 1.0073a13.7383 13.7383 0 00-.2936.0284L9.9803.3374a.3462.3462 0 00-.578.1154l-.4141 1.1065c-.0962.0274-.1903.0567-.2855.086L7.744.955a.3483.3483 0 00-.5447.2258L7.009 2.348a9.3574 9.3574 0 00-.2622.1407l-1.0762-.491a.3462.3462 0 00-.49.328l.0416 1.1845a7.9826 7.9826 0 00-.2278.1873L3.8413 3.425a.3472.3472 0 00-.4171.4171l.2713 1.1531c-.0628.075-.1255.1509-.1863.2268l-1.1845-.0415a.3462.3462 0 00-.328.49l.491 1.0761a9.167 9.167 0 00-.1407.2622l-1.1662.1894a.3483.3483 0 00-.2258.5446l.6904.9587a13.303 13.303 0 00-.087.2855l-1.1065.414a.3483.3483 0 00-.1155.5781l.8656.807a9.2936 9.2936 0 00-.0283.2935l-1.0073.6236a.3442.3442 0 000 .5892l1.0073.6236c.008.0982.0182.1964.0283.2936l-.8656.8079a.3462.3462 0 00.1155.578l1.1065.4141c.0273.0962.0567.1914.087.2855l-.6904.9587a.3452.3452 0 00.2268.5447l1.1662.1893c.0456.088.0922.1751.1408.2622l-.491 1.0762a.3462.3462 0 00.328.49l1.1834-.0415c.0618.0769.1235.1528.1873.2277l-.2713 1.1541a.3462.3462 0 00.4171.4161l1.153-.2713c.075.0638.151.1255.2279.1863l-.0415 1.1845a.3442.3442 0 00.49.327l1.0761-.49c.087.0486.1741.0951.2622.1407l.1903 1.1662a.3483.3483 0 00.5447.2268l.9587-.6904a9.299 9.299 0 00.2855.087l.414 1.1066a.3452.3452 0 00.5781.1154l.8079-.8656c.0972.0111.1954.0203.2936.0294l.6236 1.0073a.3472.3472 0 00.5892 0l.6236-1.0073c.0982-.0091.1964-.0183.2936-.0294l.8069.8656a.3483.3483 0 00.578-.1154l.4141-1.1066a8.4626 8.4626 0 00.2855-.087l.9587.6904a.3452.3452 0 00.5447-.2268l.1903-1.1662c.088-.0456.1751-.0931.2622-.1407l1.0762.49a.3472.3472 0 00.49-.327l-.0415-1.1845a6.7267 6.7267 0 00.2267-.1863l1.1531.2713a.3472.3472 0 00.4171-.416l-.2713-1.1542c.0628-.0749.1255-.1508.1863-.2278l1.1845.0415a.3442.3442 0 00.328-.49l-.49-1.076c.0475-.0872.0951-.1742.1407-.2623l1.1662-.1893a.3483.3483 0 00.2258-.5447l-.6904-.9587.087-.2855 1.1066-.414a.3462.3462 0 00.1154-.5781l-.8656-.8079c.0101-.0972.0202-.1954.0283-.2936l1.0073-.6236a.3442.3442 0 000-.5892zm-6.7413 8.3551a.7138.7138 0 01.2986-1.396.714.714 0 11-.2997 1.396zm-.3422-2.3142a.649.649 0 00-.7715.5l-.3573 1.6685c-1.1035.501-2.3285.7795-3.6193.7795a8.7368 8.7368 0 01-3.6951-.814l-.3574-1.6684a.648.648 0 00-.7714-.499l-1.473.3158a8.7216 8.7216 0 01-.7613-.898h7.1676c.081 0 .1356-.0141.1356-.088v-2.536c0-.074-.0536-.0881-.1356-.0881h-2.0966v-1.6077h2.2677c.2065 0 1.1065.0587 1.394 1.2088.0901.3533.2875 1.5044.4232 1.8729.1346.413.6833 1.2381 1.2685 1.2381h3.5716a.7492.7492 0 00.1296-.0131 8.7874 8.7874 0 01-.8119.9526zM6.8369 20.024a.714.714 0 11-.2997-1.396.714.714 0 01.2997 1.396zM4.1177 8.9972a.7137.7137 0 11-1.304.5791.7137.7137 0 011.304-.579zm-.8352 1.9813l1.5347-.6824a.65.65 0 00.33-.8585l-.3158-.7147h1.2432v5.6025H3.5669a8.7753 8.7753 0 01-.2834-3.348zm6.7343-.5437V8.7836h2.9601c.153 0 1.0792.1772 1.0792.8697 0 .575-.7107.7815-1.2948.7815zm10.7574 1.4862c0 .2187-.008.4363-.0243.651h-.9c-.09 0-.1265.0586-.1265.1477v.413c0 .973-.5487 1.1846-1.0296 1.2382-.4576.0517-.9648-.1913-1.0275-.4717-.2704-1.5186-.7198-1.8436-1.4305-2.4034.8817-.5599 1.799-1.386 1.799-2.4915 0-1.1936-.819-1.9458-1.3769-2.3153-.7825-.5163-1.6491-.6195-1.883-.6195H5.4682a8.7651 8.7651 0 014.907-2.7699l1.0974 1.151a.648.648 0 00.9182.0213l1.227-1.1743a8.7753 8.7753 0 016.0044 4.2762l-.8403 1.8982a.652.652 0 00.33.8585l1.6178.7188c.0283.2875.0425.577.0425.8717zm-9.3006-9.5993a.7128.7128 0 11.984 1.0316.7137.7137 0 01-.984-1.0316zm8.3389 6.71a.7107.7107 0 01.9395-.3625.7137.7137 0 11-.9405.3635z"/></svg>

client/public/assets/tsnode.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>ts-node</title><path d="M11.999 0c-.196 0-.392.05-.568.153L2.026 5.58a1.135 1.135 0 00-.568.983V17.43c0 .406.216.781.568.984l5.787 3.344v-7.344H4.748v-1.943h8.342v1.943h-3.065v8.622l1.406.812c.351.203.784.203 1.136 0l2.317-1.338a3.958 3.958 0 01-1.195-1.413l1.801-1.042c.361.59.806 1.06 1.48 1.25l2.174-1.256c-.127-.568-.698-.823-1.584-1.21l-.553-.238c-1.596-.68-2.655-1.532-2.655-3.334 0-1.658 1.265-2.922 3.24-2.922 1.406 0 2.417.49 3.144 1.77l-1.723 1.105c-.379-.68-.79-.948-1.421-.948-.648 0-1.06.41-1.06.948 0 .663.412.932 1.36 1.343l.553.237c1.336.573 2.255 1.155 2.676 2.107l.853-.493c.352-.203.568-.578.568-.984V6.565c0-.406-.216-.782-.568-.984L12.567.153A1.134 1.134 0 0011.999 0z"/></svg>

client/src/Providers/CodeBlockContext.tsx

@@ -0,0 +1,34 @@
+import { createContext, useContext, ReactNode, useCallback, useRef } from 'react';
+
+type TCodeBlockContext = {
+  getNextIndex: (skip: boolean) => number;
+  resetCounter: () => void;
+  // codeBlocks: Map<number, string>;
+};
+
+export const CodeBlockContext = createContext<TCodeBlockContext>({} as TCodeBlockContext);
+export const useCodeBlockContext = () => useContext(CodeBlockContext);
+
+export function CodeBlockProvider({ children }: { children: ReactNode }) {
+  const counterRef = useRef(0);
+  // const codeBlocks = useRef(new Map<number, string>()).current;
+
+  const getNextIndex = useCallback((skip: boolean) => {
+    if (skip) {
+      return counterRef.current;
+    }
+    const nextIndex = counterRef.current;
+    counterRef.current += 1;
+    return nextIndex;
+  }, []);
+
+  const resetCounter = useCallback(() => {
+    counterRef.current = 0;
+  }, []);
+
+  return (
+    <CodeBlockContext.Provider value={{ getNextIndex, resetCounter }}>
+      {children}
+    </CodeBlockContext.Provider>
+  );
+}

client/src/Providers/MessageContext.tsx

@@ -0,0 +1,9 @@
+import { createContext, useContext } from 'react';
+type MessageContext = {
+  messageId: string;
+  partIndex?: number;
+  conversationId?: string | null;
+};
+
+export const MessageContext = createContext<MessageContext>({} as MessageContext);
+export const useMessageContext = () => useContext(MessageContext);

client/src/Providers/ToolCallsMapContext.tsx

@@ -0,0 +1,21 @@
+import { createContext, useContext } from 'react';
+import useToolCallsMap from '~/hooks/Plugins/useToolCallsMap';
+type ToolCallsMapContextType = ReturnType<typeof useToolCallsMap>;
+
+export const ToolCallsMapContext = createContext<ToolCallsMapContextType>(
+  {} as ToolCallsMapContextType,
+);
+export const useToolCallsMapContext = () => useContext(ToolCallsMapContext);
+
+interface ToolCallsMapProviderProps {
+  children: React.ReactNode;
+  conversationId: string;
+}
+
+export function ToolCallsMapProvider({ children, conversationId }: ToolCallsMapProviderProps) {
+  const toolCallsMap = useToolCallsMap({ conversationId });
+
+  return (
+    <ToolCallsMapContext.Provider value={toolCallsMap}>{children}</ToolCallsMapContext.Provider>
+  );
+}

client/src/Providers/index.ts

@@ -9,9 +9,12 @@ export * from './FileMapContext';
 export * from './AddedChatContext';
 export * from './ChatFormContext';
 export * from './BookmarkContext';
+export * from './MessageContext';
 export * from './DashboardContext';
 export * from './AssistantsContext';
 export * from './AgentsContext';
 export * from './AssistantsMapContext';
 export * from './AnnouncerContext';
 export * from './AgentsMapContext';
+export * from './CodeBlockContext';
+export * from './ToolCallsMapContext';

client/src/common/agents-types.ts

@@ -11,6 +11,8 @@ export type TAgentOption = OptionWithIcon &
 export type TAgentCapabilities = {
   [AgentCapabilities.execute_code]: boolean;
   [AgentCapabilities.file_search]: boolean;
+  [AgentCapabilities.end_after_tools]?: boolean;
+  [AgentCapabilities.hide_sequential_outputs]?: boolean;
 };
 
 export type AgentForm = {
@@ -23,4 +25,5 @@ export type AgentForm = {
   model_parameters: AgentModelParameters;
   tools?: string[];
   provider?: AgentProvider | OptionWithIcon;
+  agent_ids?: string[];
 } & TAgentCapabilities;

client/src/common/index.ts

@@ -1,5 +1,6 @@
 export * from './a11y';
 export * from './artifacts';
 export * from './types';
+export * from './tools';
 export * from './assistants-types';
 export * from './agents-types';

client/src/common/tools.ts

@@ -0,0 +1,6 @@
+import type { AuthType } from 'librechat-data-provider';
+
+export type ApiKeyFormData = {
+  apiKey: string;
+  authType?: string | AuthType;
+};

client/src/common/types.ts

@@ -1,36 +1,21 @@
-import React from 'react';
+import { RefObject } from 'react';
 import { FileSources } from 'librechat-data-provider';
 import type * as InputNumberPrimitive from 'rc-input-number';
 import type { ColumnDef } from '@tanstack/react-table';
 import type { SetterOrUpdater } from 'recoil';
-import type {
-  TRole,
-  TUser,
-  Agent,
-  Action,
-  TPreset,
-  TPlugin,
-  TMessage,
-  Assistant,
-  TResPlugin,
-  TLoginUser,
-  AuthTypeEnum,
-  TModelsConfig,
-  TConversation,
-  TStartupConfig,
-  EModelEndpoint,
-  TEndpointsConfig,
-  ActionMetadata,
-  AssistantDocument,
-  AssistantsEndpoint,
-  TMessageContentParts,
-  AuthorizationTypeEnum,
-  TSetOption as SetOption,
-  TokenExchangeMethodEnum,
-} from 'librechat-data-provider';
+import type * as t from 'librechat-data-provider';
 import type { UseMutationResult } from '@tanstack/react-query';
 import type { LucideIcon } from 'lucide-react';
 
+export type CodeBarProps = {
+  lang: string;
+  error?: boolean;
+  plugin?: boolean;
+  blockIndex?: number;
+  allowExecution?: boolean;
+  codeRef: RefObject<HTMLElement>;
+};
+
 export enum PromptsEditorMode {
   SIMPLE = 'simple',
   ADVANCED = 'advanced',
@@ -65,21 +50,21 @@ export type AudioChunk = {
 export type AssistantListItem = {
   id: string;
   name: string;
-  metadata: Assistant['metadata'];
+  metadata: t.Assistant['metadata'];
   model: string;
 };
 
 export type AgentListItem = {
   id: string;
   name: string;
-  avatar: Agent['avatar'];
+  avatar: t.Agent['avatar'];
 };
 
-export type TPluginMap = Record<string, TPlugin>;
+export type TPluginMap = Record<string, t.TPlugin>;
 
 export type GenericSetter<T> = (value: T | ((currentValue: T) => T)) => void;
 
-export type LastSelectedModels = Record<EModelEndpoint, string>;
+export type LastSelectedModels = Record<t.EModelEndpoint, string>;
 
 export type LocalizeFunction = (phraseKey: string, ...values: string[]) => string;
 
@@ -145,11 +130,11 @@ export type FileSetter =
 
 export type ActionAuthForm = {
   /* General */
-  type: AuthTypeEnum;
+  type: t.AuthTypeEnum;
   saved_auth_fields: boolean;
   /* API key */
   api_key: string; // not nested
-  authorization_type: AuthorizationTypeEnum;
+  authorization_type: t.AuthorizationTypeEnum;
   custom_auth_header: string;
   /* OAuth */
   oauth_client_id: string; // not nested
@@ -157,23 +142,23 @@ export type ActionAuthForm = {
   authorization_url: string;
   client_url: string;
   scope: string;
-  token_exchange_method: TokenExchangeMethodEnum;
+  token_exchange_method: t.TokenExchangeMethodEnum;
 };
 
-export type ActionWithNullableMetadata = Omit<Action, 'metadata'> & {
-  metadata: ActionMetadata | null;
+export type ActionWithNullableMetadata = Omit<t.Action, 'metadata'> & {
+  metadata: t.ActionMetadata | null;
 };
 
 export type AssistantPanelProps = {
   index?: number;
   action?: ActionWithNullableMetadata;
-  actions?: Action[];
+  actions?: t.Action[];
   assistant_id?: string;
   activePanel?: string;
-  endpoint: AssistantsEndpoint;
+  endpoint: t.AssistantsEndpoint;
   version: number | string;
-  documentsMap: Map<string, AssistantDocument> | null;
-  setAction: React.Dispatch<React.SetStateAction<Action | undefined>>;
+  documentsMap: Map<string, t.AssistantDocument> | null;
+  setAction: React.Dispatch<React.SetStateAction<t.Action | undefined>>;
   setCurrentAssistantId: React.Dispatch<React.SetStateAction<string | undefined>>;
   setActivePanel: React.Dispatch<React.SetStateAction<Panel>>;
 };
@@ -182,11 +167,11 @@ export type AgentPanelProps = {
   index?: number;
   agent_id?: string;
   activePanel?: string;
-  action?: Action;
-  actions?: Action[];
+  action?: t.Action;
+  actions?: t.Action[];
   setActivePanel: React.Dispatch<React.SetStateAction<Panel>>;
-  setAction: React.Dispatch<React.SetStateAction<Action | undefined>>;
-  endpointsConfig?: TEndpointsConfig;
+  setAction: React.Dispatch<React.SetStateAction<t.Action | undefined>>;
+  endpointsConfig?: t.TEndpointsConfig;
   setCurrentAgentId: React.Dispatch<React.SetStateAction<string | undefined>>;
 };
 
@@ -199,7 +184,7 @@ export type AgentModelPanelProps = {
 
 export type AugmentedColumnDef<TData, TValue> = ColumnDef<TData, TValue> & DataColumnMeta;
 
-export type TSetOption = SetOption;
+export type TSetOption = t.TSetOption;
 
 export type TSetExample = (
   i: number,
@@ -234,7 +219,7 @@ export type TShowToast = {
 };
 
 export type TBaseSettingsProps = {
-  conversation: TConversation | TPreset | null;
+  conversation: t.TConversation | t.TPreset | null;
   className?: string;
   isPreset?: boolean;
   readonly?: boolean;
@@ -255,7 +240,7 @@ export type TModelSelectProps = TSettingsProps & TModels;
 export type TEditPresetProps = {
   open: boolean;
   onOpenChange: React.Dispatch<React.SetStateAction<boolean>>;
-  preset: TPreset;
+  preset: t.TPreset;
   title?: string;
 };
 
@@ -266,18 +251,18 @@ export type TSetOptionsPayload = {
   addExample: () => void;
   removeExample: () => void;
   setAgentOption: TSetOption;
-  // getConversation: () => TConversation | TPreset | null;
+  // getConversation: () => t.TConversation | t.TPreset | null;
   checkPluginSelection: (value: string) => boolean;
   setTools: (newValue: string, remove?: boolean) => void;
   setOptions?: TSetOptions;
 };
 
 export type TPresetItemProps = {
-  preset: TPreset;
-  value: TPreset;
-  onSelect: (preset: TPreset) => void;
-  onChangePreset: (preset: TPreset) => void;
-  onDeletePreset: (preset: TPreset) => void;
+  preset: t.TPreset;
+  value: t.TPreset;
+  onSelect: (preset: t.TPreset) => void;
+  onChangePreset: (preset: t.TPreset) => void;
+  onDeletePreset: (preset: t.TPreset) => void;
 };
 
 export type TOnClick = (e: React.MouseEvent<HTMLButtonElement>) => void;
@@ -302,16 +287,16 @@ export type TOptions = {
   isRegenerate?: boolean;
   isContinued?: boolean;
   isEdited?: boolean;
-  overrideMessages?: TMessage[];
+  overrideMessages?: t.TMessage[];
 };
 
 export type TAskFunction = (props: TAskProps, options?: TOptions) => void;
 
 export type TMessageProps = {
-  conversation?: TConversation | null;
+  conversation?: t.TConversation | null;
   messageId?: string | null;
-  message?: TMessage;
-  messagesTree?: TMessage[];
+  message?: t.TMessage;
+  messagesTree?: t.TMessage[];
   currentEditId: string | number | null;
   isSearchView?: boolean;
   siblingIdx?: number;
@@ -330,7 +315,7 @@ export type TInitialProps = {
 };
 export type TAdditionalProps = {
   ask: TAskFunction;
-  message: TMessage;
+  message: t.TMessage;
   isCreatedByUser: boolean;
   siblingIdx: number;
   enterEdit: (cancel: boolean) => void;
@@ -354,7 +339,7 @@ export type TDisplayProps = TText &
 export type TConfigProps = {
   userKey: string;
   setUserKey: React.Dispatch<React.SetStateAction<string>>;
-  endpoint: EModelEndpoint | string;
+  endpoint: t.EModelEndpoint | string;
 };
 
 export type TDangerButtonProps = {
@@ -389,18 +374,18 @@ export type TResError = {
 };
 
 export type TAuthContext = {
-  user: TUser | undefined;
+  user: t.TUser | undefined;
   token: string | undefined;
   isAuthenticated: boolean;
   error: string | undefined;
-  login: (data: TLoginUser) => void;
+  login: (data: t.TLoginUser) => void;
   logout: () => void;
   setError: React.Dispatch<React.SetStateAction<string | undefined>>;
-  roles?: Record<string, TRole | null | undefined>;
+  roles?: Record<string, t.TRole | null | undefined>;
 };
 
 export type TUserContext = {
-  user?: TUser | undefined;
+  user?: t.TUser | undefined;
   token: string | undefined;
   isAuthenticated: boolean;
   redirect?: string;
@@ -411,16 +396,16 @@ export type TAuthConfig = {
   test?: boolean;
 };
 
-export type IconProps = Pick<TMessage, 'isCreatedByUser' | 'model'> &
-  Pick<TConversation, 'chatGptLabel' | 'modelLabel' | 'jailbreak'> & {
+export type IconProps = Pick<t.TMessage, 'isCreatedByUser' | 'model'> &
+  Pick<t.TConversation, 'chatGptLabel' | 'modelLabel' | 'jailbreak'> & {
     size?: number;
     button?: boolean;
     iconURL?: string;
     message?: boolean;
     className?: string;
     iconClassName?: string;
-    endpoint?: EModelEndpoint | string | null;
-    endpointType?: EModelEndpoint | null;
+    endpoint?: t.EModelEndpoint | string | null;
+    endpointType?: t.EModelEndpoint | null;
     assistantName?: string;
     agentName?: string;
     error?: boolean;
@@ -440,7 +425,7 @@ export type VoiceOption = {
 
 export type TMessageAudio = {
   messageId?: string;
-  content?: TMessageContentParts[] | string;
+  content?: t.TMessageContentParts[] | string;
   className?: string;
   isLast: boolean;
   index: number;
@@ -482,12 +467,12 @@ export interface ExtendedFile {
 export type ContextType = { navVisible: boolean; setNavVisible: (visible: boolean) => void };
 
 export interface SwitcherProps {
-  endpoint?: EModelEndpoint | null;
+  endpoint?: t.EModelEndpoint | null;
   endpointKeyProvided: boolean;
   isCollapsed: boolean;
 }
 export type TLoginLayoutContext = {
-  startupConfig: TStartupConfig | null;
+  startupConfig: t.TStartupConfig | null;
   startupConfigError: unknown;
   isFetching: boolean;
   error: string | null;
@@ -497,34 +482,34 @@ export type TLoginLayoutContext = {
 };
 
 export type NewConversationParams = {
-  template?: Partial<TConversation>;
-  preset?: Partial<TPreset>;
-  modelsData?: TModelsConfig;
+  template?: Partial<t.TConversation>;
+  preset?: Partial<t.TPreset>;
+  modelsData?: t.TModelsConfig;
   buildDefault?: boolean;
   keepLatestMessage?: boolean;
   keepAddedConvos?: boolean;
 };
 
-export type ConvoGenerator = (params: NewConversationParams) => void | TConversation;
+export type ConvoGenerator = (params: NewConversationParams) => void | t.TConversation;
 
 export type TBaseResData = {
-  plugin?: TResPlugin;
+  plugin?: t.TResPlugin;
   final?: boolean;
   initial?: boolean;
-  previousMessages?: TMessage[];
-  conversation: TConversation;
+  previousMessages?: t.TMessage[];
+  conversation: t.TConversation;
   conversationId?: string;
-  runMessages?: TMessage[];
+  runMessages?: t.TMessage[];
 };
 
 export type TResData = TBaseResData & {
-  requestMessage: TMessage;
-  responseMessage: TMessage;
+  requestMessage: t.TMessage;
+  responseMessage: t.TMessage;
 };
 
 export type TFinalResData = TBaseResData & {
-  requestMessage?: TMessage;
-  responseMessage?: TMessage;
+  requestMessage?: t.TMessage;
+  responseMessage?: t.TMessage;
 };
 
 export type TVectorStore = {

client/src/components/Chat/AddMultiConvo.tsx

@@ -5,7 +5,6 @@ import { useChatContext, useAddedChatContext } from '~/Providers';
 import { TooltipAnchor } from '~/components';
 import { mainTextareaId } from '~/common';
 import { useLocalize } from '~/hooks';
-import { cn } from '~/utils';
 
 function AddMultiConvo() {
   const { conversation } = useChatContext();

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

@@ -0,0 +1,100 @@
+import * as Ariakit from '@ariakit/react';
+import React, { useRef, useState } from 'react';
+import { FileSearch, ImageUpIcon, TerminalSquareIcon } from 'lucide-react';
+import { EToolResources } from 'librechat-data-provider';
+import { FileUpload, TooltipAnchor, DropdownPopup } from '~/components/ui';
+import { AttachmentIcon } from '~/components/svg';
+import { useLocalize } from '~/hooks';
+import { cn } from '~/utils';
+
+interface AttachFileProps {
+  isRTL: boolean;
+  disabled?: boolean | null;
+  handleFileChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  setToolResource?: React.Dispatch<React.SetStateAction<string | undefined>>;
+}
+
+const AttachFile = ({ isRTL, disabled, setToolResource, handleFileChange }: AttachFileProps) => {
+  const localize = useLocalize();
+  const isUploadDisabled = disabled ?? false;
+  const inputRef = useRef<HTMLInputElement>(null);
+  const [isPopoverActive, setIsPopoverActive] = useState(false);
+
+  const handleUploadClick = (isImage?: boolean) => {
+    if (!inputRef.current) {
+      return;
+    }
+    inputRef.current.value = '';
+    inputRef.current.accept = isImage === true ? 'image/*' : '';
+    inputRef.current.click();
+    inputRef.current.accept = '';
+  };
+
+  const dropdownItems = [
+    {
+      label: localize('com_ui_upload_image_input'),
+      onClick: () => {
+        setToolResource?.(undefined);
+        handleUploadClick(true);
+      },
+      icon: <ImageUpIcon className="icon-md" />,
+    },
+    {
+      label: localize('com_ui_upload_file_search'),
+      onClick: () => {
+        setToolResource?.(EToolResources.file_search);
+        handleUploadClick();
+      },
+      icon: <FileSearch className="icon-md" />,
+    },
+    {
+      label: localize('com_ui_upload_code_files'),
+      onClick: () => {
+        setToolResource?.(EToolResources.execute_code);
+        handleUploadClick();
+      },
+      icon: <TerminalSquareIcon className="icon-md" />,
+    },
+  ];
+
+  const menuTrigger = (
+    <TooltipAnchor
+      render={
+        <Ariakit.MenuButton
+          disabled={isUploadDisabled}
+          id="attach-file-menu-button"
+          aria-label="Attach File Options"
+          className={cn(
+            'absolute flex size-[35px] items-center justify-center rounded-full p-1 transition-colors hover:bg-surface-hover focus:outline-none focus:ring-2 focus:ring-primary focus:ring-opacity-50',
+            isRTL ? 'bottom-2 right-2' : 'bottom-2 left-1 md:left-2',
+          )}
+        >
+          <div className="flex w-full items-center justify-center gap-2">
+            <AttachmentIcon />
+          </div>
+        </Ariakit.MenuButton>
+      }
+      id="attach-file-menu-button"
+      description={localize('com_sidepanel_attach_files')}
+      disabled={isUploadDisabled}
+    />
+  );
+
+  return (
+    <FileUpload ref={inputRef} handleFileChange={handleFileChange}>
+      <div className="relative">
+        <DropdownPopup
+          menuId="attach-file-menu"
+          isOpen={isPopoverActive}
+          setIsOpen={setIsPopoverActive}
+          modal={true}
+          trigger={menuTrigger}
+          items={dropdownItems}
+          iconClassName="mr-0"
+        />
+      </div>
+    </FileUpload>
+  );
+};
+
+export default React.memo(AttachFile);

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

@@ -1,12 +1,14 @@
-import { memo } from 'react';
+import { memo, useMemo } from 'react';
 import { useRecoilValue } from 'recoil';
 import {
   supportsFiles,
   mergeFileConfig,
+  isAgentsEndpoint,
   EndpointFileConfig,
   fileConfig as defaultFileConfig,
 } from 'librechat-data-provider';
 import { useGetFileConfig } from '~/data-provider';
+import AttachFileMenu from './AttachFileMenu';
 import { useChatContext } from '~/Providers';
 import { useFileHandling } from '~/hooks';
 import AttachFile from './AttachFile';
@@ -20,23 +22,46 @@ function FileFormWrapper({
   disableInputs: boolean;
   children?: React.ReactNode;
 }) {
-  const { handleFileChange, abortUpload } = useFileHandling();
   const chatDirection = useRecoilValue(store.chatDirection).toLowerCase();
-
   const { files, setFiles, conversation, setFilesLoading } = useChatContext();
+  const { endpoint: _endpoint, endpointType } = conversation ?? { endpoint: null };
+  const isAgents = useMemo(() => isAgentsEndpoint(_endpoint), [_endpoint]);
+
+  const { handleFileChange, abortUpload, setToolResource } = useFileHandling();
+
   const { data: fileConfig = defaultFileConfig } = useGetFileConfig({
     select: (data) => mergeFileConfig(data),
   });
 
   const isRTL = chatDirection === 'rtl';
 
-  const { endpoint: _endpoint, endpointType } = conversation ?? { endpoint: null };
   const endpointFileConfig = fileConfig.endpoints[_endpoint ?? ''] as
     | EndpointFileConfig
     | undefined;
+
   const endpointSupportsFiles: boolean = supportsFiles[endpointType ?? _endpoint ?? ''] ?? false;
   const isUploadDisabled = (disableInputs || endpointFileConfig?.disabled) ?? false;
 
+  const renderAttachFile = () => {
+    if (isAgents) {
+      return (
+        <AttachFileMenu
+          isRTL={isRTL}
+          disabled={disableInputs}
+          setToolResource={setToolResource}
+          handleFileChange={handleFileChange}
+        />
+      );
+    }
+    if (endpointSupportsFiles && !isUploadDisabled) {
+      return (
+        <AttachFile isRTL={isRTL} disabled={disableInputs} handleFileChange={handleFileChange} />
+      );
+    }
+
+    return null;
+  };
+
   return (
     <>
       <FileRow
@@ -50,9 +75,7 @@ function FileFormWrapper({
         )}
       />
       {children}
-      {endpointSupportsFiles && !isUploadDisabled && (
-        <AttachFile isRTL={isRTL} disabled={disableInputs} handleFileChange={handleFileChange} />
-      )}
+      {renderAttachFile()}
     </>
   );
 }

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

@@ -26,8 +26,15 @@ export default function Mention({
 }) {
   const localize = useLocalize();
   const assistantMap = useAssistantsMapContext();
-  const { options, presets, modelSpecs, modelsConfig, endpointsConfig, assistantListMap } =
-    useMentions({ assistantMap: assistantMap || {}, includeAssistants });
+  const {
+    options,
+    presets,
+    modelSpecs,
+    agentsList,
+    modelsConfig,
+    endpointsConfig,
+    assistantListMap,
+  } = useMentions({ assistantMap: assistantMap || {}, includeAssistants });
   const { onSelectMention } = useSelectMention({
     presets,
     modelSpecs,
@@ -62,18 +69,23 @@ export default function Mention({
       }
     };
 
-    if (mention.type === 'endpoint' && mention.value === EModelEndpoint.assistants) {
+    if (mention.type === 'endpoint' && mention.value === EModelEndpoint.agents) {
       setSearchValue('');
-      setInputOptions(assistantListMap[EModelEndpoint.assistants]);
+      setInputOptions(agentsList ?? []);
+      setActiveIndex(0);
+      inputRef.current?.focus();
+    } else if (mention.type === 'endpoint' && mention.value === EModelEndpoint.assistants) {
+      setSearchValue('');
+      setInputOptions(assistantListMap[EModelEndpoint.assistants] ?? []);
       setActiveIndex(0);
       inputRef.current?.focus();
     } else if (mention.type === 'endpoint' && mention.value === EModelEndpoint.azureAssistants) {
       setSearchValue('');
-      setInputOptions(assistantListMap[EModelEndpoint.azureAssistants]);
+      setInputOptions(assistantListMap[EModelEndpoint.azureAssistants] ?? []);
       setActiveIndex(0);
       inputRef.current?.focus();
     } else if (mention.type === 'endpoint') {
-      const models = (modelsConfig?.[mention.value ?? ''] ?? []).map((model) => ({
+      const models = (modelsConfig?.[mention.value || ''] ?? []).map((model) => ({
         value: mention.value,
         label: model,
         type: 'model',

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

@@ -1,47 +1,57 @@
 import type { FC } from 'react';
 import { Close } from '@radix-ui/react-popover';
-import { EModelEndpoint, alternateName } from 'librechat-data-provider';
+import {
+  EModelEndpoint,
+  alternateName,
+  PermissionTypes,
+  Permissions,
+} from 'librechat-data-provider';
 import { useGetEndpointsQuery } from 'librechat-data-provider/react-query';
 import MenuSeparator from '../UI/MenuSeparator';
 import { getEndpointField } from '~/utils';
+import { useHasAccess } from '~/hooks';
 import MenuItem from './MenuItem';
 
 const EndpointItems: FC<{
-  endpoints: EModelEndpoint[];
+  endpoints: Array<EModelEndpoint | undefined>;
   selected: EModelEndpoint | '';
-}> = ({ endpoints, selected }) => {
+}> = ({ endpoints = [], selected }) => {
+  const hasAccessToAgents = useHasAccess({
+    permissionType: PermissionTypes.AGENTS,
+    permission: Permissions.USE,
+  });
   const { data: endpointsConfig } = useGetEndpointsQuery();
   return (
     <>
-      {endpoints &&
-        endpoints.map((endpoint, i) => {
-          if (!endpoint) {
-            return null;
-          } else if (!endpointsConfig?.[endpoint]) {
-            return null;
-          }
-          const userProvidesKey: boolean | null | undefined = getEndpointField(
-            endpointsConfig,
-            endpoint,
-            'userProvide',
-          );
-          return (
-            <Close asChild key={`endpoint-${endpoint}`}>
-              <div key={`endpoint-${endpoint}`}>
-                <MenuItem
-                  key={`endpoint-item-${endpoint}`}
-                  title={alternateName[endpoint] || endpoint}
-                  value={endpoint}
-                  selected={selected === endpoint}
-                  data-testid={`endpoint-item-${endpoint}`}
-                  userProvidesKey={!!userProvidesKey}
-                  // description="With DALL·E, browsing and analysis"
-                />
-                {i !== endpoints.length - 1 && <MenuSeparator />}
-              </div>
-            </Close>
-          );
-        })}
+      {endpoints.map((endpoint, i) => {
+        if (!endpoint) {
+          return null;
+        } else if (!endpointsConfig?.[endpoint]) {
+          return null;
+        }
+
+        if (endpoint === EModelEndpoint.agents && !hasAccessToAgents) {
+          return null;
+        }
+        const userProvidesKey: boolean | null | undefined =
+          getEndpointField(endpointsConfig, endpoint, 'userProvide') ?? false;
+        return (
+          <Close asChild key={`endpoint-${endpoint}`}>
+            <div key={`endpoint-${endpoint}`}>
+              <MenuItem
+                key={`endpoint-item-${endpoint}`}
+                title={alternateName[endpoint] || endpoint}
+                value={endpoint}
+                selected={selected === endpoint}
+                data-testid={`endpoint-item-${endpoint}`}
+                userProvidesKey={!!userProvidesKey}
+                // description="With DALL·E, browsing and analysis"
+              />
+              {i !== endpoints.length - 1 && <MenuSeparator />}
+            </div>
+          </Close>
+        );
+      })}
     </>
   );
 };

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

@@ -4,12 +4,14 @@ import { ContentTypes } from 'librechat-data-provider';
 import type { TMessageContentParts, TAttachment, Agents } from 'librechat-data-provider';
 import EditTextPart from './Parts/EditTextPart';
 import { mapAttachments } from '~/utils/map';
+import { MessageContext } from '~/Providers';
 import store from '~/store';
 import Part from './Part';
 
 type ContentPartsProps = {
   content: Array<TMessageContentParts | undefined> | undefined;
   messageId: string;
+  conversationId?: string | null;
   attachments?: TAttachment[];
   isCreatedByUser: boolean;
   isLast: boolean;
@@ -27,6 +29,7 @@ const ContentParts = memo(
   ({
     content,
     messageId,
+    conversationId,
     attachments,
     isCreatedByUser,
     isLast,
@@ -79,15 +82,23 @@ const ContentParts = memo(
             const attachments = attachmentMap[toolCallId];
 
             return (
-              <Part
-                part={part}
-                isSubmitting={isSubmitting}
-                attachments={attachments}
-                key={`display-${messageId}-${idx}`}
-                showCursor={idx === content.length - 1 && isLast}
-                messageId={messageId}
-                isCreatedByUser={isCreatedByUser}
-              />
+              <MessageContext.Provider
+                key={`provider-${messageId}-${idx}`}
+                value={{
+                  messageId,
+                  conversationId,
+                  partIndex: idx,
+                }}
+              >
+                <Part
+                  part={part}
+                  attachments={attachments}
+                  isSubmitting={isSubmitting}
+                  key={`part-${messageId}-${idx}`}
+                  isCreatedByUser={isCreatedByUser}
+                  showCursor={idx === content.length - 1 && isLast}
+                />
+              </MessageContext.Provider>
             );
           })}
       </>

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

@@ -1,4 +1,4 @@
-import React, { memo, useMemo } from 'react';
+import React, { memo, useMemo, useRef, useEffect } from 'react';
 import remarkGfm from 'remark-gfm';
 import remarkMath from 'remark-math';
 import supersub from 'remark-supersub';
@@ -10,10 +10,10 @@ import remarkDirective from 'remark-directive';
 import type { Pluggable } from 'unified';
 import { Artifact, artifactPlugin } from '~/components/Artifacts/Artifact';
 import { langSubset, preprocessLaTeX, handleDoubleClick } from '~/utils';
+import { useToastContext, CodeBlockProvider, useCodeBlockContext } from '~/Providers';
 import CodeBlock from '~/components/Messages/Content/CodeBlock';
 import { useFileDownload } from '~/data-provider';
 import useLocalize from '~/hooks/useLocalize';
-import { useToastContext } from '~/Providers';
 import store from '~/store';
 
 type TCodeProps = {
@@ -25,6 +25,32 @@ type TCodeProps = {
 export const code: React.ElementType = memo(({ className, children }: TCodeProps) => {
   const match = /language-(\w+)/.exec(className ?? '');
   const lang = match && match[1];
+  const isMath = lang === 'math';
+  const isSingleLine = typeof children === 'string' && children.split('\n').length === 1;
+
+  const { getNextIndex, resetCounter } = useCodeBlockContext();
+  const blockIndex = useRef(getNextIndex(isMath || isSingleLine)).current;
+
+  useEffect(() => {
+    resetCounter();
+  }, [children, resetCounter]);
+
+  if (isMath) {
+    return children;
+  } else if (isSingleLine) {
+    return (
+      <code onDoubleClick={handleDoubleClick} className={className}>
+        {children}
+      </code>
+    );
+  } else {
+    return <CodeBlock lang={lang ?? 'text'} codeChildren={children} blockIndex={blockIndex} />;
+  }
+});
+
+export const codeNoExecution: React.ElementType = memo(({ className, children }: TCodeProps) => {
+  const match = /language-(\w+)/.exec(className ?? '');
+  const lang = match && match[1];
 
   if (lang === 'math') {
     return children;
@@ -35,7 +61,7 @@ export const code: React.ElementType = memo(({ className, children }: TCodeProps
       </code>
     );
   } else {
-    return <CodeBlock lang={lang ?? 'text'} codeChildren={children} />;
+    return <CodeBlock lang={lang ?? 'text'} codeChildren={children} allowExecution={false} />;
   }
 });
 
@@ -45,7 +71,11 @@ export const a: React.ElementType = memo(
     const { showToast } = useToastContext();
     const localize = useLocalize();
 
-    const { file_id, filename, filepath } = useMemo(() => {
+    const {
+      file_id = '',
+      filename = '',
+      filepath,
+    } = useMemo(() => {
       const pattern = new RegExp(`(?:files|outputs)/${user?.id}/([^\\s]+)`);
       const match = href.match(pattern);
       if (match && match[0]) {
@@ -164,25 +194,27 @@ const Markdown = memo(({ content = '', showCursor, isLatestMessage }: TContentPr
     : [supersub, remarkGfm, [remarkMath, { singleDollarTextMath: true }]];
 
   return (
-    <ReactMarkdown
-      /** @ts-ignore */
-      remarkPlugins={remarkPlugins}
-      /* @ts-ignore */
-      rehypePlugins={rehypePlugins}
-      // linkTarget="_new"
-      components={
-        {
-          code,
-          a,
-          p,
-          artifact: Artifact,
-        } as {
-          [nodeType: string]: React.ElementType;
+    <CodeBlockProvider>
+      <ReactMarkdown
+        /** @ts-ignore */
+        remarkPlugins={remarkPlugins}
+        /* @ts-ignore */
+        rehypePlugins={rehypePlugins}
+        // linkTarget="_new"
+        components={
+          {
+            code,
+            a,
+            p,
+            artifact: Artifact,
+          } as {
+            [nodeType: string]: React.ElementType;
+          }
         }
-      }
-    >
-      {isLatestMessage && showCursor === true ? currentContent + cursor : currentContent}
-    </ReactMarkdown>
+      >
+        {isLatestMessage && showCursor === true ? currentContent + cursor : currentContent}
+      </ReactMarkdown>
+    </CodeBlockProvider>
   );
 });
 

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

@@ -6,40 +6,51 @@ import supersub from 'remark-supersub';
 import ReactMarkdown from 'react-markdown';
 import rehypeHighlight from 'rehype-highlight';
 import type { PluggableList } from 'unified';
+import { code, codeNoExecution, a, p } from './Markdown';
+import { CodeBlockProvider } from '~/Providers';
 import { langSubset } from '~/utils';
-import { code, a, p } from './Markdown';
 
-const MarkdownLite = memo(({ content = '' }: { content?: string }) => {
-  const rehypePlugins: PluggableList = [
-    [rehypeKatex, { output: 'mathml' }],
-    [
-      rehypeHighlight,
-      {
-        detect: true,
-        ignoreMissing: true,
-        subset: langSubset,
-      },
-    ],
-  ];
-
-  return (
-    <ReactMarkdown
-      remarkPlugins={[supersub, remarkGfm, [remarkMath, { singleDollarTextMath: true }]]}
-      rehypePlugins={rehypePlugins}
-      // linkTarget="_new"
-      components={
+const MarkdownLite = memo(
+  ({ content = '', codeExecution = true }: { content?: string; codeExecution?: boolean }) => {
+    const rehypePlugins: PluggableList = [
+      [rehypeKatex, { output: 'mathml' }],
+      [
+        rehypeHighlight,
         {
-          code,
-          a,
-          p,
-        } as {
-          [nodeType: string]: React.ElementType;
-        }
-      }
-    >
-      {content}
-    </ReactMarkdown>
-  );
-});
+          detect: true,
+          ignoreMissing: true,
+          subset: langSubset,
+        },
+      ],
+    ];
+
+    return (
+      <CodeBlockProvider>
+        <ReactMarkdown
+          remarkPlugins={[
+            /** @ts-ignore */
+            supersub,
+            remarkGfm,
+            [remarkMath, { singleDollarTextMath: true }],
+          ]}
+          /** @ts-ignore */
+          rehypePlugins={rehypePlugins}
+          // linkTarget="_new"
+          components={
+            {
+              code: codeExecution ? code : codeNoExecution,
+              a,
+              p,
+            } as {
+              [nodeType: string]: React.ElementType;
+            }
+          }
+        >
+          {content}
+        </ReactMarkdown>
+      </CodeBlockProvider>
+    );
+  },
+);
 
 export default MarkdownLite;

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

@@ -21,143 +21,130 @@ type PartProps = {
   part?: TMessageContentParts;
   isSubmitting: boolean;
   showCursor: boolean;
-  messageId: string;
   isCreatedByUser: boolean;
   attachments?: TAttachment[];
 };
 
-const Part = memo(
-  ({ part, isSubmitting, attachments, showCursor, messageId, isCreatedByUser }: PartProps) => {
-    attachments && console.log(attachments);
-    if (!part) {
+const Part = memo(({ part, isSubmitting, attachments, showCursor, isCreatedByUser }: PartProps) => {
+  if (!part) {
+    return null;
+  }
+
+  if (part.type === ContentTypes.ERROR) {
+    return <ErrorMessage text={part[ContentTypes.TEXT].value} className="my-2" />;
+  } else if (part.type === ContentTypes.TEXT) {
+    const text = typeof part.text === 'string' ? part.text : part.text.value;
+
+    if (typeof text !== 'string') {
+      return null;
+    }
+    if (part.tool_call_ids != null && !text) {
+      return null;
+    }
+    return (
+      <Container>
+        <Text text={text} isCreatedByUser={isCreatedByUser} showCursor={showCursor} />
+      </Container>
+    );
+  } else if (part.type === ContentTypes.TOOL_CALL) {
+    const toolCall = part[ContentTypes.TOOL_CALL];
+
+    if (!toolCall) {
       return null;
     }
 
-    if (part.type === ContentTypes.ERROR) {
-      return <ErrorMessage text={part[ContentTypes.TEXT].value} className="my-2" />;
-    } else if (part.type === ContentTypes.TEXT) {
-      const text = typeof part.text === 'string' ? part.text : part.text.value;
-
-      if (typeof text !== 'string') {
-        return null;
-      }
-      if (part.tool_call_ids != null && !text) {
-        return null;
-      }
+    const isToolCall =
+      'args' in toolCall && (!toolCall.type || toolCall.type === ToolCallTypes.TOOL_CALL);
+    if (isToolCall && toolCall.name === Tools.execute_code) {
       return (
-        <Container>
-          <Text
-            text={text}
-            isCreatedByUser={isCreatedByUser}
-            messageId={messageId}
-            showCursor={showCursor}
-          />
-        </Container>
+        <ExecuteCode
+          args={typeof toolCall.args === 'string' ? toolCall.args : ''}
+          output={toolCall.output ?? ''}
+          initialProgress={toolCall.progress ?? 0.1}
+          isSubmitting={isSubmitting}
+          attachments={attachments}
+        />
       );
-    } else if (part.type === ContentTypes.TOOL_CALL) {
-      const toolCall = part[ContentTypes.TOOL_CALL];
-
-      if (!toolCall) {
+    } else if (isToolCall) {
+      return (
+        <ToolCall
+          args={toolCall.args ?? ''}
+          name={toolCall.name || ''}
+          output={toolCall.output ?? ''}
+          initialProgress={toolCall.progress ?? 0.1}
+          isSubmitting={isSubmitting}
+          attachments={attachments}
+        />
+      );
+    } else if (toolCall.type === ToolCallTypes.CODE_INTERPRETER) {
+      const code_interpreter = toolCall[ToolCallTypes.CODE_INTERPRETER];
+      return (
+        <CodeAnalyze
+          initialProgress={toolCall.progress ?? 0.1}
+          code={code_interpreter.input}
+          outputs={code_interpreter.outputs ?? []}
+          isSubmitting={isSubmitting}
+        />
+      );
+    } else if (
+      toolCall.type === ToolCallTypes.RETRIEVAL ||
+      toolCall.type === ToolCallTypes.FILE_SEARCH
+    ) {
+      return (
+        <RetrievalCall initialProgress={toolCall.progress ?? 0.1} isSubmitting={isSubmitting} />
+      );
+    } else if (
+      toolCall.type === ToolCallTypes.FUNCTION &&
+      ToolCallTypes.FUNCTION in toolCall &&
+      imageGenTools.has(toolCall.function.name)
+    ) {
+      return (
+        <ImageGen
+          initialProgress={toolCall.progress ?? 0.1}
+          args={toolCall.function.arguments as string}
+        />
+      );
+    } else if (toolCall.type === ToolCallTypes.FUNCTION && ToolCallTypes.FUNCTION in toolCall) {
+      if (isImageVisionTool(toolCall)) {
+        if (isSubmitting && showCursor) {
+          return (
+            <Container>
+              <Text text={''} isCreatedByUser={isCreatedByUser} showCursor={showCursor} />
+            </Container>
+          );
+        }
         return null;
       }
 
-      const isToolCall =
-        'args' in toolCall && (!toolCall.type || toolCall.type === ToolCallTypes.TOOL_CALL);
-      if (isToolCall && toolCall.name === Tools.execute_code) {
-        return (
-          <ExecuteCode
-            args={typeof toolCall.args === 'string' ? toolCall.args : ''}
-            output={toolCall.output ?? ''}
-            initialProgress={toolCall.progress ?? 0.1}
-            isSubmitting={isSubmitting}
-            attachments={attachments}
-          />
-        );
-      } else if (isToolCall) {
-        return (
-          <ToolCall
-            args={toolCall.args ?? ''}
-            name={toolCall.name ?? ''}
-            output={toolCall.output ?? ''}
-            initialProgress={toolCall.progress ?? 0.1}
-            isSubmitting={isSubmitting}
-          />
-        );
-      } else if (toolCall.type === ToolCallTypes.CODE_INTERPRETER) {
-        const code_interpreter = toolCall[ToolCallTypes.CODE_INTERPRETER];
-        return (
-          <CodeAnalyze
-            initialProgress={toolCall.progress ?? 0.1}
-            code={code_interpreter.input}
-            outputs={code_interpreter.outputs ?? []}
-            isSubmitting={isSubmitting}
-          />
-        );
-      } else if (
-        toolCall.type === ToolCallTypes.RETRIEVAL ||
-        toolCall.type === ToolCallTypes.FILE_SEARCH
-      ) {
-        return (
-          <RetrievalCall initialProgress={toolCall.progress ?? 0.1} isSubmitting={isSubmitting} />
-        );
-      } else if (
-        toolCall.type === ToolCallTypes.FUNCTION &&
-        ToolCallTypes.FUNCTION in toolCall &&
-        imageGenTools.has(toolCall.function.name)
-      ) {
-        return (
-          <ImageGen
-            initialProgress={toolCall.progress ?? 0.1}
-            args={toolCall.function.arguments as string}
-          />
-        );
-      } else if (toolCall.type === ToolCallTypes.FUNCTION && ToolCallTypes.FUNCTION in toolCall) {
-        if (isImageVisionTool(toolCall)) {
-          if (isSubmitting && showCursor) {
-            return (
-              <Container>
-                <Text
-                  text={''}
-                  isCreatedByUser={isCreatedByUser}
-                  messageId={messageId}
-                  showCursor={showCursor}
-                />
-              </Container>
-            );
-          }
-          return null;
-        }
-
-        return (
-          <ToolCall
-            initialProgress={toolCall.progress ?? 0.1}
-            isSubmitting={isSubmitting}
-            args={toolCall.function.arguments as string}
-            name={toolCall.function.name}
-            output={toolCall.function.output}
-          />
-        );
-      }
-    } else if (part.type === ContentTypes.IMAGE_FILE) {
-      const imageFile = part[ContentTypes.IMAGE_FILE];
-      const height = imageFile.height ?? 1920;
-      const width = imageFile.width ?? 1080;
       return (
-        <Image
-          imagePath={imageFile.filepath}
-          height={height}
-          width={width}
-          altText={imageFile.filename ?? 'Uploaded Image'}
-          placeholderDimensions={{
-            height: height + 'px',
-            width: width + 'px',
-          }}
+        <ToolCall
+          initialProgress={toolCall.progress ?? 0.1}
+          isSubmitting={isSubmitting}
+          args={toolCall.function.arguments as string}
+          name={toolCall.function.name}
+          output={toolCall.function.output}
         />
       );
     }
+  } else if (part.type === ContentTypes.IMAGE_FILE) {
+    const imageFile = part[ContentTypes.IMAGE_FILE];
+    const height = imageFile.height ?? 1920;
+    const width = imageFile.width ?? 1080;
+    return (
+      <Image
+        imagePath={imageFile.filepath}
+        height={height}
+        width={width}
+        altText={imageFile.filename ?? 'Uploaded Image'}
+        placeholderDimensions={{
+          height: height + 'px',
+          width: width + 'px',
+        }}
+      />
+    );
+  }
 
-    return null;
-  },
-);
+  return null;
+});
 
 export default Part;

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

@@ -0,0 +1,19 @@
+import { imageExtRegex } from 'librechat-data-provider';
+import type { TAttachment, TFile, TAttachmentMetadata } from 'librechat-data-provider';
+import Image from '~/components/Chat/Messages/Content/Image';
+
+export default function Attachment({ attachment }: { attachment?: TAttachment }) {
+  if (!attachment) {
+    return null;
+  }
+  const { width, height, filepath = null } = attachment as TFile & TAttachmentMetadata;
+  const isImage =
+    imageExtRegex.test(attachment.filename) && width != null && height != null && filepath != null;
+
+  if (isImage) {
+    return (
+      <Image altText={attachment.filename} imagePath={filepath} height={height} width={width} />
+    );
+  }
+  return null;
+}

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

@@ -1,12 +1,11 @@
 import React, { useMemo, useState } from 'react';
 import { useRecoilValue } from 'recoil';
-import { CodeInProgress } from './CodeProgress';
-import { imageExtRegex } from 'librechat-data-provider';
-import type { TFile, TAttachment, TAttachmentMetadata } from 'librechat-data-provider';
+import type { TAttachment } from 'librechat-data-provider';
 import ProgressText from '~/components/Chat/Messages/Content/ProgressText';
 import FinishedIcon from '~/components/Chat/Messages/Content/FinishedIcon';
 import MarkdownLite from '~/components/Chat/Messages/Content/MarkdownLite';
-import Image from '~/components/Chat/Messages/Content/Image';
+import { CodeInProgress } from './CodeProgress';
+import Attachment from './Attachment';
 import LogContent from './LogContent';
 import { useProgress } from '~/hooks';
 import store from '~/store';
@@ -86,7 +85,10 @@ export default function ExecuteCode({
       </div>
       {showCode && (
         <div className="code-analyze-block mb-3 mt-0.5 overflow-hidden rounded-xl bg-black">
-          <MarkdownLite content={code ? `\`\`\`${lang}\n${code}\n\`\`\`` : ''} />
+          <MarkdownLite
+            content={code ? `\`\`\`${lang}\n${code}\n\`\`\`` : ''}
+            codeExecution={false}
+          />
           {output.length > 0 && (
             <div className="bg-gray-700 p-4 text-xs">
               <div
@@ -103,25 +105,9 @@ export default function ExecuteCode({
           )}
         </div>
       )}
-      {attachments?.map((attachment, index) => {
-        const { width, height, filepath } = attachment as TFile & TAttachmentMetadata;
-        const isImage =
-          imageExtRegex.test(attachment.filename) &&
-          width != null &&
-          height != null &&
-          filepath != null;
-        if (isImage) {
-          return (
-            <Image
-              key={index}
-              altText={attachment.filename}
-              imagePath={filepath}
-              height={height}
-              width={width}
-            />
-          );
-        }
-      })}
+      {attachments?.map((attachment, index) => (
+        <Attachment attachment={attachment} key={index} />
+      ))}
     </>
   );
 }

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

@@ -1,17 +1,26 @@
 import { isAfter } from 'date-fns';
 import React, { useMemo } from 'react';
 import { imageExtRegex } from 'librechat-data-provider';
-import type { TAttachment } from 'librechat-data-provider';
+import type { TFile, TAttachment, TAttachmentMetadata } from 'librechat-data-provider';
+import Image from '~/components/Chat/Messages/Content/Image';
 import { useLocalize } from '~/hooks';
 import LogLink from './LogLink';
 
 interface LogContentProps {
   output?: string;
+  renderImages?: boolean;
   attachments?: TAttachment[];
 }
 
-const LogContent: React.FC<LogContentProps> = ({ output = '', attachments }) => {
+type ImageAttachment = TFile &
+  TAttachmentMetadata & {
+    height: number;
+    width: number;
+  };
+
+const LogContent: React.FC<LogContentProps> = ({ output = '', renderImages, attachments }) => {
   const localize = useLocalize();
+
   const processedContent = useMemo(() => {
     if (!output) {
       return '';
@@ -21,8 +30,29 @@ const LogContent: React.FC<LogContentProps> = ({ output = '', attachments }) =>
     return parts[0].trim();
   }, [output]);
 
-  const nonImageAttachments =
-    attachments?.filter((file) => !imageExtRegex.test(file.filename)) || [];
+  const { imageAttachments, nonImageAttachments } = useMemo(() => {
+    const imageAtts: ImageAttachment[] = [];
+    const nonImageAtts: TAttachment[] = [];
+
+    attachments?.forEach((attachment) => {
+      const { width, height, filepath = null } = attachment as TFile & TAttachmentMetadata;
+      const isImage =
+        imageExtRegex.test(attachment.filename) &&
+        width != null &&
+        height != null &&
+        filepath != null;
+      if (isImage) {
+        imageAtts.push(attachment as ImageAttachment);
+      } else {
+        nonImageAtts.push(attachment);
+      }
+    });
+
+    return {
+      imageAttachments: renderImages === true ? imageAtts : null,
+      nonImageAttachments: nonImageAtts,
+    };
+  }, [attachments, renderImages]);
 
   const renderAttachment = (file: TAttachment) => {
     const now = new Date();
@@ -59,6 +89,18 @@ const LogContent: React.FC<LogContentProps> = ({ output = '', attachments }) =>
           ))}
         </div>
       )}
+      {imageAttachments?.map((attachment, index) => {
+        const { width, height, filepath } = attachment;
+        return (
+          <Image
+            key={index}
+            altText={attachment.filename}
+            imagePath={filepath}
+            height={height}
+            width={width}
+          />
+        );
+      })}
     </>
   );
 };

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

@@ -2,15 +2,14 @@ import { memo, useMemo, ReactElement } from 'react';
 import { useRecoilValue } from 'recoil';
 import MarkdownLite from '~/components/Chat/Messages/Content/MarkdownLite';
 import Markdown from '~/components/Chat/Messages/Content/Markdown';
-import { useChatContext } from '~/Providers';
+import { useChatContext, useMessageContext } from '~/Providers';
 import { cn } from '~/utils';
 import store from '~/store';
 
 type TextPartProps = {
   text: string;
-  isCreatedByUser: boolean;
-  messageId: string;
   showCursor: boolean;
+  isCreatedByUser: boolean;
 };
 
 type ContentType =
@@ -18,7 +17,8 @@ type ContentType =
   | ReactElement<React.ComponentProps<typeof MarkdownLite>>
   | ReactElement;
 
-const TextPart = memo(({ text, isCreatedByUser, messageId, showCursor }: TextPartProps) => {
+const TextPart = memo(({ text, isCreatedByUser, showCursor }: TextPartProps) => {
+  const { messageId } = useMessageContext();
   const { isSubmitting, latestMessage } = useChatContext();
   const enableUserMsgMarkdown = useRecoilValue(store.enableUserMsgMarkdown);
   const showCursorState = useMemo(() => showCursor && isSubmitting, [showCursor, isSubmitting]);

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

@@ -1,9 +1,11 @@
 import { useMemo } from 'react';
-import { actionDelimiter, actionDomainSeparator, Constants } from 'librechat-data-provider';
 import * as Popover from '@radix-ui/react-popover';
+import { actionDelimiter, actionDomainSeparator, Constants } from 'librechat-data-provider';
+import type { TAttachment } from 'librechat-data-provider';
 import useLocalize from '~/hooks/useLocalize';
 import ProgressCircle from './ProgressCircle';
 import InProgressCall from './InProgressCall';
+import Attachment from './Parts/Attachment';
 import CancelledIcon from './CancelledIcon';
 import ProgressText from './ProgressText';
 import FinishedIcon from './FinishedIcon';
@@ -18,12 +20,14 @@ export default function ToolCall({
   name,
   args: _args = '',
   output,
+  attachments,
 }: {
   initialProgress: number;
   isSubmitting: boolean;
   name: string;
   args: string | Record<string, unknown>;
   output?: string | null;
+  attachments?: TAttachment[];
 }) {
   const localize = useLocalize();
   const progress = useProgress(initialProgress);
@@ -106,6 +110,9 @@ export default function ToolCall({
           />
         )}
       </div>
+      {attachments?.map((attachment, index) => (
+        <Attachment attachment={attachment} key={index} />
+      ))}
     </Popover.Root>
   );
 }

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

@@ -33,7 +33,7 @@ export default function ToolPopover({
         <div tabIndex={-1}>
           <div className="bg-token-surface-primary max-w-sm rounded-md p-2 shadow-[0_0_24px_0_rgba(0,0,0,0.05),inset_0_0.5px_0_0_rgba(0,0,0,0.05),0_2px_8px_0_rgba(0,0,0,0.05)]">
             <div className="mb-2 text-sm font-medium dark:text-gray-100">
-              {domain
+              {domain != null && domain
                 ? localize('com_assistants_domain_info', domain)
                 : localize('com_assistants_function_use', function_name)}
             </div>
@@ -42,7 +42,7 @@ export default function ToolPopover({
                 <code className="!whitespace-pre-wrap ">{formatText(input)}</code>
               </div>
             </div>
-            {output && (
+            {output != null && output && (
               <>
                 <div className="mb-2 mt-2 text-sm font-medium dark:text-gray-100">
                   {localize('com_ui_result')}

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

@@ -82,11 +82,12 @@ export default function Message(props: TMessageProps) {
               <div className="flex-col gap-1 md:gap-3">
                 <div className="flex max-w-full flex-grow flex-col gap-0">
                   <ContentParts
-                    content={message.content as Array<TMessageContentParts | undefined>}
-                    messageId={message.messageId}
-                    isCreatedByUser={message.isCreatedByUser}
                     isLast={isLast}
                     isSubmitting={isSubmitting}
+                    messageId={message.messageId}
+                    isCreatedByUser={message.isCreatedByUser}
+                    conversationId={conversation?.conversationId}
+                    content={message.content as Array<TMessageContentParts | undefined>}
                   />
                 </div>
               </div>

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

@@ -9,6 +9,7 @@ import HoverButtons from '~/components/Chat/Messages/HoverButtons';
 import Icon from '~/components/Chat/Messages/MessageIcon';
 import { Plugin } from '~/components/Messages/Content';
 import SubRow from '~/components/Chat/Messages/SubRow';
+import { MessageContext } from '~/Providers';
 import { useMessageActions } from '~/hooks';
 import { cn, logger } from '~/utils';
 import store from '~/store';
@@ -59,9 +60,10 @@ const MessageRender = memo(
     const fontSize = useRecoilValue(store.fontSize);
     const handleRegenerateMessage = useCallback(() => regenerateMessage(), [regenerateMessage]);
     const { isCreatedByUser, error, unfinished } = msg ?? {};
+    const hasNoChildren = !(msg?.children?.length ?? 0);
     const isLast = useMemo(
-      () => !msg?.children?.length && (msg?.depth === latestMessage?.depth || msg?.depth === -1),
-      [msg?.children, msg?.depth, latestMessage?.depth],
+      () => hasNoChildren && (msg?.depth === latestMessage?.depth || msg?.depth === -1),
+      [hasNoChildren, msg?.depth, latestMessage?.depth],
     );
 
     if (!msg) {
@@ -122,24 +124,31 @@ const MessageRender = memo(
           <h2 className={cn('select-none font-semibold', fontSize)}>{messageLabel}</h2>
           <div className="flex-col gap-1 md:gap-3">
             <div className="flex max-w-full flex-grow flex-col gap-0">
-              {msg.plugin && <Plugin plugin={msg.plugin} />}
-              <MessageContent
-                ask={ask}
-                edit={edit}
-                isLast={isLast}
-                text={msg.text || ''}
-                message={msg}
-                enterEdit={enterEdit}
-                error={!!(error ?? false)}
-                isSubmitting={isSubmitting}
-                unfinished={unfinished ?? false}
-                isCreatedByUser={isCreatedByUser ?? true}
-                siblingIdx={siblingIdx ?? 0}
-                setSiblingIdx={setSiblingIdx ?? (() => ({}))}
-              />
+              <MessageContext.Provider
+                value={{
+                  messageId: msg.messageId,
+                  conversationId: conversation?.conversationId,
+                }}
+              >
+                {msg.plugin && <Plugin plugin={msg.plugin} />}
+                <MessageContent
+                  ask={ask}
+                  edit={edit}
+                  isLast={isLast}
+                  text={msg.text || ''}
+                  message={msg}
+                  enterEdit={enterEdit}
+                  error={!!(error ?? false)}
+                  isSubmitting={isSubmitting}
+                  unfinished={unfinished ?? false}
+                  isCreatedByUser={isCreatedByUser ?? true}
+                  siblingIdx={siblingIdx ?? 0}
+                  setSiblingIdx={setSiblingIdx ?? (() => ({}))}
+                />
+              </MessageContext.Provider>
             </div>
           </div>
-          {!msg.children?.length && (isSubmittingFamily === true || isSubmitting) ? (
+          {hasNoChildren && (isSubmittingFamily === true || isSubmitting) ? (
             <PlaceholderRow isCard={isCard} />
           ) : (
             <SubRow classes="text-xs">

client/src/components/Endpoints/SaveAsPresetDialog.tsx

@@ -28,7 +28,7 @@ const SaveAsPresetDialog = ({ open, onOpenChange, preset }: TEditPresetProps) =>
     createPresetMutation.mutate(_preset, {
       onSuccess: () => {
         showToast({
-          message: `${toastTitle} ${localize('com_endpoint_preset_saved')}`,
+          message: `${toastTitle} ${localize('com_ui_saved')}`,
         });
         onOpenChange(false); // Close the dialog on success
       },

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

@@ -1,81 +1,133 @@
 import copy from 'copy-to-clipboard';
 import { InfoIcon } from 'lucide-react';
-import React, { useRef, useState, RefObject } from 'react';
+import { Tools } from 'librechat-data-provider';
+import React, { useRef, useState, useMemo, useEffect } from 'react';
+import type { CodeBarProps } from '~/common';
+import LogContent from '~/components/Chat/Messages/Content/Parts/LogContent';
+import ResultSwitcher from '~/components/Messages/Content/ResultSwitcher';
+import { useToolCallsMapContext, useMessageContext } from '~/Providers';
+import RunCode from '~/components/Messages/Content/RunCode';
 import Clipboard from '~/components/svg/Clipboard';
 import CheckMark from '~/components/svg/CheckMark';
 import useLocalize from '~/hooks/useLocalize';
 import cn from '~/utils/cn';
 
-type CodeBarProps = {
-  lang: string;
-  codeRef: RefObject<HTMLElement>;
-  plugin?: boolean;
-  error?: boolean;
-};
-
-type CodeBlockProps = Pick<CodeBarProps, 'lang' | 'plugin' | 'error'> & {
+type CodeBlockProps = Pick<
+  CodeBarProps,
+  'lang' | 'plugin' | 'error' | 'allowExecution' | 'blockIndex'
+> & {
   codeChildren: React.ReactNode;
   classProp?: string;
 };
 
-const CodeBar: React.FC<CodeBarProps> = React.memo(({ lang, codeRef, error, plugin = null }) => {
-  const localize = useLocalize();
-  const [isCopied, setIsCopied] = useState(false);
-  return (
-    <div className="relative flex items-center rounded-tl-md rounded-tr-md bg-gray-700 px-4 py-2 font-sans text-xs text-gray-200 dark:bg-gray-700">
-      <span className="">{lang}</span>
-      {plugin === true ? (
-        <InfoIcon className="ml-auto flex h-4 w-4 gap-2 text-white/50" />
-      ) : (
-        <button
-          type="button"
-          className={cn(
-            'ml-auto flex gap-2',
-            error === true ? 'h-4 w-4 items-start text-white/50' : '',
-          )}
-          onClick={async () => {
-            const codeString = codeRef.current?.textContent;
-            if (codeString != null) {
-              setIsCopied(true);
-              copy(codeString.trim(), { format: 'text/plain' });
+const CodeBar: React.FC<CodeBarProps> = React.memo(
+  ({ lang, error, codeRef, blockIndex, plugin = null, allowExecution = true }) => {
+    const localize = useLocalize();
+    const [isCopied, setIsCopied] = useState(false);
+    return (
+      <div className="relative flex items-center justify-between rounded-tl-md rounded-tr-md bg-gray-700 px-4 py-2 font-sans text-xs text-gray-200 dark:bg-gray-700">
+        <span className="">{lang}</span>
+        {plugin === true ? (
+          <InfoIcon className="ml-auto flex h-4 w-4 gap-2 text-white/50" />
+        ) : (
+          <div className="flex items-center justify-center gap-4">
+            {allowExecution === true && (
+              <RunCode lang={lang} codeRef={codeRef} blockIndex={blockIndex} />
+            )}
+            <button
+              type="button"
+              className={cn(
+                'ml-auto flex gap-2',
+                error === true ? 'h-4 w-4 items-start text-white/50' : '',
+              )}
+              onClick={async () => {
+                const codeString = codeRef.current?.textContent;
+                if (codeString != null) {
+                  setIsCopied(true);
+                  copy(codeString.trim(), { format: 'text/plain' });
 
-              setTimeout(() => {
-                setIsCopied(false);
-              }, 3000);
-            }
-          }}
-        >
-          {isCopied ? (
-            <>
-              <CheckMark className="h-[18px] w-[18px]" />
-              {error === true ? '' : localize('com_ui_copied')}
-            </>
-          ) : (
-            <>
-              <Clipboard />
-              {error === true ? '' : localize('com_ui_copy_code')}
-            </>
-          )}
-        </button>
-      )}
-    </div>
-  );
-});
+                  setTimeout(() => {
+                    setIsCopied(false);
+                  }, 3000);
+                }
+              }}
+            >
+              {isCopied ? (
+                <>
+                  <CheckMark className="h-[18px] w-[18px]" />
+                  {error === true ? '' : localize('com_ui_copied')}
+                </>
+              ) : (
+                <>
+                  <Clipboard />
+                  {error === true ? '' : localize('com_ui_copy_code')}
+                </>
+              )}
+            </button>
+          </div>
+        )}
+      </div>
+    );
+  },
+);
 
 const CodeBlock: React.FC<CodeBlockProps> = ({
   lang,
+  blockIndex,
   codeChildren,
   classProp = '',
+  allowExecution = true,
   plugin = null,
   error,
 }) => {
   const codeRef = useRef<HTMLElement>(null);
+  const toolCallsMap = useToolCallsMapContext();
+  const { messageId, partIndex } = useMessageContext();
+  const key = allowExecution
+    ? `${messageId}_${partIndex ?? 0}_${blockIndex ?? 0}_${Tools.execute_code}`
+    : '';
+  const [currentIndex, setCurrentIndex] = useState(0);
+
+  const fetchedToolCalls = toolCallsMap?.[key];
+  const [toolCalls, setToolCalls] = useState(toolCallsMap?.[key] ?? null);
+
+  useEffect(() => {
+    if (fetchedToolCalls) {
+      setToolCalls(fetchedToolCalls);
+      setCurrentIndex(fetchedToolCalls.length - 1);
+    }
+  }, [fetchedToolCalls]);
+
+  const currentToolCall = useMemo(() => toolCalls?.[currentIndex], [toolCalls, currentIndex]);
+
+  const next = () => {
+    if (!toolCalls) {
+      return;
+    }
+    if (currentIndex < toolCalls.length - 1) {
+      setCurrentIndex(currentIndex + 1);
+    }
+  };
+
+  const previous = () => {
+    if (currentIndex > 0) {
+      setCurrentIndex(currentIndex - 1);
+    }
+  };
+
   const isNonCode = !!(plugin === true || error === true);
   const language = isNonCode ? 'json' : lang;
 
   return (
     <div className="w-full rounded-md bg-gray-900 text-xs text-white/80">
-      <CodeBar lang={lang} codeRef={codeRef} plugin={plugin === true} error={error} />
+      <CodeBar
+        lang={lang}
+        error={error}
+        codeRef={codeRef}
+        blockIndex={blockIndex}
+        plugin={plugin === true}
+        allowExecution={allowExecution}
+      />
       <div className={cn(classProp, 'overflow-y-auto p-4')}>
         <code
           ref={codeRef}
@@ -86,6 +138,34 @@ const CodeBlock: React.FC<CodeBlockProps> = ({
           {codeChildren}
         </code>
       </div>
+      {allowExecution === true && toolCalls && toolCalls.length > 0 && (
+        <>
+          <div className="bg-gray-700 p-4 text-xs">
+            <div
+              className="prose flex flex-col-reverse text-white"
+              style={{
+                color: 'white',
+              }}
+            >
+              <pre className="shrink-0">
+                <LogContent
+                  output={(currentToolCall?.result as string | undefined) ?? ''}
+                  attachments={currentToolCall?.attachments ?? []}
+                  renderImages={true}
+                />
+              </pre>
+            </div>
+          </div>
+          {toolCalls.length > 1 && (
+            <ResultSwitcher
+              currentIndex={currentIndex}
+              totalCount={toolCalls.length}
+              onPrevious={previous}
+              onNext={next}
+            />
+          )}
+        </>
+      )}
     </div>
   );
 };

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

@@ -0,0 +1,69 @@
+interface ResultSwitcherProps {
+  currentIndex: number;
+  totalCount: number;
+  onPrevious: () => void;
+  onNext: () => void;
+}
+
+const ResultSwitcher: React.FC<ResultSwitcherProps> = ({
+  currentIndex,
+  totalCount,
+  onPrevious,
+  onNext,
+}) => {
+  if (totalCount <= 1) {
+    return null;
+  }
+
+  return (
+    <div className="flex items-center justify-start gap-1 self-center bg-gray-700 pb-2 text-xs">
+      <button
+        className="hover-button rounded-md p-1 text-gray-400 hover:bg-gray-700 hover:text-gray-200 disabled:hover:text-gray-400"
+        type="button"
+        onClick={onPrevious}
+        disabled={currentIndex === 0}
+      >
+        <svg
+          stroke="currentColor"
+          fill="none"
+          strokeWidth="1.5"
+          viewBox="0 0 24 24"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          className="h-4 w-4"
+          height="1em"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <polyline points="15 18 9 12 15 6" />
+        </svg>
+      </button>
+      <span className="flex-shrink-0 tabular-nums">
+        {currentIndex + 1} / {totalCount}
+      </span>
+      <button
+        className="hover-button rounded-md p-1 text-gray-400 hover:bg-gray-700 hover:text-gray-200 disabled:hover:text-gray-400"
+        type="button"
+        onClick={onNext}
+        disabled={currentIndex === totalCount - 1}
+      >
+        <svg
+          stroke="currentColor"
+          fill="none"
+          strokeWidth="1.5"
+          viewBox="0 0 24 24"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          className="h-4 w-4"
+          height="1em"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <polyline points="9 18 15 12 9 6" />
+        </svg>
+      </button>
+    </div>
+  );
+};
+
+export default ResultSwitcher;

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

@@ -0,0 +1,109 @@
+import debounce from 'lodash/debounce';
+import { Tools, AuthType } from 'librechat-data-provider';
+import { TerminalSquareIcon, Loader } from 'lucide-react';
+import React, { useMemo, useCallback, useEffect } from 'react';
+import type { CodeBarProps } from '~/common';
+import { useVerifyAgentToolAuth, useToolCallMutation } from '~/data-provider';
+import ApiKeyDialog from '~/components/SidePanel/Agents/Code/ApiKeyDialog';
+import { useLocalize, useCodeApiKeyForm } from '~/hooks';
+import { useMessageContext } from '~/Providers';
+import { cn, normalizeLanguage } from '~/utils';
+import { useToastContext } from '~/Providers';
+
+const RunCode: React.FC<CodeBarProps> = React.memo(({ lang, codeRef, blockIndex }) => {
+  const localize = useLocalize();
+  const { showToast } = useToastContext();
+  const execute = useToolCallMutation(Tools.execute_code, {
+    onError: () => {
+      showToast({ message: localize('com_ui_run_code_error'), status: 'error' });
+    },
+  });
+
+  const { messageId, conversationId, partIndex } = useMessageContext();
+  const normalizedLang = useMemo(() => normalizeLanguage(lang), [lang]);
+  const { data } = useVerifyAgentToolAuth({ toolId: Tools.execute_code });
+  const authType = useMemo(() => data?.message ?? false, [data?.message]);
+  const isAuthenticated = useMemo(() => data?.authenticated ?? false, [data?.authenticated]);
+  const { methods, onSubmit, isDialogOpen, setIsDialogOpen, handleRevokeApiKey } =
+    useCodeApiKeyForm({});
+
+  const handleExecute = useCallback(async () => {
+    if (!isAuthenticated) {
+      setIsDialogOpen(true);
+      return;
+    }
+    const codeString: string = codeRef.current?.textContent ?? '';
+    if (
+      typeof codeString !== 'string' ||
+      codeString.length === 0 ||
+      typeof normalizedLang !== 'string' ||
+      normalizedLang.length === 0
+    ) {
+      return;
+    }
+
+    execute.mutate({
+      partIndex,
+      messageId,
+      blockIndex,
+      conversationId: conversationId ?? '',
+      lang: normalizedLang,
+      code: codeString,
+    });
+  }, [
+    codeRef,
+    execute,
+    partIndex,
+    messageId,
+    blockIndex,
+    conversationId,
+    normalizedLang,
+    setIsDialogOpen,
+    isAuthenticated,
+  ]);
+
+  const debouncedExecute = useMemo(
+    () => debounce(handleExecute, 1000, { leading: true }),
+    [handleExecute],
+  );
+
+  useEffect(() => {
+    return () => {
+      debouncedExecute.cancel();
+    };
+  }, [debouncedExecute]);
+
+  if (typeof normalizedLang !== 'string' || normalizedLang.length === 0) {
+    return null;
+  }
+
+  return (
+    <>
+      <button
+        type="button"
+        className={cn('ml-auto flex gap-2')}
+        onClick={debouncedExecute}
+        disabled={execute.isLoading}
+      >
+        {execute.isLoading ? (
+          <Loader className="animate-spin" size={18} />
+        ) : (
+          <TerminalSquareIcon size={18} />
+        )}
+        {localize('com_ui_run_code')}
+      </button>
+      <ApiKeyDialog
+        onSubmit={onSubmit}
+        isOpen={isDialogOpen}
+        register={methods.register}
+        onRevoke={handleRevokeApiKey}
+        onOpenChange={setIsDialogOpen}
+        handleSubmit={methods.handleSubmit}
+        isToolAuthenticated={isAuthenticated}
+        isUserProvided={authType === AuthType.USER_PROVIDED}
+      />
+    </>
+  );
+});
+
+export default RunCode;

client/src/components/Messages/ContentRender.tsx

@@ -129,16 +129,17 @@ const ContentRender = memo(
           <div className="flex-col gap-1 md:gap-3">
             <div className="flex max-w-full flex-grow flex-col gap-0">
               <ContentParts
-                content={msg.content as Array<TMessageContentParts | undefined>}
-                messageId={msg.messageId}
-                isCreatedByUser={msg.isCreatedByUser}
-                isLast={isLast}
-                isSubmitting={isSubmitting}
                 edit={edit}
+                isLast={isLast}
                 enterEdit={enterEdit}
                 siblingIdx={siblingIdx}
+                messageId={msg.messageId}
+                isSubmitting={isSubmitting}
                 setSiblingIdx={setSiblingIdx}
                 attachments={msg.attachments}
+                isCreatedByUser={msg.isCreatedByUser}
+                conversationId={conversation?.conversationId}
+                content={msg.content as Array<TMessageContentParts | undefined>}
               />
             </div>
           </div>

client/src/components/Prompts/AdminSettings.tsx

@@ -29,17 +29,19 @@ const LabelController: React.FC<LabelControllerProps> = ({
   setValue,
 }) => (
   <div className="mb-4 flex items-center justify-between gap-2">
-    <label
+    <button
       className="cursor-pointer select-none"
-      htmlFor={promptPerm}
+      type="button"
+      // htmlFor={promptPerm}
       onClick={() =>
         setValue(promptPerm, !getValues(promptPerm), {
           shouldDirty: true,
         })
       }
+      tabIndex={0}
     >
       {label}
-    </label>
+    </button>
     <Controller
       name={promptPerm}
       control={control}
@@ -48,7 +50,7 @@ const LabelController: React.FC<LabelControllerProps> = ({
           {...field}
           checked={field.value}
           onCheckedChange={field.onChange}
-          value={field?.value?.toString()}
+          value={field.value.toString()}
         />
       )}
     />
@@ -61,7 +63,7 @@ const AdminSettings = () => {
   const { showToast } = useToastContext();
   const { mutate, isLoading } = useUpdatePromptPermissionsMutation({
     onSuccess: () => {
-      showToast({ status: 'success', message: localize('com_endpoint_preset_saved') });
+      showToast({ status: 'success', message: localize('com_ui_saved') });
     },
     onError: () => {
       showToast({ status: 'error', message: localize('com_ui_error_save_admin_settings') });

client/src/components/Prompts/Groups/VariableForm.tsx

@@ -14,9 +14,9 @@ import {
   replaceSpecialVars,
   extractVariableInfo,
 } from '~/utils';
+import { codeNoExecution } from '~/components/Chat/Messages/Content/Markdown';
 import { useAuthContext, useLocalize, useSubmitMessage } from '~/hooks';
 import { TextareaAutosize, InputCombobox } from '~/components/ui';
-import { code } from '~/components/Chat/Messages/Content/Markdown';
 
 type FieldType = 'text' | 'select';
 
@@ -143,12 +143,16 @@ export default function VariableForm({
       <form onSubmit={handleSubmit(onSubmit)} className="space-y-4">
         <div className="mb-6 max-h-screen max-w-[90vw] overflow-auto rounded-md bg-gray-100 p-4 text-text-secondary dark:bg-gray-700/50 sm:max-w-full md:max-h-80">
           <ReactMarkdown
+            /** @ts-ignore */
             remarkPlugins={[supersub, remarkGfm, [remarkMath, { singleDollarTextMath: true }]]}
             rehypePlugins={[
+              /** @ts-ignore */
               [rehypeKatex, { output: 'mathml' }],
+              /** @ts-ignore */
               [rehypeHighlight, { ignoreMissing: true }],
             ]}
-            components={{ code }}
+            /** @ts-ignore */
+            components={{ code: codeNoExecution }}
             className="prose dark:prose-invert light dark:text-gray-70 my-1 max-h-[50vh] break-words"
           >
             {generateHighlightedMarkdown()}

client/src/components/Prompts/PromptDetails.tsx

@@ -6,7 +6,7 @@ import remarkMath from 'remark-math';
 import supersub from 'remark-supersub';
 import rehypeHighlight from 'rehype-highlight';
 import type { TPromptGroup } from 'librechat-data-provider';
-import { code } from '~/components/Chat/Messages/Content/Markdown';
+import { codeNoExecution } from '~/components/Chat/Messages/Content/Markdown';
 import { useLocalize, useAuthContext } from '~/hooks';
 import CategoryIcon from './Groups/CategoryIcon';
 import PromptVariables from './PromptVariables';
@@ -50,12 +50,20 @@ const PromptDetails = ({ group }: { group?: TPromptGroup }) => {
             </h2>
             <div className="group relative min-h-32 rounded-b-lg border border-gray-300 p-4 transition-all duration-150 dark:border-gray-600 sm:max-w-full">
               <ReactMarkdown
-                remarkPlugins={[supersub, remarkGfm, [remarkMath, { singleDollarTextMath: true }]]}
+                remarkPlugins={[
+                  /** @ts-ignore */
+                  supersub,
+                  remarkGfm,
+                  [remarkMath, { singleDollarTextMath: true }],
+                ]}
                 rehypePlugins={[
+                  /** @ts-ignore */
                   [rehypeKatex, { output: 'mathml' }],
+                  /** @ts-ignore */
                   [rehypeHighlight, { ignoreMissing: true }],
                 ]}
-                components={{ p: PromptVariableGfm, code }}
+                /** @ts-ignore */
+                components={{ p: PromptVariableGfm, code: codeNoExecution }}
                 className="prose dark:prose-invert light dark:text-gray-70 my-1"
               >
                 {mainText}

client/src/components/Prompts/PromptEditor.tsx

@@ -9,8 +9,8 @@ import rehypeKatex from 'rehype-katex';
 import remarkMath from 'remark-math';
 import supersub from 'remark-supersub';
 import ReactMarkdown from 'react-markdown';
+import { codeNoExecution } from '~/components/Chat/Messages/Content/Markdown';
 import AlwaysMakeProd from '~/components/Prompts/Groups/AlwaysMakeProd';
-import { code } from '~/components/Chat/Messages/Content/Markdown';
 import { SaveIcon, CrossIcon } from '~/components/svg';
 import { TextareaAutosize } from '~/components/ui';
 import { PromptVariableGfm } from './Markdown';
@@ -75,7 +75,7 @@ const PromptEditor: React.FC<Props> = ({ name, isEditing, setIsEditing }) => {
         role="button"
         className={cn(
           'min-h-[8rem] w-full rounded-b-lg border border-border-medium p-4 transition-all duration-150',
-          { 'bg-surface-secondary-alt cursor-pointer hover:bg-surface-tertiary': !isEditing },
+          { 'cursor-pointer bg-surface-secondary-alt hover:bg-surface-tertiary': !isEditing },
         )}
         onClick={() => !isEditing && setIsEditing(true)}
         onKeyDown={(e) => {
@@ -107,9 +107,12 @@ const PromptEditor: React.FC<Props> = ({ name, isEditing, setIsEditing }) => {
               />
             ) : (
               <ReactMarkdown
+                /** @ts-ignore */
                 remarkPlugins={[supersub, remarkGfm, [remarkMath, { singleDollarTextMath: true }]]}
+                /** @ts-ignore */
                 rehypePlugins={rehypePlugins}
-                components={{ p: PromptVariableGfm, code }}
+                /** @ts-ignore */
+                components={{ p: PromptVariableGfm, code: codeNoExecution }}
                 className="markdown prose dark:prose-invert light my-1 w-full break-words text-text-primary"
               >
                 {field.value}