@copilotkit/react-core 1.66.2 → 1.66.4

package/dist/{copilotkit-2v7ami2b.cjs → copilotkit-sitn7Oe8.cjs}

@@ -4936,6 +4936,8 @@ function useInterrupt(config) {
 	pendingRef.current = pending;
 	const [handlerResult, setHandlerResult] = (0, react.useState)(null);
 	const interruptStateRef = (0, react.useRef)(new _copilotkit_core.ɵInterruptState());
+	const interruptRunIdsRef = (0, react.useRef)(/* @__PURE__ */ new Map());
+	const legacyRunIdRef = (0, react.useRef)(void 0);
 	(0, react.useEffect)(() => {
 		const interruptState = interruptStateRef.current;
 		let localLegacy = null;
@@ -4948,19 +4950,26 @@ function useInterrupt(config) {
 				};
 			},
 			onRunFinishedEvent: (params) => {
-				if (params.outcome === "interrupt") localStandard = params.interrupts;
+				if (params.outcome === "interrupt") {
+					const runId = params.input.runId;
+					for (const interrupt of params.interrupts) interruptRunIdsRef.current.set(interrupt.id, runId);
+					localStandard = params.interrupts;
+				}
 			},
 			onRunStartedEvent: () => {
 				localLegacy = null;
 				localStandard = null;
+				interruptRunIdsRef.current.clear();
+				legacyRunIdRef.current = void 0;
 				interruptState.clear();
 				setPending(null);
 			},
-			onRunFinalized: () => {
+			onRunFinalized: (params) => {
 				if (localStandard && localStandard.length > 0) {
 					interruptState.setStandard(localStandard);
 					setPending(interruptState.pending);
 				} else if (localLegacy) {
+					legacyRunIdRef.current = params.input.runId;
 					interruptState.setLegacy(localLegacy);
 					setPending(interruptState.pending);
 				}
@@ -4970,6 +4979,8 @@ function useInterrupt(config) {
 			onRunFailed: () => {
 				localLegacy = null;
 				localStandard = null;
+				interruptRunIdsRef.current.clear();
+				legacyRunIdRef.current = void 0;
 				interruptState.clear();
 				setPending(null);
 			}
@@ -4984,18 +4995,22 @@ function useInterrupt(config) {
 		if (!current) return;
 		if (current.kind === "standard" && current.interrupts.length > 1 && interruptId === void 0) console.warn(`[CopilotKit] useInterrupt: resolve()/cancel() called without an interruptId while ${current.interrupts.length} interrupts are open; defaulting to the first. Pass an interruptId to address a specific interrupt.`);
 		const decision = interruptStateRef.current.resolve(payload, interruptId);
-		if (decision.kind === "legacy-resume") try {
-			return await copilotkit.runAgent({
-				agent,
-				forwardedProps: { command: {
-					resume: decision.payload,
-					interruptEvent: decision.interruptValue
-				} }
-			});
-		} catch (err) {
-			console.error("[CopilotKit] useInterrupt resolve: runAgent rejected; clearing pending + rethrowing", err);
-			setPending(null);
-			throw err;
+		if (decision.kind === "legacy-resume") {
+			const runId = legacyRunIdRef.current;
+			try {
+				return await copilotkit.runAgent({
+					agent,
+					...runId !== void 0 ? { runId } : {},
+					forwardedProps: { command: {
+						resume: decision.payload,
+						interruptEvent: decision.interruptValue
+					} }
+				});
+			} catch (err) {
+				console.error("[CopilotKit] useInterrupt resolve: runAgent rejected; clearing pending + rethrowing", err);
+				setPending(null);
+				throw err;
+			}
 		}
 		if (decision.kind === "expired") {
 			console.error(`[CopilotKit] useInterrupt: interrupt ${decision.interrupt.id} expired at ${decision.interrupt.expiresAt}; not resuming.`);
@@ -5004,6 +5019,7 @@ function useInterrupt(config) {
 			return;
 		}
 		if (decision.kind !== "resume") return;
+		const runId = decision.resume.map((entry) => interruptRunIdsRef.current.get(entry.interruptId)).find((candidate) => candidate !== void 0);
 		for (const toolResult of decision.toolResults) agent.addMessage({
 			id: (0, _ag_ui_client.randomUUID)(),
 			role: "tool",
@@ -5013,7 +5029,8 @@ function useInterrupt(config) {
 		try {
 			return await copilotkit.runAgent({
 				agent,
-				resume: decision.resume
+				resume: decision.resume,
+				...runId !== void 0 ? { runId } : {}
 			});
 		} catch (err) {
 			console.error("[CopilotKit] useInterrupt resolve: runAgent rejected; clearing pending + rethrowing", err);
@@ -5040,6 +5057,7 @@ function useInterrupt(config) {
 			return;
 		}
 		if (decision.kind !== "resume") return;
+		const runId = decision.resume.map((entry) => interruptRunIdsRef.current.get(entry.interruptId)).find((candidate) => candidate !== void 0);
 		for (const toolResult of decision.toolResults) agent.addMessage({
 			id: (0, _ag_ui_client.randomUUID)(),
 			role: "tool",
@@ -5049,7 +5067,8 @@ function useInterrupt(config) {
 		try {
 			return await copilotkit.runAgent({
 				agent,
-				resume: decision.resume
+				resume: decision.resume,
+				...runId !== void 0 ? { runId } : {}
 			});
 		} catch (err) {
 			console.error("[CopilotKit] useInterrupt resolve: runAgent rejected; clearing pending + rethrowing", err);
@@ -7064,6 +7083,37 @@ const MemoizedCustomMessage = react.default.memo(function MemoizedCustomMessage(
 *
 * @internal Exported for unit testing only — not part of the public API.
 */
+/**
+* Collapse tool calls that share an id, keeping first-seen order.
+*
+* AG-UI's TOOL_CALL_START handler appends to the parent message's `toolCalls`
+* without checking whether that id is already present. So whenever a start
+* event is applied twice — which the human-in-the-loop flow triggers when the
+* run syncs after `respond()` — the message ends up carrying the same call
+* twice. The second copy has EMPTY `arguments`, because a start event carries
+* none; the args arrive later as TOOL_CALL_ARGS deltas addressed to the first
+* copy.
+*
+* Left alone that renders the same tool call twice: once populated and once
+* blank (an approval card with no transaction id, offering live buttons for an
+* action already taken), and React warns "Encountered two children with the
+* same key" because the call id is the render key.
+*
+* The empty copy is the redundant one, so prefer whichever entry actually
+* carries arguments rather than blindly taking the first.
+*/
+function dedupeToolCalls(toolCalls) {
+	const byId = /* @__PURE__ */ new Map();
+	for (const toolCall of toolCalls) {
+		const existing = byId.get(toolCall.id);
+		if (!existing) {
+			byId.set(toolCall.id, toolCall);
+			continue;
+		}
+		if (!existing.function?.arguments && toolCall.function?.arguments) byId.set(toolCall.id, toolCall);
+	}
+	return byId.size === toolCalls.length ? toolCalls : [...byId.values()];
+}
 function deduplicateMessages(messages) {
 	const acc = /* @__PURE__ */ new Map();
 	for (const message of messages) {
@@ -7075,9 +7125,13 @@ function deduplicateMessages(messages) {
 				...existing,
 				...message,
 				content,
-				toolCalls
+				toolCalls: toolCalls ? dedupeToolCalls(toolCalls) : toolCalls
 			});
-		} else acc.set(message.id, message);
+		} else if (message.role === "assistant" && message.toolCalls) acc.set(message.id, {
+			...message,
+			toolCalls: dedupeToolCalls(message.toolCalls)
+		});
+		else acc.set(message.id, message);
 	}
 	return [...acc.values()];
 }
@@ -12267,4 +12321,4 @@ Object.defineProperty(exports, 'ɵrunMcpFollowUp', {
     return ɵrunMcpFollowUp;
   }
 });
-//# sourceMappingURL=copilotkit-2v7ami2b.cjs.map
+//# sourceMappingURL=copilotkit-sitn7Oe8.cjs.map