@copilotkit/core 1.75.1 → 1.76.0

package/dist/index.umd.js

@@ -5,6 +5,23 @@
 })(this, function(exports, _tanstack_pacer, _ag_ui_client, _copilotkit_shared, rxjs, rxjs_operators, phoenix, zod_to_json_schema) {
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
+//#region src/utils/http-agent.ts
+/**
+	* Whether an agent is an `HttpAgent`, including one built from another copy of
+	* `@ag-ui/client` (an app that pins its own 0.x version next to CopilotKit's
+	* 1.0, for example). `instanceof` is false across package copies, which made
+	* CopilotKit silently skip headers and abort wiring for those agents. The
+	* fallback checks the public fields CopilotKit uses, which every published
+	* `HttpAgent` has.
+	*/
+	function ɵisHttpAgent(agent) {
+		if (agent instanceof _ag_ui_client.HttpAgent) return true;
+		if (typeof agent !== "object" || agent === null) return false;
+		const candidate = agent;
+		return typeof candidate.url === "string" && typeof candidate.headers === "object" && candidate.headers !== null && candidate.abortController instanceof AbortController && typeof candidate.runAgent === "function";
+	}
+
+//#endregion
 //#region src/utils/connect-replay.ts
 /**
 	* Runs an agent's `connect()` stream through the AbstractAgent apply pipeline
@@ -21,18 +38,27 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 	*   Cannot send event type 'RUN_STARTED': The run has already errored with
 	*   'RUN_ERROR'. No further events can be sent.
 	*
-	* `transformChunks` is still applied — message reassembly is needed either way.
+	* The AG-UI 1.0 compatibility boundary still runs first, so stored 0.x history
+	* is translated (THINKING_* events, `binary` parts, legacy nulls) exactly as in
+	* the base pipeline. `enforceEvents` is omitted too: a replay is stored
+	* history, and one event that the 1.0 schema rejects (the Intelligence gateway
+	* replays RUN_STARTED without `runId`, for example) must not stop the whole
+	* thread from hydrating. That keeps the leniency this path had before 1.0.
 	*
 	* Connection-local replay hooks track the phase before applying events. An
 	* explicitly live RUN_ERROR clears busy without closing the connection;
 	* historical errors remain data. Connections without hooks retain the existing
-	* completion behavior. Subscriber, detach, and result contracts are preserved.
+	* completion behavior.
+	*
+	* Apart from the above, this mirrors the base `AbstractAgent.connectAgent`
+	* implementation, so callers keep the same subscriber notifications, detach
+	* semantics, and `{ result, newMessages }` return shape.
 	*
 	* TODO: Remove this in favour of the base implementation once AG-UI's
 	* AbstractAgent supports opting out of `verifyEvents` for transports whose
 	* connection life-cycle isn't a single run AND preserves the connection-local
 	* replay lifecycle and running-state behavior below. Skipping verification alone
-	* is insufficient. As of `@ag-ui/client@0.0.57`
+	* is insufficient. As of `@ag-ui/client@1.0.1`
 	* `connectAgent(parameters?, subscriber?)` takes no such option.
 	*
 	* @param agent - The agent whose `connect()` stream should be consumed.
@@ -41,6 +67,9 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 	*/
 	async function ɵconnectWithoutEventVerification(agent, parameters, subscriber, connect) {
 		const self = agent;
+		let finalizeRun = () => {
+			agent.isRunning = false;
+		};
 		try {
 			var _agent$agentId;
 			agent.isRunning = true;
@@ -65,12 +94,35 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				...agent.subscribers,
 				subscriber !== null && subscriber !== void 0 ? subscriber : {}
 			];
-			await self.onInitialize(input, subscribers);
-			self.activeRunDetach$ = new rxjs.Subject();
+			const activeRunDetach$ = new rxjs.Subject();
+			self.activeRunDetach$ = activeRunDetach$;
 			let resolveCompletion;
 			self.activeRunCompletionPromise = new Promise((resolve) => {
 				resolveCompletion = resolve;
 			});
+			let detached = false;
+			let finalized = false;
+			const detachSubscription = activeRunDetach$.subscribe(() => {
+				detached = true;
+			});
+			finalizeRun = () => {
+				if (finalized) return;
+				finalized = true;
+				detachSubscription.unsubscribe();
+				if (self.activeRunDetach$ === activeRunDetach$) {
+					agent.isRunning = false;
+					self.activeRunCompletionPromise = void 0;
+					self.activeRunDetach$ = void 0;
+					self.onFinalize(input, subscribers);
+				}
+				resolveCompletion === null || resolveCompletion === void 0 || resolveCompletion();
+				resolveCompletion = void 0;
+			};
+			await self.onInitialize(input, subscribers);
+			if (detached) return {
+				result: void 0,
+				newMessages: []
+			};
 			const lifecycle = {
 				onReplayStarted: () => {
 					isReplaying = true;
@@ -80,29 +132,23 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 					isReplaying = false;
 				}
 			};
-			const source$ = (0, rxjs.defer)(() => connect ? connect(input, lifecycle) : self.connect(input)).pipe((0, rxjs_operators.tap)((event) => {
+			const source$ = (0, rxjs.defer)(() => new _ag_ui_client.CompatibilityBoundary().run(input, { run: () => connect ? connect(input, lifecycle) : self.connect(input) })).pipe((0, rxjs_operators.tap)((event) => {
 				if (!isReplaying && event.type === _ag_ui_client.EventType.RUN_ERROR) liveErrors.add(event);
-			}), (0, _ag_ui_client.transformChunks)(self.debugLogger), (0, rxjs_operators.takeUntil)(self.activeRunDetach$));
+			}), (0, _ag_ui_client.transformChunks)(self.debugLogger), (0, rxjs_operators.takeUntil)(activeRunDetach$));
 			const applied$ = self.apply(input, source$, subscribers);
 			await (0, rxjs.lastValueFrom)(self.processApplyEvents(input, applied$, subscribers).pipe((0, rxjs_operators.catchError)((error) => {
+				if (self.activeRunDetach$ !== activeRunDetach$) return rxjs.EMPTY;
 				agent.isRunning = false;
 				if (error instanceof _ag_ui_client.AGUIConnectNotImplementedError) return rxjs.EMPTY;
 				return self.onError(input, error, subscribers);
-			}), (0, rxjs_operators.finalize)(() => {
-				agent.isRunning = false;
-				self.onFinalize(input, subscribers);
-				resolveCompletion === null || resolveCompletion === void 0 || resolveCompletion();
-				resolveCompletion = void 0;
-				self.activeRunCompletionPromise = void 0;
-				self.activeRunDetach$ = void 0;
-			})), { defaultValue: void 0 });
+			}), (0, rxjs_operators.finalize)(() => finalizeRun())), { defaultValue: void 0 });
 			const newMessages = (0, _ag_ui_client.structuredClone_)(agent.messages).filter((m) => !previousMessageIds.has(m.id));
 			return {
 				result,
 				newMessages
 			};
 		} finally {
-			agent.isRunning = false;
+			finalizeRun();
 		}
 	}
 
@@ -635,7 +681,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		observeThreadEvents$(threadId, channel$, options) {
 			return channel$.pipe((0, rxjs_operators.switchMap)(({ channel }) => this.observeChannelEvent$(channel, CLIENT_AG_UI_EVENT)), (0, rxjs_operators.tap)((payload) => {
 				this.updateLastSeenEventId(threadId, payload);
-			}), (0, rxjs_operators.mergeMap)((payload) => this.createThreadNotifications(payload, {
+			}), (0, rxjs_operators.map)((payload) => options.streamMode === "run" ? (0, _copilotkit_shared.stripIntelligenceRoutingFields)(payload) : payload), (0, rxjs_operators.mergeMap)((payload) => this.createThreadNotifications(payload, {
 				completeOnRunError: options.completeOnRunError,
 				completeOnRunFinished: options.streamMode === "run",
 				errorOnRunError: options.streamMode === "run"
@@ -957,6 +1003,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			_defineProperty(this, "_capabilities", void 0);
 			_defineProperty(this, "delegate", void 0);
 			_defineProperty(this, "runtimeInfoPromise", void 0);
+			_defineProperty(this, "connectionAttempt", void 0);
 			_defineProperty(this, "_messageFilter", void 0);
 			_defineProperty(this, "activeRun", void 0);
 			this.runtimeUrl = normalizedRuntimeUrl !== null && normalizedRuntimeUrl !== void 0 ? normalizedRuntimeUrl : config.runtimeUrl;
@@ -1000,13 +1047,12 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			this.runtimeMode = runtimeMode;
 			this.intelligence = intelligence;
 			if (unchanged) return;
+			this.connectionAttempt = void 0;
 			this.runtimeInfoPromise = void 0;
 			const staleDelegate = this.delegate;
 			this.delegate = void 0;
-			if (staleDelegate) {
-				staleDelegate.abortRun();
-				this.detachActiveRun();
-			}
+			if (staleDelegate) staleDelegate.abortRun();
+			this.detachActiveRun();
 		}
 		/**
 		* The agent id used for outbound runtime requests — `runtimeAgentId` when
@@ -1052,8 +1098,12 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			return (_this$_capabilities = this._capabilities) !== null && _this$_capabilities !== void 0 ? _this$_capabilities : {};
 		}
 		async detachActiveRun() {
-			if (this.delegate) await this.delegate.detachActiveRun();
-			await super.detachActiveRun();
+			var _this$delegate;
+			this.connectionAttempt = void 0;
+			this.isRunning = false;
+			const delegateDetach = (_this$delegate = this.delegate) === null || _this$delegate === void 0 ? void 0 : _this$delegate.detachActiveRun();
+			const proxyDetach = super.detachActiveRun();
+			await Promise.all([delegateDetach, proxyDetach]);
 		}
 		abortRun() {
 			var _this$activeRun;
@@ -1108,41 +1158,74 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			});
 		}
 		async connectAgent(parameters, subscriber) {
+			const detached = this.detachActiveRun();
+			const connection = {};
+			const threadId = this.threadId;
+			this.connectionAttempt = connection;
+			const isCurrentConnection = () => this.connectionAttempt === connection && this.threadId === threadId;
+			await detached;
+			if (!isCurrentConnection()) return {
+				result: void 0,
+				newMessages: []
+			};
+			await this.ensureRuntimeConfiguration();
+			if (!isCurrentConnection()) return {
+				result: void 0,
+				newMessages: []
+			};
 			if (this.runtimeMode !== _copilotkit_shared.RUNTIME_MODE_INTELLIGENCE) return ɵconnectWithoutEventVerification(this, parameters, subscriber, (input, lifecycle) => this.connect(input, lifecycle));
-			if (this.delegate) await this.delegate.detachActiveRun();
 			await this.resolveDelegate();
+			if (!isCurrentConnection()) return {
+				result: void 0,
+				newMessages: []
+			};
 			const delegate = this.delegate;
 			const bridgeSub = delegate.subscribe({
 				onMessagesChanged: () => {
+					if (!isCurrentConnection()) return;
 					this.setMessages([...delegate.messages]);
 				},
 				onStateChanged: () => {
+					if (!isCurrentConnection()) return;
 					this.setState({ ...delegate.state });
 				},
 				onRunInitialized: () => {
+					if (!isCurrentConnection()) return;
 					this.isRunning = true;
 				},
 				onRunFinalized: () => {
+					if (!isCurrentConnection()) return;
+					this.pendingInterrupts = (0, _ag_ui_client.structuredClone_)(delegate.pendingInterrupts);
 					this.isRunning = false;
 				},
 				onRunFailed: () => {
+					if (!isCurrentConnection()) return;
 					this.isRunning = false;
 				},
 				onRunErrorEvent: () => {
+					if (!isCurrentConnection()) return;
 					this.isRunning = delegate.isRunning;
 				},
 				onRunStartedEvent: () => {
+					if (!isCurrentConnection()) return;
 					this.isRunning = delegate.isRunning;
 				}
 			});
-			const forwardedSubs = this.subscribers.map((s) => delegate.subscribe(s));
+			const forwardedSubs = [...this.subscribers, ...subscriber ? [subscriber] : []].map((subscriber) => delegate.subscribe(new Proxy(subscriber, { get(target, property, receiver) {
+				const callback = Reflect.get(target, property, receiver);
+				if (typeof callback !== "function") return callback;
+				return (...args) => isCurrentConnection() ? Reflect.apply(callback, target, args) : void 0;
+			} })));
 			try {
-				const result = await delegate.connectAgent(parameters, subscriber);
-				this.setMessages([...delegate.messages]);
-				this.setState({ ...delegate.state });
+				const result = await delegate.connectAgent(parameters);
+				if (isCurrentConnection()) {
+					this.setMessages([...delegate.messages]);
+					this.setState({ ...delegate.state });
+					this.pendingInterrupts = (0, _ag_ui_client.structuredClone_)(delegate.pendingInterrupts);
+				}
 				return result;
 			} finally {
-				this.isRunning = false;
+				if (isCurrentConnection()) this.isRunning = false;
 				bridgeSub.unsubscribe();
 				for (const sub of forwardedSubs) sub.unsubscribe();
 			}
@@ -1177,6 +1260,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			cloned.threadId = this.threadId;
 			cloned.setState(this.state);
 			cloned.setMessages(this.messages);
+			cloned.pendingInterrupts = (0, _ag_ui_client.structuredClone_)(this.pendingInterrupts);
 			if (this.delegate) {
 				const clonedDelegate = this.delegate.clone();
 				cloned.delegate = clonedDelegate;
@@ -1218,6 +1302,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			if (!this.runtimeUrl) throw new Error("Runtime URL is not set");
 			const runtimeInfoPromise = (_this$runtimeInfoProm = this.runtimeInfoPromise) !== null && _this$runtimeInfoProm !== void 0 ? _this$runtimeInfoProm : this.fetchRuntimeInfo().then((runtimeInfo) => {
 				var _runtimeInfo$mode;
+				if (this.runtimeInfoPromise !== runtimeInfoPromise) return;
 				this.runtimeMode = (_runtimeInfo$mode = runtimeInfo.mode) !== null && _runtimeInfo$mode !== void 0 ? _runtimeInfo$mode : _copilotkit_shared.RUNTIME_MODE_SSE;
 				this.intelligence = runtimeInfo.intelligence;
 			});
@@ -1325,6 +1410,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			delegate.debugLogger = this.debugLogger;
 			delegate.setMessages(this.messages);
 			delegate.setState(this.state);
+			delegate.pendingInterrupts = (0, _ag_ui_client.structuredClone_)(this.pendingInterrupts);
 			if (hasHeaders(delegate)) delegate.headers = { ...this.headers };
 			if (hasCredentials(delegate)) delegate.credentials = this.credentials;
 		}
@@ -1385,14 +1471,31 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		const input = _assertClassBrand(_ProxiedCopilotRuntimeAgent_brand, this, _applyMessageFilter).call(this, unfiltered);
 		this.activeRun = void 0;
 		const routedId = this.routedAgentId();
+		let httpEvents;
 		if (this.transport === "single") {
 			if (!this.singleEndpointUrl) throw new Error("Single endpoint transport requires a runtimeUrl");
 			const requestInit = this.createSingleRouteRequestInit(input, "agent/connect", { agentId: routedId });
-			return withAbortErrorHandling((0, _ag_ui_client.transformHttpEventStream)((0, _ag_ui_client.runHttpRequest)(() => this.fetch(this.singleEndpointUrl, requestInit))));
-		}
-		const connectUrl = `${this.runtimeUrl}/agent/${routedId}/connect`;
-		const connectRequestInit = this.requestInit(input);
-		return withAbortErrorHandling((0, _ag_ui_client.transformHttpEventStream)((0, _ag_ui_client.runHttpRequest)(() => this.fetch(connectUrl, connectRequestInit))));
+			httpEvents = (0, _ag_ui_client.runHttpRequest)(() => this.fetch(this.singleEndpointUrl, requestInit));
+		} else {
+			const connectUrl = `${this.runtimeUrl}/agent/${routedId}/connect`;
+			const connectRequestInit = this.requestInit(input);
+			httpEvents = (0, _ag_ui_client.runHttpRequest)(() => this.fetch(connectUrl, connectRequestInit));
+		}
+		return withAbortErrorHandling((0, rxjs.defer)(() => {
+			let replayStarted = false;
+			const emptyHistory = [{
+				type: _ag_ui_client.EventType.MESSAGES_SNAPSHOT,
+				messages: []
+			}, {
+				type: _ag_ui_client.EventType.STATE_SNAPSHOT,
+				snapshot: {}
+			}];
+			return (0, _ag_ui_client.transformHttpEventStream)(httpEvents).pipe((0, rxjs_operators.concatMap)((event) => {
+				if (replayStarted) return (0, rxjs.of)(event);
+				replayStarted = true;
+				return (0, rxjs.from)([...emptyHistory, event]);
+			}), (0, rxjs_operators.concatWith)((0, rxjs.defer)(() => replayStarted ? rxjs.EMPTY : (0, rxjs.from)(emptyHistory))));
+		}));
 	}
 	function _runViaDelegate(input) {
 		return (0, rxjs.defer)(() => (0, rxjs.from)(this.resolveDelegate())).pipe((0, rxjs_operators.switchMap)((delegate) => withAbortErrorHandling(delegate.run(input))));
@@ -1840,7 +1943,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		* because only `HttpAgent` carries a `headers` field. See #5635.
 		*/
 		applyHeadersToAgent(agent) {
-			if (agent instanceof _ag_ui_client.HttpAgent) {
+			if (ɵisHttpAgent(agent)) {
 				if (!this.agentOwnHeaders.has(agent)) this.agentOwnHeaders.set(agent, { ...agent.headers });
 				agent.headers = {
 					...this.agentOwnHeaders.get(agent),
@@ -3166,6 +3269,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			_defineProperty(this, "_runDepth", 0);
 			_defineProperty(this, "_webmcpRegistry", new WebMCPRegistry());
 			_defineProperty(this, "_lastConnectedThreadIdsByAgent", /* @__PURE__ */ new Map());
+			_defineProperty(this, "_lastActiveThreadIdsByAgent", /* @__PURE__ */ new Map());
 			_defineProperty(this, "_anonymousAgentIds", /* @__PURE__ */ new WeakMap());
 			_defineProperty(this, "_nextAnonymousAgentId", 0);
 			_defineProperty(this, "_executingToolCalls", /* @__PURE__ */ new WeakMap());
@@ -3342,7 +3446,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		*/
 		async connectAgent({ agent }) {
 			var _agent$threadId;
-			this._connectionGenerations.set(agent, {});
+			const connection = {};
+			this._connectionGenerations.set(agent, connection);
 			const incomingThreadId = (_agent$threadId = agent.threadId) !== null && _agent$threadId !== void 0 ? _agent$threadId : null;
 			const previousReplay = this._interactionAbortControllers.get(agent);
 			if (previousReplay && previousReplay.threadId !== incomingThreadId) {
@@ -3351,14 +3456,21 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				this._executingToolCalls.delete(agent);
 			}
 			try {
-				var _this$_lastConnectedT, _agent$threadId2, _this$_interactionAbo;
+				var _ref, _agent$threadId2, _agent$threadId3, _agent$threadId4, _this$_interactionAbo;
 				const restoreKey = this.getConnectRestoreKey(agent);
-				const isFreshRestore = incomingThreadId !== ((_this$_lastConnectedT = this._lastConnectedThreadIdsByAgent.get(restoreKey)) !== null && _this$_lastConnectedT !== void 0 ? _this$_lastConnectedT : null);
-				this._lastConnectedThreadIdsByAgent.set(restoreKey, incomingThreadId);
+				const previousThreadId = this._lastActiveThreadIdsByAgent.get(restoreKey);
+				const isFreshRestore = incomingThreadId !== ((_ref = previousThreadId !== null && previousThreadId !== void 0 ? previousThreadId : this._lastConnectedThreadIdsByAgent.get(restoreKey)) !== null && _ref !== void 0 ? _ref : null);
 				await agent.detachActiveRun();
+				if (this._connectionGenerations.get(agent) !== connection || ((_agent$threadId2 = agent.threadId) !== null && _agent$threadId2 !== void 0 ? _agent$threadId2 : null) !== incomingThreadId) return {
+					result: void 0,
+					newMessages: []
+				};
+				this._lastConnectedThreadIdsByAgent.set(restoreKey, incomingThreadId);
+				this._lastActiveThreadIdsByAgent.set(restoreKey, incomingThreadId);
 				if (isFreshRestore) {
 					agent.setMessages([]);
 					agent.setState({});
+					if (previousThreadId !== void 0 && previousThreadId !== incomingThreadId) agent.pendingInterrupts = [];
 					const cursorAware = agent;
 					if (incomingThreadId) {
 						if (typeof cursorAware.clearReplayCursor === "function") cursorAware.clearReplayCursor(incomingThreadId);
@@ -3373,12 +3485,16 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 						agent
 					});
 				}, "Subscriber onAgentRunStarted error:");
+				if (this._connectionGenerations.get(agent) !== connection || ((_agent$threadId3 = agent.threadId) !== null && _agent$threadId3 !== void 0 ? _agent$threadId3 : null) !== incomingThreadId) return {
+					result: void 0,
+					newMessages: []
+				};
 				const runAgentResult = await agent.connectAgent({
 					forwardedProps: this._internal.properties,
 					tools: this.buildFrontendTools(agent.agentId),
 					context: this._internal.getContextForAgent(agent.agentId)
 				}, this.createAgentErrorSubscriber(agent));
-				if (((_agent$threadId2 = agent.threadId) !== null && _agent$threadId2 !== void 0 ? _agent$threadId2 : null) !== incomingThreadId) return runAgentResult;
+				if (this._connectionGenerations.get(agent) !== connection || ((_agent$threadId4 = agent.threadId) !== null && _agent$threadId4 !== void 0 ? _agent$threadId4 : null) !== incomingThreadId) return runAgentResult;
 				const controller = new AbortController();
 				const replay = (_this$_interactionAbo = this._interactionAbortControllers.get(agent)) !== null && _this$_interactionAbo !== void 0 ? _this$_interactionAbo : {
 					threadId: incomingThreadId,
@@ -3435,6 +3551,12 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				continuationHandoff === null || continuationHandoff === void 0 || continuationHandoff.cancel();
 				throw error;
 			}
+			const resumedRunId = this._internal.stateManager.getContinuationRunId(agent, {
+				threadId: agent.threadId,
+				resume,
+				forwardedProps
+			});
+			const logicalHandoff = continuationHandoff !== null && continuationHandoff !== void 0 ? continuationHandoff : resumedRunId ? this._internal.stateManager.markNextRunAsContinuation(agent, resumedRunId) : void 0;
 			const isTopLevel = this._runDepth === 0;
 			let originalAbortRun;
 			if (isTopLevel) {
@@ -3455,18 +3577,19 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			}
 			this._runDepth++;
 			try {
-				let logicalRunId = runId;
+				let logicalRunId = resumedRunId !== null && resumedRunId !== void 0 ? resumedRunId : runId;
 				const agentSubscriber = this.createAgentErrorSubscriber(agent);
 				let started = false;
 				const onRunStartedEvent = agentSubscriber.onRunStartedEvent;
 				const onRunInitialized = agentSubscriber.onRunInitialized;
 				agentSubscriber.onRunInitialized = async (params) => {
-					continuationHandoff === null || continuationHandoff === void 0 || continuationHandoff.bind(params.input);
+					this._lastActiveThreadIdsByAgent.set(this.getConnectRestoreKey(agent), params.input.threadId);
+					logicalHandoff === null || logicalHandoff === void 0 || logicalHandoff.bind(params.input);
 					return onRunInitialized === null || onRunInitialized === void 0 ? void 0 : onRunInitialized(params);
 				};
 				agentSubscriber.onRunStartedEvent = async (params) => {
 					started = true;
-					if (!continuationHandoff) logicalRunId = params.input.runId;
+					if (!logicalHandoff) logicalRunId = params.input.runId;
 					return onRunStartedEvent === null || onRunStartedEvent === void 0 ? void 0 : onRunStartedEvent(params);
 				};
 				const pinRunIdOnWire = runId !== void 0 && !continuationHandoff;
@@ -3481,14 +3604,14 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 					context: this._internal.getContextForAgent(agent.agentId)
 				};
 				const runAgentResult = await agent.runAgent(agentRunInput, agentSubscriber);
-				if (!started) continuationHandoff === null || continuationHandoff === void 0 || continuationHandoff.cancel();
+				if (!started) logicalHandoff === null || logicalHandoff === void 0 || logicalHandoff.cancel();
 				return await this.processAgentResult({
 					runAgentResult,
 					agent,
 					runId: logicalRunId
 				});
 			} catch (error) {
-				continuationHandoff === null || continuationHandoff === void 0 || continuationHandoff.cancel();
+				logicalHandoff === null || logicalHandoff === void 0 || logicalHandoff.cancel();
 				const runError = error instanceof Error ? error : new Error(String(error));
 				const context = {};
 				if (agent.agentId) context.agentId = agent.agentId;
@@ -4057,6 +4180,15 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 	* Tracks agent state snapshots and message-to-run associations.
 	*/
 	var StateManager = class {
+		/** Find the interrupted logical run without consuming its pending answers. */
+		getContinuationRunId(agent, input) {
+			var _this$interruptedRuns, _input$resume, _input$resume2;
+			const pending = (_this$interruptedRuns = this.interruptedRuns.get(agent)) === null || _this$interruptedRuns === void 0 ? void 0 : _this$interruptedRuns.get(input.threadId);
+			if (!pending) return void 0;
+			if (pending.interruptIds === null) return input.resume === void 0 && isContinuation(input) ? pending.runId : void 0;
+			const submitted = new Set((_input$resume = input.resume) === null || _input$resume === void 0 ? void 0 : _input$resume.map((entry) => entry.interruptId));
+			return submitted.size > 0 && submitted.size === ((_input$resume2 = input.resume) === null || _input$resume2 === void 0 ? void 0 : _input$resume2.length) && submitted.size === pending.interruptIds.length && pending.interruptIds.every((id) => submitted.has(id)) ? pending.runId : void 0;
+		}
 		constructor(core) {
 			this.core = core;
 			_defineProperty(this, "stateByRun", /* @__PURE__ */ new Map());
@@ -4065,6 +4197,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			_defineProperty(this, "activeRun", /* @__PURE__ */ new Map());
 			_defineProperty(this, "agentSubscriptions", /* @__PURE__ */ new Map());
 			_defineProperty(this, "pendingContinuations", /* @__PURE__ */ new WeakMap());
+			_defineProperty(this, "interruptedRuns", /* @__PURE__ */ new WeakMap());
 		}
 		/**
 		* Initialize state tracking for an agent
@@ -4106,6 +4239,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			}
 			let revoked = false;
 			let subRunId;
+			let legacyInterrupted = false;
 			let runFinished = false;
 			const pendingResults = /* @__PURE__ */ new WeakMap();
 			const reconcilePendingResults = (historyMessages, input) => {
@@ -4184,27 +4318,52 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			};
 			const { unsubscribe } = agent.subscribe({
 				onRunStartedEvent: ({ event, input, state }) => {
+					var _event$input, _this$interruptedRuns2;
 					if (revoked) return;
 					const pendingForAgent = this.pendingContinuations.get(agent);
 					const internalContinuation = [...pendingForAgent !== null && pendingForAgent !== void 0 ? pendingForAgent : []].find((pending) => pending.expectedInput === input);
 					internalContinuation === null || internalContinuation === void 0 || internalContinuation.cancel();
+					const startedInput = (_event$input = event.input) !== null && _event$input !== void 0 ? _event$input : {
+						...input,
+						threadId: event.threadId
+					};
+					const resumedRunId = this.getContinuationRunId(agent, startedInput);
+					(_this$interruptedRuns2 = this.interruptedRuns.get(agent)) === null || _this$interruptedRuns2 === void 0 || _this$interruptedRuns2.delete(startedInput.threadId);
+					legacyInterrupted = false;
 					if (internalContinuation) {
 						var _ref, _internalContinuation;
 						subRunId = (_ref = (_internalContinuation = internalContinuation.expectedRunId) !== null && _internalContinuation !== void 0 ? _internalContinuation : event.runId) !== null && _ref !== void 0 ? _ref : input.runId;
-					} else if (runFinished && input.runId === subRunId && !isContinuation(input) && (event.runId == null || event.runId === subRunId)) subRunId = (0, _ag_ui_client.randomUUID)();
+					} else if (resumedRunId) subRunId = resumedRunId;
+					else if (runFinished && input.runId === subRunId && !isContinuation(input) && (event.runId == null || event.runId === subRunId)) subRunId = (0, _ag_ui_client.randomUUID)();
 					else subRunId = event.runId || input.runId;
 					runFinished = false;
 					this.handleRunStarted(agent, effectiveInput(input), state);
 				},
-				onRunFinishedEvent: ({ input, state, messages }) => {
+				onRunFinishedEvent: ({ event, input, state, messages }) => {
+					var _event$outcome;
 					if (revoked) return;
 					runFinished = true;
 					const effective = effectiveInput(input);
+					let interrupted = this.interruptedRuns.get(agent);
+					if (((_event$outcome = event.outcome) === null || _event$outcome === void 0 ? void 0 : _event$outcome.type) === "interrupt" || legacyInterrupted) {
+						var _event$outcome2;
+						if (!interrupted) {
+							interrupted = /* @__PURE__ */ new Map();
+							this.interruptedRuns.set(agent, interrupted);
+						}
+						interrupted.set(event.threadId, {
+							runId: effective.runId,
+							interruptIds: ((_event$outcome2 = event.outcome) === null || _event$outcome2 === void 0 ? void 0 : _event$outcome2.type) === "interrupt" ? event.outcome.interrupts.map((interrupt) => interrupt.id) : null
+						});
+					} else interrupted === null || interrupted === void 0 || interrupted.delete(event.threadId);
 					const mutation = reconcilePendingResults(messages, input);
 					clearPendingResults(input);
 					this.handleRunFinished(agent, effective, state);
 					return mutation;
 				},
+				onCustomEvent: ({ event }) => {
+					if (!revoked && event.name === "on_interrupt") legacyInterrupted = true;
+				},
 				onRunErrorEvent: ({ input, state, messages }) => {
 					if (revoked) return;
 					runFinished = true;
@@ -4261,6 +4420,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				unsubscribe: () => {
 					revoked = true;
 					this.pendingContinuations.delete(agent);
+					this.interruptedRuns.delete(agent);
 					unsubscribe();
 				}
 			});
@@ -4435,6 +4595,9 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		* Clear all state for an agent
 		*/
 		clearAgentState(agentId) {
+			var _this$agentSubscripti;
+			const agent = (_this$agentSubscripti = this.agentSubscriptions.get(agentId)) === null || _this$agentSubscripti === void 0 ? void 0 : _this$agentSubscripti.agent;
+			if (agent) this.interruptedRuns.delete(agent);
 			this.stateByRun.delete(agentId);
 			this.messageToRun.delete(agentId);
 			this.rawEventByMessage.delete(agentId);
@@ -4443,7 +4606,9 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		* Clear all state for a thread
 		*/
 		clearThreadState(agentId, threadId) {
-			var _this$stateByRun$get4, _this$messageToRun$ge2, _this$rawEventByMessa8;
+			var _this$agentSubscripti2, _this$interruptedRuns3, _this$stateByRun$get4, _this$messageToRun$ge2, _this$rawEventByMessa8;
+			const agent = (_this$agentSubscripti2 = this.agentSubscriptions.get(agentId)) === null || _this$agentSubscripti2 === void 0 ? void 0 : _this$agentSubscripti2.agent;
+			if (agent) (_this$interruptedRuns3 = this.interruptedRuns.get(agent)) === null || _this$interruptedRuns3 === void 0 || _this$interruptedRuns3.delete(threadId);
 			(_this$stateByRun$get4 = this.stateByRun.get(agentId)) === null || _this$stateByRun$get4 === void 0 || _this$stateByRun$get4.delete(threadId);
 			(_this$messageToRun$ge2 = this.messageToRun.get(agentId)) === null || _this$messageToRun$ge2 === void 0 || _this$messageToRun$ge2.delete(threadId);
 			(_this$rawEventByMessa8 = this.rawEventByMessage.get(agentId)) === null || _this$rawEventByMessa8 === void 0 || _this$rawEventByMessa8.delete(threadId);
@@ -7621,6 +7786,7 @@ exports.ɵcreateMemoryStore = createMemoryStore;
 exports.ɵcreateThreadSelectors = ɵcreateThreadSelectors;
 exports.ɵcreateThreadStore = createThreadStore;
 exports.ɵisCopilotKitFeature = ɵisCopilotKitFeature;
+exports.ɵisHttpAgent = ɵisHttpAgent;
 exports.ɵisRetryableMemoryStatus = isRetryableStatus;
 exports.ɵjoinPhoenixChannel$ = ɵjoinPhoenixChannel$;
 exports.ɵmapMemoryMetadataEvent = ɵmapMemoryMetadataEvent;