@copilotkit/react-core 1.69.3 → 1.70.1

package/dist/index.umd.js

@@ -688,7 +688,6 @@ react_markdown = __toESM(react_markdown);
 			newMessages: []
 		};
 	}
-	const PROTOCOL_VERSION = "2025-06-18";
 	function buildSandboxHTML(extraCspDomains) {
 		const baseScriptSrc = "'self' 'wasm-unsafe-eval' 'unsafe-inline' 'unsafe-eval' blob: data: http://localhost:* https://localhost:*";
 		const baseFrameSrc = "* blob: data: http://localhost:* https://localhost:*";
@@ -800,6 +799,13 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 		}
 	};
 	const mcpAppsRequestQueue = new MCPAppsRequestQueue();
+	const MCP_OPEN_LINK_BLOCKED_SCHEMES = new Set([
+		"javascript:",
+		"data:",
+		"vbscript:",
+		"blob:",
+		"file:"
+	]);
 	/**
 	* Activity type for MCP Apps events - must match the middleware's MCPAppsActivityType
 	*/
@@ -815,18 +821,32 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 		serverId: zod.z.string().optional(),
 		toolInput: zod.z.record(zod.z.string(), zod.z.unknown()).optional()
 	});
-	function isRequest(msg) {
-		return "id" in msg && "method" in msg;
-	}
-	function isNotification(msg) {
-		return !("id" in msg) && "method" in msg;
-	}
 	/**
 	* MCP Apps Extension Activity Renderer
 	*
 	* Renders MCP Apps UI in a sandboxed iframe with full protocol support.
 	* Fetches resource content on-demand via proxied MCP requests.
 	*/
+	/**
+	* Permissive `ui/message` schema. ext-apps restricts the request to
+	* `role: "user"` with no `followUp`, but CopilotKit intentionally extends
+	* `ui/message` with `role` ("user" | "assistant") and `followUp` (documented
+	* behavior with dedicated tests). We register our own handler (instead of the
+	* bridge's strict `onmessage`) so those extensions survive the migration.
+	*
+	* Going forward, widgets SHOULD pass the extensions under
+	* `params._meta.copilotkit`; the top-level `role`/`followUp` fields are the
+	* legacy channel, kept for backward compatibility and slated for deprecation.
+	*/
+	const CopilotKitUiMessageSchema = zod.z.object({
+		method: zod.z.literal("ui/message"),
+		params: zod.z.object({
+			role: zod.z.string().optional(),
+			content: zod.z.array(zod.z.any()).optional(),
+			followUp: zod.z.boolean().optional(),
+			_meta: zod.z.record(zod.z.string(), zod.z.any()).optional()
+		}).passthrough()
+	});
 	const MCPAppsActivityRenderer = function MCPAppsActivityRenderer({ content, agent }) {
 		const { copilotkit } = useCopilotKit();
 		const containerRef = (0, react.useRef)(null);
@@ -840,41 +860,12 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 		contentRef.current = content;
 		const agentRef = (0, react.useRef)(agent);
 		agentRef.current = agent;
+		const bridgeRef = (0, react.useRef)(null);
 		const fetchStateRef = (0, react.useRef)({
 			inProgress: false,
 			promise: null,
 			resourceUri: null
 		});
-		const sendToIframe = (0, react.useCallback)((msg) => {
-			if (iframeRef.current?.contentWindow) {
-				console.log("[MCPAppsRenderer] Sending to iframe:", msg);
-				iframeRef.current.contentWindow.postMessage(msg, "*");
-			}
-		}, []);
-		const sendResponse = (0, react.useCallback)((id, result) => {
-			sendToIframe({
-				jsonrpc: "2.0",
-				id,
-				result
-			});
-		}, [sendToIframe]);
-		const sendErrorResponse = (0, react.useCallback)((id, code, message) => {
-			sendToIframe({
-				jsonrpc: "2.0",
-				id,
-				error: {
-					code,
-					message
-				}
-			});
-		}, [sendToIframe]);
-		const sendNotification = (0, react.useCallback)((method, params) => {
-			sendToIframe({
-				jsonrpc: "2.0",
-				method,
-				params: params || {}
-			});
-		}, [sendToIframe]);
 		(0, react.useEffect)(() => {
 			const { resourceUri, serverHash, serverId } = content;
 			if (fetchStateRef.current.inProgress && fetchStateRef.current.resourceUri === resourceUri) {
@@ -929,11 +920,15 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 			const container = containerRef.current;
 			if (!container) return;
 			let mounted = true;
-			let messageHandler = null;
-			let initialListener = null;
+			let bridge = null;
 			let createdIframe = null;
 			const setup = async () => {
 				try {
+					const bridgeModule = await import("@modelcontextprotocol/ext-apps/app-bridge").catch((importErr) => {
+						throw new Error("MCP Apps require '@modelcontextprotocol/ext-apps' and its peer '@modelcontextprotocol/sdk'. Install them with: npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/sdk", { cause: importErr });
+					});
+					if (!mounted) return;
+					const { AppBridge, PostMessageTransport } = bridgeModule;
 					const iframe = document.createElement("iframe");
 					createdIframe = iframe;
 					iframe.style.width = "100%";
@@ -944,151 +939,108 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 					iframe.setAttribute("sandbox", "allow-scripts allow-same-origin allow-forms");
 					iframe.setAttribute("data-testid", "mcp-app-iframe");
 					iframe.setAttribute("title", "Interactive MCP application");
-					const sandboxReady = new Promise((resolve) => {
-						initialListener = (event) => {
-							if (event.source === iframe.contentWindow) {
-								if (event.data?.method === "ui/notifications/sandbox-proxy-ready") {
-									if (initialListener) {
-										window.removeEventListener("message", initialListener);
-										initialListener = null;
-									}
-									resolve();
-								}
-							}
-						};
-						window.addEventListener("message", initialListener);
-					});
-					if (!mounted) {
-						if (initialListener) {
-							window.removeEventListener("message", initialListener);
-							initialListener = null;
-						}
-						return;
-					}
 					const cspDomains = fetchedResource._meta?.ui?.csp?.resourceDomains;
 					iframe.srcdoc = buildSandboxHTML(cspDomains);
 					iframeRef.current = iframe;
 					container.appendChild(iframe);
-					await sandboxReady;
-					if (!mounted) return;
-					console.log("[MCPAppsRenderer] Sandbox proxy ready");
-					messageHandler = async (event) => {
-						if (event.source !== iframe.contentWindow) return;
-						const msg = event.data;
-						if (!msg || typeof msg !== "object" || msg.jsonrpc !== "2.0") return;
-						console.log("[MCPAppsRenderer] Received from iframe:", msg);
-						if (isRequest(msg)) switch (msg.method) {
-							case "ui/initialize":
-								sendResponse(msg.id, {
-									protocolVersion: PROTOCOL_VERSION,
-									hostInfo: {
-										name: "CopilotKit MCP Apps Host",
-										version: "1.0.0"
-									},
-									hostCapabilities: {
-										openLinks: {},
-										logging: {}
-									},
-									hostContext: {
-										theme: "light",
-										platform: "web"
-									}
-								});
-								break;
-							case "ui/message": {
-								const currentAgent = agentRef.current;
-								if (!currentAgent) {
-									console.warn("[MCPAppsRenderer] ui/message: No agent available");
-									sendResponse(msg.id, { isError: false });
-									break;
-								}
-								try {
-									const params = msg.params;
-									const role = params.role || "user";
-									const textContent = params.content?.filter((c) => c.type === "text" && c.text).map((c) => c.text).join("\n") || "";
-									if (textContent) currentAgent.addMessage({
-										id: crypto.randomUUID(),
-										role,
-										content: textContent
-									});
-									sendResponse(msg.id, { isError: false });
-									if ((params.followUp ?? role === "user") && textContent) {
-										const capturedThreadId = currentAgent.threadId || "default";
-										mcpAppsRequestQueue.enqueue(currentAgent, () => ɵrunMcpFollowUp({
-											host: copilotkit,
-											agent: currentAgent,
-											capturedThreadId
-										})).catch((err) => console.error("[MCPAppsRenderer] ui/message agent run failed:", err));
-									}
-								} catch (err) {
-									console.error("[MCPAppsRenderer] ui/message error:", err);
-									sendResponse(msg.id, { isError: true });
-								}
-								break;
-							}
-							case "ui/open-link": {
-								const url = msg.params?.url;
-								if (url) {
-									window.open(url, "_blank", "noopener,noreferrer");
-									sendResponse(msg.id, { isError: false });
-								} else sendErrorResponse(msg.id, -32602, "Missing url parameter");
-								break;
-							}
-							case "tools/call": {
-								const { serverHash, serverId } = contentRef.current;
-								const currentAgent = agentRef.current;
-								if (!serverHash) {
-									sendErrorResponse(msg.id, -32603, "No server hash available for proxying");
-									break;
-								}
-								if (!currentAgent) {
-									sendErrorResponse(msg.id, -32603, "No agent available for proxying");
-									break;
-								}
-								try {
-									const runResult = await mcpAppsRequestQueue.enqueue(currentAgent, () => currentAgent.runAgent({ forwardedProps: { __proxiedMCPRequest: {
-										serverHash,
-										serverId,
-										method: "tools/call",
-										params: msg.params
-									} } }));
-									sendResponse(msg.id, runResult.result || {});
-								} catch (err) {
-									console.error("[MCPAppsRenderer] tools/call error:", err);
-									sendErrorResponse(msg.id, -32603, String(err));
-								}
-								break;
-							}
-							default: sendErrorResponse(msg.id, -32601, `Method not found: ${msg.method}`);
-						}
-						if (isNotification(msg)) switch (msg.method) {
-							case "ui/notifications/initialized":
-								console.log("[MCPAppsRenderer] Inner iframe initialized");
-								if (mounted) setIframeReady(true);
-								break;
-							case "ui/notifications/size-changed": {
-								const { width, height } = msg.params || {};
-								console.log("[MCPAppsRenderer] Size change:", {
-									width,
-									height
-								});
-								if (mounted) setIframeSize({
-									width: typeof width === "number" ? width : void 0,
-									height: typeof height === "number" ? height : void 0
-								});
-								break;
-							}
-							case "notifications/message":
-								console.log("[MCPAppsRenderer] App log:", msg.params);
-								break;
-						}
-					};
-					window.addEventListener("message", messageHandler);
+					const win = iframe.contentWindow;
+					if (!win) throw new Error("Sandbox iframe has no contentWindow");
 					let html;
 					if (fetchedResource.text) html = fetchedResource.text;
 					else if (fetchedResource.blob) html = atob(fetchedResource.blob);
 					else throw new Error("Resource has no text or blob content");
-					sendNotification("ui/notifications/sandbox-resource-ready", { html });
+					bridge = new AppBridge(null, {
+						name: "CopilotKit MCP Apps Host",
+						version: "1.0.0"
+					}, {
+						openLinks: {},
+						logging: {},
+						message: { text: {} }
+					}, { hostContext: {
+						theme: "light",
+						platform: "web"
+					} });
+					bridge.onsandboxready = () => {
+						bridge?.sendSandboxResourceReady({ html });
+					};
+					bridge.setRequestHandler(CopilotKitUiMessageSchema, async (req) => {
+						const currentAgent = agentRef.current;
+						if (!currentAgent) {
+							console.warn("[MCPAppsRenderer] ui/message: No agent available");
+							return { isError: false };
+						}
+						try {
+							const params = req.params;
+							const ck = params._meta?.copilotkit ?? {};
+							const role = ck.role || params.role || "user";
+							const textContent = params.content?.filter((c) => c.type === "text" && c.text).map((c) => c.text).join("\n") || "";
+							if (textContent) currentAgent.addMessage({
+								id: crypto.randomUUID(),
+								role,
+								content: textContent
+							});
+							if ((ck.followUp ?? params.followUp ?? role === "user") && textContent) {
+								const capturedThreadId = currentAgent.threadId || "default";
+								mcpAppsRequestQueue.enqueue(currentAgent, () => ɵrunMcpFollowUp({
+									host: copilotkit,
+									agent: currentAgent,
+									capturedThreadId
+								})).catch((err) => console.error("[MCPAppsRenderer] ui/message agent run failed:", err));
+							}
+							return { isError: false };
+						} catch (err) {
+							console.error("[MCPAppsRenderer] ui/message error:", err);
+							return { isError: true };
+						}
+					});
+					bridge.onopenlink = async ({ url }) => {
+						let parsed;
+						try {
+							parsed = new URL(url);
+						} catch {
+							console.warn("[MCPAppsRenderer] ui/open-link rejected: unparseable url");
+							return { isError: true };
+						}
+						if (MCP_OPEN_LINK_BLOCKED_SCHEMES.has(parsed.protocol)) {
+							console.warn("[MCPAppsRenderer] ui/open-link rejected: blocked scheme", parsed.protocol);
+							return { isError: true };
+						}
+						window.open(url, "_blank", "noopener,noreferrer");
+						return { isError: false };
+					};
+					bridge.oncalltool = async (params) => {
+						const { serverHash, serverId } = contentRef.current;
+						const currentAgent = agentRef.current;
+						if (!serverHash) throw new Error("No server hash available for proxying");
+						if (!currentAgent) throw new Error("No agent available for proxying");
+						return (await mcpAppsRequestQueue.enqueue(currentAgent, () => currentAgent.runAgent({ forwardedProps: { __proxiedMCPRequest: {
+							serverHash,
+							serverId,
+							method: "tools/call",
+							params
+						} } }))).result || { content: [] };
+					};
+					bridge.onsizechange = (p) => {
+						if (!mounted) return;
+						const { width, height } = p || {};
+						setIframeSize({
+							width: typeof width === "number" ? width : void 0,
+							height: typeof height === "number" ? height : void 0
+						});
+					};
+					bridge.oninitialized = () => {
+						if (mounted) setIframeReady(true);
+					};
+					bridge.onloggingmessage = (p) => {
+						console.log("[MCPAppsRenderer] App log:", p);
+					};
+					const transport = new PostMessageTransport(win, win);
+					await bridge.connect(transport);
+					if (!mounted) {
+						await bridge.close();
+						return;
+					}
+					bridgeRef.current = bridge;
 				} catch (err) {
 					console.error("[MCPAppsRenderer] Setup error:", err);
 					if (mounted) setError(err instanceof Error ? err : new Error(String(err)));
@@ -1097,11 +1049,8 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 			setup();
 			return () => {
 				mounted = false;
-				if (initialListener) {
-					window.removeEventListener("message", initialListener);
-					initialListener = null;
-				}
-				if (messageHandler) window.removeEventListener("message", messageHandler);
+				bridgeRef.current = null;
+				bridge?.close();
 				if (createdIframe) {
 					createdIframe.remove();
 					createdIframe = null;
@@ -1111,9 +1060,7 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 		}, [
 			isLoading,
 			fetchedResource,
-			sendNotification,
-			sendResponse,
-			sendErrorResponse
+			copilotkit
 		]);
 		(0, react.useEffect)(() => {
 			if (iframeRef.current) {
@@ -1125,25 +1072,11 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 			}
 		}, [iframeSize]);
 		(0, react.useEffect)(() => {
-			if (iframeReady && content.toolInput) {
-				console.log("[MCPAppsRenderer] Sending tool input:", content.toolInput);
-				sendNotification("ui/notifications/tool-input", { arguments: content.toolInput });
-			}
-		}, [
-			iframeReady,
-			content.toolInput,
-			sendNotification
-		]);
+			if (iframeReady && content.toolInput) bridgeRef.current?.sendToolInput({ arguments: content.toolInput });
+		}, [iframeReady, content.toolInput]);
 		(0, react.useEffect)(() => {
-			if (iframeReady && content.result) {
-				console.log("[MCPAppsRenderer] Sending tool result:", content.result);
-				sendNotification("ui/notifications/tool-result", content.result);
-			}
-		}, [
-			iframeReady,
-			content.result,
-			sendNotification
-		]);
+			if (iframeReady && content.result) bridgeRef.current?.sendToolResult(content.result);
+		}, [iframeReady, content.result]);
 		const borderStyle = fetchedResource?._meta?.ui?.prefersBorder === true ? {
 			borderRadius: "8px",
 			backgroundColor: "#f9f9f9",
@@ -2363,6 +2296,8 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 		const a2uiCatalogProvided = !!a2ui?.catalog;
 		const a2uiActive = runtimeA2UIEnabled || a2uiCatalogProvided;
 		const [runtimeLicenseStatus, setRuntimeLicenseStatus] = (0, react.useState)(void 0);
+		const [runtimeEntitlements, setRuntimeEntitlements] = (0, react.useState)(void 0);
+		const [runtimeEntitlementRetryPending, setRuntimeEntitlementRetryPending] = (0, react.useState)(false);
 		const requestInspectorOpen = (0, react.useCallback)((request) => {
 			setInspectorOpenRequest({ ...request });
 		}, []);
@@ -2553,6 +2488,8 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 				setRuntimeA2UIEnabled(copilotkit.a2uiEnabled);
 				setRuntimeOpenGenUIEnabled(copilotkit.openGenerativeUIEnabled);
 				setRuntimeLicenseStatus(copilotkit.licenseStatus);
+				setRuntimeEntitlements(copilotkit.runtimeEntitlements);
+				setRuntimeEntitlementRetryPending(copilotkit.runtimeEntitlementRetryPending);
 			};
 			const subscription = copilotkit.subscribe({ onRuntimeConnectionStatusChanged: syncRuntimeInfo });
 			syncRuntimeInfo();
@@ -2693,7 +2630,26 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 			copilotkit,
 			executingToolCallIds
 		}), [copilotkit, executingToolCallIds]);
-		const licenseContextValue = (0, react.useMemo)(() => (0, _copilotkit_shared.createLicenseContextValue)(runtimeLicenseStatus), [runtimeLicenseStatus]);
+		const retryableRuntimeEntitlementFailure = runtimeEntitlements?.status !== "ready" && runtimeEntitlements?.error.retryable === true;
+		const hasNonReadyRuntimeEntitlement = runtimeEntitlements !== void 0 && runtimeEntitlements.status !== "ready";
+		const hasLegacyRuntimeEntitlementFallback = runtimeLicenseStatus === "valid" || runtimeLicenseStatus === "expiring";
+		const runtimeEntitlementRetryInProgress = retryableRuntimeEntitlementFailure && runtimeEntitlementRetryPending && !hasLegacyRuntimeEntitlementFallback;
+		const runtimeEntitlementFailureSettled = hasNonReadyRuntimeEntitlement && !runtimeEntitlementRetryInProgress && !hasLegacyRuntimeEntitlementFallback;
+		const licenseContextValue = (0, react.useMemo)(() => {
+			const runtimeLicenseContext = (0, _copilotkit_shared.createLicenseContextValue)(runtimeEntitlementRetryInProgress ? void 0 : runtimeLicenseStatus, runtimeEntitlements);
+			if (!runtimeEntitlementFailureSettled) return runtimeLicenseContext;
+			return {
+				...runtimeLicenseContext,
+				checkFeature: () => false,
+				getLimit: () => null
+			};
+		}, [
+			runtimeEntitlementFailureSettled,
+			runtimeEntitlementRetryInProgress,
+			runtimeEntitlements,
+			runtimeLicenseStatus
+		]);
+		const runtimeLicenseWarningStatus = runtimeEntitlementRetryInProgress ? void 0 : licenseContextValue.status ?? void 0;
 		return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SandboxFunctionsContext.Provider, {
 			value: sandboxFunctionsList,
 			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CopilotKitContext.Provider, {
@@ -2713,10 +2669,10 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 								openRequest: inspectorOpenRequest
 							}) : null]
 						}),
-						runtimeLicenseStatus === "none" && !resolvedPublicKey && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LicenseWarningBanner, { type: "no_license" }),
-						runtimeLicenseStatus === "expired" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LicenseWarningBanner, { type: "expired" }),
-						runtimeLicenseStatus === "invalid" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LicenseWarningBanner, { type: "invalid" }),
-						runtimeLicenseStatus === "expiring" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LicenseWarningBanner, { type: "expiring" })
+						runtimeLicenseWarningStatus === "none" && !resolvedPublicKey && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LicenseWarningBanner, { type: "no_license" }),
+						runtimeLicenseWarningStatus === "expired" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LicenseWarningBanner, { type: "expired" }),
+						runtimeLicenseWarningStatus === "invalid" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LicenseWarningBanner, { type: "invalid" }),
+						runtimeLicenseWarningStatus === "expiring" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LicenseWarningBanner, { type: "expiring" })
 					]
 				})
 			})
@@ -2774,7 +2730,7 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 	function useFrontendTool$1(tool, deps) {
 		const { copilotkit } = useCopilotKit();
 		const extraDeps = deps ?? EMPTY_DEPS;
-		(0, react.useEffect)(() => {
+		(0, react.useLayoutEffect)(() => {
 			const name = tool.name;
 			if (copilotkit.getTool({
 				toolName: name,
@@ -2797,12 +2753,15 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 			tool.name,
 			tool.available,
 			copilotkit,
-			JSON.stringify(extraDeps)
+			JSON.stringify(extraDeps),
+			JSON.stringify(tool.webmcp ?? null)
 		]);
 	}
 
 //#endregion
 //#region src/v2/hooks/use-human-in-the-loop.tsx
+/** Registration name of a catch-all tool: handles any otherwise-unhandled call. */
+	const WILDCARD_TOOL_NAME = "*";
 	function useHumanInTheLoop$1(tool, deps) {
 		const { copilotkit } = useCopilotKit();
 		const resolvePromiseRef = (0, react.useRef)(null);
@@ -2838,10 +2797,11 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 		}, []);
 		const RenderComponent = (0, react.useCallback)((props) => {
 			const ToolComponent = tool.render;
+			const name = tool.name === WILDCARD_TOOL_NAME ? props.name : tool.name;
 			if (props.status === _copilotkit_core.ToolCallStatus.InProgress) {
 				const enhancedProps = {
 					...props,
-					name: tool.name,
+					name,
 					description: tool.description || "",
 					agentId: tool.agentId,
 					respond: void 0
@@ -2850,7 +2810,7 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 			} else if (props.status === _copilotkit_core.ToolCallStatus.Executing) {
 				const enhancedProps = {
 					...props,
-					name: tool.name,
+					name,
 					description: tool.description || "",
 					agentId: tool.agentId,
 					respond
@@ -2859,7 +2819,7 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 			} else if (props.status === _copilotkit_core.ToolCallStatus.Complete) {
 				const enhancedProps = {
 					...props,
-					name: tool.name,
+					name,
 					description: tool.description || "",
 					agentId: tool.agentId,
 					respond: void 0
@@ -2879,7 +2839,7 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 			handler,
 			render: RenderComponent
 		}, deps);
-		(0, react.useEffect)(() => {
+		(0, react.useLayoutEffect)(() => {
 			return () => {
 				copilotkit.removeHookRenderToolCall(tool.name, tool.agentId);
 			};
@@ -3299,8 +3259,12 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 	}
 
 //#endregion
-//#region src/v2/hooks/use-interrupt.tsx
+//#region src/v2/types/interrupt.ts
+/** Name of the legacy custom event agents emit to signal an interrupt. */
 	const INTERRUPT_EVENT_NAME = "on_interrupt";
+
+//#endregion
+//#region src/v2/hooks/use-interrupt.tsx
 	function isPromiseLike(value) {
 		return (typeof value === "object" || typeof value === "function") && value !== null && typeof Reflect.get(value, "then") === "function";
 	}
@@ -4507,7 +4471,7 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 		switch (error.code) {
 			case _copilotkit_shared.CopilotKitErrorCode.MISSING_PUBLIC_API_KEY_ERROR: return { primary: {
 				label: "Show me how",
-				onClick: () => window.open("https://docs.copilotkit.ai/premium/overview#getting-access", "_blank", "noopener,noreferrer")
+				onClick: () => window.open("https://docs.copilotkit.ai/intelligence/overview#plans-and-access", "_blank", "noopener,noreferrer")
 			} };
 			case _copilotkit_shared.CopilotKitErrorCode.UPGRADE_REQUIRED_ERROR: return { primary: {
 				label: "Upgrade",
@@ -5753,13 +5717,18 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 		const renderToolCall = useRenderToolCall$1();
 		return (0, react.useCallback)((message, messages) => {
 			if (!message?.toolCalls?.length) return null;
-			const toolCall = message.toolCalls[0];
-			if (!toolCall) return null;
-			const toolMessage = messages?.find((m) => m.role === "tool" && m.toolCallId === toolCall.id);
-			return () => renderToolCall({
-				toolCall,
-				toolMessage
-			});
+			const toolCalls = message.toolCalls;
+			return () => {
+				const renderedToolCalls = toolCalls.map((toolCall) => {
+					const toolMessage = messages?.find((m) => m.role === "tool" && m.toolCallId === toolCall.id);
+					return renderToolCall({
+						toolCall,
+						toolMessage
+					});
+				}).filter((renderedToolCall) => renderedToolCall !== null);
+				if (!renderedToolCalls.length) return null;
+				return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: renderedToolCalls });
+			};
 		}, [renderToolCall]);
 	}
 
@@ -6094,7 +6063,7 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 	* `useCopilotChatHeadless_c` is for building fully custom UI (headless UI) implementations.
 	*
 	* <Callout title="This is a CopilotKit Intelligence feature">
-	* Read more about <a href="/premium/overview">CopilotKit Intelligence</a>.
+	* Read more about <a href="/intelligence/overview">CopilotKit Intelligence</a>.
 	*
 	* Usage is generous and **free** to get started.
 	* </Callout>
@@ -6325,7 +6294,7 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 	* See https://docs.copilotkit.ai/reference/v2/hooks/useFrontendTool
 	*/
 	function useFrontendTool(tool, dependencies) {
-		const { name, description, parameters, render, followUp, available } = tool;
+		const { name, description, parameters, render, followUp, available, webmcp } = tool;
 		const zodParameters = (0, _copilotkit_shared.getZodParameters)(parameters);
 		const renderRef = (0, react.useRef)(render);
 		(0, react.useEffect)(() => {
@@ -6356,7 +6325,8 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 			handler: tool.handler ? (args) => handlerRef.current?.(args) : void 0,
 			followUp,
 			render: normalizedRender,
-			available: available === void 0 ? void 0 : available !== "disabled"
+			available: available === void 0 ? void 0 : available !== "disabled",
+			webmcp
 		});
 	}
 
@@ -6454,20 +6424,24 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 				if (!render) return null;
 				const rendered = render((() => {
 					const mappedArgs = args.args;
+					const toolCallName = args.name;
 					switch (args.status) {
 						case _copilotkit_core.ToolCallStatus.InProgress: return {
+							name: toolCallName,
 							args: mappedArgs,
 							respond: args.respond,
 							status: args.status,
 							handler: void 0
 						};
 						case _copilotkit_core.ToolCallStatus.Executing: return {
+							name: toolCallName,
 							args: mappedArgs,
 							respond: args.respond,
 							status: args.status,
 							handler: () => {}
 						};
 						case _copilotkit_core.ToolCallStatus.Complete: return {
+							name: toolCallName,
 							args: mappedArgs,
 							respond: args.respond,
 							status: args.status,
@@ -6627,10 +6601,21 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 	* This hooks enables you to dynamically generate UI elements and render them in the copilot chat. For more information, check out the [Generative UI](/guides/generative-ui) page.
 	*/
 	function getActionConfig(action) {
-		if (action.name === "*") return {
-			type: "render",
-			action
-		};
+		if (action.name === "*") {
+			const catchAll = action;
+			const waitRender = catchAll.renderAndWaitForResponse ?? catchAll.renderAndWait;
+			if (waitRender) return {
+				type: "hitl",
+				action: {
+					...catchAll,
+					render: waitRender
+				}
+			};
+			return {
+				type: "render",
+				action
+			};
+		}
 		if ("renderAndWaitForResponse" in action || "renderAndWait" in action) {
 			let render = action.render;
 			if (!render && "renderAndWaitForResponse" in action) render = action.renderAndWaitForResponse;
@@ -6941,37 +6926,87 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 
 //#endregion
 //#region src/v1-deprecated/hooks/use-agent-nodename.ts
-/**
+	const initialAgentNodeNameState = {
+		nodeName: "start",
+		lastActiveNodeName: "start",
+		hasLegacyInterrupt: false
+	};
+	const transitionAgentNodeName = (state, event) => {
+		switch (event.type) {
+			case "reset":
+			case "runStarted": return initialAgentNodeNameState;
+			case "stepStarted": return {
+				...state,
+				nodeName: event.nodeName,
+				lastActiveNodeName: event.nodeName
+			};
+			case "legacyInterruptReceived": return {
+				...state,
+				hasLegacyInterrupt: true
+			};
+			case "runFinished":
+				if (event.outcome === "interrupt" || state.hasLegacyInterrupt) return {
+					...state,
+					nodeName: state.lastActiveNodeName,
+					hasLegacyInterrupt: false
+				};
+				return {
+					...state,
+					nodeName: "end",
+					hasLegacyInterrupt: false
+				};
+			case "runError": return {
+				...state,
+				nodeName: "end",
+				hasLegacyInterrupt: false
+			};
+		}
+	};
+	/**
 	* Tracks the node the agent is currently executing.
 	*
 	* Backed by state rather than a ref: mutating a ref schedules no render, so
 	* consumers such as `useCoAgent().nodeName` kept reporting whichever node was
-	* current at their last render and never updated on their own.
+	* current at their last render and never updated on their own. Interrupt-aware
+	* transitions keep the last active node available while an interrupt is pending.
 	*/
 	function useAgentNodeName(agentName) {
 		const { agent } = useAgent({ agentId: agentName });
-		const [nodeName, setNodeName] = (0, react.useState)("start");
+		const [nodeNameState, setNodeNameState] = (0, react.useState)(initialAgentNodeNameState);
 		(0, react.useEffect)(() => {
+			const transition = (event) => {
+				setNodeNameState((state) => transitionAgentNodeName(state, event));
+			};
+			transition({ type: "reset" });
 			if (!agent) return;
 			const subscription = agent.subscribe({
 				onStepStartedEvent: ({ event }) => {
-					setNodeName(event.stepName);
+					transition({
+						type: "stepStarted",
+						nodeName: event.stepName
+					});
 				},
 				onRunStartedEvent: () => {
-					setNodeName("start");
+					transition({ type: "runStarted" });
 				},
-				onRunFinishedEvent: () => {
-					setNodeName("end");
+				onRunFinishedEvent: ({ outcome }) => {
+					transition({
+						type: "runFinished",
+						outcome
+					});
 				},
 				onRunErrorEvent: () => {
-					setNodeName("end");
+					transition({ type: "runError" });
+				},
+				onCustomEvent: ({ event }) => {
+					if (event.name === INTERRUPT_EVENT_NAME) transition({ type: "legacyInterruptReceived" });
 				}
 			});
 			return () => {
 				subscription.unsubscribe();
 			};
-		}, [agent]);
-		return nodeName;
+		}, [agent, agentName]);
+		return nodeNameState.nodeName;
 	}
 
 //#endregion
@@ -7174,6 +7209,7 @@ window.parent.postMessage({jsonrpc:"2.0",method:"ui/notifications/sandbox-proxy-
 			agent?.threadId,
 			agent?.isRunning,
 			agent?.agentId,
+			nodeName,
 			handleStateUpdate,
 			options.name
 		]);