Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🔧 refactor: Optimize Agent Tool Loading and Fix Bedrock Tool Handling (#4641)
Danny Avila0c2a583df891
diff --git a/api/app/clients/prompts/formatAgentMessages.spec.js b/api/app/clients/prompts/formatAgentMessages.spec.jsindex fe0f1e0228..17b8fda7e0 100644--- a/api/app/clients/prompts/formatAgentMessages.spec.js+++ b/api/app/clients/prompts/formatAgentMessages.spec.js@@ -120,7 +120,7 @@ describe('formatAgentMessages', () => {];const result = formatAgentMessages(payload);expect(result).toHaveLength(2);- expect(result[0].tool_calls[0].args).toBe('non-json-string');+ expect(result[0].tool_calls[0].args).toStrictEqual({ input: 'non-json-string' });});it('should handle complex tool calls with multiple steps', () => {diff --git a/api/app/clients/prompts/formatMessages.js b/api/app/clients/prompts/formatMessages.jsindex c9839102d3..8a0dc97ea9 100644--- a/api/app/clients/prompts/formatMessages.js+++ b/api/app/clients/prompts/formatMessages.js@@ -189,10 +189,13 @@ const formatAgentMessages = (payload) => {// TODO: investigate; args as dictionary may need to be provider-or-tool-specificlet args = _args;try {- args = JSON.parse(args);+ args = JSON.parse(_args);} catch (e) {- // failed to parse, leave as is+ if (typeof _args === 'string') {+ args = { input: _args };+ }}+tool_call.args = args;lastAIMessage.tool_calls.push(tool_call);diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.jsindex c7f832db1e..277d545baa 100644--- a/api/server/controllers/agents/client.js+++ b/api/server/controllers/agents/client.js@@ -461,7 +461,6 @@ class AgentClient extends BaseClient {req: this.options.req,agent: this.options.agent,tools: this.options.tools,- toolMap: this.options.toolMap,runId: this.responseMessageId,modelOptions: this.modelOptions,customHandlers: this.options.eventHandlers,diff --git a/api/server/controllers/agents/run.js b/api/server/controllers/agents/run.jsindex 241d224730..56cc46d5b3 100644--- a/api/server/controllers/agents/run.js+++ b/api/server/controllers/agents/run.js@@ -18,7 +18,6 @@ const { providerEndpointMap } = require('librechat-data-provider');* @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 {Record<string, StructuredTool[]> | undefined} [options.toolMap] - The tool map for the 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.@@ -29,7 +28,6 @@ async function createRun({runId,tools,agent,- toolMap,modelOptions,customHandlers,streaming = true,@@ -47,7 +45,6 @@ async function createRun({const graphConfig = {tools,- toolMap,llmConfig,instructions: agent.instructions,additional_instructions: agent.additional_instructions,diff --git a/api/server/services/ActionService.js b/api/server/services/ActionService.jsindex 6bca75b989..ea1bcc4d23 100644--- a/api/server/services/ActionService.js+++ b/api/server/services/ActionService.js@@ -14,6 +14,7 @@ const { getLogStores } = require('~/cache');const { logger } = require('~/config');const toolNameRegex = /^[a-zA-Z0-9_-]+$/;+const replaceSeparatorRegex = new RegExp(actionDomainSeparator, 'g');/*** Validates tool name against regex pattern and updates if necessary.@@ -83,8 +84,6 @@ async function domainParser(req, domain, inverse = false) {return key;}- const replaceSeparatorRegex = new RegExp(actionDomainSeparator, 'g');-if (!cachedDomain) {return domain.replace(replaceSeparatorRegex, '.');}@@ -156,7 +155,7 @@ async function createActionTool({ action, requestBuilder, zodSchema, name, descrif (name) {return tool(_call, {- name,+ name: name.replace(replaceSeparatorRegex, '_'),description: description || '',schema: zodSchema,});diff --git a/api/server/services/Endpoints/agents/initialize.js b/api/server/services/Endpoints/agents/initialize.jsindex 93bb837695..796f69e4ac 100644--- a/api/server/services/Endpoints/agents/initialize.js+++ b/api/server/services/Endpoints/agents/initialize.js@@ -54,7 +54,7 @@ const initializeClient = async ({ req, res, endpointOption }) => {throw new Error('Agent not found');}- const { tools, toolMap } = await loadAgentTools({+ const { tools } = await loadAgentTools({req,tools: agent.tools,agent_id: agent.id,@@ -100,7 +100,6 @@ const initializeClient = async ({ req, res, endpointOption }) => {agent,tools,sender,- toolMap,contentParts,modelOptions,eventHandlers,diff --git a/api/server/services/Endpoints/bedrock/initialize.js b/api/server/services/Endpoints/bedrock/initialize.jsindex 4a7e98a4ad..00630c41e6 100644--- a/api/server/services/Endpoints/bedrock/initialize.js+++ b/api/server/services/Endpoints/bedrock/initialize.js@@ -60,7 +60,6 @@ const initializeClient = async ({ req, res, endpointOption }) => {agent,sender,// tools,- // toolMap,modelOptions,contentParts,eventHandlers,diff --git a/api/server/services/ToolService.js b/api/server/services/ToolService.jsindex 778b29ff06..9fa012191b 100644--- a/api/server/services/ToolService.js+++ b/api/server/services/ToolService.js@@ -373,14 +373,14 @@ async function processRequiredActions(client, requiredActions) {}/**- * Processes the runtime tool calls and returns a combined toolMap.+ * Processes the runtime tool calls and returns the tool classes.* @param {Object} params - Run params containing user and request information.* @param {ServerRequest} params.req - The request object.* @param {string} params.agent_id - The agent ID.* @param {Agent['tools']} params.tools - The agent's available tools.* @param {Agent['tool_resources']} params.tool_resources - The agent's available tool resources.* @param {string | undefined} [params.openAIApiKey] - The OpenAI API key.- * @returns {Promise<{ tools?: StructuredTool[]; toolMap?: Record<string, StructuredTool>}>} The combined toolMap.+ * @returns {Promise<{ tools?: StructuredTool[] }>} The agent tools.*/async function loadAgentTools({ req, agent_id, tools, tool_resources, openAIApiKey }) {if (!tools || tools.length === 0) {@@ -482,10 +482,8 @@ async function loadAgentTools({ req, agent_id, tools, tool_resources, openAIApiKthrow new Error('No tools found for the specified tool calls.');}- const toolMap = { ...ToolMap, ...ActionToolMap };return {tools: agentTools,- toolMap,};}diff --git a/api/typedefs.js b/api/typedefs.jsindex 371fe94447..8c1af11a69 100644--- a/api/typedefs.js+++ b/api/typedefs.js@@ -958,7 +958,6 @@* @property {Object} [headers] - Additional headers for requests* @property {string} [proxy] - Proxy configuration* @property {Object} [tools] - Available tools for the agent- * @property {Object} [toolMap] - Mapping of tool configurations* @property {Object} [eventHandlers] - Custom event handlers* @property {Object} [addParams] - Additional parameters to add to requests* @property {string[]} [dropParams] - Parameters to remove from requests