@librechat/agents 3.2.2 → 3.2.31

package/src/tools/ToolNode.ts

@@ -1,4 +1,5 @@
 import { ToolCall } from '@langchain/core/messages/tool';
+import { AsyncLocalStorageProviderSingleton } from '@langchain/core/singletons';
 import {
   ToolMessage,
   HumanMessage,
@@ -14,7 +15,6 @@ import {
   isGraphInterrupt,
   MessagesAnnotation,
 } from '@langchain/langgraph';
-import { AsyncLocalStorageProviderSingleton } from '@langchain/core/singletons';
 import type {
   RunnableConfig,
   RunnableToolLike,
@@ -33,29 +33,29 @@ import type {
   PostToolBatchEntry,
 } from '@/hooks';
 import type * as t from '@/types';
-import { RunnableCallable } from '@/utils';
-import {
-  calculateMaxToolResultChars,
-  truncateToolResultContent,
-} from '@/utils/truncation';
-import { safeDispatchCustomEvent } from '@/utils/events';
-import { executeHooks } from '@/hooks';
-import { toLangChainContent } from '@/messages/langchain';
-import { withLangfuseToolOutputTracingConfig } from '@/langfuseToolOutputTracing';
-import { Constants, GraphEvents, CODE_EXECUTION_TOOLS } from '@/common';
 import {
   buildReferenceKey,
   ToolOutputReferenceRegistry,
 } from '@/tools/toolOutputReferences';
-import { stripCodeSessionFileSummary } from '@/tools/CodeSessionFileSummary';
-import {
-  resolveLocalToolRegistry,
-  resolveLocalExecutionTools,
-} from '@/tools/local';
 import {
   buildToolExecutionRequestPlan,
   recordArgsEqual,
 } from '@/tools/eagerEventExecution';
+import {
+  calculateMaxToolResultChars,
+  truncateToolResultContent,
+} from '@/utils/truncation';
+import {
+  resolveLocalToolRegistry,
+  resolveLocalExecutionTools,
+} from '@/tools/local';
+import { withLangfuseToolOutputTracingConfig } from '@/langfuseToolOutputTracing';
+import { stripCodeSessionFileSummary } from '@/tools/CodeSessionFileSummary';
+import { Constants, GraphEvents, CODE_EXECUTION_TOOLS } from '@/common';
+import { toLangChainContent } from '@/messages/langchain';
+import { safeDispatchCustomEvent } from '@/utils/events';
+import { RunnableCallable } from '@/utils';
+import { executeHooks } from '@/hooks';
 
 /**
  * Per-call batch context for `runTool`. Bundles every optional
@@ -431,6 +431,13 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
   private eagerEventToolUsageCount?: Map<string, number>;
   /** Agent ID for event-driven mode */
   private agentId?: string;
+  /**
+   * 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.
+   */
+  private executingAgentId?: string;
   /** Tool names that bypass event dispatch and execute directly (e.g., graph-managed handoff tools) */
   private directToolNames?: Set<string>;
   /**
@@ -492,6 +499,7 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
     eagerEventToolExecutions,
     eagerEventToolUsageCount,
     agentId,
+    executingAgentId,
     directToolNames,
     maxContextTokens,
     maxToolResultChars,
@@ -526,6 +534,9 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
     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);
@@ -925,6 +936,7 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
             runId: (config.configurable?.run_id as string | undefined) ?? '',
             threadId: config.configurable?.thread_id as string | undefined,
             agentId: this.agentId,
+            executingAgentId: this.executingAgentId,
           },
         };
       } else if (call.name === Constants.TOOL_SEARCH) {
@@ -1260,6 +1272,7 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
           runId,
           threadId,
           agentId: this.agentId,
+          executingAgentId: this.executingAgentId,
           toolName: call.name,
           toolInput: resolvedArgs,
           toolUseId: call.id ?? '',
@@ -1467,6 +1480,7 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
           runId,
           threadId,
           agentId: this.agentId,
+          executingAgentId: this.executingAgentId,
           toolName: call.name,
           toolInput: effectiveCall.args as Record<string, unknown>,
           toolUseId: call.id ?? '',
@@ -1500,6 +1514,7 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
           runId,
           threadId,
           agentId: this.agentId,
+          executingAgentId: this.executingAgentId,
           toolName: call.name,
           toolInput: effectiveCall.args as Record<string, unknown>,
           toolOutput: output.content,
@@ -1606,6 +1621,7 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
           runId,
           threadId,
           agentId: this.agentId,
+          executingAgentId: this.executingAgentId,
           toolName: call.name,
           toolInput: resolvedArgs,
           toolUseId: call.id ?? '',
@@ -1950,6 +1966,7 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
               runId,
               threadId,
               agentId: this.agentId,
+              executingAgentId: this.executingAgentId,
               toolName: entry.call.name,
               toolInput: entry.args,
               toolUseId: entry.call.id!,
@@ -2041,6 +2058,7 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
                 runId,
                 threadId,
                 agentId: this.agentId,
+                executingAgentId: this.executingAgentId,
                 toolName: item.toolName,
                 toolInput: item.args,
                 toolUseId: item.callId,
@@ -2609,6 +2627,7 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
                 runId,
                 threadId,
                 agentId: this.agentId,
+                executingAgentId: this.executingAgentId,
                 toolName,
                 toolInput: request?.args ?? {},
                 toolUseId: result.toolCallId,
@@ -2652,6 +2671,7 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
                 runId,
                 threadId,
                 agentId: this.agentId,
+                executingAgentId: this.executingAgentId,
                 toolName,
                 toolInput: request?.args ?? {},
                 toolOutput: result.content,
@@ -2889,6 +2909,7 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
           runId,
           threadId,
           agentId: this.agentId,
+          executingAgentId: this.executingAgentId,
           entries: orderedBatchEntries,
         },
         sessionId: runId,

package/src/tools/ToolSearch.ts

@@ -1,6 +1,6 @@
 // src/tools/ToolSearch.ts
-import * as okapibm25Module from 'okapibm25';
 import { config } from 'dotenv';
+import * as okapibm25Module from 'okapibm25';
 
 type BM25Fn = (
   documents: string[],

package/src/tools/__tests__/CloudflareSandboxExecution.test.ts

@@ -1,18 +1,18 @@
 import type * as t from '@/types';
-import { Constants } from '@/common';
-import { spawnLocalProcess } from '../local/LocalExecutionEngine';
-import { resolveLocalToolsForBinding } from '../local/resolveLocalExecutionTools';
 import {
   createCloudflareWorkspaceFS,
   createCloudflareLocalExecutionConfig,
   executeCloudflareBash,
   executeCloudflareCode,
 } from '../cloudflare/CloudflareSandboxExecutionEngine';
-import { createCloudflareBridgeRuntime } from '../cloudflare/CloudflareBridgeRuntime';
 import {
   createCloudflareBashProgrammaticToolCallingTool,
   createCloudflareProgrammaticToolCallingTool,
 } from '../cloudflare/CloudflareProgrammaticToolCalling';
+import { createCloudflareBridgeRuntime } from '../cloudflare/CloudflareBridgeRuntime';
+import { resolveLocalToolsForBinding } from '../local/resolveLocalExecutionTools';
+import { spawnLocalProcess } from '../local/LocalExecutionEngine';
+import { Constants } from '@/common';
 
 function sseResponse(events: string): Response {
   return new Response(events, {

package/src/tools/__tests__/CodeApiAuthHeaders.test.ts

@@ -3,10 +3,14 @@ import { beforeEach, describe, expect, it, jest } from '@jest/globals';
 import type { RequestInit } from 'node-fetch';
 import type * as t from '@/types';
 import {
-  createCodeExecutionTool,
-  resolveCodeApiAuthHeaders,
-} from '../CodeExecutor';
-import { createBashExecutionTool } from '../BashExecutor';
+  createLocalProgrammaticToolCallingTool,
+  createLocalBashProgrammaticToolCallingTool,
+} from '../local/LocalProgrammaticToolCalling';
+import {
+  clampCodeApiRunTimeoutMs,
+  createCodeApiRunTimeoutSchema,
+  MAX_CODE_API_RUN_TIMEOUT_SCHEMA_MS,
+} from '../ptcTimeout';
 import {
   createProgrammaticToolCallingTool,
   fetchSessionFiles,
@@ -14,14 +18,10 @@ import {
 } from '../ProgrammaticToolCalling';
 import { createBashProgrammaticToolCallingTool } from '../BashProgrammaticToolCalling';
 import {
-  clampCodeApiRunTimeoutMs,
-  createCodeApiRunTimeoutSchema,
-  MAX_CODE_API_RUN_TIMEOUT_SCHEMA_MS,
-} from '../ptcTimeout';
-import {
-  createLocalProgrammaticToolCallingTool,
-  createLocalBashProgrammaticToolCallingTool,
-} from '../local/LocalProgrammaticToolCalling';
+  createCodeExecutionTool,
+  resolveCodeApiAuthHeaders,
+} from '../CodeExecutor';
+import { createBashExecutionTool } from '../BashExecutor';
 
 jest.mock('node-fetch', () => ({
   __esModule: true,