@copilotkit/react-core 1.66.2 → 1.66.3

package/dist/v2/headless.mjs

@@ -686,6 +686,8 @@ function useInterrupt(config) {
 	pendingRef.current = pending;
 	const [handlerResult, setHandlerResult] = useState(null);
 	const interruptStateRef = useRef(new ɵInterruptState());
+	const interruptRunIdsRef = useRef(/* @__PURE__ */ new Map());
+	const legacyRunIdRef = useRef(void 0);
 	useEffect(() => {
 		const interruptState = interruptStateRef.current;
 		let localLegacy = null;
@@ -698,19 +700,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);
 				}
@@ -720,6 +729,8 @@ function useInterrupt(config) {
 			onRunFailed: () => {
 				localLegacy = null;
 				localStandard = null;
+				interruptRunIdsRef.current.clear();
+				legacyRunIdRef.current = void 0;
 				interruptState.clear();
 				setPending(null);
 			}
@@ -734,18 +745,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.`);
@@ -754,6 +769,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: randomUUID$1(),
 			role: "tool",
@@ -763,7 +779,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);
@@ -790,6 +807,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: randomUUID$1(),
 			role: "tool",
@@ -799,7 +817,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);