@librechat/agents 3.4.3 → 3.4.4

package/dist/cjs/tools/subagent/SubagentExecutor.cjs

@@ -2,8 +2,8 @@ const require_SubagentReplay = require("./SubagentReplay.cjs");
 const require_misc = require("../../utils/misc.cjs");
 require("../../common/enum.cjs");
 require("../../common/index.cjs");
-const require_eagerEventExecution = require("../eagerEventExecution.cjs");
 const require_streamLimits = require("../../llm/streamLimits.cjs");
+const require_eagerEventExecution = require("../eagerEventExecution.cjs");
 const require_SubagentExecutionRegistry = require("./SubagentExecutionRegistry.cjs");
 require("./runtimeLimits.cjs");
 const require_executeHooks = require("../../hooks/executeHooks.cjs");
@@ -12,8 +12,8 @@ require("../../hooks/index.cjs");
 const require_childGraphConfig = require("./childGraphConfig.cjs");
 let nanoid = require("nanoid");
 let _langchain_core_callbacks_base = require("@langchain/core/callbacks/base");
-let _langchain_core_messages = require("@langchain/core/messages");
 let _langchain_langgraph = require("@langchain/langgraph");
+let _langchain_core_messages = require("@langchain/core/messages");
 let _langchain_core_singletons = require("@langchain/core/singletons");
 let crypto = require("crypto");
 //#region src/tools/subagent/SubagentExecutor.ts
@@ -24,6 +24,48 @@ const TEXT_DELTA_CONTENT_TYPE = `text_delta`;
 const SUBAGENT_RESOLUTION_ERROR_MESSAGE = "Subagent error: Unable to initialize the selected subagent.";
 const SUBAGENT_CONFIG_CHANGED_MESSAGE = "Subagent error: Subagent configuration changed since this execution was paused.";
 const SUBAGENT_INVOCATION_CHANGED_MESSAGE = "Subagent error: Subagent invocation changed for this execution.";
+function cloneToolSessionContext(context) {
+	return {
+		...context,
+		...context.files == null ? {} : { files: context.files.map((file) => ({
+			...file,
+			storage_session_id: file.storage_session_id ?? context.session_id
+		})) }
+	};
+}
+function seedChildGraphSessions(childGraph, agents) {
+	const seenFilesByTool = /* @__PURE__ */ new Map();
+	for (const agent of agents) {
+		if (agent.initialSessions == null) continue;
+		for (const [toolName, context] of agent.initialSessions) {
+			const existing = childGraph.sessions.get(toolName);
+			if (existing == null) {
+				const cloned = cloneToolSessionContext(context);
+				childGraph.sessions.set(toolName, cloned);
+				seenFilesByTool.set(toolName, new Set(cloned.files?.map((file) => `${file.storage_session_id ?? ""}\0${file.id}`) ?? []));
+				continue;
+			}
+			if (context.files == null || context.files.length === 0) continue;
+			const seenFiles = seenFilesByTool.get(toolName) ?? new Set(existing.files?.map((file) => `${file.storage_session_id ?? existing.session_id}\0${file.id}`) ?? []);
+			const files = existing.files == null ? [] : [...existing.files];
+			for (const file of context.files) {
+				const storageSessionId = file.storage_session_id ?? context.session_id;
+				const key = `${storageSessionId}\0${file.id}`;
+				if (seenFiles.has(key)) continue;
+				seenFiles.add(key);
+				files.push({
+					...file,
+					storage_session_id: storageSessionId
+				});
+			}
+			seenFilesByTool.set(toolName, seenFiles);
+			childGraph.sessions.set(toolName, {
+				...existing,
+				files
+			});
+		}
+	}
+}
 async function dispatchObservationalSubagentUpdate(handler, event) {
 	let timeout;
 	try {
@@ -916,12 +958,14 @@ var SubagentExecutor = class {
 			});
 		}
 		childGraph ??= this.createChildGraph(childGraphInput);
+		if (cachedChildRun == null) seedChildGraphSessions(childGraph, childPlan.agents);
 		let forwarding;
 		if (forwardingEnabled) forwarding = this.createForwarderCallback({
 			parentRegistry,
 			subagentType,
 			subagentKind: childPlan.kind,
 			subagentAgentId: childAgentId,
+			graphMemberInputs: childPlan.kind === "graph" ? childPlan.memberInputs : void 0,
 			childRunId,
 			parentToolCallId,
 			executionContext: childExecutionContext
@@ -1238,9 +1282,10 @@ var SubagentExecutor = class {
 	*     cares about; host apps can extend by registering more phases).
 	*/
 	createForwarderCallback(args) {
-		const { parentRegistry, subagentType, subagentKind, subagentAgentId, childRunId, parentToolCallId, executionContext } = args;
+		const { parentRegistry, subagentType, subagentKind, subagentAgentId, graphMemberInputs, childRunId, parentToolCallId, executionContext } = args;
 		const immediateParentRunId = this.parentRunId;
 		const parentAgentId = this.parentAgentId;
+		const memberAgentIdByStepId = /* @__PURE__ */ new Map();
 		const wrap = async (eventName, phase, data, memberAgentId) => {
 			const handler = parentRegistry.getHandler("on_subagent_update");
 			if (!handler) return true;
@@ -1307,7 +1352,12 @@ var SubagentExecutor = class {
 			drain();
 		};
 		const handler = _langchain_core_callbacks_base.BaseCallbackHandler.fromMethods({ ["handleCustomEvent"]: async (eventName, data, _runId, _tags, metadata) => {
-			const memberAgentId = asNonEmptyString(metadata?.agentId) ?? getEventAgentId(data);
+			const memberAgentId = graphMemberInputs == null ? asNonEmptyString(metadata?.agentId) ?? getEventAgentId(data) : getGraphEventMemberAgentId({
+				data,
+				metadata,
+				memberInputs: graphMemberInputs,
+				memberAgentIdByStepId
+			});
 			if (eventName === "on_tool_execute") {
 				const toolHandler = parentRegistry.getHandler("on_tool_execute");
 				if (toolHandler) await toolHandler.handle("on_tool_execute", data);
@@ -1457,6 +1507,24 @@ function getEventAgentId(data) {
 	const event = data;
 	return asNonEmptyString(event.agentId) ?? asNonEmptyString(event.result?.agentId);
 }
+function getEventStepId(data) {
+	if (data == null || typeof data !== "object") return;
+	const event = data;
+	return asNonEmptyString(event.id) ?? asNonEmptyString(event.result?.id);
+}
+function getGraphEventMemberAgentId({ data, metadata, memberInputs, memberAgentIdByStepId }) {
+	const eventAgentId = getEventAgentId(data);
+	const stepId = getEventStepId(data);
+	if (eventAgentId != null) {
+		if (!memberInputs.has(eventAgentId)) return;
+		if (stepId != null) memberAgentIdByStepId.set(stepId, eventAgentId);
+		return eventAgentId;
+	}
+	const stepMemberAgentId = stepId == null ? void 0 : memberAgentIdByStepId.get(stepId);
+	if (stepMemberAgentId != null) return stepMemberAgentId;
+	const metadataAgentId = asNonEmptyString(metadata?.agentId);
+	return metadataAgentId != null && memberInputs.has(metadataAgentId) ? metadataAgentId : void 0;
+}
 /**
 * Best-effort read of the configured model from a subagent's client
 * options. Providers disagree on the key (`model` vs `modelName`), and the
@@ -1589,8 +1657,15 @@ function sanitizeStepDetails(stepDetails) {
 	const rawDetails = stepDetails;
 	if (rawDetails.type === "message_creation") {
 		const sanitized = { type: "message_creation" };
-		const messageId = rawDetails.message_creation?.message_id;
-		if (typeof messageId === "string") sanitized.message_creation = { message_id: messageId };
+		const rawMessageCreation = rawDetails.message_creation;
+		const messageId = rawMessageCreation?.message_id;
+		const contentType = rawMessageCreation?.content_type;
+		const phase = rawMessageCreation?.phase;
+		if (typeof messageId === "string" || contentType === "text" || contentType === "think" || phase === "commentary" || phase === "final_answer") sanitized.message_creation = {
+			...typeof messageId === "string" ? { message_id: messageId } : {},
+			...contentType === "text" || contentType === "think" ? { content_type: contentType } : {},
+			...phase === "commentary" || phase === "final_answer" ? { phase } : {}
+		};
 		return sanitized;
 	}
 	if (rawDetails.type === "tool_calls") {