@librechat/agents 3.2.21 → 3.2.32

package/dist/esm/tools/ToolNode.mjs

@@ -1,34 +1,33 @@
+import { AsyncLocalStorageProviderSingleton } from '@langchain/core/singletons';
 import { isBaseMessage, ToolMessage, HumanMessage, isAIMessage } from '@langchain/core/messages';
 import { isCommand, isGraphInterrupt, interrupt, Command, Send, END } from '@langchain/langgraph';
-import { AsyncLocalStorageProviderSingleton } from '@langchain/core/singletons';
-import { Constants, CODE_EXECUTION_TOOLS, GraphEvents } from '../common/enum.mjs';
-import '../stream.mjs';
-import { RunnableCallable } from '../utils/run.mjs';
-import 'ai-tokenizer';
-import 'zod-to-json-schema';
-import { calculateMaxToolResultChars, truncateToolResultContent } from '../utils/truncation.mjs';
-import { safeDispatchCustomEvent } from '../utils/events.mjs';
-import { executeHooks } from '../hooks/executeHooks.mjs';
-import '../hooks/createWorkspacePolicyHook.mjs';
-import { toLangChainContent } from '../messages/langchain.mjs';
-import { withLangfuseToolOutputTracingConfig } from '../langfuseToolOutputTracing.mjs';
 import { ToolOutputReferenceRegistry, buildReferenceKey } from './toolOutputReferences.mjs';
-import { stripCodeSessionFileSummary } from './CodeSessionFileSummary.mjs';
+import { buildToolExecutionRequestPlan, recordArgsEqual } from './eagerEventExecution.mjs';
+import { calculateMaxToolResultChars, truncateToolResultContent } from '../utils/truncation.mjs';
 import './local/CompileCheckTool.mjs';
 import 'path';
 import 'fs/promises';
 import './local/LocalCodingTools.mjs';
 import './local/LocalExecutionEngine.mjs';
 import '@langchain/core/tools';
-import './CodeExecutor.mjs';
 import './BashExecutor.mjs';
-import 'crypto';
+import './CodeExecutor.mjs';
+import { Constants, CODE_EXECUTION_TOOLS, GraphEvents } from '../common/enum.mjs';
 import 'http';
+import 'crypto';
 import './ProgrammaticToolCalling.mjs';
 import './BashProgrammaticToolCalling.mjs';
+import { executeHooks } from '../hooks/executeHooks.mjs';
+import '../hooks/createWorkspacePolicyHook.mjs';
 import { resolveLocalToolRegistry, resolveLocalExecutionTools } from './local/resolveLocalExecutionTools.mjs';
-import './local/attachments.mjs';
-import { buildToolExecutionRequestPlan, recordArgsEqual } from './eagerEventExecution.mjs';
+import { withLangfuseToolOutputTracingConfig } from '../langfuseToolOutputTracing.mjs';
+import { stripCodeSessionFileSummary } from './CodeSessionFileSummary.mjs';
+import { toLangChainContent } from '../messages/langchain.mjs';
+import { safeDispatchCustomEvent } from '../utils/events.mjs';
+import '../stream.mjs';
+import { RunnableCallable } from '../utils/run.mjs';
+import 'ai-tokenizer';
+import 'zod-to-json-schema';
 
 const TOOL_NODE_RUN_NAME = 'tool_batch';
 /**
@@ -270,6 +269,13 @@ class ToolNode extends RunnableCallable {
     eagerEventToolUsageCount;
     /** Agent ID for event-driven mode */
     agentId;
+    /**
+     * ID of the agent that owns this tool node, whenever the graph knows it
+     * (including top-level agents in a multi-agent graph). Surfaced to hooks as
+     * `executingAgentId` so they can attribute a tool batch to a specific agent
+     * even where `agentId` (the subagent-scope marker) is undefined.
+     */
+    executingAgentId;
     /** Tool names that bypass event dispatch and execute directly (e.g., graph-managed handoff tools) */
     directToolNames;
     /**
@@ -311,7 +317,7 @@ class ToolNode extends RunnableCallable {
      * other's in-flight state.
      */
     anonBatchCounter = 0;
-    constructor({ tools, toolMap, name, tags, trace, runLangfuse, agentLangfuse, errorHandler, toolCallStepIds, handleToolErrors, loadRuntimeTools, toolRegistry, sessions, eventDrivenMode, eagerEventToolExecution, eagerEventToolExecutions, eagerEventToolUsageCount, agentId, directToolNames, maxContextTokens, maxToolResultChars, hookRegistry, humanInTheLoop, toolOutputReferences, toolOutputRegistry, toolExecution, fileCheckpointer, }) {
+    constructor({ tools, toolMap, name, tags, trace, runLangfuse, agentLangfuse, errorHandler, toolCallStepIds, handleToolErrors, loadRuntimeTools, toolRegistry, sessions, eventDrivenMode, eagerEventToolExecution, eagerEventToolExecutions, eagerEventToolUsageCount, agentId, executingAgentId, directToolNames, maxContextTokens, maxToolResultChars, hookRegistry, humanInTheLoop, toolOutputReferences, toolOutputRegistry, toolExecution, fileCheckpointer, }) {
         super({
             name: name ?? TOOL_NODE_RUN_NAME,
             tags,
@@ -336,6 +342,9 @@ class ToolNode extends RunnableCallable {
         this.eagerEventToolExecutions = eagerEventToolExecutions;
         this.eagerEventToolUsageCount = eagerEventToolUsageCount;
         this.agentId = agentId;
+        // Default to agentId so callers constructing ToolNode directly (who pass the
+        // existing agentId option) still get attribution without knowing the new option.
+        this.executingAgentId = executingAgentId ?? agentId;
         this.directToolNames = directToolNames;
         this.maxToolResultChars =
             maxToolResultChars ?? calculateMaxToolResultChars(maxContextTokens);
@@ -649,6 +658,7 @@ class ToolNode extends RunnableCallable {
                         runId: config.configurable?.run_id ?? '',
                         threadId: config.configurable?.thread_id,
                         agentId: this.agentId,
+                        executingAgentId: this.executingAgentId,
                     },
                 };
             }
@@ -935,6 +945,7 @@ class ToolNode extends RunnableCallable {
                     runId,
                     threadId,
                     agentId: this.agentId,
+                    executingAgentId: this.executingAgentId,
                     toolName: call.name,
                     toolInput: resolvedArgs,
                     toolUseId: call.id ?? '',
@@ -1106,6 +1117,7 @@ class ToolNode extends RunnableCallable {
                     runId,
                     threadId,
                     agentId: this.agentId,
+                    executingAgentId: this.executingAgentId,
                     toolName: call.name,
                     toolInput: effectiveCall.args,
                     toolUseId: call.id ?? '',
@@ -1133,6 +1145,7 @@ class ToolNode extends RunnableCallable {
                     runId,
                     threadId,
                     agentId: this.agentId,
+                    executingAgentId: this.executingAgentId,
                     toolName: call.name,
                     toolInput: effectiveCall.args,
                     toolOutput: output.content,
@@ -1215,6 +1228,7 @@ class ToolNode extends RunnableCallable {
                     runId,
                     threadId,
                     agentId: this.agentId,
+                    executingAgentId: this.executingAgentId,
                     toolName: call.name,
                     toolInput: resolvedArgs,
                     toolUseId: call.id ?? '',
@@ -1496,6 +1510,7 @@ class ToolNode extends RunnableCallable {
                     runId,
                     threadId,
                     agentId: this.agentId,
+                    executingAgentId: this.executingAgentId,
                     toolName: entry.call.name,
                     toolInput: entry.args,
                     toolUseId: entry.call.id,
@@ -1565,6 +1580,7 @@ class ToolNode extends RunnableCallable {
                                 runId,
                                 threadId,
                                 agentId: this.agentId,
+                                executingAgentId: this.executingAgentId,
                                 toolName: item.toolName,
                                 toolInput: item.args,
                                 toolUseId: item.callId,
@@ -2006,6 +2022,7 @@ class ToolNode extends RunnableCallable {
                                 runId,
                                 threadId,
                                 agentId: this.agentId,
+                                executingAgentId: this.executingAgentId,
                                 toolName,
                                 toolInput: request?.args ?? {},
                                 toolUseId: result.toolCallId,
@@ -2045,6 +2062,7 @@ class ToolNode extends RunnableCallable {
                                 runId,
                                 threadId,
                                 agentId: this.agentId,
+                                executingAgentId: this.executingAgentId,
                                 toolName,
                                 toolInput: request?.args ?? {},
                                 toolOutput: result.content,
@@ -2217,6 +2235,7 @@ class ToolNode extends RunnableCallable {
                     runId,
                     threadId,
                     agentId: this.agentId,
+                    executingAgentId: this.executingAgentId,
                     entries: orderedBatchEntries,
                 },
                 sessionId: runId,