@copilotkit/core 1.56.3 → 1.56.4

package/dist/index.cjs

@@ -128,6 +128,8 @@ function ɵobservePhoenixSocketHealth$(socketSignals$, maxConsecutiveErrors) {
 //#endregion
 //#region src/intelligence-agent.ts
 const CLIENT_AG_UI_EVENT = "ag_ui_event";
+const REPLAY_COMPLETE_EVENT = "replay_complete";
+const STREAM_IDLE_EVENT = "stream_idle";
 const STOP_RUN_EVENT = "stop_run";
 var AgentThreadLockedError = class extends Error {
 	constructor(threadId) {
@@ -240,10 +242,14 @@ var IntelligenceAgent = class IntelligenceAgent extends _ag_ui_client.AbstractAg
 	run(input) {
 		this.threadId = input.threadId;
 		this.canonicalRunId = input.runId;
-		return (0, rxjs.defer)(() => this.requestJoinCredentials$("run", input)).pipe((0, rxjs.switchMap)((credentials) => this.observeThread$(input, credentials, {
-			completeOnRunError: false,
-			streamMode: "run"
-		})));
+		return (0, rxjs.defer)(() => this.requestJoinCredentials$("run", input)).pipe((0, rxjs.switchMap)((credentials) => {
+			if (credentials === null) return (0, rxjs.throwError)(() => /* @__PURE__ */ new Error("REST run request returned no credentials"));
+			const canonicalInput = this.applyCanonicalRunIdentity(input, credentials, { fallbackToInputRunId: true });
+			return this.observeThread$(canonicalInput, credentials, {
+				completeOnRunError: false,
+				streamMode: "run"
+			});
+		}));
 	}
 	/**
 	* Reconnect to an existing thread by fetching websocket credentials and
@@ -251,19 +257,15 @@ var IntelligenceAgent = class IntelligenceAgent extends _ag_ui_client.AbstractAg
 	*/
 	connect(input) {
 		this.threadId = input.threadId;
-		this.canonicalRunId = input.runId;
-		return (0, rxjs.defer)(() => this.requestConnectPlan$(input)).pipe((0, rxjs.switchMap)((plan) => {
-			if (plan === null) return rxjs.EMPTY;
-			if (plan.mode === "bootstrap") {
-				this.setLastSeenEventId(input.threadId, plan.latestEventId);
-				return (0, rxjs.from)(plan.events);
-			}
-			this.setLastSeenEventId(input.threadId, plan.joinFromEventId);
-			return (0, rxjs.concat)((0, rxjs.from)(plan.events), this.observeThread$(input, { joinToken: plan.joinToken }, {
-				completeOnRunError: true,
-				streamMode: "connect",
-				replayCursor: plan.joinFromEventId
-			}));
+		this.canonicalRunId = null;
+		this.clearReconnectCursor(input.threadId);
+		return (0, rxjs.defer)(() => this.requestJoinCredentials$("connect", input)).pipe((0, rxjs.switchMap)((credentials) => {
+			if (credentials === null) return rxjs.EMPTY;
+			const canonicalInput = this.applyCanonicalRunIdentity(input, credentials, { fallbackToInputRunId: false });
+			return this.observeThread$(canonicalInput, credentials, {
+				completeOnRunError: false,
+				streamMode: "connect"
+			});
 		}));
 	}
 	/**
@@ -280,7 +282,6 @@ var IntelligenceAgent = class IntelligenceAgent extends _ag_ui_client.AbstractAg
 			ownSocket.disconnect();
 			if (this.socket === ownSocket) this.socket = null;
 		}
-		if (this.threadId) this.sharedState.lastSeenEventIds.delete(this.threadId);
 		this.canonicalRunId = null;
 	}
 	cleanup() {
@@ -302,80 +303,56 @@ var IntelligenceAgent = class IntelligenceAgent extends _ag_ui_client.AbstractAg
 						tools: input.tools,
 						context: input.context,
 						state: input.state,
-						forwardedProps: input.forwardedProps
+						forwardedProps: input.forwardedProps,
+						...mode === "connect" ? { lastSeenEventId: this.getReconnectCursor(input) } : {}
 					}),
 					...this.config.credentials ? { credentials: this.config.credentials } : {}
 				});
-				if (response.status === 409) throw new AgentThreadLockedError(input.threadId);
+				if (response.status === 204 && mode === "connect") return null;
+				if (response.status === 409 && mode === "run") throw new AgentThreadLockedError(input.threadId);
 				if (!response.ok) {
 					const text = await response.text().catch(() => "");
 					throw new Error(text || response.statusText || String(response.status));
 				}
-				const payload = await response.json();
-				if (!payload.joinToken) throw new Error("missing joinToken");
-				return { joinToken: payload.joinToken };
+				return this.normalizeJoinCredentials(await response.json(), input);
 			} catch (error) {
 				if (error instanceof AgentThreadLockedError) throw error;
 				throw new Error(`REST ${mode} request failed: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
 			}
 		});
 	}
-	requestConnectPlan$(input) {
-		return (0, rxjs.defer)(async () => {
-			try {
-				const response = await fetch(this.buildRuntimeUrl("connect"), {
-					method: "POST",
-					headers: {
-						"Content-Type": "application/json",
-						...this.config.headers
-					},
-					body: JSON.stringify({
-						threadId: input.threadId,
-						runId: input.runId,
-						messages: input.messages,
-						tools: input.tools,
-						context: input.context,
-						state: input.state,
-						forwardedProps: input.forwardedProps,
-						lastSeenEventId: this.getReconnectCursor(input)
-					}),
-					...this.config.credentials ? { credentials: this.config.credentials } : {}
-				});
-				if (response.status === 204) return null;
-				if (!response.ok) {
-					const text = await response.text().catch(() => "");
-					throw new Error(text || response.statusText || String(response.status));
-				}
-				return this.normalizeConnectPlan(await response.json());
-			} catch (error) {
-				throw new Error(`REST connect request failed: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
-			}
-		});
-	}
-	normalizeConnectPlan(payload) {
+	normalizeJoinCredentials(payload, input) {
 		const envelope = payload && typeof payload === "object" ? payload : null;
-		if (envelope?.mode === "bootstrap") return {
-			mode: "bootstrap",
-			latestEventId: typeof envelope.latestEventId === "string" ? envelope.latestEventId : null,
-			events: Array.isArray(envelope.events) ? envelope.events : []
+		const realtime = envelope?.realtime && typeof envelope.realtime === "object" ? envelope.realtime : null;
+		if (typeof envelope?.joinToken !== "string" || !envelope.joinToken) throw new Error("missing joinToken");
+		if (typeof realtime?.clientUrl !== "string" || !realtime.clientUrl) throw new Error("missing realtime.clientUrl");
+		if (typeof realtime.topic !== "string" || !realtime.topic) throw new Error("missing realtime.topic");
+		return {
+			threadId: typeof envelope.threadId === "string" && envelope.threadId ? envelope.threadId : input.threadId,
+			runId: typeof envelope.runId === "string" && envelope.runId ? envelope.runId : null,
+			joinToken: envelope.joinToken,
+			realtime: {
+				clientUrl: realtime.clientUrl,
+				topic: realtime.topic
+			}
 		};
-		if (envelope?.mode === "live") {
-			if (typeof envelope.joinToken !== "string" || envelope.joinToken.length === 0) throw new Error("missing joinToken");
-			return {
-				mode: "live",
-				joinToken: envelope.joinToken,
-				joinFromEventId: typeof envelope.joinFromEventId === "string" ? envelope.joinFromEventId : null,
-				events: Array.isArray(envelope.events) ? envelope.events : []
-			};
-		}
-		throw new Error("invalid connect plan");
 	}
 	observeThread$(input, credentials, options) {
+		return this.observeThreadSession$(input, credentials, options).pipe((0, rxjs_operators.catchError)((error) => {
+			if (!this.isSocketReconnectExhaustedError(error)) return (0, rxjs.throwError)(() => error);
+			return this.requestJoinCredentials$("connect", input).pipe((0, rxjs.switchMap)((refreshedCredentials) => refreshedCredentials === null ? rxjs.EMPTY : this.observeThread$(this.applyCanonicalRunIdentity(input, refreshedCredentials, { fallbackToInputRunId: options.streamMode === "run" }), refreshedCredentials, {
+				...options,
+				channelMode: "connect",
+				replayCursor: this.getReconnectCursor(input)
+			})));
+		}));
+	}
+	observeThreadSession$(input, credentials, options) {
 		return (0, rxjs.defer)(() => {
 			let ownSocket = null;
 			let ownChannel = null;
 			const socket$ = ɵphoenixSocket$({
-				url: this.config.url,
+				url: credentials.realtime.clientUrl,
 				options: {
 					params: {
 						...this.config.socketParams,
@@ -391,10 +368,10 @@ var IntelligenceAgent = class IntelligenceAgent extends _ag_ui_client.AbstractAg
 				bufferSize: 1,
 				refCount: true
 			}));
-			const { topic, params } = this.createThreadChannelDescriptor(input, options.streamMode, options.replayCursor);
+			const params = this.createThreadChannelParams(input, options.channelMode ?? options.streamMode, options.replayCursor);
 			const channel$ = ɵphoenixChannel$({
 				socket$,
-				topic,
+				topic: credentials.realtime.topic,
 				params
 			}).pipe((0, rxjs_operators.tap)(({ channel }) => {
 				ownChannel = channel;
@@ -404,8 +381,14 @@ var IntelligenceAgent = class IntelligenceAgent extends _ag_ui_client.AbstractAg
 				refCount: true
 			}));
 			const threadEvents$ = this.observeThreadEvents$(input.threadId, channel$, options).pipe((0, rxjs_operators.share)());
-			const threadCompleted$ = threadEvents$.pipe((0, rxjs_operators.ignoreElements)(), (0, rxjs_operators.endWith)(null), (0, rxjs_operators.take)(1));
-			return (0, rxjs.merge)(this.joinThreadChannel$(channel$), this.observeSocketHealth$(socket$).pipe((0, rxjs_operators.takeUntil)(threadCompleted$)), threadEvents$).pipe((0, rxjs_operators.finalize)(() => this.cleanupOwned(ownChannel, ownSocket)));
+			const replayComplete$ = this.observeControlEvent$(input.threadId, channel$, REPLAY_COMPLETE_EVENT).pipe((0, rxjs_operators.ignoreElements)(), (0, rxjs_operators.share)());
+			const streamIdle$ = this.observeControlEvent$(input.threadId, channel$, STREAM_IDLE_EVENT).pipe((0, rxjs_operators.shareReplay)({
+				bufferSize: 1,
+				refCount: true
+			}));
+			const streamIdleCompletion$ = options.streamMode === "connect" ? streamIdle$.pipe((0, rxjs_operators.take)(1)) : rxjs.EMPTY;
+			const terminal$ = (0, rxjs.merge)(threadEvents$.pipe((0, rxjs_operators.ignoreElements)(), (0, rxjs_operators.endWith)(null), (0, rxjs_operators.take)(1)), streamIdleCompletion$);
+			return (0, rxjs.merge)(this.joinThreadChannel$(channel$), this.observeSocketHealth$(socket$).pipe((0, rxjs_operators.takeUntil)(terminal$)), threadEvents$.pipe((0, rxjs_operators.takeUntil)(streamIdleCompletion$)), replayComplete$.pipe((0, rxjs_operators.takeUntil)(terminal$)), streamIdleCompletion$.pipe((0, rxjs_operators.ignoreElements)())).pipe((0, rxjs_operators.finalize)(() => this.cleanupOwned(ownChannel, ownSocket)));
 		});
 	}
 	joinThreadChannel$(channel$) {
@@ -417,16 +400,23 @@ var IntelligenceAgent = class IntelligenceAgent extends _ag_ui_client.AbstractAg
 	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) => (0, rxjs.from)(this.createThreadNotifications(payload, options.completeOnRunError))), (0, rxjs.dematerialize)());
+		}), (0, rxjs_operators.mergeMap)((payload) => this.createThreadNotifications(payload, {
+			completeOnRunError: options.completeOnRunError,
+			completeOnRunFinished: options.streamMode === "run",
+			errorOnRunError: options.streamMode === "run"
+		})), (0, rxjs.dematerialize)());
+	}
+	observeControlEvent$(threadId, channel$, eventName) {
+		return channel$.pipe((0, rxjs_operators.switchMap)(({ channel }) => this.observeChannelEvent$(channel, eventName)), (0, rxjs_operators.tap)((payload) => this.updateLastSeenEventIdFromControl(threadId, payload)));
 	}
 	observeChannelEvent$(channel, eventName) {
 		return ɵobservePhoenixEvent$(channel, eventName);
 	}
-	createThreadNotifications(payload, completeOnRunError) {
-		if (payload.type === _ag_ui_client.EventType.RUN_FINISHED) return [rxjs.Notification.createNext(payload), rxjs.Notification.createComplete()];
+	createThreadNotifications(payload, options) {
+		if (payload.type === _ag_ui_client.EventType.RUN_FINISHED) return options.completeOnRunFinished ? [rxjs.Notification.createNext(payload), rxjs.Notification.createComplete()] : [rxjs.Notification.createNext(payload)];
 		if (payload.type === _ag_ui_client.EventType.RUN_ERROR) {
 			const errorMessage = payload.message ?? "Run error";
-			return completeOnRunError ? [rxjs.Notification.createNext(payload), rxjs.Notification.createComplete()] : [rxjs.Notification.createNext(payload), rxjs.Notification.createError(new Error(errorMessage))];
+			return options.completeOnRunError ? [rxjs.Notification.createNext(payload), rxjs.Notification.createComplete()] : options.errorOnRunError ? [rxjs.Notification.createNext(payload), rxjs.Notification.createError(new Error(errorMessage))] : [rxjs.Notification.createNext(payload)];
 		}
 		return [rxjs.Notification.createNext(payload)];
 	}
@@ -435,34 +425,31 @@ var IntelligenceAgent = class IntelligenceAgent extends _ag_ui_client.AbstractAg
 		const origin = typeof window !== "undefined" && window.location ? window.location.origin : "http://localhost";
 		return new URL(path, new URL(this.config.runtimeUrl, origin)).toString();
 	}
-	createThreadChannelDescriptor(input, streamMode, replayCursor) {
-		const params = streamMode === "run" ? {
+	createThreadChannelParams(input, streamMode, replayCursor) {
+		return streamMode === "run" ? {
 			stream_mode: "run",
 			run_id: input.runId
 		} : {
 			stream_mode: "connect",
 			last_seen_event_id: replayCursor === void 0 ? this.getReconnectCursor(input) : replayCursor
 		};
-		return {
-			topic: `thread:${input.threadId}`,
-			params
-		};
 	}
 	getLastSeenEventId(threadId) {
 		return this.sharedState.lastSeenEventIds.get(threadId) ?? null;
 	}
 	getReconnectCursor(input) {
-		return this.hasLocalThreadMessages(input) ? this.getLastSeenEventId(input.threadId) : null;
+		return this.getLastSeenEventId(input.threadId);
 	}
-	hasLocalThreadMessages(input) {
-		return Array.isArray(input.messages) && input.messages.length > 0;
+	clearReconnectCursor(threadId) {
+		this.sharedState.lastSeenEventIds.delete(threadId);
 	}
 	updateLastSeenEventId(threadId, payload) {
 		const eventId = this.readEventId(payload);
 		if (!eventId) return;
 		this.sharedState.lastSeenEventIds.set(threadId, eventId);
 	}
-	setLastSeenEventId(threadId, eventId) {
+	updateLastSeenEventIdFromControl(threadId, payload) {
+		const eventId = this.readControlEventId(payload);
 		if (!eventId) return;
 		this.sharedState.lastSeenEventIds.set(threadId, eventId);
 	}
@@ -472,6 +459,24 @@ var IntelligenceAgent = class IntelligenceAgent extends _ag_ui_client.AbstractAg
 		const runnerEventId = metadata.cpki_event_id;
 		return typeof runnerEventId === "string" ? runnerEventId : null;
 	}
+	readControlEventId(payload) {
+		if (!payload || typeof payload !== "object") return null;
+		const latestEventId = payload.latestEventId;
+		return typeof latestEventId === "string" ? latestEventId : null;
+	}
+	applyCanonicalRunIdentity(input, credentials, options) {
+		this.threadId = credentials.threadId;
+		const runId = credentials.runId ?? (options.fallbackToInputRunId ? input.runId : null);
+		this.canonicalRunId = runId;
+		return {
+			...input,
+			threadId: credentials.threadId,
+			...runId === null ? {} : { runId }
+		};
+	}
+	isSocketReconnectExhaustedError(error) {
+		return error instanceof Error && error.message.includes("WebSocket connection failed after");
+	}
 };
 
 //#endregion