@librechat/agents 3.1.87 → 3.1.89

package/dist/cjs/tools/ToolNode.cjs

@@ -1910,14 +1910,26 @@ class ToolNode extends run.RunnableCallable {
                     })
                         .catch(reject);
                 });
-            const eagerResultsPromise = Promise.all(eagerExecutions.map(({ request, execution }) => this.resolveEagerEventExecution(request, execution))).then((results) => results.flat());
+            const eagerResultsPromise = Promise.all(eagerExecutions.map(async ({ request, execution }) => {
+                const results = await this.resolveEagerEventExecution(request, execution);
+                return {
+                    results,
+                    completionDispatched: execution.completionDispatched === true &&
+                        execution.request.turn === request.turn,
+                    toolCallId: request.id,
+                };
+            }));
             const [eagerResults, dispatchedResults] = await Promise.all([
                 eagerResultsPromise,
                 dispatchPromise,
             ]);
+            const eagerCompletionDispatchedIds = new Set(eagerResults
+                .filter((result) => result.completionDispatched)
+                .map((result) => result.toolCallId));
+            const flattenedEagerResults = eagerResults.flatMap((result) => result.results);
             const results = [
                 ...plan.rejectedResults,
-                ...eagerResults,
+                ...flattenedEagerResults,
                 ...dispatchedResults,
             ];
             this.storeCodeSessionFromResults(results, requestMap);
@@ -2058,7 +2070,9 @@ class ToolNode extends run.RunnableCallable {
                         }),
                     });
                 }
-                await this.dispatchStepCompleted(result.toolCallId, toolName, request?.args ?? {}, contentString, config, request?.turn);
+                if (!eagerCompletionDispatchedIds.has(result.toolCallId)) {
+                    await this.dispatchStepCompleted(result.toolCallId, toolName, request?.args ?? {}, contentString, config, request?.turn);
+                }
                 postToolBatchEntryByCallId.set(result.toolCallId, {
                     toolName,
                     toolInput: request?.args ?? {},
@@ -2090,8 +2104,7 @@ class ToolNode extends run.RunnableCallable {
         return (this.eventDrivenMode &&
             this.eagerEventToolExecution?.enabled === true &&
             this.hookRegistry == null &&
-            this.humanInTheLoop?.enabled !== true &&
-            this.toolOutputRegistry == null);
+            this.humanInTheLoop?.enabled !== true);
     }
     takeMatchingEagerEventExecution(request) {
         if (!this.canConsumeEagerEventExecution()) {
@@ -2102,9 +2115,13 @@ class ToolNode extends run.RunnableCallable {
             return undefined;
         }
         this.eagerEventToolExecutions?.delete(request.id);
+        // Only tool identity + canonical args define side-effect identity here.
+        // `request.turn` is final-planning metadata; if it drifts between the
+        // streamed eager reservation and model-end materialization, consume the
+        // same-name/same-args eager result and let the final request drive refs,
+        // completion metadata, and PostToolBatch state.
         if (execution.toolName !== request.name ||
-            !eagerEventExecution.recordArgsEqual(execution.args, request.args) ||
-            execution.request.turn !== request.turn) {
+            !eagerEventExecution.recordArgsEqual(execution.args, request.args)) {
             return {
                 toolCallId: request.id,
                 toolName: request.name,