@librechat/agents 3.8.4 → 3.8.6

package/dist/cjs/tools/ToolNode.cjs

@@ -1,15 +1,15 @@
 const require_enum = require("../common/enum.cjs");
 require("../common/index.cjs");
-const require_truncation = require("../utils/truncation.cjs");
-const require_runStepResume = require("./runStepResume.cjs");
-const require_SubagentReplay = require("./subagent/SubagentReplay.cjs");
 const require_misc = require("../utils/misc.cjs");
 const require_langfuseRuntimeScope = require("../langfuseRuntimeScope.cjs");
+const require_truncation = require("../utils/truncation.cjs");
 const require_toolContent = require("../utils/toolContent.cjs");
 const require_provenance = require("../messages/provenance.cjs");
+const require_runStepResume = require("./runStepResume.cjs");
+const require_SubagentReplay = require("./subagent/SubagentReplay.cjs");
+const require_types = require("../hooks/types.cjs");
 const require_eagerEventExecution = require("./eagerEventExecution.cjs");
 const require_approvalReview = require("../hitl/approvalReview.cjs");
-const require_types = require("../hooks/types.cjs");
 const require_toolBatchReplay = require("./toolBatchReplay.cjs");
 const require_executeHooks = require("../hooks/executeHooks.cjs");
 require("../hooks/index.cjs");
@@ -237,6 +237,41 @@ function updateCodeSession(sessions, sessionKey, execSessionId, files) {
 		lastUpdated: Date.now()
 	});
 }
+function retainCodeSessionInputs(sessions, sessionKey, context) {
+	if (context?.session_id == null || context.session_id === "" || context.files == null) return;
+	const existing = sessions.get(sessionKey);
+	const files = [...existing?.files ?? []];
+	const indexByIdentity = /* @__PURE__ */ new Map();
+	const indexByName = /* @__PURE__ */ new Map();
+	for (let i = 0; i < files.length; i++) {
+		indexByIdentity.set(fileIdentityKey(files[i]), i);
+		indexByName.set(files[i].name, i);
+	}
+	let changed = existing?.session_id !== context.session_id;
+	for (const file of context.files) {
+		if (!file.id || !file.name || !file.storage_session_id) continue;
+		const identity = fileIdentityKey(file);
+		if (indexByIdentity.has(identity)) continue;
+		const replacementIndex = indexByName.get(file.name);
+		if (replacementIndex !== void 0) {
+			indexByIdentity.delete(fileIdentityKey(files[replacementIndex]));
+			files[replacementIndex] = { ...file };
+			indexByIdentity.set(identity, replacementIndex);
+			changed = true;
+			continue;
+		}
+		indexByIdentity.set(identity, files.length);
+		indexByName.set(file.name, files.length);
+		files.push({ ...file });
+		changed = true;
+	}
+	if (!changed) return;
+	sessions.set(sessionKey, {
+		session_id: context.session_id,
+		files,
+		lastUpdated: Date.now()
+	});
+}
 var ToolNode = class extends require_run.RunnableCallable {
 	toolMap;
 	loadRuntimeTools;
@@ -265,6 +300,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 	eagerEventToolSuppressions;
 	agentId;
 	executingAgentId;
+	executionContext;
 	executingAgentName;
 	rootAgentId;
 	rootAgentName;
@@ -280,7 +316,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 	getRunScope;
 	preparedSubagents;
 	anonBatchCounter = 0;
-	constructor({ tools, toolMap, name, tags, trace, runLangfuse, agentLangfuse, errorHandler, toolCallStepIds, handleToolErrors, loadRuntimeTools, toolRegistry, toolDefinitions, getDiscoveredToolNames, sessions, codeSessionKey, eventDrivenMode, eagerEventToolExecution, eagerEventToolExecutions, eagerEventToolUsageCount, eagerEventToolSuppressions, agentId, executingAgentId, executingAgentName, rootAgentId, rootAgentName, directToolNames, interruptingToolNames, codeSessionToolNames, maxContextTokens, maxToolResultChars, hookRegistry, humanInTheLoop, toolOutputReferences, toolOutputRegistry, toolExecution, fileCheckpointer, getBreakerSignal, getRunScope, preparedSubagents, restoreRunStepResumeState, createRunStepResumeState }) {
+	constructor({ tools, toolMap, name, tags, trace, runLangfuse, agentLangfuse, errorHandler, toolCallStepIds, handleToolErrors, loadRuntimeTools, toolRegistry, toolDefinitions, getDiscoveredToolNames, sessions, codeSessionKey, eventDrivenMode, eagerEventToolExecution, eagerEventToolExecutions, eagerEventToolUsageCount, eagerEventToolSuppressions, agentId, executingAgentId, executionContext, executingAgentName, rootAgentId, rootAgentName, directToolNames, interruptingToolNames, codeSessionToolNames, maxContextTokens, maxToolResultChars, hookRegistry, humanInTheLoop, toolOutputReferences, toolOutputRegistry, toolExecution, fileCheckpointer, getBreakerSignal, getRunScope, preparedSubagents, restoreRunStepResumeState, createRunStepResumeState }) {
 		super({
 			name: name ?? TOOL_NODE_RUN_NAME,
 			tags,
@@ -298,14 +334,15 @@ var ToolNode = class extends require_run.RunnableCallable {
 					const trustedParentCallIds = new Set(calls.filter((call) => call.name === "subagent" && this.toolMap.get(call.name)?.[require_SubagentReplay.SUBAGENT_REPLAY_CONTROLLER] != null).map((call) => call.id ?? ""));
 					isChildReplay = reviewEvidence?.owner != null ? require_toolBatchReplay.isChildToolReplayOwner(config, reviewEvidence.owner, trustedParentCallIds) : replayState.records.some((record) => require_toolBatchReplay.isChildToolReplayOwner(config, record.owner, trustedParentCallIds));
 				}
-				if ((reviewEvidence?.owner != null || replayState != null) && !require_toolBatchReplay.isToolReplayResume(config, reviewEvidence?.interruptId ?? replayState?.interruptId, isChildReplay)) {
+				const hasApprovalAuthorization = reviewEvidence?.owner != null || replayState?.approvalOwner != null;
+				const replayResumeStatus = hasApprovalAuthorization || replayState != null ? require_toolBatchReplay.getToolReplayResumeStatus(config, reviewEvidence?.interruptId ?? replayState?.interruptId, isChildReplay) : void 0;
+				if (replayResumeStatus === "unverifiable" && hasApprovalAuthorization) throw new Error("Cannot verify the active tool approval resume — failing closed");
+				if (replayResumeStatus === "stale") {
+					const configurable = { ...config.configurable };
+					require_toolBatchReplay.clearStaleToolApprovalConfig(configurable, replayOwner, activeReplayKey);
 					config = {
 						...config,
-						configurable: {
-							...config.configurable,
-							[require_approvalReview.TOOL_APPROVAL_REVIEW_CONFIG_KEY]: void 0,
-							[require_toolBatchReplay.TOOL_BATCH_REPLAY_KEY]: void 0
-						}
+						configurable
 					};
 					reviewEvidence = void 0;
 				}
@@ -373,6 +410,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 		this.eagerEventToolSuppressions = eagerEventToolSuppressions;
 		this.agentId = agentId;
 		this.executingAgentId = executingAgentId ?? agentId;
+		this.executionContext = executionContext;
 		this.executingAgentName = executingAgentName;
 		this.rootAgentId = rootAgentId;
 		this.rootAgentName = rootAgentName;
@@ -400,8 +438,13 @@ var ToolNode = class extends require_run.RunnableCallable {
 	withToolScope(options, invoke) {
 		const scopedOptions = this.executingAgentId == null ? options : {
 			...options,
+			configurable: {
+				...options?.configurable,
+				executionContext: this.executionContext
+			},
 			metadata: {
 				...options?.metadata,
+				executionContext: this.executionContext,
 				agentId: this.executingAgentId,
 				activeAgentId: this.executingAgentId,
 				...this.executingAgentName == null ? {} : { activeAgentName: this.executingAgentName },
@@ -660,6 +703,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 						runId: config.configurable?.run_id ?? "",
 						threadId: config.configurable?.thread_id,
 						agentId: this.agentId,
+						executionContext: this.executionContext,
 						executingAgentId: this.executingAgentId
 					}
 				};
@@ -855,6 +899,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 					runId,
 					threadId,
 					agentId: this.agentId,
+					executionContext: this.executionContext,
 					executingAgentId: this.executingAgentId,
 					toolName: call.name,
 					toolInput: resolvedArgs,
@@ -1033,6 +1078,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 					runId,
 					threadId,
 					agentId: this.agentId,
+					executionContext: this.executionContext,
 					executingAgentId: this.executingAgentId,
 					toolName: call.name,
 					toolInput: effectiveCall.args,
@@ -1058,6 +1104,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 					runId,
 					threadId,
 					agentId: this.agentId,
+					executionContext: this.executionContext,
 					executingAgentId: this.executingAgentId,
 					toolName: call.name,
 					toolInput: effectiveCall.args,
@@ -1105,6 +1152,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 				runId,
 				threadId,
 				agentId: this.agentId,
+				executionContext: this.executionContext,
 				executingAgentId: this.executingAgentId,
 				toolName: call.name,
 				toolInput: resolvedArgs,
@@ -1148,19 +1196,45 @@ var ToolNode = class extends require_run.RunnableCallable {
 	resolveRuntimeSessionHint(config) {
 		return require_eagerEventExecution.resolveRuntimeSessionHint(this.toolExecution, config.configurable?.thread_id);
 	}
-	storeCodeSessionFromResults(results, requestMap) {
+	storeCodeSessionFromResults(results, requestMap, baselineByRequestId) {
 		if (!this.sessions) return;
+		this.retainCodeSessionInputsFromRequests(requestMap.values(), baselineByRequestId);
 		for (let i = 0; i < results.length; i++) {
 			const result = results[i];
-			if (result.status !== "success" || result.artifact == null) continue;
 			const request = requestMap.get(result.toolCallId);
 			if (request?.name == null || request.name === "" || !this.participatesInCodeSession(request.name) && request.name !== "skill") continue;
+			if (result.status !== "success" || result.artifact == null) continue;
 			const artifact = result.artifact;
 			const execSessionId = artifact?.session_id;
 			if (execSessionId == null || execSessionId === "") continue;
 			updateCodeSession(this.sessions, this.codeSessionKey, execSessionId, artifact?.files);
 		}
 	}
+	retainCodeSessionInputsFromRequests(requests, baselineByRequestId) {
+		if (!this.sessions) return;
+		const refreshedByName = /* @__PURE__ */ new Map();
+		let refreshedSessionId;
+		let fileSessionId;
+		for (const request of requests) {
+			if (request.name === "" || !this.participatesInCodeSession(request.name) && request.name !== "skill" && request.name !== "read_file" && request.retainCodeSessionInputs !== true) continue;
+			const context = request.codeSessionContext;
+			if (context?.session_id == null || context.session_id === "") continue;
+			if (context.session_id !== request.codeSessionBaselineId) refreshedSessionId = context.session_id;
+			const baselineIdentityByName = baselineByRequestId.get(request.id);
+			for (const file of context.files ?? []) {
+				if (!file.id || !file.name || !file.storage_session_id) continue;
+				if (baselineIdentityByName?.get(file.name) === fileIdentityKey(file)) continue;
+				fileSessionId = context.session_id;
+				refreshedByName.set(file.name, file);
+			}
+		}
+		const sessionId = refreshedSessionId ?? fileSessionId;
+		if (sessionId == null) return;
+		retainCodeSessionInputs(this.sessions, this.codeSessionKey, {
+			session_id: sessionId,
+			files: [...refreshedByName.values()]
+		});
+	}
 	async handleRunToolCompletions(calls, outputs, config, resolvedArgsByCallId, errorOwnership) {
 		const ownership = errorOwnership ?? this.looseErrorOwnership;
 		for (let i = 0; i < calls.length; i++) {
@@ -1273,6 +1347,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 						runId,
 						threadId,
 						agentId: this.agentId,
+						executionContext: this.executionContext,
 						executingAgentId: this.executingAgentId,
 						toolName: entry.call.name,
 						toolInput: entry.args,
@@ -1323,6 +1398,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 							runId,
 							threadId,
 							agentId: this.agentId,
+							executionContext: this.executionContext,
 							executingAgentId: this.executingAgentId,
 							toolName: item.toolName,
 							toolInput: item.args,
@@ -1488,15 +1564,20 @@ var ToolNode = class extends require_run.RunnableCallable {
 			for (const entry of approvedEntries) if (entry.batchIndex != null && entry.call.id != null) batchIndexByCallId.set(entry.call.id, entry.batchIndex);
 			for (const result of plan.rejectedResults) this.eagerEventToolExecutions?.delete(result.toolCallId);
 			const requestMap = new Map(plan.allRequests.map((r) => [r.id, r]));
+			for (const request of plan.allRequests) request.codeSessionBaselineId = request.codeSessionContext?.session_id;
+			const codeSessionBaselineByRequestId = new Map(plan.allRequests.map((request) => [request.id, new Map((request.codeSessionContext?.files ?? []).map((file) => [file.name, fileIdentityKey(file)]))]));
 			const eagerExecutions = [];
 			const dispatchRequests = [];
 			for (const request of requests) {
 				const eagerExecution = this.takeMatchingEagerEventExecution(request);
-				if (eagerExecution != null) eagerExecutions.push({
-					request,
-					execution: eagerExecution
-				});
-				else dispatchRequests.push(request);
+				if (eagerExecution != null) {
+					eagerExecutions.push({
+						request,
+						execution: eagerExecution
+					});
+					if (eagerExecution.codeSessionBaselineByName != null) codeSessionBaselineByRequestId.set(request.id, eagerExecution.codeSessionBaselineByName);
+					request.codeSessionBaselineId = eagerExecution.request.codeSessionBaselineId;
+				} else dispatchRequests.push(request);
 			}
 			const canEmitEarlyCompletions = this.hookRegistry?.hasResultAlteringHooks(runId) !== true && this.humanInTheLoop?.enabled !== true;
 			const hasPostHook = this.hookRegistry?.hasHookFor("PostToolUse", runId) === true;
@@ -1524,6 +1605,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 					if (dispatchSettled && resultSettled) resolve(settledResults ?? []);
 				};
 				const batchRequest = {
+					executionContext: this.executionContext,
 					toolCalls: dispatchRequests,
 					userId: config.configurable?.user_id,
 					agentId: this.executingAgentId,
@@ -1545,13 +1627,27 @@ var ToolNode = class extends require_run.RunnableCallable {
 				}).catch(reject);
 			});
 			const eagerResultsPromise = Promise.all(eagerExecutions.map(async ({ request, execution }) => {
-				return {
-					results: await this.resolveEagerEventExecution(request, execution),
-					completionDispatched: execution.completionDispatched === true && execution.request.turn === request.turn,
-					toolCallId: request.id
-				};
+				try {
+					return {
+						results: await this.resolveEagerEventExecution(request, execution),
+						completionDispatched: execution.completionDispatched === true && execution.request.turn === request.turn,
+						toolCallId: request.id
+					};
+				} finally {
+					if (execution.request.codeSessionContext != null) request.codeSessionContext = execution.request.codeSessionContext;
+				}
 			}));
-			const [eagerResults, dispatchedResults] = await Promise.all([eagerResultsPromise, dispatchPromise]);
+			const [eagerOutcome, dispatchedOutcome] = await Promise.allSettled([eagerResultsPromise, dispatchPromise]);
+			if (eagerOutcome.status === "rejected") {
+				this.retainCodeSessionInputsFromRequests(requestMap.values(), codeSessionBaselineByRequestId);
+				throw eagerOutcome.reason;
+			}
+			if (dispatchedOutcome.status === "rejected") {
+				this.retainCodeSessionInputsFromRequests(requestMap.values(), codeSessionBaselineByRequestId);
+				throw dispatchedOutcome.reason;
+			}
+			const eagerResults = eagerOutcome.value;
+			const dispatchedResults = dispatchedOutcome.value;
 			await Promise.allSettled(earlyCompletionDispatches);
 			const eagerCompletionDispatchedIds = new Set(eagerResults.filter((result) => result.completionDispatched).map((result) => result.toolCallId));
 			const flattenedEagerResults = eagerResults.flatMap((result) => result.results);
@@ -1560,7 +1656,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 				...flattenedEagerResults,
 				...dispatchedResults
 			];
-			this.storeCodeSessionFromResults(results, requestMap);
+			this.storeCodeSessionFromResults(results, requestMap, codeSessionBaselineByRequestId);
 			for (const result of results) {
 				if (result.injectedMessages && result.injectedMessages.length > 0) try {
 					injected.push(...require_injected.convertInjectedMessages(result.injectedMessages));
@@ -1591,6 +1687,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 								runId,
 								threadId,
 								agentId: this.agentId,
+								executionContext: this.executionContext,
 								executingAgentId: this.executingAgentId,
 								toolName,
 								toolInput: request?.args ?? {},
@@ -1618,6 +1715,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 								runId,
 								threadId,
 								agentId: this.agentId,
+								executionContext: this.executionContext,
 								executingAgentId: this.executingAgentId,
 								toolName,
 								toolInput: request?.args ?? {},
@@ -1687,18 +1785,21 @@ var ToolNode = class extends require_run.RunnableCallable {
 		if (execution.toolName !== request.name || !require_eagerEventExecution.recordArgsEqual(execution.args, request.args)) {
 			this.eagerEventToolSuppressions?.add(request.name);
 			this.eagerEventToolSuppressions?.add(execution.toolName);
+			if (this.participatesInCodeSession(execution.toolName) || execution.toolName === "skill" || execution.toolName === "read_file") request.retainCodeSessionInputs = true;
 			console.warn(`[ToolNode] eager prestart args diverged from the final request for tool "${request.name}" (toolCallId=${request.id}); suppressing eager prestart for this tool for the rest of the run`);
+			const createMismatchOutcome = () => ({ results: [{
+				toolCallId: request.id,
+				status: "error",
+				content: "",
+				errorMessage: "Tool call changed after eager execution started; refusing to re-run the tool to avoid duplicate side effects."
+			}] });
 			return {
 				toolCallId: request.id,
 				toolName: request.name,
 				args: request.args,
-				request,
-				promise: Promise.resolve({ results: [{
-					toolCallId: request.id,
-					status: "error",
-					content: "",
-					errorMessage: "Tool call changed after eager execution started; refusing to re-run the tool to avoid duplicate side effects."
-				}] })
+				request: execution.request,
+				codeSessionBaselineByName: execution.codeSessionBaselineByName,
+				promise: execution.promise.then(createMismatchOutcome, createMismatchOutcome)
 			};
 		}
 		return execution;
@@ -1733,6 +1834,7 @@ var ToolNode = class extends require_run.RunnableCallable {
 					runId,
 					threadId,
 					agentId: this.agentId,
+					executionContext: this.executionContext,
 					executingAgentId: this.executingAgentId,
 					entries: orderedBatchEntries
 				},