@librechat/agents 3.0.22 → 3.0.24

package/dist/cjs/tools/ToolNode.cjs

@@ -1,19 +1,26 @@
 'use strict';
 
-var langgraph = require('@langchain/langgraph');
 var messages = require('@langchain/core/messages');
+var langgraph = require('@langchain/langgraph');
 require('../common/enum.cjs');
 require('nanoid');
 require('../messages/core.cjs');
 var run = require('../utils/run.cjs');
 require('js-tiktoken/lite');
 
+/**
+ * Helper to check if a value is a Send object
+ */
+function isSend(value) {
+    return value instanceof langgraph.Send;
+}
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 class ToolNode extends run.RunnableCallable {
     tools;
     toolMap;
     loadRuntimeTools;
     handleToolErrors = true;
+    trace = false;
     toolCallStepIds;
     errorHandler;
     toolUsageCount;
@@ -34,74 +41,147 @@ class ToolNode extends run.RunnableCallable {
     getToolUsageCounts() {
         return new Map(this.toolUsageCount); // Return a copy
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    async run(input, config) {
-        const message = Array.isArray(input)
-            ? input[input.length - 1]
-            : input.messages[input.messages.length - 1];
-        if (message._getType() !== 'ai') {
-            throw new Error('ToolNode only accepts AIMessages as input.');
-        }
-        if (this.loadRuntimeTools) {
-            const { tools, toolMap } = this.loadRuntimeTools(message.tool_calls ?? []);
-            this.tools = tools;
-            this.toolMap = toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));
+    /**
+     * Runs a single tool call with error handling
+     */
+    async runTool(call, config) {
+        const tool = this.toolMap.get(call.name);
+        try {
+            if (tool === undefined) {
+                throw new Error(`Tool "${call.name}" not found.`);
+            }
+            const turn = this.toolUsageCount.get(call.name) ?? 0;
+            this.toolUsageCount.set(call.name, turn + 1);
+            const args = call.args;
+            const stepId = this.toolCallStepIds?.get(call.id);
+            const output = await tool.invoke({ ...call, args, type: 'tool_call', stepId, turn }, config);
+            if ((messages.isBaseMessage(output) && output._getType() === 'tool') ||
+                langgraph.isCommand(output)) {
+                return output;
+            }
+            else {
+                return new messages.ToolMessage({
+                    status: 'success',
+                    name: tool.name,
+                    content: typeof output === 'string' ? output : JSON.stringify(output),
+                    tool_call_id: call.id,
+                });
+            }
         }
-        const outputs = await Promise.all(message.tool_calls?.map(async (call) => {
-            const tool = this.toolMap.get(call.name);
-            try {
-                if (tool === undefined) {
-                    throw new Error(`Tool "${call.name}" not found.`);
-                }
-                const turn = this.toolUsageCount.get(call.name) ?? 0;
-                this.toolUsageCount.set(call.name, turn + 1);
-                const args = call.args;
-                const stepId = this.toolCallStepIds?.get(call.id);
-                const output = await tool.invoke({ ...call, args, type: 'tool_call', stepId, turn }, config);
-                if ((messages.isBaseMessage(output) && output._getType() === 'tool') ||
-                    langgraph.isCommand(output)) {
-                    return output;
+        catch (_e) {
+            const e = _e;
+            if (!this.handleToolErrors) {
+                throw e;
+            }
+            if (langgraph.isGraphInterrupt(e)) {
+                throw e;
+            }
+            if (this.errorHandler) {
+                try {
+                    await this.errorHandler({
+                        error: e,
+                        id: call.id,
+                        name: call.name,
+                        input: call.args,
+                    }, config.metadata);
                 }
-                else {
-                    return new messages.ToolMessage({
-                        name: tool.name,
-                        content: typeof output === 'string' ? output : JSON.stringify(output),
-                        tool_call_id: call.id,
-                    });
+                catch (handlerError) {
+                    // eslint-disable-next-line no-console
+                    console.error('Error in errorHandler for tool', call.name, ':', handlerError);
                 }
             }
-            catch (_e) {
-                const e = _e;
-                if (!this.handleToolErrors) {
-                    throw e;
-                }
-                if (langgraph.isGraphInterrupt(e)) {
-                    throw e;
+            return new messages.ToolMessage({
+                status: 'error',
+                content: `Error: ${e.message}\n Please fix your mistakes.`,
+                name: call.name,
+                tool_call_id: call.id ?? '',
+            });
+        }
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async run(input, config) {
+        let outputs;
+        if (this.isSendInput(input)) {
+            outputs = [await this.runTool(input.lg_tool_call, config)];
+        }
+        else {
+            let messages$1;
+            if (Array.isArray(input)) {
+                messages$1 = input;
+            }
+            else if (this.isMessagesState(input)) {
+                messages$1 = input.messages;
+            }
+            else {
+                throw new Error('ToolNode only accepts BaseMessage[] or { messages: BaseMessage[] } as input.');
+            }
+            const toolMessageIds = new Set(messages$1
+                .filter((msg) => msg._getType() === 'tool')
+                .map((msg) => msg.tool_call_id));
+            let aiMessage;
+            for (let i = messages$1.length - 1; i >= 0; i--) {
+                const message = messages$1[i];
+                if (messages.isAIMessage(message)) {
+                    aiMessage = message;
+                    break;
                 }
-                this.errorHandler?.({
-                    error: e,
-                    id: call.id,
-                    name: call.name,
-                    input: call.args,
-                }, config.metadata);
-                return new messages.ToolMessage({
-                    content: `Error: ${e.message}\n Please fix your mistakes.`,
-                    name: call.name,
-                    tool_call_id: call.id ?? '',
-                });
             }
-        }) ?? []);
+            if (aiMessage == null || !messages.isAIMessage(aiMessage)) {
+                throw new Error('ToolNode only accepts AIMessages as input.');
+            }
+            if (this.loadRuntimeTools) {
+                const { tools, toolMap } = this.loadRuntimeTools(aiMessage.tool_calls ?? []);
+                this.tools = tools;
+                this.toolMap =
+                    toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));
+            }
+            outputs = await Promise.all(aiMessage.tool_calls
+                ?.filter((call) => call.id == null || !toolMessageIds.has(call.id))
+                .map((call) => this.runTool(call, config)) ?? []);
+        }
         if (!outputs.some(langgraph.isCommand)) {
             return (Array.isArray(input) ? outputs : { messages: outputs });
         }
-        const combinedOutputs = outputs.map((output) => {
+        const combinedOutputs = [];
+        let parentCommand = null;
+        for (const output of outputs) {
             if (langgraph.isCommand(output)) {
-                return output;
+                if (output.graph === langgraph.Command.PARENT &&
+                    Array.isArray(output.goto) &&
+                    output.goto.every((send) => isSend(send))) {
+                    if (parentCommand) {
+                        parentCommand.goto.push(...output.goto);
+                    }
+                    else {
+                        parentCommand = new langgraph.Command({
+                            graph: langgraph.Command.PARENT,
+                            goto: output.goto,
+                        });
+                    }
+                }
+                else {
+                    combinedOutputs.push(output);
+                }
             }
-            return Array.isArray(input) ? [output] : { messages: [output] };
-        });
+            else {
+                combinedOutputs.push(Array.isArray(input) ? [output] : { messages: [output] });
+            }
+        }
+        if (parentCommand) {
+            combinedOutputs.push(parentCommand);
+        }
         return combinedOutputs;
     }
+    isSendInput(input) {
+        return (typeof input === 'object' && input != null && 'lg_tool_call' in input);
+    }
+    isMessagesState(input) {
+        return (typeof input === 'object' &&
+            input != null &&
+            'messages' in input &&
+            Array.isArray(input.messages) &&
+            input.messages.every(messages.isBaseMessage));
+    }
 }
 function areToolCallsInvoked(message, invokedToolIds) {
     if (!invokedToolIds || invokedToolIds.size === 0)

package/dist/cjs/tools/ToolNode.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ToolNode.cjs","sources":["../../../src/tools/ToolNode.ts"],"sourcesContent":["import {\n  END,\n  MessagesAnnotation,\n  isCommand,\n  isGraphInterrupt,\n} from '@langchain/langgraph';\nimport { ToolMessage, isBaseMessage } from '@langchain/core/messages';\nimport type {\n  RunnableConfig,\n  RunnableToolLike,\n} from '@langchain/core/runnables';\nimport type { BaseMessage, AIMessage } from '@langchain/core/messages';\nimport type { StructuredToolInterface } from '@langchain/core/tools';\nimport type * as t from '@/types';\nimport { RunnableCallable } from '@/utils';\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport class ToolNode<T = any> extends RunnableCallable<T, T> {\n  tools: t.GenericTool[];\n  private toolMap: Map<string, StructuredToolInterface | RunnableToolLike>;\n  private loadRuntimeTools?: t.ToolRefGenerator;\n  handleToolErrors = true;\n  toolCallStepIds?: Map<string, string>;\n  errorHandler?: t.ToolNodeConstructorParams['errorHandler'];\n  private toolUsageCount: Map<string, number>;\n\n  constructor({\n    tools,\n    toolMap,\n    name,\n    tags,\n    errorHandler,\n    toolCallStepIds,\n    handleToolErrors,\n    loadRuntimeTools,\n  }: t.ToolNodeConstructorParams) {\n    super({ name, tags, func: (input, config) => this.run(input, config) });\n    this.tools = tools;\n    this.toolMap = toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));\n    this.toolCallStepIds = toolCallStepIds;\n    this.handleToolErrors = handleToolErrors ?? this.handleToolErrors;\n    this.loadRuntimeTools = loadRuntimeTools;\n    this.errorHandler = errorHandler;\n    this.toolUsageCount = new Map<string, number>();\n  }\n\n  /**\n   * Returns a snapshot of the current tool usage counts.\n   * @returns A ReadonlyMap where keys are tool names and values are their usage counts.\n   */\n  public getToolUsageCounts(): ReadonlyMap<string, number> {\n    return new Map(this.toolUsageCount); // Return a copy\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  protected async run(input: any, config: RunnableConfig): Promise<T> {\n    const message = Array.isArray(input)\n      ? input[input.length - 1]\n      : input.messages[input.messages.length - 1];\n\n    if (message._getType() !== 'ai') {\n      throw new Error('ToolNode only accepts AIMessages as input.');\n    }\n\n    if (this.loadRuntimeTools) {\n      const { tools, toolMap } = this.loadRuntimeTools(\n        (message as AIMessage).tool_calls ?? []\n      );\n      this.tools = tools;\n      this.toolMap = toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));\n    }\n    const outputs = await Promise.all(\n      (message as AIMessage).tool_calls?.map(async (call) => {\n        const tool = this.toolMap.get(call.name);\n        try {\n          if (tool === undefined) {\n            throw new Error(`Tool \"${call.name}\" not found.`);\n          }\n          const turn = this.toolUsageCount.get(call.name) ?? 0;\n          this.toolUsageCount.set(call.name, turn + 1);\n          const args = call.args;\n          const stepId = this.toolCallStepIds?.get(call.id!);\n          const output = await tool.invoke(\n            { ...call, args, type: 'tool_call', stepId, turn },\n            config\n          );\n          if (\n            (isBaseMessage(output) && output._getType() === 'tool') ||\n            isCommand(output)\n          ) {\n            return output;\n          } else {\n            return new ToolMessage({\n              name: tool.name,\n              content:\n                typeof output === 'string' ? output : JSON.stringify(output),\n              tool_call_id: call.id!,\n            });\n          }\n        } catch (_e: unknown) {\n          const e = _e as Error;\n          if (!this.handleToolErrors) {\n            throw e;\n          }\n          if (isGraphInterrupt(e)) {\n            throw e;\n          }\n          this.errorHandler?.(\n            {\n              error: e,\n              id: call.id!,\n              name: call.name,\n              input: call.args,\n            },\n            config.metadata\n          );\n          return new ToolMessage({\n            content: `Error: ${e.message}\\n Please fix your mistakes.`,\n            name: call.name,\n            tool_call_id: call.id ?? '',\n          });\n        }\n      }) ?? []\n    );\n\n    if (!outputs.some(isCommand)) {\n      return (Array.isArray(input) ? outputs : { messages: outputs }) as T;\n    }\n\n    const combinedOutputs = outputs.map((output) => {\n      if (isCommand(output)) {\n        return output;\n      }\n      return Array.isArray(input) ? [output] : { messages: [output] };\n    });\n    return combinedOutputs as T;\n  }\n}\n\nfunction areToolCallsInvoked(\n  message: AIMessage,\n  invokedToolIds?: Set<string>\n): boolean {\n  if (!invokedToolIds || invokedToolIds.size === 0) return false;\n  return (\n    message.tool_calls?.every(\n      (toolCall) => toolCall.id != null && invokedToolIds.has(toolCall.id)\n    ) ?? false\n  );\n}\n\nexport function toolsCondition<T extends string>(\n  state: BaseMessage[] | typeof MessagesAnnotation.State,\n  toolNode: T,\n  invokedToolIds?: Set<string>\n): T | typeof END {\n  const message: AIMessage = Array.isArray(state)\n    ? state[state.length - 1]\n    : state.messages[state.messages.length - 1];\n\n  if (\n    'tool_calls' in message &&\n    (message.tool_calls?.length ?? 0) > 0 &&\n    !areToolCallsInvoked(message, invokedToolIds)\n  ) {\n    return toolNode;\n  } else {\n    return END;\n  }\n}\n"],"names":["RunnableCallable","isBaseMessage","isCommand","ToolMessage","isGraphInterrupt","END"],"mappings":"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"}
+{"version":3,"file":"ToolNode.cjs","sources":["../../../src/tools/ToolNode.ts"],"sourcesContent":["import { ToolCall } from '@langchain/core/messages/tool';\nimport {\n  ToolMessage,\n  isAIMessage,\n  isBaseMessage,\n} from '@langchain/core/messages';\nimport {\n  END,\n  Send,\n  Command,\n  isCommand,\n  isGraphInterrupt,\n  MessagesAnnotation,\n} from '@langchain/langgraph';\nimport type {\n  RunnableConfig,\n  RunnableToolLike,\n} from '@langchain/core/runnables';\nimport type { BaseMessage, AIMessage } from '@langchain/core/messages';\nimport type { StructuredToolInterface } from '@langchain/core/tools';\nimport type * as t from '@/types';\nimport { RunnableCallable } from '@/utils';\n\n/**\n * Helper to check if a value is a Send object\n */\nfunction isSend(value: unknown): value is Send {\n  return value instanceof Send;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport class ToolNode<T = any> extends RunnableCallable<T, T> {\n  tools: t.GenericTool[];\n  private toolMap: Map<string, StructuredToolInterface | RunnableToolLike>;\n  private loadRuntimeTools?: t.ToolRefGenerator;\n  handleToolErrors = true;\n  trace = false;\n  toolCallStepIds?: Map<string, string>;\n  errorHandler?: t.ToolNodeConstructorParams['errorHandler'];\n  private toolUsageCount: Map<string, number>;\n\n  constructor({\n    tools,\n    toolMap,\n    name,\n    tags,\n    errorHandler,\n    toolCallStepIds,\n    handleToolErrors,\n    loadRuntimeTools,\n  }: t.ToolNodeConstructorParams) {\n    super({ name, tags, func: (input, config) => this.run(input, config) });\n    this.tools = tools;\n    this.toolMap = toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));\n    this.toolCallStepIds = toolCallStepIds;\n    this.handleToolErrors = handleToolErrors ?? this.handleToolErrors;\n    this.loadRuntimeTools = loadRuntimeTools;\n    this.errorHandler = errorHandler;\n    this.toolUsageCount = new Map<string, number>();\n  }\n\n  /**\n   * Returns a snapshot of the current tool usage counts.\n   * @returns A ReadonlyMap where keys are tool names and values are their usage counts.\n   */\n  public getToolUsageCounts(): ReadonlyMap<string, number> {\n    return new Map(this.toolUsageCount); // Return a copy\n  }\n\n  /**\n   * Runs a single tool call with error handling\n   */\n  protected async runTool(\n    call: ToolCall,\n    config: RunnableConfig\n  ): Promise<BaseMessage | Command> {\n    const tool = this.toolMap.get(call.name);\n    try {\n      if (tool === undefined) {\n        throw new Error(`Tool \"${call.name}\" not found.`);\n      }\n      const turn = this.toolUsageCount.get(call.name) ?? 0;\n      this.toolUsageCount.set(call.name, turn + 1);\n      const args = call.args;\n      const stepId = this.toolCallStepIds?.get(call.id!);\n      const output = await tool.invoke(\n        { ...call, args, type: 'tool_call', stepId, turn },\n        config\n      );\n      if (\n        (isBaseMessage(output) && output._getType() === 'tool') ||\n        isCommand(output)\n      ) {\n        return output;\n      } else {\n        return new ToolMessage({\n          status: 'success',\n          name: tool.name,\n          content: typeof output === 'string' ? output : JSON.stringify(output),\n          tool_call_id: call.id!,\n        });\n      }\n    } catch (_e: unknown) {\n      const e = _e as Error;\n      if (!this.handleToolErrors) {\n        throw e;\n      }\n      if (isGraphInterrupt(e)) {\n        throw e;\n      }\n      if (this.errorHandler) {\n        try {\n          await this.errorHandler(\n            {\n              error: e,\n              id: call.id!,\n              name: call.name,\n              input: call.args,\n            },\n            config.metadata\n          );\n        } catch (handlerError) {\n          // eslint-disable-next-line no-console\n          console.error(\n            'Error in errorHandler for tool',\n            call.name,\n            ':',\n            handlerError\n          );\n        }\n      }\n      return new ToolMessage({\n        status: 'error',\n        content: `Error: ${e.message}\\n Please fix your mistakes.`,\n        name: call.name,\n        tool_call_id: call.id ?? '',\n      });\n    }\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  protected async run(input: any, config: RunnableConfig): Promise<T> {\n    let outputs: (BaseMessage | Command)[];\n\n    if (this.isSendInput(input)) {\n      outputs = [await this.runTool(input.lg_tool_call, config)];\n    } else {\n      let messages: BaseMessage[];\n      if (Array.isArray(input)) {\n        messages = input;\n      } else if (this.isMessagesState(input)) {\n        messages = input.messages;\n      } else {\n        throw new Error(\n          'ToolNode only accepts BaseMessage[] or { messages: BaseMessage[] } as input.'\n        );\n      }\n\n      const toolMessageIds: Set<string> = new Set(\n        messages\n          .filter((msg) => msg._getType() === 'tool')\n          .map((msg) => (msg as ToolMessage).tool_call_id)\n      );\n\n      let aiMessage: AIMessage | undefined;\n      for (let i = messages.length - 1; i >= 0; i--) {\n        const message = messages[i];\n        if (isAIMessage(message)) {\n          aiMessage = message;\n          break;\n        }\n      }\n\n      if (aiMessage == null || !isAIMessage(aiMessage)) {\n        throw new Error('ToolNode only accepts AIMessages as input.');\n      }\n\n      if (this.loadRuntimeTools) {\n        const { tools, toolMap } = this.loadRuntimeTools(\n          aiMessage.tool_calls ?? []\n        );\n        this.tools = tools;\n        this.toolMap =\n          toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));\n      }\n\n      outputs = await Promise.all(\n        aiMessage.tool_calls\n          ?.filter((call) => call.id == null || !toolMessageIds.has(call.id))\n          .map((call) => this.runTool(call, config)) ?? []\n      );\n    }\n\n    if (!outputs.some(isCommand)) {\n      return (Array.isArray(input) ? outputs : { messages: outputs }) as T;\n    }\n\n    const combinedOutputs: (\n      | { messages: BaseMessage[] }\n      | BaseMessage[]\n      | Command\n    )[] = [];\n    let parentCommand: Command | null = null;\n\n    for (const output of outputs) {\n      if (isCommand(output)) {\n        if (\n          output.graph === Command.PARENT &&\n          Array.isArray(output.goto) &&\n          output.goto.every((send): send is Send => isSend(send))\n        ) {\n          if (parentCommand) {\n            (parentCommand.goto as Send[]).push(...(output.goto as Send[]));\n          } else {\n            parentCommand = new Command({\n              graph: Command.PARENT,\n              goto: output.goto,\n            });\n          }\n        } else {\n          combinedOutputs.push(output);\n        }\n      } else {\n        combinedOutputs.push(\n          Array.isArray(input) ? [output] : { messages: [output] }\n        );\n      }\n    }\n\n    if (parentCommand) {\n      combinedOutputs.push(parentCommand);\n    }\n\n    return combinedOutputs as T;\n  }\n\n  private isSendInput(input: unknown): input is { lg_tool_call: ToolCall } {\n    return (\n      typeof input === 'object' && input != null && 'lg_tool_call' in input\n    );\n  }\n\n  private isMessagesState(\n    input: unknown\n  ): input is { messages: BaseMessage[] } {\n    return (\n      typeof input === 'object' &&\n      input != null &&\n      'messages' in input &&\n      Array.isArray((input as { messages: unknown }).messages) &&\n      (input as { messages: unknown[] }).messages.every(isBaseMessage)\n    );\n  }\n}\n\nfunction areToolCallsInvoked(\n  message: AIMessage,\n  invokedToolIds?: Set<string>\n): boolean {\n  if (!invokedToolIds || invokedToolIds.size === 0) return false;\n  return (\n    message.tool_calls?.every(\n      (toolCall) => toolCall.id != null && invokedToolIds.has(toolCall.id)\n    ) ?? false\n  );\n}\n\nexport function toolsCondition<T extends string>(\n  state: BaseMessage[] | typeof MessagesAnnotation.State,\n  toolNode: T,\n  invokedToolIds?: Set<string>\n): T | typeof END {\n  const message: AIMessage = Array.isArray(state)\n    ? state[state.length - 1]\n    : state.messages[state.messages.length - 1];\n\n  if (\n    'tool_calls' in message &&\n    (message.tool_calls?.length ?? 0) > 0 &&\n    !areToolCallsInvoked(message, invokedToolIds)\n  ) {\n    return toolNode;\n  } else {\n    return END;\n  }\n}\n"],"names":["Send","RunnableCallable","isBaseMessage","isCommand","ToolMessage","isGraphInterrupt","messages","isAIMessage","Command","END"],"mappings":"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"}

package/dist/esm/tools/ToolNode.mjs

@@ -1,17 +1,24 @@
-import { isCommand, isGraphInterrupt, END } from '@langchain/langgraph';
-import { isBaseMessage, ToolMessage } from '@langchain/core/messages';
+import { isBaseMessage, ToolMessage, isAIMessage } from '@langchain/core/messages';
+import { isCommand, isGraphInterrupt, Command, END, Send } from '@langchain/langgraph';
 import '../common/enum.mjs';
 import 'nanoid';
 import '../messages/core.mjs';
 import { RunnableCallable } from '../utils/run.mjs';
 import 'js-tiktoken/lite';
 
+/**
+ * Helper to check if a value is a Send object
+ */
+function isSend(value) {
+    return value instanceof Send;
+}
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 class ToolNode extends RunnableCallable {
     tools;
     toolMap;
     loadRuntimeTools;
     handleToolErrors = true;
+    trace = false;
     toolCallStepIds;
     errorHandler;
     toolUsageCount;
@@ -32,74 +39,147 @@ class ToolNode extends RunnableCallable {
     getToolUsageCounts() {
         return new Map(this.toolUsageCount); // Return a copy
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    async run(input, config) {
-        const message = Array.isArray(input)
-            ? input[input.length - 1]
-            : input.messages[input.messages.length - 1];
-        if (message._getType() !== 'ai') {
-            throw new Error('ToolNode only accepts AIMessages as input.');
-        }
-        if (this.loadRuntimeTools) {
-            const { tools, toolMap } = this.loadRuntimeTools(message.tool_calls ?? []);
-            this.tools = tools;
-            this.toolMap = toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));
+    /**
+     * Runs a single tool call with error handling
+     */
+    async runTool(call, config) {
+        const tool = this.toolMap.get(call.name);
+        try {
+            if (tool === undefined) {
+                throw new Error(`Tool "${call.name}" not found.`);
+            }
+            const turn = this.toolUsageCount.get(call.name) ?? 0;
+            this.toolUsageCount.set(call.name, turn + 1);
+            const args = call.args;
+            const stepId = this.toolCallStepIds?.get(call.id);
+            const output = await tool.invoke({ ...call, args, type: 'tool_call', stepId, turn }, config);
+            if ((isBaseMessage(output) && output._getType() === 'tool') ||
+                isCommand(output)) {
+                return output;
+            }
+            else {
+                return new ToolMessage({
+                    status: 'success',
+                    name: tool.name,
+                    content: typeof output === 'string' ? output : JSON.stringify(output),
+                    tool_call_id: call.id,
+                });
+            }
         }
-        const outputs = await Promise.all(message.tool_calls?.map(async (call) => {
-            const tool = this.toolMap.get(call.name);
-            try {
-                if (tool === undefined) {
-                    throw new Error(`Tool "${call.name}" not found.`);
-                }
-                const turn = this.toolUsageCount.get(call.name) ?? 0;
-                this.toolUsageCount.set(call.name, turn + 1);
-                const args = call.args;
-                const stepId = this.toolCallStepIds?.get(call.id);
-                const output = await tool.invoke({ ...call, args, type: 'tool_call', stepId, turn }, config);
-                if ((isBaseMessage(output) && output._getType() === 'tool') ||
-                    isCommand(output)) {
-                    return output;
+        catch (_e) {
+            const e = _e;
+            if (!this.handleToolErrors) {
+                throw e;
+            }
+            if (isGraphInterrupt(e)) {
+                throw e;
+            }
+            if (this.errorHandler) {
+                try {
+                    await this.errorHandler({
+                        error: e,
+                        id: call.id,
+                        name: call.name,
+                        input: call.args,
+                    }, config.metadata);
                 }
-                else {
-                    return new ToolMessage({
-                        name: tool.name,
-                        content: typeof output === 'string' ? output : JSON.stringify(output),
-                        tool_call_id: call.id,
-                    });
+                catch (handlerError) {
+                    // eslint-disable-next-line no-console
+                    console.error('Error in errorHandler for tool', call.name, ':', handlerError);
                 }
             }
-            catch (_e) {
-                const e = _e;
-                if (!this.handleToolErrors) {
-                    throw e;
-                }
-                if (isGraphInterrupt(e)) {
-                    throw e;
+            return new ToolMessage({
+                status: 'error',
+                content: `Error: ${e.message}\n Please fix your mistakes.`,
+                name: call.name,
+                tool_call_id: call.id ?? '',
+            });
+        }
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async run(input, config) {
+        let outputs;
+        if (this.isSendInput(input)) {
+            outputs = [await this.runTool(input.lg_tool_call, config)];
+        }
+        else {
+            let messages;
+            if (Array.isArray(input)) {
+                messages = input;
+            }
+            else if (this.isMessagesState(input)) {
+                messages = input.messages;
+            }
+            else {
+                throw new Error('ToolNode only accepts BaseMessage[] or { messages: BaseMessage[] } as input.');
+            }
+            const toolMessageIds = new Set(messages
+                .filter((msg) => msg._getType() === 'tool')
+                .map((msg) => msg.tool_call_id));
+            let aiMessage;
+            for (let i = messages.length - 1; i >= 0; i--) {
+                const message = messages[i];
+                if (isAIMessage(message)) {
+                    aiMessage = message;
+                    break;
                 }
-                this.errorHandler?.({
-                    error: e,
-                    id: call.id,
-                    name: call.name,
-                    input: call.args,
-                }, config.metadata);
-                return new ToolMessage({
-                    content: `Error: ${e.message}\n Please fix your mistakes.`,
-                    name: call.name,
-                    tool_call_id: call.id ?? '',
-                });
             }
-        }) ?? []);
+            if (aiMessage == null || !isAIMessage(aiMessage)) {
+                throw new Error('ToolNode only accepts AIMessages as input.');
+            }
+            if (this.loadRuntimeTools) {
+                const { tools, toolMap } = this.loadRuntimeTools(aiMessage.tool_calls ?? []);
+                this.tools = tools;
+                this.toolMap =
+                    toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));
+            }
+            outputs = await Promise.all(aiMessage.tool_calls
+                ?.filter((call) => call.id == null || !toolMessageIds.has(call.id))
+                .map((call) => this.runTool(call, config)) ?? []);
+        }
         if (!outputs.some(isCommand)) {
             return (Array.isArray(input) ? outputs : { messages: outputs });
         }
-        const combinedOutputs = outputs.map((output) => {
+        const combinedOutputs = [];
+        let parentCommand = null;
+        for (const output of outputs) {
             if (isCommand(output)) {
-                return output;
+                if (output.graph === Command.PARENT &&
+                    Array.isArray(output.goto) &&
+                    output.goto.every((send) => isSend(send))) {
+                    if (parentCommand) {
+                        parentCommand.goto.push(...output.goto);
+                    }
+                    else {
+                        parentCommand = new Command({
+                            graph: Command.PARENT,
+                            goto: output.goto,
+                        });
+                    }
+                }
+                else {
+                    combinedOutputs.push(output);
+                }
+            }
+            else {
+                combinedOutputs.push(Array.isArray(input) ? [output] : { messages: [output] });
             }
-            return Array.isArray(input) ? [output] : { messages: [output] };
-        });
+        }
+        if (parentCommand) {
+            combinedOutputs.push(parentCommand);
+        }
         return combinedOutputs;
     }
+    isSendInput(input) {
+        return (typeof input === 'object' && input != null && 'lg_tool_call' in input);
+    }
+    isMessagesState(input) {
+        return (typeof input === 'object' &&
+            input != null &&
+            'messages' in input &&
+            Array.isArray(input.messages) &&
+            input.messages.every(isBaseMessage));
+    }
 }
 function areToolCallsInvoked(message, invokedToolIds) {
     if (!invokedToolIds || invokedToolIds.size === 0)

package/dist/esm/tools/ToolNode.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ToolNode.mjs","sources":["../../../src/tools/ToolNode.ts"],"sourcesContent":["import {\n  END,\n  MessagesAnnotation,\n  isCommand,\n  isGraphInterrupt,\n} from '@langchain/langgraph';\nimport { ToolMessage, isBaseMessage } from '@langchain/core/messages';\nimport type {\n  RunnableConfig,\n  RunnableToolLike,\n} from '@langchain/core/runnables';\nimport type { BaseMessage, AIMessage } from '@langchain/core/messages';\nimport type { StructuredToolInterface } from '@langchain/core/tools';\nimport type * as t from '@/types';\nimport { RunnableCallable } from '@/utils';\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport class ToolNode<T = any> extends RunnableCallable<T, T> {\n  tools: t.GenericTool[];\n  private toolMap: Map<string, StructuredToolInterface | RunnableToolLike>;\n  private loadRuntimeTools?: t.ToolRefGenerator;\n  handleToolErrors = true;\n  toolCallStepIds?: Map<string, string>;\n  errorHandler?: t.ToolNodeConstructorParams['errorHandler'];\n  private toolUsageCount: Map<string, number>;\n\n  constructor({\n    tools,\n    toolMap,\n    name,\n    tags,\n    errorHandler,\n    toolCallStepIds,\n    handleToolErrors,\n    loadRuntimeTools,\n  }: t.ToolNodeConstructorParams) {\n    super({ name, tags, func: (input, config) => this.run(input, config) });\n    this.tools = tools;\n    this.toolMap = toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));\n    this.toolCallStepIds = toolCallStepIds;\n    this.handleToolErrors = handleToolErrors ?? this.handleToolErrors;\n    this.loadRuntimeTools = loadRuntimeTools;\n    this.errorHandler = errorHandler;\n    this.toolUsageCount = new Map<string, number>();\n  }\n\n  /**\n   * Returns a snapshot of the current tool usage counts.\n   * @returns A ReadonlyMap where keys are tool names and values are their usage counts.\n   */\n  public getToolUsageCounts(): ReadonlyMap<string, number> {\n    return new Map(this.toolUsageCount); // Return a copy\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  protected async run(input: any, config: RunnableConfig): Promise<T> {\n    const message = Array.isArray(input)\n      ? input[input.length - 1]\n      : input.messages[input.messages.length - 1];\n\n    if (message._getType() !== 'ai') {\n      throw new Error('ToolNode only accepts AIMessages as input.');\n    }\n\n    if (this.loadRuntimeTools) {\n      const { tools, toolMap } = this.loadRuntimeTools(\n        (message as AIMessage).tool_calls ?? []\n      );\n      this.tools = tools;\n      this.toolMap = toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));\n    }\n    const outputs = await Promise.all(\n      (message as AIMessage).tool_calls?.map(async (call) => {\n        const tool = this.toolMap.get(call.name);\n        try {\n          if (tool === undefined) {\n            throw new Error(`Tool \"${call.name}\" not found.`);\n          }\n          const turn = this.toolUsageCount.get(call.name) ?? 0;\n          this.toolUsageCount.set(call.name, turn + 1);\n          const args = call.args;\n          const stepId = this.toolCallStepIds?.get(call.id!);\n          const output = await tool.invoke(\n            { ...call, args, type: 'tool_call', stepId, turn },\n            config\n          );\n          if (\n            (isBaseMessage(output) && output._getType() === 'tool') ||\n            isCommand(output)\n          ) {\n            return output;\n          } else {\n            return new ToolMessage({\n              name: tool.name,\n              content:\n                typeof output === 'string' ? output : JSON.stringify(output),\n              tool_call_id: call.id!,\n            });\n          }\n        } catch (_e: unknown) {\n          const e = _e as Error;\n          if (!this.handleToolErrors) {\n            throw e;\n          }\n          if (isGraphInterrupt(e)) {\n            throw e;\n          }\n          this.errorHandler?.(\n            {\n              error: e,\n              id: call.id!,\n              name: call.name,\n              input: call.args,\n            },\n            config.metadata\n          );\n          return new ToolMessage({\n            content: `Error: ${e.message}\\n Please fix your mistakes.`,\n            name: call.name,\n            tool_call_id: call.id ?? '',\n          });\n        }\n      }) ?? []\n    );\n\n    if (!outputs.some(isCommand)) {\n      return (Array.isArray(input) ? outputs : { messages: outputs }) as T;\n    }\n\n    const combinedOutputs = outputs.map((output) => {\n      if (isCommand(output)) {\n        return output;\n      }\n      return Array.isArray(input) ? [output] : { messages: [output] };\n    });\n    return combinedOutputs as T;\n  }\n}\n\nfunction areToolCallsInvoked(\n  message: AIMessage,\n  invokedToolIds?: Set<string>\n): boolean {\n  if (!invokedToolIds || invokedToolIds.size === 0) return false;\n  return (\n    message.tool_calls?.every(\n      (toolCall) => toolCall.id != null && invokedToolIds.has(toolCall.id)\n    ) ?? false\n  );\n}\n\nexport function toolsCondition<T extends string>(\n  state: BaseMessage[] | typeof MessagesAnnotation.State,\n  toolNode: T,\n  invokedToolIds?: Set<string>\n): T | typeof END {\n  const message: AIMessage = Array.isArray(state)\n    ? state[state.length - 1]\n    : state.messages[state.messages.length - 1];\n\n  if (\n    'tool_calls' in message &&\n    (message.tool_calls?.length ?? 0) > 0 &&\n    !areToolCallsInvoked(message, invokedToolIds)\n  ) {\n    return toolNode;\n  } else {\n    return END;\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"ToolNode.mjs","sources":["../../../src/tools/ToolNode.ts"],"sourcesContent":["import { ToolCall } from '@langchain/core/messages/tool';\nimport {\n  ToolMessage,\n  isAIMessage,\n  isBaseMessage,\n} from '@langchain/core/messages';\nimport {\n  END,\n  Send,\n  Command,\n  isCommand,\n  isGraphInterrupt,\n  MessagesAnnotation,\n} from '@langchain/langgraph';\nimport type {\n  RunnableConfig,\n  RunnableToolLike,\n} from '@langchain/core/runnables';\nimport type { BaseMessage, AIMessage } from '@langchain/core/messages';\nimport type { StructuredToolInterface } from '@langchain/core/tools';\nimport type * as t from '@/types';\nimport { RunnableCallable } from '@/utils';\n\n/**\n * Helper to check if a value is a Send object\n */\nfunction isSend(value: unknown): value is Send {\n  return value instanceof Send;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport class ToolNode<T = any> extends RunnableCallable<T, T> {\n  tools: t.GenericTool[];\n  private toolMap: Map<string, StructuredToolInterface | RunnableToolLike>;\n  private loadRuntimeTools?: t.ToolRefGenerator;\n  handleToolErrors = true;\n  trace = false;\n  toolCallStepIds?: Map<string, string>;\n  errorHandler?: t.ToolNodeConstructorParams['errorHandler'];\n  private toolUsageCount: Map<string, number>;\n\n  constructor({\n    tools,\n    toolMap,\n    name,\n    tags,\n    errorHandler,\n    toolCallStepIds,\n    handleToolErrors,\n    loadRuntimeTools,\n  }: t.ToolNodeConstructorParams) {\n    super({ name, tags, func: (input, config) => this.run(input, config) });\n    this.tools = tools;\n    this.toolMap = toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));\n    this.toolCallStepIds = toolCallStepIds;\n    this.handleToolErrors = handleToolErrors ?? this.handleToolErrors;\n    this.loadRuntimeTools = loadRuntimeTools;\n    this.errorHandler = errorHandler;\n    this.toolUsageCount = new Map<string, number>();\n  }\n\n  /**\n   * Returns a snapshot of the current tool usage counts.\n   * @returns A ReadonlyMap where keys are tool names and values are their usage counts.\n   */\n  public getToolUsageCounts(): ReadonlyMap<string, number> {\n    return new Map(this.toolUsageCount); // Return a copy\n  }\n\n  /**\n   * Runs a single tool call with error handling\n   */\n  protected async runTool(\n    call: ToolCall,\n    config: RunnableConfig\n  ): Promise<BaseMessage | Command> {\n    const tool = this.toolMap.get(call.name);\n    try {\n      if (tool === undefined) {\n        throw new Error(`Tool \"${call.name}\" not found.`);\n      }\n      const turn = this.toolUsageCount.get(call.name) ?? 0;\n      this.toolUsageCount.set(call.name, turn + 1);\n      const args = call.args;\n      const stepId = this.toolCallStepIds?.get(call.id!);\n      const output = await tool.invoke(\n        { ...call, args, type: 'tool_call', stepId, turn },\n        config\n      );\n      if (\n        (isBaseMessage(output) && output._getType() === 'tool') ||\n        isCommand(output)\n      ) {\n        return output;\n      } else {\n        return new ToolMessage({\n          status: 'success',\n          name: tool.name,\n          content: typeof output === 'string' ? output : JSON.stringify(output),\n          tool_call_id: call.id!,\n        });\n      }\n    } catch (_e: unknown) {\n      const e = _e as Error;\n      if (!this.handleToolErrors) {\n        throw e;\n      }\n      if (isGraphInterrupt(e)) {\n        throw e;\n      }\n      if (this.errorHandler) {\n        try {\n          await this.errorHandler(\n            {\n              error: e,\n              id: call.id!,\n              name: call.name,\n              input: call.args,\n            },\n            config.metadata\n          );\n        } catch (handlerError) {\n          // eslint-disable-next-line no-console\n          console.error(\n            'Error in errorHandler for tool',\n            call.name,\n            ':',\n            handlerError\n          );\n        }\n      }\n      return new ToolMessage({\n        status: 'error',\n        content: `Error: ${e.message}\\n Please fix your mistakes.`,\n        name: call.name,\n        tool_call_id: call.id ?? '',\n      });\n    }\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  protected async run(input: any, config: RunnableConfig): Promise<T> {\n    let outputs: (BaseMessage | Command)[];\n\n    if (this.isSendInput(input)) {\n      outputs = [await this.runTool(input.lg_tool_call, config)];\n    } else {\n      let messages: BaseMessage[];\n      if (Array.isArray(input)) {\n        messages = input;\n      } else if (this.isMessagesState(input)) {\n        messages = input.messages;\n      } else {\n        throw new Error(\n          'ToolNode only accepts BaseMessage[] or { messages: BaseMessage[] } as input.'\n        );\n      }\n\n      const toolMessageIds: Set<string> = new Set(\n        messages\n          .filter((msg) => msg._getType() === 'tool')\n          .map((msg) => (msg as ToolMessage).tool_call_id)\n      );\n\n      let aiMessage: AIMessage | undefined;\n      for (let i = messages.length - 1; i >= 0; i--) {\n        const message = messages[i];\n        if (isAIMessage(message)) {\n          aiMessage = message;\n          break;\n        }\n      }\n\n      if (aiMessage == null || !isAIMessage(aiMessage)) {\n        throw new Error('ToolNode only accepts AIMessages as input.');\n      }\n\n      if (this.loadRuntimeTools) {\n        const { tools, toolMap } = this.loadRuntimeTools(\n          aiMessage.tool_calls ?? []\n        );\n        this.tools = tools;\n        this.toolMap =\n          toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));\n      }\n\n      outputs = await Promise.all(\n        aiMessage.tool_calls\n          ?.filter((call) => call.id == null || !toolMessageIds.has(call.id))\n          .map((call) => this.runTool(call, config)) ?? []\n      );\n    }\n\n    if (!outputs.some(isCommand)) {\n      return (Array.isArray(input) ? outputs : { messages: outputs }) as T;\n    }\n\n    const combinedOutputs: (\n      | { messages: BaseMessage[] }\n      | BaseMessage[]\n      | Command\n    )[] = [];\n    let parentCommand: Command | null = null;\n\n    for (const output of outputs) {\n      if (isCommand(output)) {\n        if (\n          output.graph === Command.PARENT &&\n          Array.isArray(output.goto) &&\n          output.goto.every((send): send is Send => isSend(send))\n        ) {\n          if (parentCommand) {\n            (parentCommand.goto as Send[]).push(...(output.goto as Send[]));\n          } else {\n            parentCommand = new Command({\n              graph: Command.PARENT,\n              goto: output.goto,\n            });\n          }\n        } else {\n          combinedOutputs.push(output);\n        }\n      } else {\n        combinedOutputs.push(\n          Array.isArray(input) ? [output] : { messages: [output] }\n        );\n      }\n    }\n\n    if (parentCommand) {\n      combinedOutputs.push(parentCommand);\n    }\n\n    return combinedOutputs as T;\n  }\n\n  private isSendInput(input: unknown): input is { lg_tool_call: ToolCall } {\n    return (\n      typeof input === 'object' && input != null && 'lg_tool_call' in input\n    );\n  }\n\n  private isMessagesState(\n    input: unknown\n  ): input is { messages: BaseMessage[] } {\n    return (\n      typeof input === 'object' &&\n      input != null &&\n      'messages' in input &&\n      Array.isArray((input as { messages: unknown }).messages) &&\n      (input as { messages: unknown[] }).messages.every(isBaseMessage)\n    );\n  }\n}\n\nfunction areToolCallsInvoked(\n  message: AIMessage,\n  invokedToolIds?: Set<string>\n): boolean {\n  if (!invokedToolIds || invokedToolIds.size === 0) return false;\n  return (\n    message.tool_calls?.every(\n      (toolCall) => toolCall.id != null && invokedToolIds.has(toolCall.id)\n    ) ?? false\n  );\n}\n\nexport function toolsCondition<T extends string>(\n  state: BaseMessage[] | typeof MessagesAnnotation.State,\n  toolNode: T,\n  invokedToolIds?: Set<string>\n): T | typeof END {\n  const message: AIMessage = Array.isArray(state)\n    ? state[state.length - 1]\n    : state.messages[state.messages.length - 1];\n\n  if (\n    'tool_calls' in message &&\n    (message.tool_calls?.length ?? 0) > 0 &&\n    !areToolCallsInvoked(message, invokedToolIds)\n  ) {\n    return toolNode;\n  } else {\n    return END;\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/types/tools/ToolNode.d.ts

@@ -1,4 +1,5 @@
-import { END, MessagesAnnotation } from '@langchain/langgraph';
+import { ToolCall } from '@langchain/core/messages/tool';
+import { END, Command, MessagesAnnotation } from '@langchain/langgraph';
 import type { RunnableConfig } from '@langchain/core/runnables';
 import type { BaseMessage } from '@langchain/core/messages';
 import type * as t from '@/types';
@@ -8,6 +9,7 @@ export declare class ToolNode<T = any> extends RunnableCallable<T, T> {
     private toolMap;
     private loadRuntimeTools?;
     handleToolErrors: boolean;
+    trace: boolean;
     toolCallStepIds?: Map<string, string>;
     errorHandler?: t.ToolNodeConstructorParams['errorHandler'];
     private toolUsageCount;
@@ -17,6 +19,12 @@ export declare class ToolNode<T = any> extends RunnableCallable<T, T> {
      * @returns A ReadonlyMap where keys are tool names and values are their usage counts.
      */
     getToolUsageCounts(): ReadonlyMap<string, number>;
+    /**
+     * Runs a single tool call with error handling
+     */
+    protected runTool(call: ToolCall, config: RunnableConfig): Promise<BaseMessage | Command>;
     protected run(input: any, config: RunnableConfig): Promise<T>;
+    private isSendInput;
+    private isMessagesState;
 }
 export declare function toolsCondition<T extends string>(state: BaseMessage[] | typeof MessagesAnnotation.State, toolNode: T, invokedToolIds?: Set<string>): T | typeof END;

package/dist/types/types/tools.d.ts

@@ -24,7 +24,7 @@ export type ToolNodeOptions = {
     handleToolErrors?: boolean;
     loadRuntimeTools?: ToolRefGenerator;
     toolCallStepIds?: Map<string, string>;
-    errorHandler?: (data: ToolErrorData, metadata?: Record<string, unknown>) => void;
+    errorHandler?: (data: ToolErrorData, metadata?: Record<string, unknown>) => Promise<void>;
 };
 export type ToolNodeConstructorParams = ToolRefs & ToolNodeOptions;
 export type ToolEndEvent = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@librechat/agents",
-  "version": "3.0.22",
+  "version": "3.0.24",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/esm/main.mjs",
   "types": "./dist/types/index.d.ts",
@@ -100,8 +100,8 @@
     "@langchain/aws": "^0.1.15",
     "@langchain/core": "^0.3.79",
     "@langchain/deepseek": "^0.0.2",
-    "@langchain/google-genai": "^0.2.13",
-    "@langchain/google-vertexai": "^0.2.13",
+    "@langchain/google-genai": "^0.2.18",
+    "@langchain/google-vertexai": "^0.2.18",
     "@langchain/langgraph": "^0.4.9",
     "@langchain/mistralai": "^0.2.1",
     "@langchain/ollama": "^0.2.3",

package/src/tools/ToolNode.ts

@@ -1,10 +1,17 @@
+import { ToolCall } from '@langchain/core/messages/tool';
+import {
+  ToolMessage,
+  isAIMessage,
+  isBaseMessage,
+} from '@langchain/core/messages';
 import {
   END,
-  MessagesAnnotation,
+  Send,
+  Command,
   isCommand,
   isGraphInterrupt,
+  MessagesAnnotation,
 } from '@langchain/langgraph';
-import { ToolMessage, isBaseMessage } from '@langchain/core/messages';
 import type {
   RunnableConfig,
   RunnableToolLike,
@@ -14,12 +21,20 @@ import type { StructuredToolInterface } from '@langchain/core/tools';
 import type * as t from '@/types';
 import { RunnableCallable } from '@/utils';
 
+/**
+ * Helper to check if a value is a Send object
+ */
+function isSend(value: unknown): value is Send {
+  return value instanceof Send;
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export class ToolNode<T = any> extends RunnableCallable<T, T> {
   tools: t.GenericTool[];
   private toolMap: Map<string, StructuredToolInterface | RunnableToolLike>;
   private loadRuntimeTools?: t.ToolRefGenerator;
   handleToolErrors = true;
+  trace = false;
   toolCallStepIds?: Map<string, string>;
   errorHandler?: t.ToolNodeConstructorParams['errorHandler'];
   private toolUsageCount: Map<string, number>;
@@ -52,60 +67,50 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
     return new Map(this.toolUsageCount); // Return a copy
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  protected async run(input: any, config: RunnableConfig): Promise<T> {
-    const message = Array.isArray(input)
-      ? input[input.length - 1]
-      : input.messages[input.messages.length - 1];
-
-    if (message._getType() !== 'ai') {
-      throw new Error('ToolNode only accepts AIMessages as input.');
-    }
-
-    if (this.loadRuntimeTools) {
-      const { tools, toolMap } = this.loadRuntimeTools(
-        (message as AIMessage).tool_calls ?? []
+  /**
+   * Runs a single tool call with error handling
+   */
+  protected async runTool(
+    call: ToolCall,
+    config: RunnableConfig
+  ): Promise<BaseMessage | Command> {
+    const tool = this.toolMap.get(call.name);
+    try {
+      if (tool === undefined) {
+        throw new Error(`Tool "${call.name}" not found.`);
+      }
+      const turn = this.toolUsageCount.get(call.name) ?? 0;
+      this.toolUsageCount.set(call.name, turn + 1);
+      const args = call.args;
+      const stepId = this.toolCallStepIds?.get(call.id!);
+      const output = await tool.invoke(
+        { ...call, args, type: 'tool_call', stepId, turn },
+        config
       );
-      this.tools = tools;
-      this.toolMap = toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));
-    }
-    const outputs = await Promise.all(
-      (message as AIMessage).tool_calls?.map(async (call) => {
-        const tool = this.toolMap.get(call.name);
+      if (
+        (isBaseMessage(output) && output._getType() === 'tool') ||
+        isCommand(output)
+      ) {
+        return output;
+      } else {
+        return new ToolMessage({
+          status: 'success',
+          name: tool.name,
+          content: typeof output === 'string' ? output : JSON.stringify(output),
+          tool_call_id: call.id!,
+        });
+      }
+    } catch (_e: unknown) {
+      const e = _e as Error;
+      if (!this.handleToolErrors) {
+        throw e;
+      }
+      if (isGraphInterrupt(e)) {
+        throw e;
+      }
+      if (this.errorHandler) {
         try {
-          if (tool === undefined) {
-            throw new Error(`Tool "${call.name}" not found.`);
-          }
-          const turn = this.toolUsageCount.get(call.name) ?? 0;
-          this.toolUsageCount.set(call.name, turn + 1);
-          const args = call.args;
-          const stepId = this.toolCallStepIds?.get(call.id!);
-          const output = await tool.invoke(
-            { ...call, args, type: 'tool_call', stepId, turn },
-            config
-          );
-          if (
-            (isBaseMessage(output) && output._getType() === 'tool') ||
-            isCommand(output)
-          ) {
-            return output;
-          } else {
-            return new ToolMessage({
-              name: tool.name,
-              content:
-                typeof output === 'string' ? output : JSON.stringify(output),
-              tool_call_id: call.id!,
-            });
-          }
-        } catch (_e: unknown) {
-          const e = _e as Error;
-          if (!this.handleToolErrors) {
-            throw e;
-          }
-          if (isGraphInterrupt(e)) {
-            throw e;
-          }
-          this.errorHandler?.(
+          await this.errorHandler(
             {
               error: e,
               id: call.id!,
@@ -114,27 +119,138 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
             },
             config.metadata
           );
-          return new ToolMessage({
-            content: `Error: ${e.message}\n Please fix your mistakes.`,
-            name: call.name,
-            tool_call_id: call.id ?? '',
-          });
+        } catch (handlerError) {
+          // eslint-disable-next-line no-console
+          console.error(
+            'Error in errorHandler for tool',
+            call.name,
+            ':',
+            handlerError
+          );
         }
-      }) ?? []
-    );
+      }
+      return new ToolMessage({
+        status: 'error',
+        content: `Error: ${e.message}\n Please fix your mistakes.`,
+        name: call.name,
+        tool_call_id: call.id ?? '',
+      });
+    }
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  protected async run(input: any, config: RunnableConfig): Promise<T> {
+    let outputs: (BaseMessage | Command)[];
+
+    if (this.isSendInput(input)) {
+      outputs = [await this.runTool(input.lg_tool_call, config)];
+    } else {
+      let messages: BaseMessage[];
+      if (Array.isArray(input)) {
+        messages = input;
+      } else if (this.isMessagesState(input)) {
+        messages = input.messages;
+      } else {
+        throw new Error(
+          'ToolNode only accepts BaseMessage[] or { messages: BaseMessage[] } as input.'
+        );
+      }
+
+      const toolMessageIds: Set<string> = new Set(
+        messages
+          .filter((msg) => msg._getType() === 'tool')
+          .map((msg) => (msg as ToolMessage).tool_call_id)
+      );
+
+      let aiMessage: AIMessage | undefined;
+      for (let i = messages.length - 1; i >= 0; i--) {
+        const message = messages[i];
+        if (isAIMessage(message)) {
+          aiMessage = message;
+          break;
+        }
+      }
+
+      if (aiMessage == null || !isAIMessage(aiMessage)) {
+        throw new Error('ToolNode only accepts AIMessages as input.');
+      }
+
+      if (this.loadRuntimeTools) {
+        const { tools, toolMap } = this.loadRuntimeTools(
+          aiMessage.tool_calls ?? []
+        );
+        this.tools = tools;
+        this.toolMap =
+          toolMap ?? new Map(tools.map((tool) => [tool.name, tool]));
+      }
+
+      outputs = await Promise.all(
+        aiMessage.tool_calls
+          ?.filter((call) => call.id == null || !toolMessageIds.has(call.id))
+          .map((call) => this.runTool(call, config)) ?? []
+      );
+    }
 
     if (!outputs.some(isCommand)) {
       return (Array.isArray(input) ? outputs : { messages: outputs }) as T;
     }
 
-    const combinedOutputs = outputs.map((output) => {
+    const combinedOutputs: (
+      | { messages: BaseMessage[] }
+      | BaseMessage[]
+      | Command
+    )[] = [];
+    let parentCommand: Command | null = null;
+
+    for (const output of outputs) {
       if (isCommand(output)) {
-        return output;
+        if (
+          output.graph === Command.PARENT &&
+          Array.isArray(output.goto) &&
+          output.goto.every((send): send is Send => isSend(send))
+        ) {
+          if (parentCommand) {
+            (parentCommand.goto as Send[]).push(...(output.goto as Send[]));
+          } else {
+            parentCommand = new Command({
+              graph: Command.PARENT,
+              goto: output.goto,
+            });
+          }
+        } else {
+          combinedOutputs.push(output);
+        }
+      } else {
+        combinedOutputs.push(
+          Array.isArray(input) ? [output] : { messages: [output] }
+        );
       }
-      return Array.isArray(input) ? [output] : { messages: [output] };
-    });
+    }
+
+    if (parentCommand) {
+      combinedOutputs.push(parentCommand);
+    }
+
     return combinedOutputs as T;
   }
+
+  private isSendInput(input: unknown): input is { lg_tool_call: ToolCall } {
+    return (
+      typeof input === 'object' && input != null && 'lg_tool_call' in input
+    );
+  }
+
+  private isMessagesState(
+    input: unknown
+  ): input is { messages: BaseMessage[] } {
+    return (
+      typeof input === 'object' &&
+      input != null &&
+      'messages' in input &&
+      Array.isArray((input as { messages: unknown }).messages) &&
+      (input as { messages: unknown[] }).messages.every(isBaseMessage)
+    );
+  }
 }
 
 function areToolCallsInvoked(

package/src/types/tools.ts

@@ -34,7 +34,7 @@ export type ToolNodeOptions = {
   errorHandler?: (
     data: ToolErrorData,
     metadata?: Record<string, unknown>
-  ) => void;
+  ) => Promise<void>;
 };
 
 export type ToolNodeConstructorParams = ToolRefs & ToolNodeOptions;