@copilotkit/core 1.69.2 → 1.70.0

package/dist/index.umd.js

@@ -166,6 +166,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 //#endregion
 //#region src/intelligence-agent.ts
+	const globalFetch = (...args) => fetch(...args);
 	const CLIENT_AG_UI_EVENT = "ag_ui_event";
 	const REPLAY_COMPLETE_EVENT = "replay_complete";
 	const STREAM_IDLE_EVENT = "stream_idle";
@@ -393,7 +394,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		requestJoinCredentials$(mode, input, replayCursor) {
 			return (0, rxjs.defer)(async () => {
 				try {
-					const response = await fetch(this.buildRuntimeUrl(mode), {
+					var _this$config$fetch;
+					const response = await ((_this$config$fetch = this.config.fetch) !== null && _this$config$fetch !== void 0 ? _this$config$fetch : globalFetch)(this.buildRuntimeUrl(mode), {
 						method: "POST",
 						headers: {
 							"Content-Type": "application/json",
@@ -641,7 +643,12 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			const message = body === null || body === void 0 ? void 0 : body.message;
 			if (typeof message === "string" && message.trim().length > 0) detail = message.trim();
 		} catch (_unused) {}
-		return new Error(detail ? `${base}: ${detail}` : base);
+		const error = new Error(detail ? `${base}: ${detail}` : base);
+		error.runtimeInfoStatus = response.status;
+		return error;
+	}
+	function isRuntimeInfoRequestError(error) {
+		return typeof error === "object" && error !== null && typeof error.runtimeInfoStatus === "number";
 	}
 
 //#endregion
@@ -711,12 +718,12 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 	function isZodError(error) {
 		return error !== null && typeof error === "object" && "name" in error && error.name === "ZodError";
 	}
-	function isAbortError$1(error) {
+	function isAbortError$2(error) {
 		return (error instanceof DOMException || error instanceof Error) && error.name === "AbortError";
 	}
 	function withAbortErrorHandling(observable) {
 		return observable.pipe((0, rxjs_operators.catchError)((error) => {
-			if (isZodError(error) || isAbortError$1(error)) return rxjs.EMPTY;
+			if (isZodError(error) || isAbortError$2(error)) return rxjs.EMPTY;
 			throw error;
 		}));
 	}
@@ -894,7 +901,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				runtimeMode: this.runtimeMode,
 				intelligence: this.intelligence,
 				capabilities: this._capabilities,
-				debug: this.debug
+				debug: this.debug,
+				fetch: this.fetch
 			});
 			cloned.threadId = this.threadId;
 			cloned.setState(this.state);
@@ -968,7 +976,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				url = `${this.runtimeUrl}/info`;
 				init = {};
 			}
-			const response = await fetch(url, {
+			const response = await this.fetch(url, {
 				...init,
 				headers,
 				...this.credentials ? { credentials: this.credentials } : {}
@@ -978,7 +986,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		}
 		async fetchRuntimeInfoAutoDetect(headers) {
 			try {
-				const response = await fetch(`${this.runtimeUrl}/info`, {
+				const response = await this.fetch(`${this.runtimeUrl}/info`, {
 					headers: { ...headers },
 					...this.credentials ? { credentials: this.credentials } : {}
 				});
@@ -989,7 +997,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			} catch (_unused) {}
 			const singleHeaders = { ...headers };
 			if (!singleHeaders["Content-Type"]) singleHeaders["Content-Type"] = "application/json";
-			const response = await fetch(this.runtimeUrl, {
+			const response = await this.fetch(this.runtimeUrl, {
 				method: "POST",
 				headers: singleHeaders,
 				body: JSON.stringify({ method: "info" }),
@@ -1032,7 +1040,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				runtimeUrl: this.runtimeUrl,
 				agentId: routedId,
 				headers: { ...this.headers },
-				credentials: this.credentials
+				credentials: this.credentials,
+				fetch: this.fetch
 			});
 		}
 		syncDelegate(delegate) {
@@ -1072,16 +1081,44 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		return withAbortErrorHandling(_superPropGet(_ProxiedCopilotRuntimeAgent.prototype, "run", this, 2)([input]));
 	}
 
+//#endregion
+//#region src/utils/abort-error.ts
+	const ABORT_MESSAGES = new Set([
+		"Fetch is aborted",
+		"signal is aborted without reason",
+		"component unmounted"
+	]);
+	function isAbortError$1(error) {
+		if (typeof error !== "object" || error === null) return false;
+		const { name, message } = error;
+		if (name === "AbortError") return true;
+		return typeof message === "string" && ABORT_MESSAGES.has(message);
+	}
+
+//#endregion
+//#region src/utils/runtime-request.ts
+	const RUNTIME_REQUEST_WATCHDOG_MS = 1e4;
+	function runtimeRequestMeta(init) {
+		return init === null || init === void 0 ? void 0 : init.ɵruntimeRequest;
+	}
+
 //#endregion
 //#region src/core/agent-registry.ts
 /** Maximum wait for optional Inspector metadata before degrading to absence. */
 	const INSPECTOR_METADATA_REQUEST_TIMEOUT_MS = 5e3;
+	const ɵRUNTIME_PROBE_TIMEOUT_MS = 5e3;
+	function classifyRuntimeRequestFailure(error, meta) {
+		if (meta === null || meta === void 0 ? void 0 : meta.nonCritical) return "ignored";
+		if (isAbortError$1(error) && !(meta === null || meta === void 0 ? void 0 : meta.timedOut)) return "aborted";
+		return "failed";
+	}
 	/** Build case-insensitive JSON headers without mutating the Core snapshot. */
 	function withJsonContentType(headers) {
 		const requestHeaders = new Headers(headers);
 		if (!requestHeaders.has("content-type")) requestHeaders.set("content-type", "application/json");
 		return requestHeaders;
 	}
+	const RUNTIME_ENTITLEMENT_RETRY_DELAY_MS = 5e3;
 	/**
 	* Manages agent registration, lifecycle, and runtime connectivity for CopilotKitCore.
 	* Handles both local development agents and remote runtime agents.
@@ -1092,8 +1129,14 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			_defineProperty(this, "_agents", {});
 			_defineProperty(this, "localAgents", {});
 			_defineProperty(this, "remoteAgents", {});
+			_defineProperty(this, "mintedThreadIds", /* @__PURE__ */ new WeakMap());
 			_defineProperty(this, "_runtimeUrl", void 0);
 			_defineProperty(this, "_connectionInFlight", void 0);
+			_defineProperty(this, "_runtimeConnectionGeneration", 0);
+			_defineProperty(this, "_activeRuntimeConnectionAttempt", void 0);
+			_defineProperty(this, "_runtimeEntitlementRetryTimer", void 0);
+			_defineProperty(this, "_runtimeEntitlementRetryAttemptedKey", void 0);
+			_defineProperty(this, "_runtimeEntitlementRetryPendingKey", void 0);
 			_defineProperty(this, "_runtimeVersion", void 0);
 			_defineProperty(this, "_runtimeConnectionStatus", CopilotKitCoreRuntimeConnectionStatus.Disconnected);
 			_defineProperty(this, "_runtimeTransport", "auto");
@@ -1116,7 +1159,16 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			_defineProperty(this, "_a2uiAgents", void 0);
 			_defineProperty(this, "_openGenerativeUIEnabled", false);
 			_defineProperty(this, "_licenseStatus", void 0);
+			_defineProperty(this, "_runtimeEntitlements", void 0);
 			_defineProperty(this, "_telemetryDisabled", false);
+			_defineProperty(this, "remoteAgentConnections", /* @__PURE__ */ new WeakMap());
+			_defineProperty(this, "runtimeFetch", void 0);
+			_defineProperty(this, "runtimeProbeInFlight", false);
+			_defineProperty(this, "runtimeProbeToken", 0);
+			_defineProperty(this, "runtimeProbeAbortController", void 0);
+			_defineProperty(this, "runtimeRecoveryRunning", false);
+			_defineProperty(this, "runtimeRecoveryPending", false);
+			_defineProperty(this, "runtimeHealthGeneration", 0);
 			_defineProperty(this, "agentOwnHeaders", /* @__PURE__ */ new WeakMap());
 		}
 		/**
@@ -1171,6 +1223,13 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		get licenseStatus() {
 			return this._licenseStatus;
 		}
+		/** Structured Runtime entitlement authority advertised by `/info`. */
+		get runtimeEntitlements() {
+			return this._runtimeEntitlements;
+		}
+		get runtimeEntitlementRetryPending() {
+			return this._runtimeEntitlementRetryPendingKey === this.runtimeConnectionKey();
+		}
 		get telemetryDisabled() {
 			return this._telemetryDisabled;
 		}
@@ -1181,6 +1240,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			this.localAgents = this.assignAgentIds(agents);
 			this.applyHeadersToAgents(this.localAgents);
 			this.applyCredentialsToAgents(this.localAgents);
+			this.applyRuntimeFetchToAgents(this.localAgents);
 			this._agents = this.localAgents;
 		}
 		/**
@@ -1190,9 +1250,13 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			const normalizedRuntimeUrl = runtimeUrl ? runtimeUrl.replace(/\/$/, "") : void 0;
 			if (this._runtimeUrl === normalizedRuntimeUrl) return;
 			this.invalidateInspectorMetadataConnection();
+			this.abandonRuntimeHealthProbe();
+			this.resetRuntimeEntitlementRetry();
+			this._licenseStatus = void 0;
+			this._runtimeEntitlements = void 0;
 			this._runtimeUrl = normalizedRuntimeUrl;
 			if (options === null || options === void 0 ? void 0 : options.deferConnection) return;
-			this.updateRuntimeConnection();
+			this.updateRuntimeConnection({ preserveOnFailure: this.hasLiveRuntimeKnowledgeToProtect() });
 		}
 		/**
 		* Start the initial runtime connection if it has not been started yet.
@@ -1214,9 +1278,41 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		setRuntimeTransport(runtimeTransport) {
 			if (this._requestedTransport === runtimeTransport) return;
 			this.invalidateInspectorMetadataConnection();
+			this.abandonRuntimeHealthProbe();
+			this.resetRuntimeEntitlementRetry();
 			this._requestedTransport = runtimeTransport;
 			this._runtimeTransport = runtimeTransport;
-			this.updateRuntimeConnection();
+			this.updateRuntimeConnection({ preserveOnFailure: this.hasLiveRuntimeKnowledgeToProtect() });
+		}
+		hasLiveRuntimeKnowledgeToProtect() {
+			if (Object.keys(this.remoteAgents).length === 0) return false;
+			return this._runtimeConnectionStatus !== CopilotKitCoreRuntimeConnectionStatus.Connected;
+		}
+		reconcileRecoveredAgents(reported) {
+			const merged = {
+				...this.remoteAgents,
+				...reported
+			};
+			if (Object.keys(reported).length === 0) return merged;
+			for (const [id, agent] of Object.entries(merged)) {
+				if (Object.prototype.hasOwnProperty.call(reported, id)) continue;
+				if (this.carriesConversationState(agent)) continue;
+				delete merged[id];
+			}
+			return merged;
+		}
+		carriesConversationState(agent) {
+			if (agent.messages.length > 0) return true;
+			const mintedThreadId = this.mintedThreadIds.get(agent);
+			return mintedThreadId === void 0 || agent.threadId !== mintedThreadId;
+		}
+		abandonRuntimeHealthProbe() {
+			var _this$runtimeProbeAbo;
+			this.runtimeProbeToken += 1;
+			this.runtimeProbeInFlight = false;
+			this.runtimeHealthGeneration += 1;
+			(_this$runtimeProbeAbo = this.runtimeProbeAbortController) === null || _this$runtimeProbeAbo === void 0 || _this$runtimeProbeAbo.abort();
+			this.runtimeProbeAbortController = void 0;
 		}
 		/**
 		* Set all agents at once (for development use)
@@ -1232,6 +1328,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			};
 			this.applyHeadersToAgents(this._agents);
 			this.applyCredentialsToAgents(this._agents);
+			this.applyRuntimeFetchToAgents(this._agents);
 			this.notifyAgentsChanged();
 		}
 		/**
@@ -1242,6 +1339,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			this.localAgents[id] = agent;
 			this.applyHeadersToAgent(agent);
 			this.applyCredentialsToAgent(agent);
+			this.applyRuntimeFetchToAgent(agent);
 			this._agents = {
 				...this.localAgents,
 				...this.remoteAgents
@@ -1285,6 +1383,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				debug: debug ? (0, _copilotkit_shared.resolveDebugConfig)(debug) : void 0
 			});
 			this.applyHeadersToAgent(agent);
+			this.applyRuntimeFetchToAgent(agent);
 			this.localAgents[agentId] = agent;
 			this._agents = {
 				...this.localAgents,
@@ -1350,6 +1449,46 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				this.applyCredentialsToAgent(agent);
 			});
 		}
+		createRuntimeFetch() {
+			if (!this.runtimeFetch) this.runtimeFetch = (async (input, init) => {
+				const meta = () => runtimeRequestMeta(init);
+				const watchdog = this.armRuntimeRequestWatchdog(meta());
+				try {
+					var _meta;
+					const response = await fetch(input, init);
+					watchdog.clear();
+					this.handleRuntimeRequestOutcome(response.ok ? "ok" : ((_meta = meta()) === null || _meta === void 0 ? void 0 : _meta.nonCritical) ? "ignored" : "failed", watchdog.checked);
+					return response;
+				} catch (error) {
+					watchdog.clear();
+					this.handleRuntimeRequestOutcome(classifyRuntimeRequestFailure(error, meta()), watchdog.checked);
+					throw error;
+				}
+			});
+			return this.runtimeFetch;
+		}
+		armRuntimeRequestWatchdog(meta) {
+			if (typeof window === "undefined" || (meta === null || meta === void 0 ? void 0 : meta.nonCritical) || (meta === null || meta === void 0 ? void 0 : meta.selfBounded)) return {
+				clear: () => {},
+				checked: () => false
+			};
+			let checked = false;
+			const timeoutId = setTimeout(() => {
+				checked = this.handleRuntimeRequestOutcome("failed");
+			}, RUNTIME_REQUEST_WATCHDOG_MS);
+			return {
+				clear: () => clearTimeout(timeoutId),
+				checked: () => checked
+			};
+		}
+		applyRuntimeFetchToAgent(agent) {
+			if (agent instanceof ProxiedCopilotRuntimeAgent) agent.fetch = this.createRuntimeFetch();
+		}
+		applyRuntimeFetchToAgents(agents) {
+			Object.values(agents).forEach((agent) => {
+				this.applyRuntimeFetchToAgent(agent);
+			});
+		}
 		/** Refresh metadata after the Core header snapshot changes. */
 		handleHeadersChanged() {
 			this.inspectorMetadataHeadersGeneration += 1;
@@ -1487,18 +1626,114 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				console.error("Subscriber onInspectorMetadataChanged queue error:", error);
 			});
 		}
+		setRuntimeConnectionStatus(status) {
+			this._runtimeConnectionStatus = status;
+			this.runtimeHealthGeneration += 1;
+		}
+		handleRuntimeRequestOutcome(outcome, alreadyChecked = () => false) {
+			if (outcome === "aborted" || outcome === "ignored") return false;
+			if (outcome === "failed" && alreadyChecked()) return false;
+			if (typeof window === "undefined") return false;
+			if (!this._runtimeUrl) return false;
+			if (outcome === "ok") {
+				this.runtimeHealthGeneration += 1;
+				if (this.runtimeRecoveryRunning) this.runtimeRecoveryPending = true;
+				if (this._runtimeConnectionStatus === CopilotKitCoreRuntimeConnectionStatus.Error) this.recoverRuntimeConnection();
+				return false;
+			}
+			if (this._runtimeConnectionStatus !== CopilotKitCoreRuntimeConnectionStatus.Connected) return false;
+			if (this.runtimeProbeInFlight) return false;
+			this.probeRuntimeReachability();
+			return true;
+		}
+		async fetchRuntimeInfoWithTimeout(abortController, runtimeUrl = this.runtimeUrl, runtimeTransport = this._runtimeTransport) {
+			if (!runtimeUrl) throw new Error("Runtime URL is not set");
+			let timeoutId;
+			const request = this.fetchRuntimeInfo(runtimeUrl, runtimeTransport, abortController.signal);
+			request.catch(() => {});
+			try {
+				const timedOut = new Promise((_resolve, reject) => {
+					timeoutId = setTimeout(() => {
+						abortController.abort();
+						reject(/* @__PURE__ */ new Error(`Runtime did not answer within ${ɵRUNTIME_PROBE_TIMEOUT_MS}ms`));
+					}, ɵRUNTIME_PROBE_TIMEOUT_MS);
+				});
+				return await Promise.race([request, timedOut]);
+			} finally {
+				if (timeoutId !== void 0) clearTimeout(timeoutId);
+			}
+		}
+		async probeRuntimeReachability() {
+			const generation = this.runtimeHealthGeneration;
+			const token = ++this.runtimeProbeToken;
+			this.runtimeProbeInFlight = true;
+			const abortController = new AbortController();
+			this.runtimeProbeAbortController = abortController;
+			try {
+				await this.fetchRuntimeInfoWithTimeout(abortController);
+			} catch (error) {
+				if (generation !== this.runtimeHealthGeneration) return;
+				await this.markRuntimeUnreachable(error instanceof Error ? error : new Error(String(error)));
+			} finally {
+				if (this.runtimeProbeAbortController === abortController) this.runtimeProbeAbortController = void 0;
+				if (this.runtimeProbeToken === token) this.runtimeProbeInFlight = false;
+			}
+		}
+		async markRuntimeUnreachable(error) {
+			this.setRuntimeConnectionStatus(CopilotKitCoreRuntimeConnectionStatus.Error);
+			await this.notifyRuntimeStatusChanged(CopilotKitCoreRuntimeConnectionStatus.Error);
+			const runtimeStatus = isRuntimeInfoRequestError(error) ? error.runtimeInfoStatus : void 0;
+			_copilotkit_shared.logger.warn(runtimeStatus === void 0 ? `Runtime did not answer the identification request (${this._runtimeUrl}/info): ${error.message}. The runtime appears to be unreachable.` : `Runtime answered the identification request with status ${runtimeStatus} (${this._runtimeUrl}/info): ${error.message}. The runtime is reachable but refused the request — check credentials and authorisation before addresses and ports.`);
+			await this.core.emitError({
+				error,
+				code: CopilotKitCoreErrorCode.RUNTIME_INFO_FETCH_FAILED,
+				context: {
+					runtimeUrl: this._runtimeUrl,
+					reason: runtimeStatus === void 0 ? "no-answer" : "answered",
+					...runtimeStatus === void 0 ? {} : { runtimeStatus }
+				}
+			});
+		}
+		async recoverRuntimeConnection() {
+			if (this.runtimeRecoveryRunning) {
+				this.runtimeRecoveryPending = true;
+				return;
+			}
+			this.runtimeRecoveryRunning = true;
+			try {
+				do {
+					this.runtimeRecoveryPending = false;
+					await this.updateRuntimeConnection({
+						preserveOnFailure: true,
+						recovery: true
+					});
+				} while (this.runtimeRecoveryPending && this._runtimeConnectionStatus !== CopilotKitCoreRuntimeConnectionStatus.Connected);
+			} finally {
+				this.runtimeRecoveryRunning = false;
+				this.runtimeRecoveryPending = false;
+			}
+		}
 		/**
 		* Update runtime connection and fetch remote agents
 		*/
-		async updateRuntimeConnection() {
-			var _this$_runtimeUrl;
+		async updateRuntimeConnection(options) {
 			if (typeof window === "undefined") return;
-			const key = `${(_this$_runtimeUrl = this._runtimeUrl) !== null && _this$_runtimeUrl !== void 0 ? _this$_runtimeUrl : ""}::${this._requestedTransport}`;
+			const key = this.runtimeConnectionKey();
 			const inFlight = this._connectionInFlight;
-			if (inFlight && inFlight.key === key) return inFlight.promise;
-			const promise = this.performRuntimeConnection();
-			this._connectionInFlight = {
+			if (inFlight && inFlight.attempt.key === key && this.isCurrentRuntimeConnection(inFlight.attempt)) return inFlight.promise;
+			const attempt = {
 				key,
+				generation: ++this._runtimeConnectionGeneration
+			};
+			this._activeRuntimeConnectionAttempt = attempt;
+			const promise = this.performRuntimeConnection({
+				attempt,
+				runtimeUrl: this._runtimeUrl,
+				transport: this._runtimeTransport,
+				options
+			});
+			this._connectionInFlight = {
+				attempt,
 				promise
 			};
 			promise.finally(() => {
@@ -1507,10 +1742,66 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			});
 			return promise;
 		}
-		async performRuntimeConnection() {
-			if (!this.runtimeUrl) {
+		/** Return the stable key that scopes connection and entitlement retries. */
+		runtimeConnectionKey() {
+			var _this$_runtimeUrl;
+			return `${(_this$_runtimeUrl = this._runtimeUrl) !== null && _this$_runtimeUrl !== void 0 ? _this$_runtimeUrl : ""}::${this._requestedTransport}`;
+		}
+		/** Return whether a proxy still targets this Runtime connection. */
+		canReuseRuntimeAgent(agent, runtimeUrl, transport) {
+			if (!runtimeUrl) return false;
+			const connection = this.remoteAgentConnections.get(agent);
+			return (connection === null || connection === void 0 ? void 0 : connection.runtimeUrl) === runtimeUrl.replace(/\/$/, "") && connection.transport === transport;
+		}
+		/** Return whether an async attempt still owns the active Runtime state. */
+		isCurrentRuntimeConnection(attempt) {
+			var _this$_activeRuntimeC;
+			return ((_this$_activeRuntimeC = this._activeRuntimeConnectionAttempt) === null || _this$_activeRuntimeC === void 0 ? void 0 : _this$_activeRuntimeC.generation) === attempt.generation && this.runtimeConnectionKey() === attempt.key;
+		}
+		/** Cancel a pending entitlement retry and allow a new target to retry. */
+		resetRuntimeEntitlementRetry() {
+			if (this._runtimeEntitlementRetryTimer !== void 0) {
+				clearTimeout(this._runtimeEntitlementRetryTimer);
+				this._runtimeEntitlementRetryTimer = void 0;
+			}
+			this._runtimeEntitlementRetryAttemptedKey = void 0;
+			this._runtimeEntitlementRetryPendingKey = void 0;
+		}
+		/** Schedule one retry after Runtime's short failed-entitlement cache. */
+		updateRuntimeEntitlementRetry(runtimeEntitlements, attempt) {
+			if (!this.isCurrentRuntimeConnection(attempt)) return;
+			const { key } = attempt;
+			if ((runtimeEntitlements === null || runtimeEntitlements === void 0 ? void 0 : runtimeEntitlements.status) === "ready" || (runtimeEntitlements === null || runtimeEntitlements === void 0 ? void 0 : runtimeEntitlements.error.retryable) !== true) {
+				this.resetRuntimeEntitlementRetry();
+				return;
+			}
+			if (this._runtimeEntitlementRetryTimer !== void 0) return;
+			if (this._runtimeEntitlementRetryAttemptedKey === key) {
+				this._runtimeEntitlementRetryPendingKey = void 0;
+				return;
+			}
+			this._runtimeEntitlementRetryAttemptedKey = key;
+			this._runtimeEntitlementRetryPendingKey = key;
+			this._runtimeEntitlementRetryTimer = setTimeout(() => {
+				this._runtimeEntitlementRetryTimer = void 0;
+				this.executeRuntimeEntitlementRetry(attempt).catch((error) => {
+					const message = error instanceof Error ? error.message : JSON.stringify(error);
+					_copilotkit_shared.logger.warn(`Failed to retry runtime info (${this.runtimeUrl}/info): ${message}`);
+				});
+			}, RUNTIME_ENTITLEMENT_RETRY_DELAY_MS);
+		}
+		/** Start the bounded retry after the original connection has settled. */
+		async executeRuntimeEntitlementRetry(attempt) {
+			const inFlight = this._connectionInFlight;
+			if ((inFlight === null || inFlight === void 0 ? void 0 : inFlight.attempt.generation) === attempt.generation) await inFlight.promise;
+			if (!this._runtimeUrl || !this.isCurrentRuntimeConnection(attempt)) return;
+			await this.updateRuntimeConnection();
+		}
+		async performRuntimeConnection({ attempt, runtimeUrl, transport, options }) {
+			const { key } = attempt;
+			if (!runtimeUrl) {
 				this.invalidateInspectorMetadataConnection();
-				this._runtimeConnectionStatus = CopilotKitCoreRuntimeConnectionStatus.Disconnected;
+				this.setRuntimeConnectionStatus(CopilotKitCoreRuntimeConnectionStatus.Disconnected);
 				this._runtimeVersion = void 0;
 				this._audioFileTranscriptionEnabled = false;
 				this._runtimeMode = _copilotkit_shared.RUNTIME_MODE_SSE;
@@ -1520,34 +1811,40 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				this._a2uiEnabled = false;
 				this._a2uiAgents = void 0;
 				this._openGenerativeUIEnabled = false;
+				this._licenseStatus = void 0;
+				this._runtimeEntitlements = void 0;
 				this.remoteAgents = {};
 				this._agents = this.localAgents;
 				await this.notifyRuntimeStatusChanged(CopilotKitCoreRuntimeConnectionStatus.Disconnected);
+				if (!this.isCurrentRuntimeConnection(attempt)) return;
 				await this.notifyAgentsChanged();
 				return;
 			}
 			const inspectorMetadataConnectionGeneration = this.inspectorMetadataConnectionGeneration;
-			this._runtimeConnectionStatus = CopilotKitCoreRuntimeConnectionStatus.Connecting;
+			this.setRuntimeConnectionStatus(CopilotKitCoreRuntimeConnectionStatus.Connecting);
+			const runtimeHealthGeneration = this.runtimeHealthGeneration;
 			await this.notifyRuntimeStatusChanged(CopilotKitCoreRuntimeConnectionStatus.Connecting);
+			if (!this.isCurrentRuntimeConnection(attempt)) return;
 			try {
 				var _runtimeInfoResponse$2, _runtimeInfoResponse$3, _ref, _a2uiInfo$enabled, _runtimeInfoResponse$4, _runtimeInfoResponse$5;
 				if (inspectorMetadataConnectionGeneration !== this.inspectorMetadataConnectionGeneration) return;
-				const { runtimeInfo: runtimeInfoResponse, resolvedTransport } = await this.fetchRuntimeInfo();
-				if (inspectorMetadataConnectionGeneration !== this.inspectorMetadataConnectionGeneration) return;
+				const { runtimeInfo: runtimeInfoResponse, resolvedTransport } = (options === null || options === void 0 ? void 0 : options.recovery) ? await this.fetchRuntimeInfoWithTimeout(new AbortController(), runtimeUrl, transport) : await this.fetchRuntimeInfo(runtimeUrl, transport);
+				if (!this.isCurrentRuntimeConnection(attempt) || inspectorMetadataConnectionGeneration !== this.inspectorMetadataConnectionGeneration) return;
 				this._runtimeTransport = resolvedTransport;
 				const { version, ...runtimeInfo } = runtimeInfoResponse;
 				const credentials = this.core.credentials;
 				const rawDebug = this.core.debug;
-				this.remoteAgents = Object.fromEntries(Object.entries(runtimeInfo.agents).map(([id, { description, capabilities }]) => {
+				const agents = Object.fromEntries(Object.entries(runtimeInfo.agents).map(([id, { description, capabilities }]) => {
 					var _runtimeInfoResponse$;
 					const existing = Object.prototype.hasOwnProperty.call(this.remoteAgents, id) ? this.remoteAgents[id] : void 0;
-					if (existing instanceof ProxiedCopilotRuntimeAgent) {
+					if (existing instanceof ProxiedCopilotRuntimeAgent && this.canReuseRuntimeAgent(existing, runtimeUrl, this._runtimeTransport)) {
 						this.applyHeadersToAgent(existing);
 						this.applyCredentialsToAgent(existing);
+						this.applyRuntimeFetchToAgent(existing);
 						return [id, existing];
 					}
 					const agent = new ProxiedCopilotRuntimeAgent({
-						runtimeUrl: this.runtimeUrl,
+						runtimeUrl,
 						agentId: id,
 						description,
 						transport: this._runtimeTransport,
@@ -1558,13 +1855,25 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 						debug: rawDebug ? (0, _copilotkit_shared.resolveDebugConfig)(rawDebug) : void 0
 					});
 					this.applyHeadersToAgent(agent);
+					this.applyRuntimeFetchToAgent(agent);
+					this.mintedThreadIds.set(agent, agent.threadId);
+					if ((options === null || options === void 0 ? void 0 : options.preserveOnFailure) === true && existing) {
+						agent.threadId = existing.threadId;
+						agent.setState(existing.state);
+						agent.setMessages([...existing.messages]);
+					}
+					this.remoteAgentConnections.set(agent, {
+						runtimeUrl,
+						transport: this._runtimeTransport
+					});
 					return [id, agent];
 				}));
+				this.remoteAgents = (options === null || options === void 0 ? void 0 : options.recovery) ? this.reconcileRecoveredAgents(agents) : agents;
 				this._agents = {
 					...this.localAgents,
 					...this.remoteAgents
 				};
-				this._runtimeConnectionStatus = CopilotKitCoreRuntimeConnectionStatus.Connected;
+				this.setRuntimeConnectionStatus(CopilotKitCoreRuntimeConnectionStatus.Connected);
 				this._runtimeVersion = version;
 				this._audioFileTranscriptionEnabled = (_runtimeInfoResponse$2 = runtimeInfoResponse.audioFileTranscriptionEnabled) !== null && _runtimeInfoResponse$2 !== void 0 ? _runtimeInfoResponse$2 : false;
 				this._runtimeMode = (_runtimeInfoResponse$3 = runtimeInfoResponse.mode) !== null && _runtimeInfoResponse$3 !== void 0 ? _runtimeInfoResponse$3 : _copilotkit_shared.RUNTIME_MODE_SSE;
@@ -1579,54 +1888,67 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				this._a2uiAgents = (a2uiInfo === null || a2uiInfo === void 0 ? void 0 : a2uiInfo.enabled) ? a2uiInfo.agents : void 0;
 				this._openGenerativeUIEnabled = (_runtimeInfoResponse$4 = runtimeInfoResponse.openGenerativeUIEnabled) !== null && _runtimeInfoResponse$4 !== void 0 ? _runtimeInfoResponse$4 : false;
 				this._licenseStatus = runtimeInfoResponse.licenseStatus;
+				this._runtimeEntitlements = runtimeInfoResponse.runtimeEntitlements;
+				this.updateRuntimeEntitlementRetry(runtimeInfoResponse.runtimeEntitlements, attempt);
 				this._telemetryDisabled = (_runtimeInfoResponse$5 = runtimeInfoResponse.telemetryDisabled) !== null && _runtimeInfoResponse$5 !== void 0 ? _runtimeInfoResponse$5 : false;
 				await this.notifyRuntimeStatusChanged(CopilotKitCoreRuntimeConnectionStatus.Connected);
+				if (!this.isCurrentRuntimeConnection(attempt)) return;
 				await this.notifyAgentsChanged();
 				if (inspectorMetadataConnectionGeneration !== this.inspectorMetadataConnectionGeneration || this._runtimeConnectionStatus !== CopilotKitCoreRuntimeConnectionStatus.Connected) return;
 				this.inspectorMetadataRefreshReady = true;
 				if (this._inspectorMetadataSupported) this.refreshInspectorMetadata();
 			} catch (error) {
-				if (inspectorMetadataConnectionGeneration !== this.inspectorMetadataConnectionGeneration) return;
-				this.invalidateInspectorMetadataConnection();
-				this._runtimeConnectionStatus = CopilotKitCoreRuntimeConnectionStatus.Error;
-				this._runtimeVersion = void 0;
-				this._audioFileTranscriptionEnabled = false;
-				this._runtimeMode = _copilotkit_shared.RUNTIME_MODE_SSE;
-				this._intelligence = void 0;
-				this._threadEndpoints = void 0;
-				this._suggestions = void 0;
-				this._a2uiEnabled = false;
-				this._a2uiAgents = void 0;
-				this._openGenerativeUIEnabled = false;
-				this.remoteAgents = {};
-				this._agents = this.localAgents;
-				await this.notifyRuntimeStatusChanged(CopilotKitCoreRuntimeConnectionStatus.Error);
-				await this.notifyAgentsChanged();
+				if (!this.isCurrentRuntimeConnection(attempt) || inspectorMetadataConnectionGeneration !== this.inspectorMetadataConnectionGeneration) return;
+				const boundedEntitlementRetryFailed = this._runtimeEntitlementRetryTimer === void 0 && this._runtimeEntitlementRetryAttemptedKey === key && this._runtimeEntitlementRetryPendingKey === key;
+				if (boundedEntitlementRetryFailed) this._runtimeEntitlementRetryPendingKey = void 0;
+				if (options === null || options === void 0 ? void 0 : options.preserveOnFailure) {
+					if ((options === null || options === void 0 ? void 0 : options.recovery) && runtimeHealthGeneration !== this.runtimeHealthGeneration) return;
+					this.setRuntimeConnectionStatus(CopilotKitCoreRuntimeConnectionStatus.Error);
+					await this.notifyRuntimeStatusChanged(CopilotKitCoreRuntimeConnectionStatus.Error);
+				} else {
+					this.invalidateInspectorMetadataConnection();
+					this.setRuntimeConnectionStatus(CopilotKitCoreRuntimeConnectionStatus.Error);
+					this._runtimeVersion = void 0;
+					this._audioFileTranscriptionEnabled = false;
+					this._runtimeMode = _copilotkit_shared.RUNTIME_MODE_SSE;
+					this._intelligence = void 0;
+					this._threadEndpoints = void 0;
+					this._suggestions = void 0;
+					this._a2uiEnabled = false;
+					this._a2uiAgents = void 0;
+					this._openGenerativeUIEnabled = false;
+					if (!boundedEntitlementRetryFailed) {
+						this._licenseStatus = void 0;
+						this._runtimeEntitlements = void 0;
+					}
+					this.remoteAgents = {};
+					this._agents = this.localAgents;
+					await this.notifyRuntimeStatusChanged(CopilotKitCoreRuntimeConnectionStatus.Error);
+					await this.notifyAgentsChanged();
+				}
 				const message = error instanceof Error ? error.message : JSON.stringify(error);
-				_copilotkit_shared.logger.warn(`Failed to load runtime info (${this.runtimeUrl}/info): ${message}`);
+				_copilotkit_shared.logger.warn(`Failed to load runtime info (${runtimeUrl}/info): ${message}`);
 				const runtimeError = error instanceof Error ? error : new Error(String(error));
 				await this.core.emitError({
 					error: runtimeError,
 					code: CopilotKitCoreErrorCode.RUNTIME_INFO_FETCH_FAILED,
-					context: { runtimeUrl: this.runtimeUrl }
+					context: { runtimeUrl }
 				});
 			}
 		}
-		async fetchRuntimeInfo() {
-			const runtimeUrl = this.runtimeUrl;
-			if (!runtimeUrl) throw new Error("Runtime URL is not set");
+		async fetchRuntimeInfo(runtimeUrl, runtimeTransport, signal) {
 			const baseHeaders = this.core.headers;
 			const credentials = this.core.credentials;
 			const headers = { ...baseHeaders };
-			const runtimeTransport = this._runtimeTransport;
 			if (runtimeTransport === "single") return {
-				runtimeInfo: await this.fetchRuntimeInfoSingle(runtimeUrl, headers, credentials),
+				runtimeInfo: await this.fetchRuntimeInfoSingle(runtimeUrl, headers, credentials, signal),
 				resolvedTransport: "single"
 			};
-			if (runtimeTransport === "auto") return this.fetchRuntimeInfoAutoDetect(runtimeUrl, headers, credentials);
+			if (runtimeTransport === "auto") return this.fetchRuntimeInfoAutoDetect(runtimeUrl, headers, credentials, signal);
 			const response = await fetch(`${runtimeUrl}/info`, {
 				headers,
-				...credentials ? { credentials } : {}
+				...credentials ? { credentials } : {},
+				...signal ? { signal } : {}
 			});
 			if (!response.ok) throw await runtimeInfoError(response);
 			return {
@@ -1634,12 +1956,13 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				resolvedTransport: "rest"
 			};
 		}
-		async fetchRuntimeInfoSingle(runtimeUrl, headers, credentials) {
+		async fetchRuntimeInfoSingle(runtimeUrl, headers, credentials, signal) {
 			const response = await fetch(runtimeUrl, {
 				method: "POST",
 				headers: withJsonContentType(headers),
 				body: JSON.stringify({ method: "info" }),
-				...credentials ? { credentials } : {}
+				...credentials ? { credentials } : {},
+				...signal ? { signal } : {}
 			});
 			if (!response.ok) throw await runtimeInfoError(response);
 			return await response.json();
@@ -1649,11 +1972,12 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		* The caller commits the detected transport only after confirming this
 		* connection attempt is still current.
 		*/
-		async fetchRuntimeInfoAutoDetect(runtimeUrl, headers, credentials) {
+		async fetchRuntimeInfoAutoDetect(runtimeUrl, headers, credentials, signal) {
 			try {
 				const response = await fetch(`${runtimeUrl}/info`, {
 					headers: { ...headers },
-					...credentials ? { credentials } : {}
+					...credentials ? { credentials } : {},
+					...signal ? { signal } : {}
 				});
 				if (response.status >= 200 && response.status < 300) return {
 					runtimeInfo: await response.json(),
@@ -1661,7 +1985,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				};
 			} catch (_unused2) {}
 			return {
-				runtimeInfo: await this.fetchRuntimeInfoSingle(runtimeUrl, { ...headers }, credentials),
+				runtimeInfo: await this.fetchRuntimeInfoSingle(runtimeUrl, { ...headers }, credentials, signal),
 				resolvedTransport: "single"
 			};
 		}
@@ -2183,13 +2507,21 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 	*/
 	const MAX_FOLLOW_UP_DEPTH = 100;
 	/**
+	* Name of the catch-all frontend tool. A tool registered under this name
+	* handles any tool call that has no exact match (see `executeWildcardTool`),
+	* and is never advertised to the agent.
+	*/
+	const WILDCARD_TOOL_NAME = "*";
+	/**
 	* Handles agent execution, tool calling, and agent connectivity for CopilotKitCore.
 	* Manages the complete lifecycle of agent runs including tool execution and follow-ups.
 	*/
 	var RunHandler = class {
 		constructor(core) {
 			this.core = core;
-			_defineProperty(this, "_tools", []);
+			_defineProperty(this, "_propTools", []);
+			_defineProperty(this, "_hookTools", /* @__PURE__ */ new Map());
+			_defineProperty(this, "_cachedMergedTools", null);
 			_defineProperty(this, "_catalogComponents", []);
 			_defineProperty(this, "_disabledCatalogComponents", /* @__PURE__ */ new Set());
 			_defineProperty(this, "_disabledToolKeys", /* @__PURE__ */ new Set());
@@ -2230,35 +2562,49 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 			return anonymousId;
 		}
 		/**
-		* Get all tools as a readonly array
+		* Get all tools as a readonly array: provider-owned tools in registration
+		* order, with imperatively-added tools appended and taking precedence over a
+		* provider tool of the same name + agentId.
 		*/
 		get tools() {
-			return this._tools;
+			if (this._hookTools.size === 0) return this._propTools;
+			if (this._cachedMergedTools) return this._cachedMergedTools;
+			const merged = /* @__PURE__ */ new Map();
+			for (const tool of this._propTools) merged.set(this.capabilityKey(tool.name, tool.agentId), tool);
+			for (const [key, tool] of this._hookTools) merged.set(key, tool);
+			this._cachedMergedTools = Array.from(merged.values());
+			return this._cachedMergedTools;
 		}
 		/**
 		* Initialize with tools
 		*/
 		initialize(tools) {
-			this._tools = tools;
+			this._propTools = [...tools];
+			this._cachedMergedTools = null;
 		}
 		/**
-		* Add a tool to the registry
+		* Add a tool to the registry. Survives provider re-syncs ({@link setTools}),
+		* and shadows a provider tool of the same name + agentId.
 		*/
 		addTool(tool) {
-			if (this._tools.findIndex((t) => t.name === tool.name && t.agentId === tool.agentId) !== -1) {
+			const key = this.capabilityKey(tool.name, tool.agentId);
+			if (this._hookTools.has(key)) {
 				_copilotkit_shared.logger.warn(`Tool already exists: '${tool.name}' for agent '${tool.agentId || "global"}', skipping.`);
 				return;
 			}
-			this._tools.push(tool);
+			this._hookTools.set(key, tool);
+			this._cachedMergedTools = null;
 		}
 		/**
 		* Remove a tool by name and optionally by agentId
 		*/
 		removeTool(id, agentId) {
-			this._tools = this._tools.filter((tool) => {
+			this._hookTools.delete(this.capabilityKey(id, agentId));
+			this._propTools = this._propTools.filter((tool) => {
 				if (agentId !== void 0) return !(tool.name === id && tool.agentId === agentId);
 				return !(tool.name === id && !tool.agentId);
 			});
+			this._cachedMergedTools = null;
 		}
 		/**
 		* Get a tool by name and optionally by agentId.
@@ -2267,17 +2613,20 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		*/
 		getTool(params) {
 			const { toolName, agentId } = params;
+			const tools = this.tools;
 			if (agentId) {
-				const agentTool = this._tools.find((tool) => tool.name === toolName && tool.agentId === agentId);
+				const agentTool = tools.find((tool) => tool.name === toolName && tool.agentId === agentId);
 				if (agentTool) return agentTool;
 			}
-			return this._tools.find((tool) => tool.name === toolName && !tool.agentId);
+			return tools.find((tool) => tool.name === toolName && !tool.agentId);
 		}
 		/**
-		* Set all tools at once. Replaces existing tools.
+		* Set all provider-owned tools at once. Replaces the previous provider set;
+		* tools registered via {@link addTool} are unaffected.
 		*/
 		setTools(tools) {
-			this._tools = [...tools];
+			this._propTools = [...tools];
+			this._cachedMergedTools = null;
 		}
 		/**
 		* Return the registered A2UI catalog components (readonly).
@@ -2346,7 +2695,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				});
 			} catch (error) {
 				const connectError = error instanceof Error ? error : new Error(String(error));
-				if (!(connectError.name === "AbortError" || connectError.message === "Fetch is aborted" || connectError.message === "signal is aborted without reason" || connectError.message === "component unmounted")) {
+				if (!isAbortError$1(connectError)) {
 					const context = {};
 					if (agent.agentId) context.agentId = agent.agentId;
 					if (incomingThreadId) context.threadId = incomingThreadId;
@@ -2463,7 +2812,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 					const getWildcardTool = () => {
 						if (tool || wildcardTool) return wildcardTool;
 						wildcardTool = this.getTool({
-							toolName: "*",
+							toolName: WILDCARD_TOOL_NAME,
 							agentId: agent.agentId
 						});
 						return wildcardTool;
@@ -2832,7 +3181,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		* Build frontend tools for an agent
 		*/
 		buildFrontendTools(agentId) {
-			return this._tools.filter((tool) => tool.available !== false && tool.available !== "disabled" && (!tool.agentId || tool.agentId === agentId) && this.isToolEnabled(tool.name, tool.agentId)).map((tool) => {
+			return this.tools.filter((tool) => tool.name !== WILDCARD_TOOL_NAME && tool.available !== false && tool.available !== "disabled" && (!tool.agentId || tool.agentId === agentId) && this.isToolEnabled(tool.name, tool.agentId)).map((tool) => {
 				var _tool$description;
 				return {
 					name: tool.name,
@@ -2987,9 +3336,10 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		subscribeToAgent(agent) {
 			if (!agent.agentId) return;
 			const agentId = agent.agentId;
-			const existingUnsubscribe = this.agentSubscriptions.get(agentId);
-			if (existingUnsubscribe) {
-				existingUnsubscribe();
+			const existing = this.agentSubscriptions.get(agentId);
+			if (existing) {
+				if (existing.agent === agent) return;
+				existing.unsubscribe();
 				this.agentSubscriptions.delete(agentId);
 			}
 			let revoked = false;
@@ -3144,19 +3494,22 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 					if (!input) this.pruneRawEvents(agent.agentId, agent.threadId, messages);
 				}
 			});
-			this.agentSubscriptions.set(agentId, () => {
-				revoked = true;
-				this.pendingContinuations.delete(agent);
-				unsubscribe();
+			this.agentSubscriptions.set(agentId, {
+				agent,
+				unsubscribe: () => {
+					revoked = true;
+					this.pendingContinuations.delete(agent);
+					unsubscribe();
+				}
 			});
 		}
 		/**
 		* Unsubscribe an agent's subscription.
 		*/
 		unsubscribeFromAgent(agentId) {
-			const unsubscribe = this.agentSubscriptions.get(agentId);
-			if (unsubscribe) {
-				unsubscribe();
+			const existing = this.agentSubscriptions.get(agentId);
+			if (existing) {
+				existing.unsubscribe();
 				this.agentSubscriptions.delete(agentId);
 			}
 			this.rawEventByMessage.delete(agentId);
@@ -4703,6 +5056,9 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		get runtimeConnectionStatus() {
 			return this.agentRegistry.runtimeConnectionStatus;
 		}
+		get ɵruntimeFetch() {
+			return this.agentRegistry.createRuntimeFetch();
+		}
 		get audioFileTranscriptionEnabled() {
 			return this.agentRegistry.audioFileTranscriptionEnabled;
 		}
@@ -4742,6 +5098,14 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 		get licenseStatus() {
 			return this.agentRegistry.licenseStatus;
 		}
+		/** Structured Runtime entitlement authority advertised by `/info`. */
+		get runtimeEntitlements() {
+			return this.agentRegistry.runtimeEntitlements;
+		}
+		/** Whether Core still has a bounded Runtime entitlement retry to settle. */
+		get runtimeEntitlementRetryPending() {
+			return this.agentRegistry.runtimeEntitlementRetryPending;
+		}
 		get telemetryDisabled() {
 			return this.agentRegistry.telemetryDisabled;
 		}
@@ -5731,22 +6095,34 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 	}
 	function threadFromFetch(input, init) {
 		return new rxjs.Observable((subscriber) => {
-			const { fetch: fetchImpl, selector, signal, ...requestInit } = init;
+			const { fetch: fetchImpl, selector, signal, timeoutMs, nonCritical, ...requestInit } = init;
 			const controller = new AbortController();
+			const runtimeRequest = {
+				...nonCritical ? { nonCritical: true } : {},
+				...timeoutMs === void 0 ? {} : { selfBounded: true }
+			};
+			let timedOut = false;
 			const abortRequest = () => controller.abort();
 			if (signal === null || signal === void 0 ? void 0 : signal.aborted) abortRequest();
 			else signal === null || signal === void 0 || signal.addEventListener("abort", abortRequest, { once: true });
+			const timeoutId = timeoutMs === void 0 ? void 0 : setTimeout(() => {
+				timedOut = true;
+				runtimeRequest.timedOut = true;
+				abortRequest();
+			}, timeoutMs);
 			fetchImpl(input, {
 				...requestInit,
-				signal: controller.signal
+				signal: controller.signal,
+				ɵruntimeRequest: runtimeRequest
 			}).then((response) => selector(response)).then((value) => {
 				if (subscriber.closed) return;
 				subscriber.next(value);
 				subscriber.complete();
 			}).catch((error) => {
-				if (!subscriber.closed) subscriber.error(error);
+				if (!subscriber.closed) subscriber.error(timedOut ? /* @__PURE__ */ new Error("Request timed out") : error);
 			});
 			return () => {
+				if (timeoutId !== void 0) clearTimeout(timeoutId);
 				signal === null || signal === void 0 || signal.removeEventListener("abort", abortRequest);
 				abortRequest();
 			};
@@ -5764,14 +6140,10 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 					return response.json();
 				},
 				fetch: environment.fetch,
+				timeoutMs: REQUEST_TIMEOUT_MS,
 				method: "GET",
 				headers: { ...context.headers }
-			}).pipe((0, rxjs_operators.timeout)({
-				first: REQUEST_TIMEOUT_MS,
-				with: () => {
-					throw new Error("Request timed out");
-				}
-			}), (0, rxjs_operators.map)((data) => {
+			}).pipe((0, rxjs_operators.map)((data) => {
 				var _data$nextCursor;
 				return threadRestEvents.listSucceeded({
 					sessionId,
@@ -5795,18 +6167,15 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 					return response.json();
 				},
 				fetch: environment.fetch,
+				timeoutMs: REQUEST_TIMEOUT_MS,
+				nonCritical: true,
 				method: "POST",
 				headers: {
 					...context.headers,
 					"Content-Type": "application/json"
 				},
 				body: JSON.stringify({})
-			}).pipe((0, rxjs_operators.timeout)({
-				first: REQUEST_TIMEOUT_MS,
-				with: () => {
-					throw new Error("Request timed out");
-				}
-			}), (0, rxjs_operators.map)((data) => {
+			}).pipe((0, rxjs_operators.map)((data) => {
 				if (typeof data.joinToken !== "string" || data.joinToken.length === 0) throw new Error("missing joinToken");
 				return threadRestEvents.metadataCredentialsSucceeded({
 					sessionId,
@@ -5943,14 +6312,10 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 							return response.json();
 						},
 						fetch: environment.fetch,
+						timeoutMs: REQUEST_TIMEOUT_MS,
 						method: "GET",
 						headers: { ...context.headers }
-					}).pipe((0, rxjs_operators.timeout)({
-						first: REQUEST_TIMEOUT_MS,
-						with: () => {
-							throw new Error("Request timed out");
-						}
-					}), (0, rxjs_operators.map)((data) => {
+					}).pipe((0, rxjs_operators.map)((data) => {
 						var _data$nextCursor2;
 						return threadRestEvents.nextPageSucceeded({
 							sessionId: state.sessionId,
@@ -6120,6 +6485,12 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 	* hardcoding the threshold separately from production.
 	*/
 	const ɵMAX_SOCKET_RETRIES = MAX_SOCKET_RETRIES;
+	/**
+	* How long a thread REST request is given before the store gives up on it.
+	* Exposed for tests for the same reason as {@link ɵMAX_SOCKET_RETRIES}: a
+	* separately hardcoded copy silently drifts away from this one.
+	*/
+	const ɵTHREAD_REQUEST_TIMEOUT_MS = REQUEST_TIMEOUT_MS;
 
 //#endregion
 //#region src/features.ts
@@ -6438,6 +6809,8 @@ exports.select = select;
 exports.ɵCOPILOTKIT_FEATURES = ɵCOPILOTKIT_FEATURES;
 exports.ɵInterruptState = ɵInterruptState;
 exports.ɵMAX_SOCKET_RETRIES = ɵMAX_SOCKET_RETRIES;
+exports.ɵRUNTIME_PROBE_TIMEOUT_MS = ɵRUNTIME_PROBE_TIMEOUT_MS;
+exports.ɵTHREAD_REQUEST_TIMEOUT_MS = ɵTHREAD_REQUEST_TIMEOUT_MS;
 exports.ɵcreateMemoryStore = createMemoryStore;
 exports.ɵcreateThreadSelectors = ɵcreateThreadSelectors;
 exports.ɵcreateThreadStore = createThreadStore;