@copilotkit/core 1.66.2-canary.1785878925 → 1.66.3

package/dist/index.cjs

@@ -1983,10 +1983,15 @@ var RunHandler = class {
 	/**
 	* Run an agent
 	*/
-	async runAgent({ agent, forwardedProps, resume, runId }) {
+	async runAgent({ agent, forwardedProps, resume, runId }, continuationHandoff) {
 		if (agent.agentId) this._internal.suggestionEngine.clearSuggestions(agent.agentId);
 		this._internal.applyHeadersToAgent(agent);
-		if (agent.detachActiveRun) await agent.detachActiveRun();
+		if (agent.detachActiveRun) try {
+			await agent.detachActiveRun();
+		} catch (error) {
+			continuationHandoff?.cancel();
+			throw error;
+		}
 		const isTopLevel = this._runDepth === 0;
 		let originalAbortRun;
 		if (isTopLevel) {
@@ -2004,21 +2009,40 @@ var RunHandler = class {
 		}
 		this._runDepth++;
 		try {
-			const runAgentResult = await agent.runAgent({
+			let logicalRunId = runId;
+			const agentSubscriber = this.createAgentErrorSubscriber(agent);
+			let started = false;
+			const onRunStartedEvent = agentSubscriber.onRunStartedEvent;
+			const onRunInitialized = agentSubscriber.onRunInitialized;
+			agentSubscriber.onRunInitialized = async (params) => {
+				continuationHandoff?.bind(params.input);
+				return onRunInitialized?.(params);
+			};
+			agentSubscriber.onRunStartedEvent = async (params) => {
+				started = true;
+				if (!continuationHandoff) logicalRunId = params.input.runId;
+				return onRunStartedEvent?.(params);
+			};
+			const pinRunIdOnWire = runId !== void 0 && !continuationHandoff;
+			const agentRunInput = {
 				forwardedProps: {
 					...this._internal.properties,
 					...forwardedProps
 				},
 				...resume !== void 0 ? { resume } : {},
-				...runId !== void 0 ? { runId } : {},
+				...pinRunIdOnWire ? { runId } : {},
 				tools: this.buildFrontendTools(agent.agentId),
 				context: this._internal.getContextForAgent(agent.agentId)
-			}, this.createAgentErrorSubscriber(agent));
+			};
+			const runAgentResult = await agent.runAgent(agentRunInput, agentSubscriber);
+			if (!started) continuationHandoff?.cancel();
 			return await this.processAgentResult({
 				runAgentResult,
-				agent
+				agent,
+				runId: logicalRunId
 			});
 		} catch (error) {
+			continuationHandoff?.cancel();
 			const runError = error instanceof Error ? error : new Error(String(error));
 			const context = {};
 			if (agent.agentId) context.agentId = agent.agentId;
@@ -2039,7 +2063,7 @@ var RunHandler = class {
 	/**
 	* Process agent result and execute tools
 	*/
-	async processAgentResult({ runAgentResult, agent, executeFrontendTools = true }) {
+	async processAgentResult({ runAgentResult, agent, runId, executeFrontendTools = true }) {
 		const { newMessages } = runAgentResult;
 		const agentId = agent.agentId;
 		let needsFollowUp = false;
@@ -2080,7 +2104,11 @@ var RunHandler = class {
 		if (needsFollowUp && !this._runAbortController?.signal.aborted) if (this._runDepth >= MAX_FOLLOW_UP_DEPTH) _copilotkit_shared.logger.warn(`[CopilotKit] Follow-up depth limit (${MAX_FOLLOW_UP_DEPTH}) reached for agent "${agentId}". Stopping recursive follow-up runs to prevent an infinite loop. This usually indicates a tool that keeps requesting a follow-up (e.g. the LLM repeatedly calling the same tool). Consider setting "followUp: false" on the offending tool.`);
 		else {
 			await this._internal.waitForPendingFrameworkUpdates();
-			return await this.runAgent({ agent });
+			const continuationHandoff = this._internal.stateManager.markNextRunAsContinuation(agent, runId);
+			return await this.runAgent({
+				agent,
+				...runId !== void 0 ? { runId } : {}
+			}, continuationHandoff);
 		}
 		this._internal.suggestionEngine.reloadSuggestions(agentId);
 		return runAgentResult;
@@ -2518,6 +2546,7 @@ function parseToolArguments(rawArgs, toolName) {
 
 //#endregion
 //#region src/core/state-manager.ts
+const isContinuation = (input) => input.resume !== void 0 || Object.prototype.hasOwnProperty.call(input.forwardedProps?.command ?? {}, "resume");
 /**
 * Manages state and message tracking by run for CopilotKitCore.
 * Tracks agent state snapshots and message-to-run associations.
@@ -2527,6 +2556,7 @@ var StateManager = class {
 	messageToRun = /* @__PURE__ */ new Map();
 	activeRun = /* @__PURE__ */ new Map();
 	agentSubscriptions = /* @__PURE__ */ new Map();
+	pendingContinuations = /* @__PURE__ */ new WeakMap();
 	constructor(core) {
 		this.core = core;
 	}
@@ -2534,6 +2564,28 @@ var StateManager = class {
 	* Initialize state tracking for an agent
 	*/
 	initialize() {}
+	markNextRunAsContinuation(agent, expectedRunId) {
+		let pendingForAgent = this.pendingContinuations.get(agent);
+		if (!pendingForAgent) {
+			pendingForAgent = /* @__PURE__ */ new Set();
+			this.pendingContinuations.set(agent, pendingForAgent);
+		}
+		const pending = {
+			active: true,
+			expectedRunId,
+			bind: (input) => {
+				if (pending.active) pending.expectedInput = input;
+			},
+			cancel: () => {
+				if (!pending.active) return;
+				pending.active = false;
+				pendingForAgent.delete(pending);
+				if (pendingForAgent.size === 0) this.pendingContinuations.delete(agent);
+			}
+		};
+		pendingForAgent.add(pending);
+		return pending;
+	}
 	/**
 	* Subscribe to an agent's events to track state and messages.
 	*/
@@ -2555,8 +2607,10 @@ var StateManager = class {
 		const { unsubscribe } = agent.subscribe({
 			onRunStartedEvent: ({ input, state }) => {
 				if (revoked) return;
-				if (runFinished && input.runId === subRunId) subRunId = (0, _ag_ui_client.randomUUID)();
-				else subRunId = input.runId;
+				const internalContinuation = [...this.pendingContinuations.get(agent) ?? []].find((pending) => pending.expectedInput === input);
+				internalContinuation?.cancel();
+				if (runFinished && input.runId === subRunId && !internalContinuation && !isContinuation(input)) subRunId = (0, _ag_ui_client.randomUUID)();
+				else subRunId = internalContinuation?.expectedRunId ?? input.runId;
 				runFinished = false;
 				this.handleRunStarted(agent, effectiveInput(input), state);
 			},
@@ -2589,6 +2643,7 @@ var StateManager = class {
 		});
 		this.agentSubscriptions.set(agentId, () => {
 			revoked = true;
+			this.pendingContinuations.delete(agent);
 			unsubscribe();
 		});
 	}