@librechat/agents 3.2.21 → 3.2.31

package/dist/cjs/graphs/Graph.cjs

@@ -13,51 +13,50 @@ var anthropicToolCache = require('../messages/anthropicToolCache.cjs');
 var content = require('../messages/content.cjs');
 var tools = require('../messages/tools.cjs');
 var reducer = require('../messages/reducer.cjs');
-var _enum = require('../common/enum.cjs');
+var langfuseToolOutputTracing = require('../langfuseToolOutputTracing.cjs');
+var langfuse = require('../langfuse.cjs');
 var graph = require('../utils/graph.cjs');
 var llm = require('../utils/llm.cjs');
 require('../stream.cjs');
+var _enum = require('../common/enum.cjs');
 var run = require('../utils/run.cjs');
 require('ai-tokenizer');
 require('zod-to-json-schema');
-var SubagentExecutor = require('../tools/subagent/SubagentExecutor.cjs');
-var SubagentTool = require('../tools/SubagentTool.cjs');
+var callbacks = require('../utils/callbacks.cjs');
+var toolCache = require('../llm/openrouter/toolCache.cjs');
 var ToolNode = require('../tools/ToolNode.cjs');
+var LocalCodingTools = require('../tools/local/LocalCodingTools.cjs');
+var SubagentExecutor = require('../tools/subagent/SubagentExecutor.cjs');
 var toolOutputReferences = require('../tools/toolOutputReferences.cjs');
+var toolCache$1 = require('../llm/bedrock/toolCache.cjs');
 var events = require('../utils/events.cjs');
+require('path');
+require('../tools/cloudflare/CloudflareProgrammaticToolCalling.cjs');
+require('stream');
+require('events');
+require('../tools/local/LocalExecutionEngine.cjs');
+var CloudflareSandboxTools = require('../tools/cloudflare/CloudflareSandboxTools.cjs');
 var invoke = require('../llm/invoke.cjs');
+var SubagentTool = require('../tools/SubagentTool.cjs');
+var instrumentation = require('../instrumentation.cjs');
 var index = require('../summarization/index.cjs');
-var node = require('../summarization/node.cjs');
-var callbacks = require('../utils/callbacks.cjs');
-var schema = require('../tools/schema.cjs');
-var AgentContext = require('../agents/AgentContext.cjs');
-var fake = require('../llm/fake.cjs');
-var handlers = require('../tools/handlers.cjs');
 require('../tools/local/CompileCheckTool.cjs');
-require('path');
 require('fs/promises');
-var LocalCodingTools = require('../tools/local/LocalCodingTools.cjs');
-require('../tools/local/LocalExecutionEngine.cjs');
-require('../tools/CodeExecutor.cjs');
 require('../tools/BashExecutor.cjs');
-require('crypto');
+require('../tools/CodeExecutor.cjs');
 require('http');
-require('../hooks/createWorkspacePolicyHook.cjs');
+require('crypto');
 require('../tools/ProgrammaticToolCalling.cjs');
 require('../tools/BashProgrammaticToolCalling.cjs');
+require('../hooks/createWorkspacePolicyHook.cjs');
 var resolveLocalExecutionTools = require('../tools/local/resolveLocalExecutionTools.cjs');
-require('../tools/local/attachments.cjs');
-require('../tools/cloudflare/CloudflareProgrammaticToolCalling.cjs');
-require('events');
-require('stream');
-var CloudflareSandboxTools = require('../tools/cloudflare/CloudflareSandboxTools.cjs');
+var node = require('../summarization/node.cjs');
+var schema = require('../tools/schema.cjs');
+var AgentContext = require('../agents/AgentContext.cjs');
+var fake = require('../llm/fake.cjs');
+var handlers = require('../tools/handlers.cjs');
 var request = require('../llm/request.cjs');
 var init = require('../llm/init.cjs');
-var langfuse = require('../langfuse.cjs');
-var instrumentation = require('../instrumentation.cjs');
-var langfuseToolOutputTracing = require('../langfuseToolOutputTracing.cjs');
-var toolCache = require('../llm/openrouter/toolCache.cjs');
-var toolCache$1 = require('../llm/bedrock/toolCache.cjs');
 
 /* eslint-disable no-console */
 const { AGENT, TOOLS, SUMMARIZE } = _enum.GraphNodeKeys;
@@ -106,7 +105,23 @@ function getResponseReasoningContent({ responseMessage, reasoningKey, }) {
     }
     return getReasoningDetailsText(additionalKwargs.reasoning_details);
 }
-function getTextMessageDeltaContent(content) {
+function isTextMessageContentPart(contentPart) {
+    return (typeof contentPart === 'object' &&
+        'type' in contentPart &&
+        typeof contentPart.type === 'string' &&
+        contentPart.type.startsWith('text'));
+}
+function isGoogleServerSideToolMessageContentPart(contentPart) {
+    return (typeof contentPart === 'object' &&
+        'type' in contentPart &&
+        (contentPart.type === 'toolCall' || contentPart.type === 'toolResponse'));
+}
+function hasGoogleServerSideToolDeltaContent(provider, content) {
+    return (llm.isGoogleLike(provider) &&
+        Array.isArray(content) &&
+        content.some((contentPart) => isGoogleServerSideToolMessageContentPart(contentPart)));
+}
+function getMessageDeltaContent(provider, content) {
     if (content == null) {
         return undefined;
     }
@@ -118,24 +133,91 @@ function getTextMessageDeltaContent(content) {
     if (content.length === 0) {
         return undefined;
     }
-    if (!content.every((contentPart) => typeof contentPart === 'object' &&
-        'type' in contentPart &&
-        typeof contentPart.type === 'string' &&
-        contentPart.type.startsWith('text'))) {
+    const hasGoogleServerSideToolPart = llm.isGoogleLike(provider) &&
+        content.some((contentPart) => isGoogleServerSideToolMessageContentPart(contentPart));
+    if (content.every((contentPart) => isTextMessageContentPart(contentPart))) {
+        return content;
+    }
+    if (!hasGoogleServerSideToolPart) {
         return undefined;
     }
-    return content;
+    const messageContent = content.filter((contentPart) => isTextMessageContentPart(contentPart) ||
+        isGoogleServerSideToolMessageContentPart(contentPart));
+    return messageContent.length > 0
+        ? messageContent
+        : undefined;
 }
-async function dispatchTextMessageContent({ graph, stepKey, content, metadata, }) {
-    const messageId = ids.getMessageId(stepKey, graph) ?? '';
-    if (!messageId) {
+function hasTextDeltaContent(content) {
+    if (content == null) {
         return false;
     }
+    return content.some((contentPart) => {
+        if (contentPart.type?.startsWith(_enum.ContentTypes.TEXT) !== true) {
+            return false;
+        }
+        const text = contentPart.text;
+        return typeof text === 'string' && text !== '';
+    });
+}
+function hasReasoningDeltaContent(content) {
+    if (content == null) {
+        return false;
+    }
+    return content.some((contentPart) => contentPart.type === _enum.ContentTypes.THINK && contentPart.think !== '');
+}
+function getCurrentStepIds({ graph, metadata, }) {
+    const baseStepKey = graph.getStepBaseKey(metadata);
+    const currentStepIds = [];
+    for (const [stepKey, stepIds] of graph.stepKeyIds) {
+        if (stepKey !== baseStepKey && !stepKey.startsWith(`${baseStepKey}_`)) {
+            continue;
+        }
+        currentStepIds.push(...stepIds);
+    }
+    return currentStepIds;
+}
+function hasCurrentTextDeltaStep({ graph, metadata, }) {
+    return getCurrentStepIds({ graph, metadata }).some((stepId) => graph.messageStepHasTextDeltas.has(stepId));
+}
+function hasCurrentReasoningDeltaStep({ graph, metadata, }) {
+    return getCurrentStepIds({ graph, metadata }).some((stepId) => graph.reasoningStepHasDeltas.has(stepId));
+}
+function clearCurrentDeltaStepMarkers({ graph, metadata, }) {
+    for (const stepId of getCurrentStepIds({ graph, metadata })) {
+        graph.messageStepHasTextDeltas.delete(stepId);
+        graph.reasoningStepHasDeltas.delete(stepId);
+    }
+}
+async function dispatchMessageCreationStep({ graph, stepKey, messageId, metadata, }) {
     await graph.dispatchRunStep(stepKey, {
         type: _enum.StepTypes.MESSAGE_CREATION,
         message_creation: { message_id: messageId },
     }, metadata);
-    const stepId = graph.getStepIdByKey(stepKey);
+    return graph.getStepIdByKey(stepKey);
+}
+async function dispatchTextMessageContent({ graph, stepKey, provider, content, metadata, }) {
+    const messageId = ids.getMessageId(stepKey, graph) ?? '';
+    if (!messageId) {
+        return false;
+    }
+    if (hasGoogleServerSideToolDeltaContent(provider, content)) {
+        for (const contentPart of content) {
+            const stepId = await dispatchMessageCreationStep({
+                graph,
+                stepKey,
+                messageId,
+                metadata,
+            });
+            await graph.dispatchMessageDelta(stepId, { content: [contentPart] }, metadata);
+        }
+        return true;
+    }
+    const stepId = await dispatchMessageCreationStep({
+        graph,
+        stepKey,
+        messageId,
+        metadata,
+    });
     await graph.dispatchMessageDelta(stepId, { content }, metadata);
     return true;
 }
@@ -172,7 +254,18 @@ function markPostReasoningContent(agentContext) {
     agentContext.tokenTypeSwitch = 'content';
     agentContext.reasoningTransitionCount++;
 }
+function getDispatchableFinalReasoningContent({ agentContext, responseReasoningContent, hasStreamedTextDeltaStep, hasStreamedReasoningDeltaStep, }) {
+    if (responseReasoningContent == null || hasStreamedReasoningDeltaStep) {
+        return undefined;
+    }
+    if (agentContext.provider === _enum.Providers.OPENROUTER &&
+        hasStreamedTextDeltaStep) {
+        return undefined;
+    }
+    return responseReasoningContent;
+}
 class Graph {
+    messageStepHasTextDeltas = new Set();
     messageStepHasToolCalls = new Map();
     messageIdsByStepKey = new Map();
     prelimMessageIdsByStepKey = new Map();
@@ -187,6 +280,7 @@ class Graph {
      * the same step are scoped to the active custom event dispatch.
      */
     handlerDispatchedStepIds = new Set();
+    reasoningStepHasDeltas = new Set();
     handlerDispatchedEventCounts = new Map();
     signal;
     /** Set of invoked tool call IDs from non-message run steps completed mid-run, if any */
@@ -259,6 +353,8 @@ class Graph {
         this.stepKeyIds = new Map();
         this.toolCallStepIds.clear();
         this.messageIdsByStepKey = new Map();
+        this.messageStepHasTextDeltas = new Set();
+        this.reasoningStepHasDeltas = new Set();
         this.messageStepHasToolCalls = new Map();
         this.prelimMessageIdsByStepKey = new Map();
         this.invokedToolIds = undefined;
@@ -479,6 +575,8 @@ class StandardGraph extends Graph {
         this.handlerDispatchedEventCounts = graph.resetIfNotEmpty(this.handlerDispatchedEventCounts, new Map());
         this.messageIdsByStepKey = graph.resetIfNotEmpty(this.messageIdsByStepKey, new Map());
         this.messageStepHasToolCalls = graph.resetIfNotEmpty(this.messageStepHasToolCalls, new Map());
+        this.messageStepHasTextDeltas = graph.resetIfNotEmpty(this.messageStepHasTextDeltas, new Set());
+        this.reasoningStepHasDeltas = graph.resetIfNotEmpty(this.reasoningStepHasDeltas, new Set());
         this.prelimMessageIdsByStepKey = graph.resetIfNotEmpty(this.prelimMessageIdsByStepKey, new Map());
         this.invokedToolIds = graph.resetIfNotEmpty(this.invokedToolIds, undefined);
         for (const context of this.agentContexts.values()) {
@@ -526,6 +624,15 @@ class StandardGraph extends Graph {
         }
         return agentContext;
     }
+    getStepBaseKey(metadata) {
+        if (!metadata)
+            return '';
+        const keyList = this.getInvocationKeyList(metadata);
+        if (this.checkKeyList(keyList)) {
+            throw new Error('Missing metadata');
+        }
+        return graph.joinKeys(keyList);
+    }
     getStepKey(metadata) {
         if (!metadata)
             return '';
@@ -564,6 +671,25 @@ class StandardGraph extends Graph {
     getKeyList(metadata) {
         if (!metadata)
             return [];
+        const keyList = this.getInvocationKeyList(metadata);
+        const agentContext = this.getAgentContext(metadata);
+        if (agentContext.currentTokenType === _enum.ContentTypes.THINK ||
+            agentContext.currentTokenType === 'think_and_text') {
+            keyList.push('reasoning');
+        }
+        else if (agentContext.tokenTypeSwitch === 'content') {
+            keyList.push(`post-reasoning-${agentContext.reasoningTransitionCount}`);
+        }
+        return keyList;
+    }
+    getInvocationKeyList(metadata) {
+        const keyList = this.getBaseKeyList(metadata);
+        if (this.invokedToolIds != null && this.invokedToolIds.size > 0) {
+            keyList.push(this.invokedToolIds.size + '');
+        }
+        return keyList;
+    }
+    getBaseKeyList(metadata) {
         const configurable = this.config?.configurable;
         const runId = metadata.run_id ??
             configurable?.run_id ??
@@ -581,17 +707,6 @@ class StandardGraph extends Graph {
             metadata.langgraph_step,
             checkpointNs,
         ];
-        const agentContext = this.getAgentContext(metadata);
-        if (agentContext.currentTokenType === _enum.ContentTypes.THINK ||
-            agentContext.currentTokenType === 'think_and_text') {
-            keyList.push('reasoning');
-        }
-        else if (agentContext.tokenTypeSwitch === 'content') {
-            keyList.push(`post-reasoning-${agentContext.reasoningTransitionCount}`);
-        }
-        if (this.invokedToolIds != null && this.invokedToolIds.size > 0) {
-            keyList.push(this.invokedToolIds.size + '');
-        }
         return keyList;
     }
     checkKeyList(keyList) {
@@ -703,6 +818,7 @@ class StandardGraph extends Graph {
                 sessions: this.sessions,
                 toolDefinitions: toolDefMap,
                 agentId: agentContext?.agentId,
+                executingAgentId: agentContext?.agentId,
                 toolCallStepIds: this.toolCallStepIds,
                 toolRegistry: agentContext?.toolRegistry,
                 hookRegistry: this.hookRegistry,
@@ -740,6 +856,10 @@ class StandardGraph extends Graph {
             trace: traceToolNode,
             runLangfuse: this.langfuse,
             agentLangfuse: agentContext?.langfuse,
+            // `agentId` is intentionally left unset on this path (it is the
+            // subagent-scope marker); `executingAgentId` always identifies the owning
+            // agent so hooks can attribute the batch even at the top level.
+            executingAgentId: agentContext?.agentId,
             toolCallStepIds: this.toolCallStepIds,
             errorHandler: (data, metadata) => StandardGraph.handleToolCallErrorStatic(this, data, metadata),
             toolRegistry: agentContext?.toolRegistry,
@@ -1137,6 +1257,7 @@ class StandardGraph extends Graph {
                     };
                 }
             }
+            const metadata = config.metadata;
             try {
                 result = await langfuseToolOutputTracing.withLangfuseToolOutputTracingConfig(this.langfuse, () => invoke.attemptInvoke({
                     model: (this.overrideModel ?? model),
@@ -1146,6 +1267,10 @@ class StandardGraph extends Graph {
                 }, invokeConfig), agentContext.langfuse);
             }
             catch (primaryError) {
+                clearCurrentDeltaStepMarkers({
+                    graph: this,
+                    metadata,
+                });
                 result = await langfuseToolOutputTracing.withLangfuseToolOutputTracingConfig(this.langfuse, () => invoke.tryFallbackProviders({
                     fallbacks,
                     tools: agentContext.tools,
@@ -1180,28 +1305,42 @@ class StandardGraph extends Graph {
             const toolCalls = responseMessage
                 ?.tool_calls;
             const hasToolCalls = Array.isArray(toolCalls) && toolCalls.length > 0;
-            const metadata = config.metadata;
             const responseReasoningContent = getResponseReasoningContent({
                 responseMessage: responseMessage,
                 reasoningKey: agentContext.reasoningKey,
             });
-            const textMessageContent = getTextMessageDeltaContent(responseMessage?.content);
+            const textMessageContent = getMessageDeltaContent(agentContext.provider, responseMessage?.content);
+            const hasStreamedTextDeltaStep = hasCurrentTextDeltaStep({
+                graph: this,
+                metadata,
+            });
+            const hasStreamedReasoningDeltaStep = hasCurrentReasoningDeltaStep({
+                graph: this,
+                metadata,
+            });
+            const dispatchableFinalReasoningContent = getDispatchableFinalReasoningContent({
+                agentContext,
+                responseReasoningContent,
+                hasStreamedTextDeltaStep,
+                hasStreamedReasoningDeltaStep,
+            });
             if (hasToolCalls) {
-                const dispatchedReasoning = responseReasoningContent != null &&
+                const dispatchedReasoning = dispatchableFinalReasoningContent != null &&
                     (await dispatchReasoningContent({
                         graph: this,
                         agentContext,
-                        reasoningContent: responseReasoningContent,
+                        reasoningContent: dispatchableFinalReasoningContent,
                         metadata,
                     }));
                 if (dispatchedReasoning) {
                     markPostReasoningContent(agentContext);
                 }
-                if (textMessageContent != null) {
+                if (textMessageContent != null && !hasStreamedTextDeltaStep) {
                     const stepKey = this.getStepKey(metadata);
                     const dispatchedText = await dispatchTextMessageContent({
                         graph: this,
                         stepKey,
+                        provider: agentContext.provider,
                         content: textMessageContent,
                         metadata,
                     });
@@ -1217,21 +1356,22 @@ class StandardGraph extends Graph {
              * this a no-op when the streaming path already handled the same step.
              */
             if (!hasToolCalls && responseMessage != null) {
-                const dispatchedReasoning = responseReasoningContent != null &&
+                const dispatchedReasoning = dispatchableFinalReasoningContent != null &&
                     (await dispatchReasoningContent({
                         graph: this,
                         agentContext,
-                        reasoningContent: responseReasoningContent,
+                        reasoningContent: dispatchableFinalReasoningContent,
                         metadata,
                     }));
                 if (dispatchedReasoning && textMessageContent != null) {
                     markPostReasoningContent(agentContext);
                 }
-                if (textMessageContent != null) {
+                if (textMessageContent != null && !hasStreamedTextDeltaStep) {
                     const stepKey = this.getStepKey(metadata);
                     await dispatchTextMessageContent({
                         graph: this,
                         stepKey,
+                        provider: agentContext.provider,
                         content: textMessageContent,
                         metadata,
                     });
@@ -1648,6 +1788,9 @@ class StandardGraph extends Graph {
             id,
             delta,
         };
+        if (hasTextDeltaContent(delta.content)) {
+            this.messageStepHasTextDeltas.add(id);
+        }
         const handler = this.handlerRegistry?.getHandler(_enum.GraphEvents.ON_MESSAGE_DELTA);
         if (handler) {
             await handler.handle(_enum.GraphEvents.ON_MESSAGE_DELTA, messageDelta, metadata, this);
@@ -1671,6 +1814,9 @@ class StandardGraph extends Graph {
             id: stepId,
             delta,
         };
+        if (hasReasoningDeltaContent(delta.content)) {
+            this.reasoningStepHasDeltas.add(stepId);
+        }
         const handler = this.handlerRegistry?.getHandler(_enum.GraphEvents.ON_REASONING_DELTA);
         if (handler) {
             await handler.handle(_enum.GraphEvents.ON_REASONING_DELTA, reasoningDelta, metadata, this);