@librechat/agents 3.1.37 → 3.1.39

package/src/tools/handlers.ts

@@ -117,6 +117,7 @@ export async function handleToolCallChunks({
       metadata
     );
   }
+
   await graph.dispatchRunStepDelta(stepId, {
     type: StepTypes.TOOL_CALLS,
     tool_calls: toolCallChunks,
@@ -129,7 +130,7 @@ export const handleToolCalls = async (
   graph?: StandardGraph | MultiAgentGraph
 ): Promise<void> => {
   if (!graph || !metadata) {
-    console.warn(`Graph or metadata not found in ${event} event`);
+    console.warn('Graph or metadata not found in `handleToolCalls`');
     return;
   }
 
@@ -143,6 +144,13 @@ export const handleToolCalls = async (
 
   const stepKey = graph.getStepKey(metadata);
 
+  /**
+   * Track whether we've already reused an empty TOOL_CALLS step created by
+   * handleToolCallChunks during streaming. Only reuse it once (for the first
+   * tool call); subsequent parallel tool calls must create their own steps.
+   */
+  let reusedChunkStepId: string | undefined;
+
   for (const tool_call of toolCalls) {
     const toolCallId = tool_call.id ?? `toolu_${nanoid()}`;
     tool_call.id = toolCallId;
@@ -159,6 +167,27 @@ export const handleToolCalls = async (
       // no previous step
     }
 
+    /**
+     * If the previous step is TOOL_CALLS (from handleToolCallChunks or a prior
+     * iteration), either reuse it (if empty) or dispatch a new TOOL_CALLS step
+     * directly — skip the intermediate MESSAGE_CREATION to avoid orphaned gaps.
+     */
+    if (prevRunStep?.type === StepTypes.TOOL_CALLS) {
+      const details = prevRunStep.stepDetails as t.ToolCallsDetails;
+      const isEmpty = !details.tool_calls || details.tool_calls.length === 0;
+      if (isEmpty && prevStepId !== reusedChunkStepId) {
+        graph.toolCallStepIds.set(toolCallId, prevStepId);
+        reusedChunkStepId = prevStepId;
+        continue;
+      }
+      await graph.dispatchRunStep(
+        stepKey,
+        { type: StepTypes.TOOL_CALLS, tool_calls: [tool_call] },
+        metadata
+      );
+      continue;
+    }
+
     /**
      * NOTE: We do NOT dispatch empty text blocks with tool_call_ids because:
      * - Empty text blocks cause providers (Anthropic, Bedrock) to reject messages
@@ -167,19 +196,9 @@ export const handleToolCalls = async (
      *   "The content field in the Message object is empty" (Bedrock)
      * - The tool_calls themselves are sufficient
      */
-
-    /* If the previous step exists and is a message creation */
-    if (
-      prevStepId &&
-      prevRunStep &&
-      prevRunStep.type === StepTypes.MESSAGE_CREATION
-    ) {
+    if (prevStepId && prevRunStep) {
       graph.messageStepHasToolCalls.set(prevStepId, true);
-      /* If the previous step doesn't exist or is not a message creation */
-    } else if (
-      !prevRunStep ||
-      prevRunStep.type !== StepTypes.MESSAGE_CREATION
-    ) {
+    } else if (!prevRunStep) {
       const messageId = getMessageId(stepKey, graph, true) ?? '';
       const stepId = await graph.dispatchRunStep(
         stepKey,

package/src/types/tools.ts

@@ -60,6 +60,7 @@ export type ToolEndEvent = {
   tool_call: ToolCall;
   /** The content index of the tool call */
   index: number;
+  type?: 'tool_call';
 };
 
 export type CodeEnvFile = {