@assistant-ui/react 0.14.13 → 0.14.15

package/dist/legacy-runtime/runtime-cores/assistant-transport/useAssistantTransportRuntime.js

@@ -2,12 +2,13 @@
 import { useRemoteThreadListRuntime } from "../remote-thread-list/useRemoteThreadListRuntime.js";
 import { useExternalStoreRuntime } from "../external-store/useExternalStoreRuntime.js";
 import { useCommandQueue } from "./commandQueue.js";
+import { createReplayBoundaryStream, useReplayRenderWait } from "./replayBoundaryStream.js";
 import { useRunManager } from "./runManager.js";
 import { useConvertedState } from "./useConvertedState.js";
 import { useAui, useAuiState } from "@assistant-ui/store";
 import { InMemoryThreadListAdapter, createRequestHeaders } from "@assistant-ui/core";
 import { asAsyncIterableStream } from "assistant-stream/utils";
-import { useMemo, useRef, useState } from "react";
+import { useMemo, useRef, useState } from "@assistant-ui/tap/react-shim";
 import { AssistantMessageAccumulator, AssistantTransportDecoder, DataStreamDecoder, toToolsJSONSchema, unstable_createInitialMessage } from "assistant-stream";
 //#region src/legacy-runtime/runtime-cores/assistant-transport/useAssistantTransportRuntime.ts
 const convertAppendMessageToCommand = (message) => {
@@ -51,6 +52,8 @@ const useAssistantTransportThreadRuntime = (options) => {
 	const agentStateRef = useRef(options.initialState);
 	const [, rerender] = useState(0);
 	const resumeFlagRef = useRef(false);
+	const [isReplaying, setIsReplaying] = useState(false);
+	const waitForReplayRender = useReplayRenderWait();
 	const parentIdRef = useRef(void 0);
 	const commandQueue = useCommandQueue({ onQueue: () => runManager.schedule() });
 	const threadId = useAuiState((s) => s.threadListItem.remoteId);
@@ -58,6 +61,7 @@ const useAssistantTransportThreadRuntime = (options) => {
 		onRun: async (signal) => {
 			const isResume = resumeFlagRef.current;
 			resumeFlagRef.current = false;
+			setIsReplaying(false);
 			const commands = isResume ? [] : commandQueue.flush();
 			if (commands.length === 0 && !isResume) throw new Error("No commands to send");
 			const headers = await createRequestHeaders(options.headers);
@@ -86,9 +90,13 @@ const useAssistantTransportThreadRuntime = (options) => {
 			options.onResponse?.(response);
 			if (!response.ok) throw new Error(`Status ${response.status}: ${await response.text()}`);
 			if (!response.body) throw new Error("Response body is null");
+			const body = await createReplayBoundaryStream(response, {
+				setReplaying: setIsReplaying,
+				waitForRender: waitForReplayRender
+			});
 			const decoder = (options.protocol ?? "data-stream") === "assistant-transport" ? new AssistantTransportDecoder() : new DataStreamDecoder();
 			let err;
-			const stream = response.body.pipeThrough(decoder).pipeThrough(new AssistantMessageAccumulator({
+			const stream = body.pipeThrough(decoder).pipeThrough(new AssistantMessageAccumulator({
 				initialMessage: unstable_createInitialMessage({ unstable_state: agentStateRef.current ?? null }),
 				throttle: isResume,
 				onError: (error) => {
@@ -109,6 +117,7 @@ const useAssistantTransportThreadRuntime = (options) => {
 		},
 		onFinish: options.onFinish,
 		onCancel: () => {
+			setIsReplaying(false);
 			const cmds = [...commandQueue.state.inTransit, ...commandQueue.state.queued];
 			commandQueue.reset();
 			options.onCancel?.({
@@ -120,6 +129,7 @@ const useAssistantTransportThreadRuntime = (options) => {
 			});
 		},
 		onError: async (error) => {
+			setIsReplaying(false);
 			const inTransitCmds = [...commandQueue.state.inTransit];
 			const queuedCmds = [...commandQueue.state.queued];
 			commandQueue.reset();
@@ -150,6 +160,7 @@ const useAssistantTransportThreadRuntime = (options) => {
 		messages: converted.messages,
 		state: converted.state,
 		isRunning: converted.isRunning,
+		isLoading: isReplaying,
 		adapters: options.adapters,
 		unstable_enableToolInvocations: true,
 		setToolStatuses,

package/dist/legacy-runtime/runtime-cores/assistant-transport/useAssistantTransportRuntime.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAssistantTransportRuntime.js","names":["createInitialMessage"],"sources":["../../../../src/legacy-runtime/runtime-cores/assistant-transport/useAssistantTransportRuntime.ts"],"sourcesContent":["\"use client\";\n\nimport type { AppendMessage } from \"@assistant-ui/core\";\nimport {\n  type ReadonlyJSONObject,\n  type ReadonlyJSONValue,\n  asAsyncIterableStream,\n} from \"assistant-stream/utils\";\nimport { useExternalStoreRuntime } from \"../external-store/useExternalStoreRuntime\";\nimport type { AssistantRuntime } from \"../../runtime/AssistantRuntime\";\nimport type { AddToolResultOptions } from \"@assistant-ui/core\";\nimport { useMemo, useRef, useState } from \"react\";\nimport {\n  AssistantMessageAccumulator,\n  DataStreamDecoder,\n  AssistantTransportDecoder,\n  unstable_createInitialMessage as createInitialMessage,\n  toToolsJSONSchema,\n} from \"assistant-stream\";\nimport type {\n  AssistantTransportOptions,\n  AddMessageCommand,\n  AddToolResultCommand,\n  UserMessagePart,\n  QueuedCommand,\n  AssistantTransportCommand,\n  SendCommandsRequestBody,\n} from \"./types\";\nimport { useCommandQueue } from \"./commandQueue\";\nimport { useRunManager } from \"./runManager\";\nimport { useConvertedState } from \"./useConvertedState\";\nimport type { ToolExecutionStatus } from \"@assistant-ui/core\";\nimport { createRequestHeaders } from \"@assistant-ui/core\";\nimport { useRemoteThreadListRuntime } from \"../remote-thread-list/useRemoteThreadListRuntime\";\nimport { InMemoryThreadListAdapter } from \"@assistant-ui/core\";\nimport { useAui, useAuiState } from \"@assistant-ui/store\";\nimport type { UserExternalState } from \"../../../augmentations\";\n\nconst convertAppendMessageToCommand = (\n  message: AppendMessage,\n): AddMessageCommand => {\n  if (message.role !== \"user\")\n    throw new Error(\"Only user messages are supported\");\n\n  const parts: UserMessagePart[] = [];\n  const content = [\n    ...message.content,\n    ...(message.attachments?.flatMap((a) => a.content) ?? []),\n  ];\n  for (const contentPart of content) {\n    if (contentPart.type === \"text\") {\n      parts.push({ type: \"text\", text: contentPart.text });\n    } else if (contentPart.type === \"image\") {\n      parts.push({ type: \"image\", image: contentPart.image });\n    }\n  }\n\n  return {\n    type: \"add-message\",\n    message: {\n      role: \"user\",\n      parts,\n    },\n    parentId: message.parentId,\n    sourceId: message.sourceId,\n  };\n};\n\nconst symbolAssistantTransportExtras = Symbol(\"assistant-transport-extras\");\ntype AssistantTransportExtras = {\n  [symbolAssistantTransportExtras]: true;\n  sendCommand: (command: AssistantTransportCommand) => void;\n  state: UserExternalState;\n};\n\nconst asAssistantTransportExtras = (\n  extras: unknown,\n): AssistantTransportExtras => {\n  if (\n    typeof extras !== \"object\" ||\n    extras == null ||\n    !(symbolAssistantTransportExtras in extras)\n  )\n    throw new Error(\n      \"This method can only be called when you are using useAssistantTransportRuntime\",\n    );\n\n  return extras as AssistantTransportExtras;\n};\n\nexport const useAssistantTransportSendCommand = () => {\n  const aui = useAui();\n\n  return (command: AssistantTransportCommand) => {\n    const extras = aui.thread().getState().extras;\n    const transportExtras = asAssistantTransportExtras(extras);\n    transportExtras.sendCommand(command);\n  };\n};\n\nexport function useAssistantTransportState(): UserExternalState;\nexport function useAssistantTransportState<T>(\n  selector: (state: UserExternalState) => T,\n): T;\nexport function useAssistantTransportState<T>(\n  selector: (state: UserExternalState) => T = (t) => t as T,\n): T | UserExternalState {\n  return useAuiState((s) =>\n    selector(asAssistantTransportExtras(s.thread.extras).state),\n  );\n}\n\nconst useAssistantTransportThreadRuntime = <T>(\n  options: AssistantTransportOptions<T>,\n): AssistantRuntime => {\n  const agentStateRef = useRef(options.initialState);\n  const [, rerender] = useState(0);\n  const resumeFlagRef = useRef(false);\n  const parentIdRef = useRef<string | null | undefined>(undefined);\n  const commandQueue = useCommandQueue({\n    onQueue: () => runManager.schedule(),\n  });\n\n  const threadId = useAuiState((s) => s.threadListItem.remoteId);\n\n  const runManager = useRunManager({\n    onRun: async (signal: AbortSignal) => {\n      const isResume = resumeFlagRef.current;\n      resumeFlagRef.current = false;\n      const commands: QueuedCommand[] = isResume ? [] : commandQueue.flush();\n      if (commands.length === 0 && !isResume)\n        throw new Error(\"No commands to send\");\n\n      const headers = await createRequestHeaders(options.headers);\n      const bodyValue =\n        typeof options.body === \"function\"\n          ? await options.body()\n          : options.body;\n      const context = runtime.thread.getModelContext();\n\n      let requestBody: Record<string, unknown> = {\n        commands,\n        state: agentStateRef.current,\n        system: context.system,\n        tools: context.tools ? toToolsJSONSchema(context.tools) : undefined,\n        threadId,\n        ...(parentIdRef.current !== undefined && {\n          parentId: parentIdRef.current,\n        }),\n        // nested (new format, aligned with AssistantChatTransport)\n        callSettings: context.callSettings,\n        config: context.config,\n        // @deprecated spread at top level — use nested `callSettings`/`config` instead. Will be removed in a future version.\n        ...context.callSettings,\n        ...context.config,\n        ...(bodyValue ?? {}),\n      };\n\n      if (options.prepareSendCommandsRequest) {\n        requestBody = await options.prepareSendCommandsRequest(\n          requestBody as SendCommandsRequestBody,\n        );\n      }\n\n      const response = await fetch(\n        isResume ? options.resumeApi! : options.api,\n        {\n          method: \"POST\",\n          headers,\n          body: JSON.stringify(requestBody),\n          signal,\n        },\n      );\n\n      options.onResponse?.(response);\n\n      if (!response.ok) {\n        throw new Error(`Status ${response.status}: ${await response.text()}`);\n      }\n\n      if (!response.body) {\n        throw new Error(\"Response body is null\");\n      }\n\n      // Select decoder based on protocol option\n      const protocol = options.protocol ?? \"data-stream\";\n      const decoder =\n        protocol === \"assistant-transport\"\n          ? new AssistantTransportDecoder()\n          : new DataStreamDecoder();\n\n      let err: string | undefined;\n      const stream = response.body.pipeThrough(decoder).pipeThrough(\n        new AssistantMessageAccumulator({\n          initialMessage: createInitialMessage({\n            unstable_state:\n              (agentStateRef.current as ReadonlyJSONValue) ?? null,\n          }),\n          throttle: isResume,\n          onError: (error) => {\n            err = error;\n          },\n        }),\n      );\n\n      let markedDelivered = false;\n\n      for await (const chunk of asAsyncIterableStream(stream)) {\n        if (chunk.metadata.unstable_state === agentStateRef.current) continue;\n\n        if (!markedDelivered) {\n          commandQueue.markDelivered();\n          markedDelivered = true;\n        }\n\n        agentStateRef.current = chunk.metadata.unstable_state as T;\n        rerender((prev) => prev + 1);\n      }\n\n      if (err) {\n        throw new Error(err);\n      }\n    },\n    onFinish: options.onFinish,\n    onCancel: () => {\n      const cmds = [\n        ...commandQueue.state.inTransit,\n        ...commandQueue.state.queued,\n      ];\n\n      commandQueue.reset();\n\n      options.onCancel?.({\n        commands: cmds,\n        updateState: (updater) => {\n          agentStateRef.current = updater(agentStateRef.current);\n          rerender((prev) => prev + 1);\n        },\n      });\n    },\n    onError: async (error) => {\n      const inTransitCmds = [...commandQueue.state.inTransit];\n      const queuedCmds = [...commandQueue.state.queued];\n\n      commandQueue.reset();\n\n      try {\n        await options.onError?.(error as Error, {\n          commands: inTransitCmds,\n          updateState: (updater) => {\n            agentStateRef.current = updater(agentStateRef.current);\n            rerender((prev) => prev + 1);\n          },\n        });\n      } finally {\n        options.onCancel?.({\n          commands: queuedCmds,\n          updateState: (updater) => {\n            agentStateRef.current = updater(agentStateRef.current);\n            rerender((prev) => prev + 1);\n          },\n          error: error as Error,\n        });\n      }\n    },\n  });\n\n  // Tool execution status state\n  const [toolStatuses, setToolStatuses] = useState<\n    Record<string, ToolExecutionStatus>\n  >({});\n\n  // Reactive conversion of agent state + connection metadata → UI state\n  const pendingCommands = useMemo(\n    () => [...commandQueue.state.inTransit, ...commandQueue.state.queued],\n    [commandQueue.state],\n  );\n  const converted = useConvertedState(\n    options.converter,\n    agentStateRef.current,\n    pendingCommands,\n    runManager.isRunning,\n    toolStatuses,\n  );\n\n  // Create runtime\n  const runtime = useExternalStoreRuntime({\n    messages: converted.messages,\n    state: converted.state,\n    isRunning: converted.isRunning,\n    adapters: options.adapters,\n    unstable_enableToolInvocations: true,\n    setToolStatuses,\n    extras: {\n      [symbolAssistantTransportExtras]: true,\n      sendCommand: (command: AssistantTransportCommand) => {\n        commandQueue.enqueue(command);\n      },\n      state: agentStateRef.current as UserExternalState,\n    } satisfies AssistantTransportExtras,\n    onNew: async (message: AppendMessage): Promise<void> => {\n      parentIdRef.current = message.parentId;\n      const command = convertAppendMessageToCommand(message);\n      commandQueue.enqueue(command);\n    },\n    ...(options.capabilities?.edit && {\n      onEdit: async (message: AppendMessage): Promise<void> => {\n        parentIdRef.current = message.parentId;\n        const command = convertAppendMessageToCommand(message);\n        commandQueue.enqueue(command);\n      },\n    }),\n    onCancel: async () => {\n      runManager.cancel();\n    },\n    onResume: async () => {\n      if (!options.resumeApi)\n        throw new Error(\"Must pass resumeApi to options to resume runs\");\n\n      resumeFlagRef.current = true;\n      runManager.schedule();\n    },\n    onAddToolResult: async (\n      toolOptions: AddToolResultOptions,\n    ): Promise<void> => {\n      const command: AddToolResultCommand = {\n        type: \"add-tool-result\",\n        toolCallId: toolOptions.toolCallId,\n        result: toolOptions.result as ReadonlyJSONObject,\n        toolName: toolOptions.toolName,\n        isError: toolOptions.isError,\n        ...(toolOptions.artifact && { artifact: toolOptions.artifact }),\n        ...(toolOptions.modelContent !== undefined && {\n          modelContent: toolOptions.modelContent,\n        }),\n      };\n\n      commandQueue.enqueue(command);\n    },\n    onLoadExternalState: async (state) => {\n      agentStateRef.current = state as T;\n      rerender((prev) => prev + 1);\n    },\n  });\n\n  return runtime;\n};\n\n/**\n * @alpha This is an experimental API that is subject to change.\n */\nexport const useAssistantTransportRuntime = <T>(\n  options: AssistantTransportOptions<T>,\n): AssistantRuntime => {\n  const runtime = useRemoteThreadListRuntime({\n    runtimeHook: function RuntimeHook() {\n      return useAssistantTransportThreadRuntime(options);\n    },\n    adapter: new InMemoryThreadListAdapter(),\n    allowNesting: true,\n  });\n  return runtime;\n};\n"],"mappings":"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"}
+{"version":3,"file":"useAssistantTransportRuntime.js","names":["createInitialMessage"],"sources":["../../../../src/legacy-runtime/runtime-cores/assistant-transport/useAssistantTransportRuntime.ts"],"sourcesContent":["\"use client\";\n\nimport type { AppendMessage } from \"@assistant-ui/core\";\nimport {\n  type ReadonlyJSONObject,\n  type ReadonlyJSONValue,\n  asAsyncIterableStream,\n} from \"assistant-stream/utils\";\nimport { useExternalStoreRuntime } from \"../external-store/useExternalStoreRuntime\";\nimport type { AssistantRuntime } from \"../../runtime/AssistantRuntime\";\nimport type { AddToolResultOptions } from \"@assistant-ui/core\";\nimport { useMemo, useRef, useState } from \"react\";\nimport {\n  AssistantMessageAccumulator,\n  DataStreamDecoder,\n  AssistantTransportDecoder,\n  unstable_createInitialMessage as createInitialMessage,\n  toToolsJSONSchema,\n} from \"assistant-stream\";\nimport type {\n  AssistantTransportOptions,\n  AddMessageCommand,\n  AddToolResultCommand,\n  UserMessagePart,\n  QueuedCommand,\n  AssistantTransportCommand,\n  SendCommandsRequestBody,\n} from \"./types\";\nimport { useCommandQueue } from \"./commandQueue\";\nimport {\n  createReplayBoundaryStream,\n  useReplayRenderWait,\n} from \"./replayBoundaryStream\";\nimport { useRunManager } from \"./runManager\";\nimport { useConvertedState } from \"./useConvertedState\";\nimport type { ToolExecutionStatus } from \"@assistant-ui/core\";\nimport { createRequestHeaders } from \"@assistant-ui/core\";\nimport { useRemoteThreadListRuntime } from \"../remote-thread-list/useRemoteThreadListRuntime\";\nimport { InMemoryThreadListAdapter } from \"@assistant-ui/core\";\nimport { useAui, useAuiState } from \"@assistant-ui/store\";\nimport type { UserExternalState } from \"../../../augmentations\";\n\nconst convertAppendMessageToCommand = (\n  message: AppendMessage,\n): AddMessageCommand => {\n  if (message.role !== \"user\")\n    throw new Error(\"Only user messages are supported\");\n\n  const parts: UserMessagePart[] = [];\n  const content = [\n    ...message.content,\n    ...(message.attachments?.flatMap((a) => a.content) ?? []),\n  ];\n  for (const contentPart of content) {\n    if (contentPart.type === \"text\") {\n      parts.push({ type: \"text\", text: contentPart.text });\n    } else if (contentPart.type === \"image\") {\n      parts.push({ type: \"image\", image: contentPart.image });\n    }\n  }\n\n  return {\n    type: \"add-message\",\n    message: {\n      role: \"user\",\n      parts,\n    },\n    parentId: message.parentId,\n    sourceId: message.sourceId,\n  };\n};\n\nconst symbolAssistantTransportExtras = Symbol(\"assistant-transport-extras\");\ntype AssistantTransportExtras = {\n  [symbolAssistantTransportExtras]: true;\n  sendCommand: (command: AssistantTransportCommand) => void;\n  state: UserExternalState;\n};\n\nconst asAssistantTransportExtras = (\n  extras: unknown,\n): AssistantTransportExtras => {\n  if (\n    typeof extras !== \"object\" ||\n    extras == null ||\n    !(symbolAssistantTransportExtras in extras)\n  )\n    throw new Error(\n      \"This method can only be called when you are using useAssistantTransportRuntime\",\n    );\n\n  return extras as AssistantTransportExtras;\n};\n\nexport const useAssistantTransportSendCommand = () => {\n  const aui = useAui();\n\n  return (command: AssistantTransportCommand) => {\n    const extras = aui.thread().getState().extras;\n    const transportExtras = asAssistantTransportExtras(extras);\n    transportExtras.sendCommand(command);\n  };\n};\n\nexport function useAssistantTransportState(): UserExternalState;\nexport function useAssistantTransportState<T>(\n  selector: (state: UserExternalState) => T,\n): T;\nexport function useAssistantTransportState<T>(\n  selector: (state: UserExternalState) => T = (t) => t as T,\n): T | UserExternalState {\n  return useAuiState((s) =>\n    selector(asAssistantTransportExtras(s.thread.extras).state),\n  );\n}\n\nconst useAssistantTransportThreadRuntime = <T>(\n  options: AssistantTransportOptions<T>,\n): AssistantRuntime => {\n  const agentStateRef = useRef(options.initialState);\n  const [, rerender] = useState(0);\n  const resumeFlagRef = useRef(false);\n  const [isReplaying, setIsReplaying] = useState(false);\n  const waitForReplayRender = useReplayRenderWait();\n  const parentIdRef = useRef<string | null | undefined>(undefined);\n  const commandQueue = useCommandQueue({\n    onQueue: () => runManager.schedule(),\n  });\n\n  const threadId = useAuiState((s) => s.threadListItem.remoteId);\n\n  const runManager = useRunManager({\n    onRun: async (signal: AbortSignal) => {\n      const isResume = resumeFlagRef.current;\n      resumeFlagRef.current = false;\n      setIsReplaying(false);\n      const commands: QueuedCommand[] = isResume ? [] : commandQueue.flush();\n      if (commands.length === 0 && !isResume)\n        throw new Error(\"No commands to send\");\n\n      const headers = await createRequestHeaders(options.headers);\n      const bodyValue =\n        typeof options.body === \"function\"\n          ? await options.body()\n          : options.body;\n      const context = runtime.thread.getModelContext();\n\n      let requestBody: Record<string, unknown> = {\n        commands,\n        state: agentStateRef.current,\n        system: context.system,\n        tools: context.tools ? toToolsJSONSchema(context.tools) : undefined,\n        threadId,\n        ...(parentIdRef.current !== undefined && {\n          parentId: parentIdRef.current,\n        }),\n        // nested (new format, aligned with AssistantChatTransport)\n        callSettings: context.callSettings,\n        config: context.config,\n        // @deprecated spread at top level — use nested `callSettings`/`config` instead. Will be removed in a future version.\n        ...context.callSettings,\n        ...context.config,\n        ...(bodyValue ?? {}),\n      };\n\n      if (options.prepareSendCommandsRequest) {\n        requestBody = await options.prepareSendCommandsRequest(\n          requestBody as SendCommandsRequestBody,\n        );\n      }\n\n      const response = await fetch(\n        isResume ? options.resumeApi! : options.api,\n        {\n          method: \"POST\",\n          headers,\n          body: JSON.stringify(requestBody),\n          signal,\n        },\n      );\n\n      options.onResponse?.(response);\n\n      if (!response.ok) {\n        throw new Error(`Status ${response.status}: ${await response.text()}`);\n      }\n\n      if (!response.body) {\n        throw new Error(\"Response body is null\");\n      }\n\n      const body = await createReplayBoundaryStream(response, {\n        setReplaying: setIsReplaying,\n        waitForRender: waitForReplayRender,\n      });\n\n      // Select decoder based on protocol option\n      const protocol = options.protocol ?? \"data-stream\";\n      const decoder =\n        protocol === \"assistant-transport\"\n          ? new AssistantTransportDecoder()\n          : new DataStreamDecoder();\n\n      let err: string | undefined;\n      const stream = body.pipeThrough(decoder).pipeThrough(\n        new AssistantMessageAccumulator({\n          initialMessage: createInitialMessage({\n            unstable_state:\n              (agentStateRef.current as ReadonlyJSONValue) ?? null,\n          }),\n          throttle: isResume,\n          onError: (error) => {\n            err = error;\n          },\n        }),\n      );\n\n      let markedDelivered = false;\n\n      for await (const chunk of asAsyncIterableStream(stream)) {\n        if (chunk.metadata.unstable_state === agentStateRef.current) continue;\n\n        if (!markedDelivered) {\n          commandQueue.markDelivered();\n          markedDelivered = true;\n        }\n\n        agentStateRef.current = chunk.metadata.unstable_state as T;\n        rerender((prev) => prev + 1);\n      }\n\n      if (err) {\n        throw new Error(err);\n      }\n    },\n    onFinish: options.onFinish,\n    onCancel: () => {\n      setIsReplaying(false);\n      const cmds = [\n        ...commandQueue.state.inTransit,\n        ...commandQueue.state.queued,\n      ];\n\n      commandQueue.reset();\n\n      options.onCancel?.({\n        commands: cmds,\n        updateState: (updater) => {\n          agentStateRef.current = updater(agentStateRef.current);\n          rerender((prev) => prev + 1);\n        },\n      });\n    },\n    onError: async (error) => {\n      setIsReplaying(false);\n      const inTransitCmds = [...commandQueue.state.inTransit];\n      const queuedCmds = [...commandQueue.state.queued];\n\n      commandQueue.reset();\n\n      try {\n        await options.onError?.(error as Error, {\n          commands: inTransitCmds,\n          updateState: (updater) => {\n            agentStateRef.current = updater(agentStateRef.current);\n            rerender((prev) => prev + 1);\n          },\n        });\n      } finally {\n        options.onCancel?.({\n          commands: queuedCmds,\n          updateState: (updater) => {\n            agentStateRef.current = updater(agentStateRef.current);\n            rerender((prev) => prev + 1);\n          },\n          error: error as Error,\n        });\n      }\n    },\n  });\n\n  // Tool execution status state\n  const [toolStatuses, setToolStatuses] = useState<\n    Record<string, ToolExecutionStatus>\n  >({});\n\n  // Reactive conversion of agent state + connection metadata → UI state\n  const pendingCommands = useMemo(\n    () => [...commandQueue.state.inTransit, ...commandQueue.state.queued],\n    [commandQueue.state],\n  );\n  const converted = useConvertedState(\n    options.converter,\n    agentStateRef.current,\n    pendingCommands,\n    runManager.isRunning,\n    toolStatuses,\n  );\n\n  // Create runtime\n  const runtime = useExternalStoreRuntime({\n    messages: converted.messages,\n    state: converted.state,\n    isRunning: converted.isRunning,\n    isLoading: isReplaying,\n    adapters: options.adapters,\n    unstable_enableToolInvocations: true,\n    setToolStatuses,\n    extras: {\n      [symbolAssistantTransportExtras]: true,\n      sendCommand: (command: AssistantTransportCommand) => {\n        commandQueue.enqueue(command);\n      },\n      state: agentStateRef.current as UserExternalState,\n    } satisfies AssistantTransportExtras,\n    onNew: async (message: AppendMessage): Promise<void> => {\n      parentIdRef.current = message.parentId;\n      const command = convertAppendMessageToCommand(message);\n      commandQueue.enqueue(command);\n    },\n    ...(options.capabilities?.edit && {\n      onEdit: async (message: AppendMessage): Promise<void> => {\n        parentIdRef.current = message.parentId;\n        const command = convertAppendMessageToCommand(message);\n        commandQueue.enqueue(command);\n      },\n    }),\n    onCancel: async () => {\n      runManager.cancel();\n    },\n    onResume: async () => {\n      if (!options.resumeApi)\n        throw new Error(\"Must pass resumeApi to options to resume runs\");\n\n      resumeFlagRef.current = true;\n      runManager.schedule();\n    },\n    onAddToolResult: async (\n      toolOptions: AddToolResultOptions,\n    ): Promise<void> => {\n      const command: AddToolResultCommand = {\n        type: \"add-tool-result\",\n        toolCallId: toolOptions.toolCallId,\n        result: toolOptions.result as ReadonlyJSONObject,\n        toolName: toolOptions.toolName,\n        isError: toolOptions.isError,\n        ...(toolOptions.artifact && { artifact: toolOptions.artifact }),\n        ...(toolOptions.modelContent !== undefined && {\n          modelContent: toolOptions.modelContent,\n        }),\n      };\n\n      commandQueue.enqueue(command);\n    },\n    onLoadExternalState: async (state) => {\n      agentStateRef.current = state as T;\n      rerender((prev) => prev + 1);\n    },\n  });\n\n  return runtime;\n};\n\n/**\n * @alpha This is an experimental API that is subject to change.\n */\nexport const useAssistantTransportRuntime = <T>(\n  options: AssistantTransportOptions<T>,\n): AssistantRuntime => {\n  const runtime = useRemoteThreadListRuntime({\n    runtimeHook: function RuntimeHook() {\n      return useAssistantTransportThreadRuntime(options);\n    },\n    adapter: new InMemoryThreadListAdapter(),\n    allowNesting: true,\n  });\n  return runtime;\n};\n"],"mappings":"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"}

package/dist/legacy-runtime/runtime-cores/assistant-transport/useConvertedState.js

@@ -1,4 +1,4 @@
-import { useMemo } from "react";
+import { useMemo } from "@assistant-ui/tap/react-shim";
 //#region src/legacy-runtime/runtime-cores/assistant-transport/useConvertedState.ts
 function useConvertedState(converter, agentState, pendingCommands, isSending, toolStatuses) {
 	return useMemo(() => converter(agentState, {

package/dist/legacy-runtime/runtime-cores/assistant-transport/useLatestRef.js

@@ -1,4 +1,4 @@
-import { useEffect, useRef } from "react";
+import { useEffect, useRef } from "@assistant-ui/tap/react-shim";
 //#region src/legacy-runtime/runtime-cores/assistant-transport/useLatestRef.ts
 function useLatestRef(value) {
 	const ref = useRef(value);

package/dist/mcp-apps/McpAppRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"McpAppRenderer.d.ts","names":[],"sources":["../../src/mcp-apps/McpAppRenderer.tsx"],"mappings":";;;;;;KAkCY,qBAAA;;AAAZ;;;;EAME,IAAA,EAAM,eAAA,CAAgB,WAAA,GAEZ;EAAV,OAAA,GAAU,mBAAA;EASI;;;;EAJd,SAAA,WAU+C;EAR/C,QAAA,GAAW,cAAA,EAQ6C;EANxD,WAAA,GAAc,iBAAA,EAXR;EAaN,QAAA,GAAW,SAAA,EAXX;EAaA,eAAA,GAAkB,SAAA,EARlB;EAUA,aAAA,GAAgB,SAAA,KAAc,KAAA,EAAO,KAAA,KAAU,SAAA;AAAA;;;;;;;;;cAiJpC,cAAA,GAAc,KAAA,EAAA,qBAAA,KAAA,eAAA;EAAA,iBAGH,4BAAA;AAAA"}
+{"version":3,"file":"McpAppRenderer.d.ts","names":[],"sources":["../../src/mcp-apps/McpAppRenderer.tsx"],"mappings":";;;;;;KA6BY,qBAAA;;AAAZ;;;;EAME,IAAA,EAAM,eAAA,CAAgB,WAAA,GAEZ;EAAV,OAAA,GAAU,mBAAA;EASI;;;;EAJd,SAAA,WAU+C;EAR/C,QAAA,GAAW,cAAA,EAQ6C;EANxD,WAAA,GAAc,iBAAA,EAXR;EAaN,QAAA,GAAW,SAAA,EAXX;EAaA,eAAA,GAAkB,SAAA,EARlB;EAUA,aAAA,GAAgB,SAAA,KAAc,KAAA,EAAO,KAAA,KAAU,SAAA;AAAA;;;;;;;;;cAiJpC,cAAA,GAAc,KAAA,EAAA,qBAAA,KAAA,eAAA;EAAA,iBAEL,4BAAA;AAAA"}

package/dist/mcp-apps/McpAppRenderer.js

@@ -2,9 +2,9 @@
 import { McpAppFrame } from "./app-frame.js";
 import { getMcpAppFromToolPart } from "./utils.js";
 import { useAui } from "@assistant-ui/store";
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "@assistant-ui/tap/react-shim";
 import { Fragment, jsx } from "react/jsx-runtime";
-import { resource, tapConst, tapRef, tapResource } from "@assistant-ui/tap";
+import { resource, useResource } from "@assistant-ui/tap";
 //#region src/mcp-apps/McpAppRenderer.tsx
 function getInput(part) {
 	if (part.status.type === "running" && (part.argsText === "" || part.argsText === "{}")) return;
@@ -99,13 +99,13 @@ function InlineRenderer({ part, internalsRef, optionsRef }) {
 * renderer loads that resource from the configured host and displays it in a
 * sandboxed frame.
 */
-const McpAppRenderer = resource((options) => {
-	const host = tapResource(options.host);
-	const optionsRef = tapRef(options);
+const McpAppRenderer = resource(function McpAppRenderer(options) {
+	const host = useResource(options.host);
+	const optionsRef = useRef(options);
 	optionsRef.current = options;
-	const internalsRef = tapRef({ host });
+	const internalsRef = useRef({ host });
 	internalsRef.current = { host };
-	return { render: tapConst(() => {
+	return { render: useMemo(() => {
 		const Render = (props) => /* @__PURE__ */ jsx(InlineRenderer, {
 			part: props,
 			internalsRef,

package/dist/mcp-apps/McpAppRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"McpAppRenderer.js","names":[],"sources":["../../src/mcp-apps/McpAppRenderer.tsx"],"sourcesContent":["\"use client\";\n\nimport {\n  useEffect,\n  useMemo,\n  useRef,\n  useState,\n  type MutableRefObject,\n  type ReactNode,\n} from \"react\";\nimport type { McpAppMetadata } from \"@assistant-ui/core\";\nimport type {\n  ToolCallMessagePartComponent,\n  ToolCallMessagePartProps,\n} from \"@assistant-ui/core/react\";\nimport { useAui } from \"@assistant-ui/store\";\nimport {\n  resource,\n  tapConst,\n  tapRef,\n  tapResource,\n  type ResourceElement,\n} from \"@assistant-ui/tap\";\nimport { McpAppFrame } from \"./app-frame\";\nimport type {\n  McpAppBridgeHandlers,\n  McpAppHostContext,\n  McpAppHostInfo,\n  McpAppResource,\n  McpAppSandboxConfig,\n  McpAppsHost,\n} from \"./types\";\nimport { getMcpAppFromToolPart } from \"./utils\";\n\nexport type McpAppRendererOptions = {\n  /**\n   * Provides the data-plane operations the widget can request\n   * (`loadResource`, `callTool`, `readResource`, `listResources`). Use\n   * `McpAppsRemoteHost({ url })` for the default HTTP-route convention.\n   */\n  host: ResourceElement<McpAppsHost>;\n  /** Sandbox + container styling. Passes through to SafeContentFrame. */\n  sandbox?: McpAppSandboxConfig;\n  /**\n   * Upper bound (in pixels) applied to the widget-driven auto-resize height.\n   * Defaults to 800.\n   */\n  maxHeight?: number;\n  /** Identifies the host to the widget in the `ui/initialize` response. */\n  hostInfo?: McpAppHostInfo;\n  /** Delivered to the widget on initialize and pushed via `notifications/host_context/changed` on change. */\n  hostContext?: McpAppHostContext;\n  /** Rendered when no MCP app is on the part, or while load is in flight / failed (unless overridden). */\n  fallback?: ReactNode;\n  /** Rendered while the resource is loading. Defaults to `fallback`. */\n  loadingFallback?: ReactNode;\n  /** Rendered when the resource load rejects. Defaults to `fallback`. */\n  errorFallback?: ReactNode | ((error: Error) => ReactNode);\n};\n\ntype LoadedResourceState = {\n  resourceUri: string;\n  resource?: McpAppResource;\n  error?: Error;\n};\n\nfunction getInput(part: {\n  status: { type: string };\n  argsText: string;\n  args: unknown;\n}): unknown {\n  if (\n    part.status.type === \"running\" &&\n    (part.argsText === \"\" || part.argsText === \"{}\")\n  ) {\n    return undefined;\n  }\n  return part.args;\n}\n\nconst defaultOpenLink = ({ url }: { url: string }) => {\n  window.open(url, \"_blank\", \"noopener,noreferrer\");\n};\n\nfunction extractSendMessageText(params: unknown): string | undefined {\n  if (typeof params === \"string\") return params;\n  if (!params || typeof params !== \"object\") return undefined;\n  const obj = params as Record<string, unknown>;\n  if (typeof obj[\"prompt\"] === \"string\") return obj[\"prompt\"];\n  if (typeof obj[\"text\"] === \"string\") return obj[\"text\"];\n  if (typeof obj[\"message\"] === \"string\") return obj[\"message\"];\n  return undefined;\n}\n\nfunction InlineRenderer({\n  part,\n  internalsRef,\n  optionsRef,\n}: {\n  part: ToolCallMessagePartProps;\n  internalsRef: MutableRefObject<{ host: McpAppsHost }>;\n  optionsRef: MutableRefObject<McpAppRendererOptions>;\n}) {\n  const opts = optionsRef.current;\n  const aui = useAui();\n  const app = getMcpAppFromToolPart(part);\n  const cachedAppRef = useRef<McpAppMetadata | undefined>(undefined);\n  if (app != null && cachedAppRef.current?.resourceUri !== app.resourceUri) {\n    cachedAppRef.current = app;\n  }\n  const appForRender = app ?? cachedAppRef.current;\n\n  const [loadedResource, setLoadedResource] = useState<LoadedResourceState>();\n\n  const resourceUri = appForRender?.resourceUri;\n  useEffect(() => {\n    if (appForRender == null || resourceUri == null) return;\n    let cancelled = false;\n    const targetUri = resourceUri;\n\n    internalsRef.current.host\n      .loadResource({ uri: targetUri })\n      .then((res) => {\n        if (!cancelled)\n          setLoadedResource({ resourceUri: targetUri, resource: res });\n      })\n      .catch((error: unknown) => {\n        if (!cancelled) {\n          setLoadedResource({\n            resourceUri: targetUri,\n            error: error instanceof Error ? error : new Error(String(error)),\n          });\n        }\n      });\n\n    return () => {\n      cancelled = true;\n    };\n    // oxlint-disable-next-line tap-hooks/exhaustive-deps -- re-fetch only when URI changes; appForRender identity is unstable and internalsRef is a stable ref\n  }, [resourceUri]);\n\n  const bridgeHandlers = useMemo<McpAppBridgeHandlers>(\n    () => ({\n      openLink: defaultOpenLink,\n      sendMessage: (params) => {\n        const text = extractSendMessageText(params);\n        if (!text) return { ok: false, reason: \"unrecognised params shape\" };\n        aui.thread().append({ content: [{ type: \"text\", text }] });\n        return { ok: true };\n      },\n      callTool: (params) => internalsRef.current.host.callTool(params),\n      readResource: (params) => internalsRef.current.host.readResource(params),\n      listResources: (params) =>\n        internalsRef.current.host.listResources(params),\n    }),\n    [aui, internalsRef],\n  );\n\n  const loadedResourceForApp =\n    loadedResource?.resourceUri === appForRender?.resourceUri\n      ? loadedResource\n      : undefined;\n  const appResource = loadedResourceForApp?.resource;\n  const error = loadedResourceForApp?.error;\n\n  const fallback = opts.fallback ?? null;\n  if (appForRender == null) {\n    return <>{fallback}</>;\n  }\n  if (error != null) {\n    const errorFallback = opts.errorFallback;\n    if (errorFallback === undefined) return <>{fallback}</>;\n    if (typeof errorFallback === \"function\") return <>{errorFallback(error)}</>;\n    return <>{errorFallback}</>;\n  }\n  if (appResource == null) {\n    return <>{opts.loadingFallback ?? fallback}</>;\n  }\n\n  return (\n    <McpAppFrame\n      app={appForRender}\n      resource={appResource}\n      input={getInput(part)}\n      output={part.result}\n      sandbox={opts.sandbox}\n      handlers={bridgeHandlers}\n      hostInfo={opts.hostInfo}\n      hostContext={opts.hostContext}\n      maxHeight={opts.maxHeight}\n    />\n  );\n}\n\n/**\n * Creates a tool-call renderer for MCP Apps embedded in assistant messages.\n *\n * Compose this into the `Tools` resource through its `mcpApp` option. When a\n * tool-call part carries `mcp.app` metadata for a `ui://` resource, the\n * renderer loads that resource from the configured host and displays it in a\n * sandboxed frame.\n */\nexport const McpAppRenderer = resource(\n  (\n    options: McpAppRendererOptions,\n  ): { readonly render: ToolCallMessagePartComponent } => {\n    const host = tapResource(options.host);\n\n    const optionsRef = tapRef<McpAppRendererOptions>(options);\n    optionsRef.current = options;\n\n    const internalsRef = tapRef<{ host: McpAppsHost }>({ host });\n    internalsRef.current = { host };\n\n    const render = tapConst((): ToolCallMessagePartComponent => {\n      const Render: ToolCallMessagePartComponent = (props) => (\n        <InlineRenderer\n          part={props}\n          internalsRef={internalsRef}\n          optionsRef={optionsRef}\n        />\n      );\n      Render.displayName = \"McpAppRenderer\";\n      return Render;\n    }, []);\n\n    return { render };\n  },\n);\n"],"mappings":"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"}
+{"version":3,"file":"McpAppRenderer.js","names":[],"sources":["../../src/mcp-apps/McpAppRenderer.tsx"],"sourcesContent":["\"use client\";\n\nimport {\n  useEffect,\n  useMemo,\n  useRef,\n  useState,\n  type MutableRefObject,\n  type ReactNode,\n} from \"react\";\nimport type { McpAppMetadata } from \"@assistant-ui/core\";\nimport type {\n  ToolCallMessagePartComponent,\n  ToolCallMessagePartProps,\n} from \"@assistant-ui/core/react\";\nimport { useAui } from \"@assistant-ui/store\";\n\nimport { useResource, resource, type ResourceElement } from \"@assistant-ui/tap\";\nimport { McpAppFrame } from \"./app-frame\";\nimport type {\n  McpAppBridgeHandlers,\n  McpAppHostContext,\n  McpAppHostInfo,\n  McpAppResource,\n  McpAppSandboxConfig,\n  McpAppsHost,\n} from \"./types\";\nimport { getMcpAppFromToolPart } from \"./utils\";\n\nexport type McpAppRendererOptions = {\n  /**\n   * Provides the data-plane operations the widget can request\n   * (`loadResource`, `callTool`, `readResource`, `listResources`). Use\n   * `McpAppsRemoteHost({ url })` for the default HTTP-route convention.\n   */\n  host: ResourceElement<McpAppsHost>;\n  /** Sandbox + container styling. Passes through to SafeContentFrame. */\n  sandbox?: McpAppSandboxConfig;\n  /**\n   * Upper bound (in pixels) applied to the widget-driven auto-resize height.\n   * Defaults to 800.\n   */\n  maxHeight?: number;\n  /** Identifies the host to the widget in the `ui/initialize` response. */\n  hostInfo?: McpAppHostInfo;\n  /** Delivered to the widget on initialize and pushed via `notifications/host_context/changed` on change. */\n  hostContext?: McpAppHostContext;\n  /** Rendered when no MCP app is on the part, or while load is in flight / failed (unless overridden). */\n  fallback?: ReactNode;\n  /** Rendered while the resource is loading. Defaults to `fallback`. */\n  loadingFallback?: ReactNode;\n  /** Rendered when the resource load rejects. Defaults to `fallback`. */\n  errorFallback?: ReactNode | ((error: Error) => ReactNode);\n};\n\ntype LoadedResourceState = {\n  resourceUri: string;\n  resource?: McpAppResource;\n  error?: Error;\n};\n\nfunction getInput(part: {\n  status: { type: string };\n  argsText: string;\n  args: unknown;\n}): unknown {\n  if (\n    part.status.type === \"running\" &&\n    (part.argsText === \"\" || part.argsText === \"{}\")\n  ) {\n    return undefined;\n  }\n  return part.args;\n}\n\nconst defaultOpenLink = ({ url }: { url: string }) => {\n  window.open(url, \"_blank\", \"noopener,noreferrer\");\n};\n\nfunction extractSendMessageText(params: unknown): string | undefined {\n  if (typeof params === \"string\") return params;\n  if (!params || typeof params !== \"object\") return undefined;\n  const obj = params as Record<string, unknown>;\n  if (typeof obj[\"prompt\"] === \"string\") return obj[\"prompt\"];\n  if (typeof obj[\"text\"] === \"string\") return obj[\"text\"];\n  if (typeof obj[\"message\"] === \"string\") return obj[\"message\"];\n  return undefined;\n}\n\nfunction InlineRenderer({\n  part,\n  internalsRef,\n  optionsRef,\n}: {\n  part: ToolCallMessagePartProps;\n  internalsRef: MutableRefObject<{ host: McpAppsHost }>;\n  optionsRef: MutableRefObject<McpAppRendererOptions>;\n}) {\n  const opts = optionsRef.current;\n  const aui = useAui();\n  const app = getMcpAppFromToolPart(part);\n  const cachedAppRef = useRef<McpAppMetadata | undefined>(undefined);\n  if (app != null && cachedAppRef.current?.resourceUri !== app.resourceUri) {\n    cachedAppRef.current = app;\n  }\n  const appForRender = app ?? cachedAppRef.current;\n\n  const [loadedResource, setLoadedResource] = useState<LoadedResourceState>();\n\n  const resourceUri = appForRender?.resourceUri;\n  useEffect(() => {\n    if (appForRender == null || resourceUri == null) return;\n    let cancelled = false;\n    const targetUri = resourceUri;\n\n    internalsRef.current.host\n      .loadResource({ uri: targetUri })\n      .then((res) => {\n        if (!cancelled)\n          setLoadedResource({ resourceUri: targetUri, resource: res });\n      })\n      .catch((error: unknown) => {\n        if (!cancelled) {\n          setLoadedResource({\n            resourceUri: targetUri,\n            error: error instanceof Error ? error : new Error(String(error)),\n          });\n        }\n      });\n\n    return () => {\n      cancelled = true;\n    };\n    // oxlint-disable-next-line react/exhaustive-deps -- re-fetch only when URI changes; appForRender identity is unstable and internalsRef is a stable ref\n  }, [resourceUri]);\n\n  const bridgeHandlers = useMemo<McpAppBridgeHandlers>(\n    () => ({\n      openLink: defaultOpenLink,\n      sendMessage: (params) => {\n        const text = extractSendMessageText(params);\n        if (!text) return { ok: false, reason: \"unrecognised params shape\" };\n        aui.thread().append({ content: [{ type: \"text\", text }] });\n        return { ok: true };\n      },\n      callTool: (params) => internalsRef.current.host.callTool(params),\n      readResource: (params) => internalsRef.current.host.readResource(params),\n      listResources: (params) =>\n        internalsRef.current.host.listResources(params),\n    }),\n    [aui, internalsRef],\n  );\n\n  const loadedResourceForApp =\n    loadedResource?.resourceUri === appForRender?.resourceUri\n      ? loadedResource\n      : undefined;\n  const appResource = loadedResourceForApp?.resource;\n  const error = loadedResourceForApp?.error;\n\n  const fallback = opts.fallback ?? null;\n  if (appForRender == null) {\n    return <>{fallback}</>;\n  }\n  if (error != null) {\n    const errorFallback = opts.errorFallback;\n    if (errorFallback === undefined) return <>{fallback}</>;\n    if (typeof errorFallback === \"function\") return <>{errorFallback(error)}</>;\n    return <>{errorFallback}</>;\n  }\n  if (appResource == null) {\n    return <>{opts.loadingFallback ?? fallback}</>;\n  }\n\n  return (\n    <McpAppFrame\n      app={appForRender}\n      resource={appResource}\n      input={getInput(part)}\n      output={part.result}\n      sandbox={opts.sandbox}\n      handlers={bridgeHandlers}\n      hostInfo={opts.hostInfo}\n      hostContext={opts.hostContext}\n      maxHeight={opts.maxHeight}\n    />\n  );\n}\n\n/**\n * Creates a tool-call renderer for MCP Apps embedded in assistant messages.\n *\n * Compose this into the `Tools` resource through its `mcpApp` option. When a\n * tool-call part carries `mcp.app` metadata for a `ui://` resource, the\n * renderer loads that resource from the configured host and displays it in a\n * sandboxed frame.\n */\nexport const McpAppRenderer = resource(function McpAppRenderer(\n  options: McpAppRendererOptions,\n): { readonly render: ToolCallMessagePartComponent } {\n  const host = useResource(options.host);\n\n  const optionsRef = useRef<McpAppRendererOptions>(options);\n  optionsRef.current = options;\n\n  const internalsRef = useRef<{ host: McpAppsHost }>({ host });\n  internalsRef.current = { host };\n\n  const render = useMemo((): ToolCallMessagePartComponent => {\n    const Render: ToolCallMessagePartComponent = (props) => (\n      <InlineRenderer\n        part={props}\n        internalsRef={internalsRef}\n        optionsRef={optionsRef}\n      />\n    );\n    Render.displayName = \"McpAppRenderer\";\n    return Render;\n  }, []);\n\n  return { render };\n});\n"],"mappings":";;;;;;;;AA6DA,SAAS,SAAS,MAIN;CACV,IACE,KAAK,OAAO,SAAS,cACpB,KAAK,aAAa,MAAM,KAAK,aAAa,OAE3C;CAEF,OAAO,KAAK;AACd;AAEA,MAAM,mBAAmB,EAAE,UAA2B;CACpD,OAAO,KAAK,KAAK,UAAU,qBAAqB;AAClD;AAEA,SAAS,uBAAuB,QAAqC;CACnE,IAAI,OAAO,WAAW,UAAU,OAAO;CACvC,IAAI,CAAC,UAAU,OAAO,WAAW,UAAU,OAAO,KAAA;CAClD,MAAM,MAAM;CACZ,IAAI,OAAO,IAAI,cAAc,UAAU,OAAO,IAAI;CAClD,IAAI,OAAO,IAAI,YAAY,UAAU,OAAO,IAAI;CAChD,IAAI,OAAO,IAAI,eAAe,UAAU,OAAO,IAAI;AAErD;AAEA,SAAS,eAAe,EACtB,MACA,cACA,cAKC;CACD,MAAM,OAAO,WAAW;CACxB,MAAM,MAAM,OAAO;CACnB,MAAM,MAAM,sBAAsB,IAAI;CACtC,MAAM,eAAe,OAAmC,KAAA,CAAS;CACjE,IAAI,OAAO,QAAQ,aAAa,SAAS,gBAAgB,IAAI,aAC3D,aAAa,UAAU;CAEzB,MAAM,eAAe,OAAO,aAAa;CAEzC,MAAM,CAAC,gBAAgB,qBAAqB,SAA8B;CAE1E,MAAM,cAAc,cAAc;CAClC,gBAAgB;EACd,IAAI,gBAAgB,QAAQ,eAAe,MAAM;EACjD,IAAI,YAAY;EAChB,MAAM,YAAY;EAElB,aAAa,QAAQ,KAClB,aAAa,EAAE,KAAK,UAAU,CAAC,CAAC,CAChC,MAAM,QAAQ;GACb,IAAI,CAAC,WACH,kBAAkB;IAAE,aAAa;IAAW,UAAU;GAAI,CAAC;EAC/D,CAAC,CAAC,CACD,OAAO,UAAmB;GACzB,IAAI,CAAC,WACH,kBAAkB;IAChB,aAAa;IACb,OAAO,iBAAiB,QAAQ,QAAQ,IAAI,MAAM,OAAO,KAAK,CAAC;GACjE,CAAC;EAEL,CAAC;EAEH,aAAa;GACX,YAAY;EACd;CAEF,GAAG,CAAC,WAAW,CAAC;CAEhB,MAAM,iBAAiB,eACd;EACL,UAAU;EACV,cAAc,WAAW;GACvB,MAAM,OAAO,uBAAuB,MAAM;GAC1C,IAAI,CAAC,MAAM,OAAO;IAAE,IAAI;IAAO,QAAQ;GAA4B;GACnE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC;IAAE,MAAM;IAAQ;GAAK,CAAC,EAAE,CAAC;GACzD,OAAO,EAAE,IAAI,KAAK;EACpB;EACA,WAAW,WAAW,aAAa,QAAQ,KAAK,SAAS,MAAM;EAC/D,eAAe,WAAW,aAAa,QAAQ,KAAK,aAAa,MAAM;EACvE,gBAAgB,WACd,aAAa,QAAQ,KAAK,cAAc,MAAM;CAClD,IACA,CAAC,KAAK,YAAY,CACpB;CAEA,MAAM,uBACJ,gBAAgB,gBAAgB,cAAc,cAC1C,iBACA,KAAA;CACN,MAAM,cAAc,sBAAsB;CAC1C,MAAM,QAAQ,sBAAsB;CAEpC,MAAM,WAAW,KAAK,YAAY;CAClC,IAAI,gBAAgB,MAClB,OAAO,oBAAA,UAAA,EAAA,UAAG,SAAW,CAAA;CAEvB,IAAI,SAAS,MAAM;EACjB,MAAM,gBAAgB,KAAK;EAC3B,IAAI,kBAAkB,KAAA,GAAW,OAAO,oBAAA,UAAA,EAAA,UAAG,SAAW,CAAA;EACtD,IAAI,OAAO,kBAAkB,YAAY,OAAO,oBAAA,UAAA,EAAA,UAAG,cAAc,KAAK,EAAI,CAAA;EAC1E,OAAO,oBAAA,UAAA,EAAA,UAAG,cAAgB,CAAA;CAC5B;CACA,IAAI,eAAe,MACjB,OAAO,oBAAA,UAAA,EAAA,UAAG,KAAK,mBAAmB,SAAW,CAAA;CAG/C,OACE,oBAAC,aAAD;EACE,KAAK;EACL,UAAU;EACV,OAAO,SAAS,IAAI;EACpB,QAAQ,KAAK;EACb,SAAS,KAAK;EACd,UAAU;EACV,UAAU,KAAK;EACf,aAAa,KAAK;EAClB,WAAW,KAAK;CACjB,CAAA;AAEL;;;;;;;;;AAUA,MAAa,iBAAiB,SAAS,SAAS,eAC9C,SACmD;CACnD,MAAM,OAAO,YAAY,QAAQ,IAAI;CAErC,MAAM,aAAa,OAA8B,OAAO;CACxD,WAAW,UAAU;CAErB,MAAM,eAAe,OAA8B,EAAE,KAAK,CAAC;CAC3D,aAAa,UAAU,EAAE,KAAK;CAc9B,OAAO,EAAE,QAZM,cAA4C;EACzD,MAAM,UAAwC,UAC5C,oBAAC,gBAAD;GACE,MAAM;GACQ;GACF;EACb,CAAA;EAEH,OAAO,cAAc;EACrB,OAAO;CACT,GAAG,CAAC,CAEU,EAAE;AAClB,CAAC"}

package/dist/mcp-apps/McpAppsRemoteHost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"McpAppsRemoteHost.d.ts","names":[],"sources":["../../src/mcp-apps/McpAppsRemoteHost.ts"],"mappings":";;;;;AAmCA;;;;;cAAa,iBAAA,GAAiB,KAAA,EAAA,wBAAA,iCAAA,eAAA,CAAA,WAAA,EAAA,wBAAA"}
+{"version":3,"file":"McpAppsRemoteHost.d.ts","names":[],"sources":["../../src/mcp-apps/McpAppsRemoteHost.ts"],"mappings":";;;;;AAoCA;;;;;cAAa,iBAAA,GAAiB,KAAA,EAAA,wBAAA,iCAAA,eAAA,CAAA,WAAA,EAAA,wBAAA"}

package/dist/mcp-apps/McpAppsRemoteHost.js

@@ -1,4 +1,5 @@
-import { resource, tapConst, tapRef } from "@assistant-ui/tap";
+import { useMemo, useRef } from "@assistant-ui/tap/react-shim";
+import { resource } from "@assistant-ui/tap";
 //#region src/mcp-apps/McpAppsRemoteHost.ts
 async function postToHost(options, method, params) {
 	const doFetch = options.fetch ?? fetch;
@@ -24,10 +25,10 @@ async function postToHost(options, method, params) {
 * params }`, using the method names expected by the assistant-ui MCP Apps
 * guide.
 */
-const McpAppsRemoteHost = resource((options) => {
-	const optionsRef = tapRef(options);
+const McpAppsRemoteHost = resource(function McpAppsRemoteHost(options) {
+	const optionsRef = useRef(options);
 	optionsRef.current = options;
-	return tapConst(() => ({
+	return useMemo(() => ({
 		loadResource: (params) => postToHost(optionsRef.current, "mcp-apps/read-resource", params),
 		callTool: (params) => postToHost(optionsRef.current, "tools/call", params),
 		readResource: (params) => postToHost(optionsRef.current, "resources/read", params),

package/dist/mcp-apps/McpAppsRemoteHost.js.map

@@ -1 +1 @@
-{"version":3,"file":"McpAppsRemoteHost.js","names":[],"sources":["../../src/mcp-apps/McpAppsRemoteHost.ts"],"sourcesContent":["import { resource, tapConst, tapRef } from \"@assistant-ui/tap\";\nimport type {\n  McpAppResource,\n  McpAppsHost,\n  McpAppsRemoteHostOptions,\n} from \"./types\";\n\nasync function postToHost(\n  options: McpAppsRemoteHostOptions,\n  method: string,\n  params: unknown,\n): Promise<unknown> {\n  const doFetch = options.fetch ?? fetch;\n  const extraHeaders =\n    typeof options.headers === \"function\"\n      ? await options.headers()\n      : (options.headers ?? {});\n  const res = await doFetch(options.url, {\n    method: \"POST\",\n    headers: { \"content-type\": \"application/json\", ...extraHeaders },\n    body: JSON.stringify({ method, params }),\n  });\n  if (!res.ok) {\n    throw new Error(`MCP App host request failed: ${res.status}`);\n  }\n  return res.json();\n}\n\n/**\n * Creates the default HTTP host for MCP App widgets.\n *\n * The host POSTs widget requests to the configured route as `{ method,\n * params }`, using the method names expected by the assistant-ui MCP Apps\n * guide.\n */\nexport const McpAppsRemoteHost = resource(\n  (options: McpAppsRemoteHostOptions): McpAppsHost => {\n    const optionsRef = tapRef(options);\n    optionsRef.current = options;\n\n    return tapConst(\n      (): McpAppsHost => ({\n        loadResource: (params) =>\n          postToHost(\n            optionsRef.current,\n            \"mcp-apps/read-resource\",\n            params,\n          ) as Promise<McpAppResource>,\n        callTool: (params) =>\n          postToHost(optionsRef.current, \"tools/call\", params),\n        readResource: (params) =>\n          postToHost(optionsRef.current, \"resources/read\", params),\n        listResources: (params) =>\n          postToHost(optionsRef.current, \"resources/list\", params),\n      }),\n      [],\n    );\n  },\n);\n"],"mappings":";;AAOA,eAAe,WACb,SACA,QACA,QACkB;CAClB,MAAM,UAAU,QAAQ,SAAS;CACjC,MAAM,eACJ,OAAO,QAAQ,YAAY,aACvB,MAAM,QAAQ,QAAQ,IACrB,QAAQ,WAAW,CAAC;CAC3B,MAAM,MAAM,MAAM,QAAQ,QAAQ,KAAK;EACrC,QAAQ;EACR,SAAS;GAAE,gBAAgB;GAAoB,GAAG;EAAa;EAC/D,MAAM,KAAK,UAAU;GAAE;GAAQ;EAAO,CAAC;CACzC,CAAC;CACD,IAAI,CAAC,IAAI,IACP,MAAM,IAAI,MAAM,gCAAgC,IAAI,QAAQ;CAE9D,OAAO,IAAI,KAAK;AAClB;;;;;;;;AASA,MAAa,oBAAoB,UAC9B,YAAmD;CAClD,MAAM,aAAa,OAAO,OAAO;CACjC,WAAW,UAAU;CAErB,OAAO,gBACe;EAClB,eAAe,WACb,WACE,WAAW,SACX,0BACA,MACF;EACF,WAAW,WACT,WAAW,WAAW,SAAS,cAAc,MAAM;EACrD,eAAe,WACb,WAAW,WAAW,SAAS,kBAAkB,MAAM;EACzD,gBAAgB,WACd,WAAW,WAAW,SAAS,kBAAkB,MAAM;CAC3D,IACA,CAAC,CACH;AACF,CACF"}
+{"version":3,"file":"McpAppsRemoteHost.js","names":[],"sources":["../../src/mcp-apps/McpAppsRemoteHost.ts"],"sourcesContent":["import { useMemo, useRef } from \"react\";\nimport { resource } from \"@assistant-ui/tap\";\nimport type {\n  McpAppResource,\n  McpAppsHost,\n  McpAppsRemoteHostOptions,\n} from \"./types\";\n\nasync function postToHost(\n  options: McpAppsRemoteHostOptions,\n  method: string,\n  params: unknown,\n): Promise<unknown> {\n  const doFetch = options.fetch ?? fetch;\n  const extraHeaders =\n    typeof options.headers === \"function\"\n      ? await options.headers()\n      : (options.headers ?? {});\n  const res = await doFetch(options.url, {\n    method: \"POST\",\n    headers: { \"content-type\": \"application/json\", ...extraHeaders },\n    body: JSON.stringify({ method, params }),\n  });\n  if (!res.ok) {\n    throw new Error(`MCP App host request failed: ${res.status}`);\n  }\n  return res.json();\n}\n\n/**\n * Creates the default HTTP host for MCP App widgets.\n *\n * The host POSTs widget requests to the configured route as `{ method,\n * params }`, using the method names expected by the assistant-ui MCP Apps\n * guide.\n */\nexport const McpAppsRemoteHost = resource(function McpAppsRemoteHost(\n  options: McpAppsRemoteHostOptions,\n): McpAppsHost {\n  const optionsRef = useRef(options);\n  optionsRef.current = options;\n\n  return useMemo(\n    (): McpAppsHost => ({\n      loadResource: (params) =>\n        postToHost(\n          optionsRef.current,\n          \"mcp-apps/read-resource\",\n          params,\n        ) as Promise<McpAppResource>,\n      callTool: (params) =>\n        postToHost(optionsRef.current, \"tools/call\", params),\n      readResource: (params) =>\n        postToHost(optionsRef.current, \"resources/read\", params),\n      listResources: (params) =>\n        postToHost(optionsRef.current, \"resources/list\", params),\n    }),\n    [],\n  );\n});\n"],"mappings":";;;AAQA,eAAe,WACb,SACA,QACA,QACkB;CAClB,MAAM,UAAU,QAAQ,SAAS;CACjC,MAAM,eACJ,OAAO,QAAQ,YAAY,aACvB,MAAM,QAAQ,QAAQ,IACrB,QAAQ,WAAW,CAAC;CAC3B,MAAM,MAAM,MAAM,QAAQ,QAAQ,KAAK;EACrC,QAAQ;EACR,SAAS;GAAE,gBAAgB;GAAoB,GAAG;EAAa;EAC/D,MAAM,KAAK,UAAU;GAAE;GAAQ;EAAO,CAAC;CACzC,CAAC;CACD,IAAI,CAAC,IAAI,IACP,MAAM,IAAI,MAAM,gCAAgC,IAAI,QAAQ;CAE9D,OAAO,IAAI,KAAK;AAClB;;;;;;;;AASA,MAAa,oBAAoB,SAAS,SAAS,kBACjD,SACa;CACb,MAAM,aAAa,OAAO,OAAO;CACjC,WAAW,UAAU;CAErB,OAAO,eACe;EAClB,eAAe,WACb,WACE,WAAW,SACX,0BACA,MACF;EACF,WAAW,WACT,WAAW,WAAW,SAAS,cAAc,MAAM;EACrD,eAAe,WACb,WAAW,WAAW,SAAS,kBAAkB,MAAM;EACzD,gBAAgB,WACd,WAAW,WAAW,SAAS,kBAAkB,MAAM;CAC3D,IACA,CAAC,CACH;AACF,CAAC"}

package/dist/mcp-apps/app-frame.d.ts

@@ -11,7 +11,7 @@ declare function McpAppFrame({
   hostInfo,
   hostContext,
   maxHeight
-}: McpAppFrameProps): import("react/jsx-runtime").JSX.Element;
+}: McpAppFrameProps): import("react").JSX.Element;
 //#endregion
 export { McpAppFrame };
 //# sourceMappingURL=app-frame.d.ts.map

package/dist/mcp-apps/app-frame.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-frame.d.ts","names":[],"sources":["../../src/mcp-apps/app-frame.tsx"],"mappings":";;;iBA2FgB,WAAA;EACd,GAAA;EACA,QAAA;EACA,KAAA;EACA,MAAA;EACA,OAAA;EACA,QAAA;EACA,QAAA;EACA,WAAA;EACA;AAAA,GACC,gBAAA,+BAAgB,GAAA,CAAA,OAAA"}
+{"version":3,"file":"app-frame.d.ts","names":[],"sources":["../../src/mcp-apps/app-frame.tsx"],"mappings":";;;iBAgGgB,WAAA;EACd,GAAA;EACA,QAAA;EACA,KAAA;EACA,MAAA;EACA,OAAA;EACA,QAAA;EACA,QAAA;EACA,WAAA;EACA;AAAA,GACC,gBAAA,mBAAgB,GAAA,CAAA,OAAA"}

package/dist/mcp-apps/app-frame.js

@@ -1,8 +1,8 @@
 "use client";
 import { createMcpAppBridge } from "./bridge.js";
-import { useEffect, useRef, useState } from "react";
+import { SandboxHost } from "../sandbox-host/SandboxHost.js";
+import { useEffect, useRef } from "@assistant-ui/tap/react-shim";
 import { jsx } from "react/jsx-runtime";
-import { SafeContentFrame } from "safe-content-frame";
 //#region src/mcp-apps/app-frame.tsx
 const DEFAULT_PRODUCT = "assistant-ui-mcp-app";
 const INIT_TIMEOUT_MS = 5e3;
@@ -49,8 +49,6 @@ function buildLiveHandlers(initial, liveRef) {
 	return out;
 }
 function McpAppFrame({ app, resource, input, output, sandbox, handlers, hostInfo, hostContext, maxHeight = DEFAULT_MAX_HEIGHT }) {
-	const containerRef = useRef(null);
-	const [contentHeight, setContentHeight] = useState(void 0);
 	const bridgeRef = useRef(null);
 	const lastSentInputRef = useRef(void 0);
 	const lastSentOutputRef = useRef(void 0);
@@ -67,116 +65,96 @@ function McpAppFrame({ app, resource, input, output, sandbox, handlers, hostInfo
 		input,
 		output
 	};
-	const resourceUri = resource.uri;
-	useEffect(() => {
-		const container = containerRef.current;
-		if (!container) return;
-		let cancelled = false;
+	const createBridge = (frame, host) => {
+		const current = liveRef.current;
 		let initTimeoutId = null;
-		let frame = null;
-		const sb = sandbox;
-		const html = resource.html;
-		const scf = new SafeContentFrame(sb?.product ?? DEFAULT_PRODUCT, {
-			...sb?.sandbox !== void 0 && { sandbox: sb.sandbox },
-			...sb?.useShadowDom !== void 0 && { useShadowDom: sb.useShadowDom },
-			...sb?.enableBrowserCaching !== void 0 && { enableBrowserCaching: sb.enableBrowserCaching },
-			...sb?.salt !== void 0 && { salt: sb.salt }
-		});
-		const renderOpts = sb?.unsafeDocumentWrite !== void 0 ? { unsafeDocumentWrite: sb.unsafeDocumentWrite } : void 0;
-		scf.renderHtml(html, container, renderOpts).then((rendered) => {
-			if (cancelled) {
-				rendered.dispose();
-				return;
+		const flushPending = () => {
+			if (widgetReadyRef.current) return;
+			widgetReadyRef.current = true;
+			const b = bridgeRef.current;
+			if (!b) return;
+			if (pendingInputRef.current !== void 0) {
+				b.notifyToolInput(pendingInputRef.current);
+				lastSentInputRef.current = pendingInputRef.current;
+				pendingInputRef.current = void 0;
 			}
-			frame = rendered;
-			const current = liveRef.current;
-			const liveHandlers = buildLiveHandlers(current.handlers, liveRef);
-			const liveOnInitialized = liveHandlers.onInitialized;
-			const flushPending = () => {
-				if (widgetReadyRef.current) return;
-				widgetReadyRef.current = true;
-				const b = bridgeRef.current;
-				if (!b) return;
-				if (pendingInputRef.current !== void 0) {
-					b.notifyToolInput(pendingInputRef.current);
-					lastSentInputRef.current = pendingInputRef.current;
-					pendingInputRef.current = void 0;
-				}
-				if (pendingOutputRef.current !== void 0) {
-					b.notifyToolResult(pendingOutputRef.current);
-					lastSentOutputRef.current = pendingOutputRef.current;
-					pendingOutputRef.current = void 0;
-				}
-				if (pendingHostContextRef.current !== void 0) {
-					b.notifyHostContextChanged(pendingHostContextRef.current);
-					lastSentHostContextRef.current = pendingHostContextRef.current;
-					pendingHostContextRef.current = void 0;
-				}
-			};
-			const wrappedHandlers = {
-				...liveHandlers,
-				onInitialized: () => {
-					if (initTimeoutId !== null) {
-						clearTimeout(initTimeoutId);
-						initTimeoutId = null;
-					}
-					flushPending();
-					liveOnInitialized?.();
-				},
-				onSizeChange: (p) => {
-					if (typeof p.height === "number" && Number.isFinite(p.height) && p.height > 0) setContentHeight(p.height);
-					liveHandlers.onSizeChange?.(p);
+			if (pendingOutputRef.current !== void 0) {
+				b.notifyToolResult(pendingOutputRef.current);
+				lastSentOutputRef.current = pendingOutputRef.current;
+				pendingOutputRef.current = void 0;
+			}
+			if (pendingHostContextRef.current !== void 0) {
+				b.notifyHostContextChanged(pendingHostContextRef.current);
+				lastSentHostContextRef.current = pendingHostContextRef.current;
+				pendingHostContextRef.current = void 0;
+			}
+		};
+		const liveHandlers = buildLiveHandlers(current.handlers, liveRef);
+		const liveOnInitialized = liveHandlers.onInitialized;
+		const wrappedHandlers = {
+			...liveHandlers,
+			onInitialized: () => {
+				if (initTimeoutId !== null) {
+					clearTimeout(initTimeoutId);
+					initTimeoutId = null;
 				}
-			};
-			initTimeoutId = setTimeout(() => {
-				initTimeoutId = null;
 				flushPending();
-			}, INIT_TIMEOUT_MS);
-			bridgeRef.current = createMcpAppBridge({
-				frame: rendered,
-				handlers: wrappedHandlers,
-				hostInfo: current.hostInfo,
-				hostContext: current.hostContext
-			});
-			if (current.input !== void 0) pendingInputRef.current = current.input;
-			if (current.output !== void 0) pendingOutputRef.current = current.output;
-		}).catch((err) => {
-			liveRef.current.handlers?.onError?.(err instanceof Error ? err : new Error(String(err)));
+				liveOnInitialized?.();
+			},
+			onSizeChange: (p) => {
+				if (p.height != null) host.setHeight(p.height);
+				liveHandlers.onSizeChange?.(p);
+			}
+		};
+		initTimeoutId = setTimeout(() => {
+			initTimeoutId = null;
+			flushPending();
+		}, INIT_TIMEOUT_MS);
+		const bridge = createMcpAppBridge({
+			frame,
+			handlers: wrappedHandlers,
+			hostInfo: current.hostInfo,
+			hostContext: current.hostContext
 		});
-		return () => {
-			cancelled = true;
-			if (initTimeoutId !== null) {
-				clearTimeout(initTimeoutId);
-				initTimeoutId = null;
+		bridgeRef.current = bridge;
+		if (current.input !== void 0) pendingInputRef.current = current.input;
+		if (current.output !== void 0) pendingOutputRef.current = current.output;
+		return {
+			onMessage: bridge.onMessage,
+			dispose: () => {
+				if (initTimeoutId !== null) {
+					clearTimeout(initTimeoutId);
+					initTimeoutId = null;
+				}
+				bridge.dispose();
+				bridgeRef.current = null;
+				lastSentInputRef.current = void 0;
+				lastSentOutputRef.current = void 0;
+				lastSentHostContextRef.current = void 0;
+				widgetReadyRef.current = false;
+				pendingInputRef.current = void 0;
+				pendingOutputRef.current = void 0;
+				pendingHostContextRef.current = void 0;
 			}
-			bridgeRef.current?.dispose();
-			bridgeRef.current = null;
-			frame?.dispose();
-			frame = null;
-			lastSentInputRef.current = void 0;
-			lastSentOutputRef.current = void 0;
-			lastSentHostContextRef.current = void 0;
-			widgetReadyRef.current = false;
-			pendingInputRef.current = void 0;
-			pendingOutputRef.current = void 0;
-			pendingHostContextRef.current = void 0;
-			setContentHeight(void 0);
 		};
-	}, [resourceUri]);
+	};
 	useBridgeNotify(input, bridgeRef, widgetReadyRef, pendingInputRef, lastSentInputRef, (b, v) => b.notifyToolInput(v));
 	useBridgeNotify(output, bridgeRef, widgetReadyRef, pendingOutputRef, lastSentOutputRef, (b, v) => b.notifyToolResult(v));
 	useBridgeNotify(hostContext, bridgeRef, widgetReadyRef, pendingHostContextRef, lastSentHostContextRef, (b, v) => b.notifyHostContextChanged(v));
-	const resolvedHeight = contentHeight != null ? Math.min(contentHeight, maxHeight) : void 0;
-	const mergedStyle = resolvedHeight != null ? {
-		...sandbox?.style,
-		height: resolvedHeight
-	} : sandbox?.style;
-	return /* @__PURE__ */ jsx("div", {
-		ref: containerRef,
-		className: sandbox?.className,
-		style: mergedStyle,
-		"data-mcp-app-resource": app.resourceUri,
-		"data-mcp-app-prefers-border": resource.meta?.prefersBorder ? "" : void 0
+	return /* @__PURE__ */ jsx(SandboxHost, {
+		content: { html: resource.html },
+		contentKey: resource.uri,
+		sandbox: {
+			...sandbox,
+			product: sandbox?.product ?? DEFAULT_PRODUCT
+		},
+		maxHeight,
+		createBridge,
+		onError: (err) => liveRef.current.handlers?.onError?.(err),
+		containerProps: {
+			"data-mcp-app-resource": app.resourceUri,
+			"data-mcp-app-prefers-border": resource.meta?.prefersBorder ? "" : void 0
+		}
 	});
 }
 //#endregion

package/dist/mcp-apps/app-frame.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-frame.js","names":[],"sources":["../../src/mcp-apps/app-frame.tsx"],"sourcesContent":["\"use client\";\n\nimport { type MutableRefObject, useEffect, useRef, useState } from \"react\";\nimport { type RenderedFrame, SafeContentFrame } from \"safe-content-frame\";\nimport { type McpAppBridge, createMcpAppBridge } from \"./bridge\";\nimport type {\n  McpAppBridgeHandlers,\n  McpAppFrameProps,\n  McpAppHostContext,\n} from \"./types\";\n\nconst DEFAULT_PRODUCT = \"assistant-ui-mcp-app\";\nconst INIT_TIMEOUT_MS = 5000;\nconst DEFAULT_MAX_HEIGHT = 800;\n\nfunction useBridgeNotify<T>(\n  value: T | undefined,\n  bridgeRef: MutableRefObject<McpAppBridge | null>,\n  widgetReadyRef: MutableRefObject<boolean>,\n  pendingRef: MutableRefObject<T | undefined>,\n  lastSentRef: MutableRefObject<T | undefined>,\n  notify: (bridge: McpAppBridge, v: T) => void,\n) {\n  useEffect(() => {\n    if (!bridgeRef.current) return;\n    if (value === undefined) return;\n    if (lastSentRef.current === value) return;\n    if (!widgetReadyRef.current) {\n      pendingRef.current = value;\n      return;\n    }\n    notify(bridgeRef.current, value);\n    lastSentRef.current = value;\n    // oxlint-disable-next-line tap-hooks/exhaustive-deps -- refs are stable; notify is assumed stable; re-run only when value changes\n  }, [value]);\n}\n\ntype LiveSnapshot = {\n  handlers: McpAppBridgeHandlers | undefined;\n  hostInfo: McpAppFrameProps[\"hostInfo\"];\n  hostContext: McpAppFrameProps[\"hostContext\"];\n  input: unknown;\n  output: unknown;\n};\n\n// Proxy each per-call handler through liveRef so the bridge always dispatches\n// to the latest handler reference (e.g. inline callbacks closing over state).\n// Capability presence is snapshot at mount: a handler added later requires a\n// remount (keyed on resource URI) to expose the capability to the widget.\nfunction buildLiveHandlers(\n  initial: McpAppBridgeHandlers | undefined,\n  liveRef: { readonly current: LiveSnapshot },\n): McpAppBridgeHandlers {\n  const live = () => liveRef.current.handlers;\n  const has = <K extends keyof McpAppBridgeHandlers>(key: K) =>\n    initial?.[key] !== undefined;\n  const out: McpAppBridgeHandlers = {};\n  if (has(\"allowedTools\")) {\n    Object.defineProperty(out, \"allowedTools\", {\n      get: () => live()?.allowedTools,\n      enumerable: true,\n      configurable: true,\n    });\n  }\n  const liveCall = <K extends keyof McpAppBridgeHandlers>(\n    key: K,\n  ): NonNullable<McpAppBridgeHandlers[K]> =>\n    ((p: unknown) => {\n      const fn = live()?.[key] as ((p: unknown) => unknown) | undefined;\n      if (!fn) {\n        throw new Error(`${key} handler is no longer available`);\n      }\n      return fn(p);\n    }) as NonNullable<McpAppBridgeHandlers[K]>;\n  if (has(\"callTool\")) out.callTool = liveCall(\"callTool\");\n  if (has(\"readResource\")) out.readResource = liveCall(\"readResource\");\n  if (has(\"listResources\")) out.listResources = liveCall(\"listResources\");\n  if (has(\"openLink\")) out.openLink = liveCall(\"openLink\");\n  if (has(\"sendMessage\")) out.sendMessage = liveCall(\"sendMessage\");\n  if (has(\"updateModelContext\"))\n    out.updateModelContext = liveCall(\"updateModelContext\");\n  if (has(\"requestDisplayMode\"))\n    out.requestDisplayMode = liveCall(\"requestDisplayMode\");\n  out.onSizeChange = (p) => live()?.onSizeChange?.(p);\n  out.onInitialized = () => live()?.onInitialized?.();\n  out.onRequestTeardown = (p) => live()?.onRequestTeardown?.(p);\n  out.onLog = (p) => live()?.onLog?.(p);\n  out.onError = (e) => live()?.onError?.(e);\n  return out;\n}\n\nexport function McpAppFrame({\n  app,\n  resource,\n  input,\n  output,\n  sandbox,\n  handlers,\n  hostInfo,\n  hostContext,\n  maxHeight = DEFAULT_MAX_HEIGHT,\n}: McpAppFrameProps) {\n  const containerRef = useRef<HTMLDivElement>(null);\n  const [contentHeight, setContentHeight] = useState<number | undefined>(\n    undefined,\n  );\n  const bridgeRef = useRef<McpAppBridge | null>(null);\n  const lastSentInputRef = useRef<unknown>(undefined);\n  const lastSentOutputRef = useRef<unknown>(undefined);\n  const lastSentHostContextRef = useRef<McpAppHostContext | undefined>(\n    undefined,\n  );\n  // Per MCP Apps spec, the host should defer notifications until the widget\n  // signals readiness via `notifications/initialized`. Until then, we record\n  // pending values and flush them on init.\n  const widgetReadyRef = useRef(false);\n  const pendingInputRef = useRef<unknown>(undefined);\n  const pendingOutputRef = useRef<unknown>(undefined);\n  const pendingHostContextRef = useRef<McpAppHostContext | undefined>(\n    undefined,\n  );\n\n  const liveRef = useRef<LiveSnapshot>(null!);\n  liveRef.current = {\n    handlers,\n    hostInfo,\n    hostContext,\n    input,\n    output,\n  };\n\n  const resourceUri = resource.uri;\n\n  useEffect(() => {\n    const container = containerRef.current;\n    if (!container) return;\n\n    let cancelled = false;\n    let initTimeoutId: ReturnType<typeof setTimeout> | null = null;\n    let frame: RenderedFrame | null = null;\n    const sb = sandbox;\n    const html = resource.html;\n\n    const scf = new SafeContentFrame(sb?.product ?? DEFAULT_PRODUCT, {\n      ...(sb?.sandbox !== undefined && { sandbox: sb.sandbox }),\n      ...(sb?.useShadowDom !== undefined && { useShadowDom: sb.useShadowDom }),\n      ...(sb?.enableBrowserCaching !== undefined && {\n        enableBrowserCaching: sb.enableBrowserCaching,\n      }),\n      ...(sb?.salt !== undefined && { salt: sb.salt }),\n    });\n\n    const renderOpts =\n      sb?.unsafeDocumentWrite !== undefined\n        ? { unsafeDocumentWrite: sb.unsafeDocumentWrite }\n        : undefined;\n\n    scf\n      .renderHtml(html, container, renderOpts)\n      .then((rendered) => {\n        if (cancelled) {\n          rendered.dispose();\n          return;\n        }\n        frame = rendered;\n        const current = liveRef.current;\n        const liveHandlers = buildLiveHandlers(current.handlers, liveRef);\n        const liveOnInitialized = liveHandlers.onInitialized;\n        const flushPending = () => {\n          if (widgetReadyRef.current) return;\n          widgetReadyRef.current = true;\n          const b = bridgeRef.current;\n          if (!b) return;\n          if (pendingInputRef.current !== undefined) {\n            b.notifyToolInput(pendingInputRef.current);\n            lastSentInputRef.current = pendingInputRef.current;\n            pendingInputRef.current = undefined;\n          }\n          if (pendingOutputRef.current !== undefined) {\n            b.notifyToolResult(pendingOutputRef.current);\n            lastSentOutputRef.current = pendingOutputRef.current;\n            pendingOutputRef.current = undefined;\n          }\n          if (pendingHostContextRef.current !== undefined) {\n            b.notifyHostContextChanged(pendingHostContextRef.current);\n            lastSentHostContextRef.current = pendingHostContextRef.current;\n            pendingHostContextRef.current = undefined;\n          }\n        };\n        const wrappedHandlers: McpAppBridgeHandlers = {\n          ...liveHandlers,\n          onInitialized: () => {\n            if (initTimeoutId !== null) {\n              clearTimeout(initTimeoutId);\n              initTimeoutId = null;\n            }\n            flushPending();\n            liveOnInitialized?.();\n          },\n          onSizeChange: (p) => {\n            if (\n              typeof p.height === \"number\" &&\n              Number.isFinite(p.height) &&\n              p.height > 0\n            ) {\n              setContentHeight(p.height);\n            }\n            liveHandlers.onSizeChange?.(p);\n          },\n        };\n        // Safety net: if the widget never sends notifications/initialized\n        // (broken or non-spec-compliant), flush the queue anyway so the host\n        // doesn't appear hung.\n        initTimeoutId = setTimeout(() => {\n          initTimeoutId = null;\n          flushPending();\n        }, INIT_TIMEOUT_MS);\n        bridgeRef.current = createMcpAppBridge({\n          frame: rendered,\n          handlers: wrappedHandlers,\n          hostInfo: current.hostInfo,\n          hostContext: current.hostContext,\n        });\n\n        if (current.input !== undefined)\n          pendingInputRef.current = current.input;\n        if (current.output !== undefined)\n          pendingOutputRef.current = current.output;\n        // hostContext is delivered inside the ui/initialize response; subsequent\n        // changes flow through useBridgeNotify's pending path.\n      })\n      .catch((err) => {\n        liveRef.current.handlers?.onError?.(\n          err instanceof Error ? err : new Error(String(err)),\n        );\n      });\n\n    return () => {\n      cancelled = true;\n      if (initTimeoutId !== null) {\n        clearTimeout(initTimeoutId);\n        initTimeoutId = null;\n      }\n      bridgeRef.current?.dispose();\n      bridgeRef.current = null;\n      frame?.dispose();\n      frame = null;\n      lastSentInputRef.current = undefined;\n      lastSentOutputRef.current = undefined;\n      lastSentHostContextRef.current = undefined;\n      widgetReadyRef.current = false;\n      pendingInputRef.current = undefined;\n      pendingOutputRef.current = undefined;\n      pendingHostContextRef.current = undefined;\n      setContentHeight(undefined);\n    };\n    // oxlint-disable-next-line tap-hooks/exhaustive-deps -- re-mount only on resource URI change; live values flow through liveRef\n  }, [resourceUri]);\n\n  useBridgeNotify(\n    input,\n    bridgeRef,\n    widgetReadyRef,\n    pendingInputRef,\n    lastSentInputRef,\n    (b, v) => b.notifyToolInput(v),\n  );\n  useBridgeNotify(\n    output,\n    bridgeRef,\n    widgetReadyRef,\n    pendingOutputRef,\n    lastSentOutputRef,\n    (b, v) => b.notifyToolResult(v),\n  );\n  useBridgeNotify(\n    hostContext,\n    bridgeRef,\n    widgetReadyRef,\n    pendingHostContextRef,\n    lastSentHostContextRef,\n    (b, v) => b.notifyHostContextChanged(v),\n  );\n\n  const resolvedHeight =\n    contentHeight != null ? Math.min(contentHeight, maxHeight) : undefined;\n  const mergedStyle =\n    resolvedHeight != null\n      ? { ...sandbox?.style, height: resolvedHeight }\n      : sandbox?.style;\n\n  return (\n    <div\n      ref={containerRef}\n      className={sandbox?.className}\n      style={mergedStyle}\n      data-mcp-app-resource={app.resourceUri}\n      data-mcp-app-prefers-border={\n        resource.meta?.prefersBorder ? \"\" : undefined\n      }\n    />\n  );\n}\n"],"mappings":"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"}
+{"version":3,"file":"app-frame.js","names":[],"sources":["../../src/mcp-apps/app-frame.tsx"],"sourcesContent":["\"use client\";\n\nimport { type MutableRefObject, useEffect, useRef } from \"react\";\nimport { type McpAppBridge, createMcpAppBridge } from \"./bridge\";\nimport {\n  SandboxHost,\n  type SandboxBridge,\n  type SandboxHostApi,\n  type SandboxHostFrame,\n} from \"../sandbox-host/SandboxHost\";\nimport type {\n  McpAppBridgeHandlers,\n  McpAppFrameProps,\n  McpAppHostContext,\n} from \"./types\";\n\nconst DEFAULT_PRODUCT = \"assistant-ui-mcp-app\";\nconst INIT_TIMEOUT_MS = 5000;\nconst DEFAULT_MAX_HEIGHT = 800;\n\nfunction useBridgeNotify<T>(\n  value: T | undefined,\n  bridgeRef: MutableRefObject<McpAppBridge | null>,\n  widgetReadyRef: MutableRefObject<boolean>,\n  pendingRef: MutableRefObject<T | undefined>,\n  lastSentRef: MutableRefObject<T | undefined>,\n  notify: (bridge: McpAppBridge, v: T) => void,\n) {\n  useEffect(() => {\n    if (!bridgeRef.current) return;\n    if (value === undefined) return;\n    if (lastSentRef.current === value) return;\n    if (!widgetReadyRef.current) {\n      pendingRef.current = value;\n      return;\n    }\n    notify(bridgeRef.current, value);\n    lastSentRef.current = value;\n    // oxlint-disable-next-line react/exhaustive-deps -- refs are stable; notify is assumed stable; re-run only when value changes\n  }, [value]);\n}\n\ntype LiveSnapshot = {\n  handlers: McpAppBridgeHandlers | undefined;\n  hostInfo: McpAppFrameProps[\"hostInfo\"];\n  hostContext: McpAppFrameProps[\"hostContext\"];\n  input: unknown;\n  output: unknown;\n};\n\n// Proxy each per-call handler through liveRef so the bridge always dispatches\n// to the latest handler reference (e.g. inline callbacks closing over state).\n// Capability presence is snapshot at mount: a handler added later requires a\n// remount (keyed on resource URI) to expose the capability to the widget.\nfunction buildLiveHandlers(\n  initial: McpAppBridgeHandlers | undefined,\n  liveRef: { readonly current: LiveSnapshot },\n): McpAppBridgeHandlers {\n  const live = () => liveRef.current.handlers;\n  const has = <K extends keyof McpAppBridgeHandlers>(key: K) =>\n    initial?.[key] !== undefined;\n  const out: McpAppBridgeHandlers = {};\n  if (has(\"allowedTools\")) {\n    Object.defineProperty(out, \"allowedTools\", {\n      get: () => live()?.allowedTools,\n      enumerable: true,\n      configurable: true,\n    });\n  }\n  const liveCall = <K extends keyof McpAppBridgeHandlers>(\n    key: K,\n  ): NonNullable<McpAppBridgeHandlers[K]> =>\n    ((p: unknown) => {\n      const fn = live()?.[key] as ((p: unknown) => unknown) | undefined;\n      if (!fn) {\n        throw new Error(`${key} handler is no longer available`);\n      }\n      return fn(p);\n    }) as NonNullable<McpAppBridgeHandlers[K]>;\n  if (has(\"callTool\")) out.callTool = liveCall(\"callTool\");\n  if (has(\"readResource\")) out.readResource = liveCall(\"readResource\");\n  if (has(\"listResources\")) out.listResources = liveCall(\"listResources\");\n  if (has(\"openLink\")) out.openLink = liveCall(\"openLink\");\n  if (has(\"sendMessage\")) out.sendMessage = liveCall(\"sendMessage\");\n  if (has(\"updateModelContext\"))\n    out.updateModelContext = liveCall(\"updateModelContext\");\n  if (has(\"requestDisplayMode\"))\n    out.requestDisplayMode = liveCall(\"requestDisplayMode\");\n  out.onSizeChange = (p) => live()?.onSizeChange?.(p);\n  out.onInitialized = () => live()?.onInitialized?.();\n  out.onRequestTeardown = (p) => live()?.onRequestTeardown?.(p);\n  out.onLog = (p) => live()?.onLog?.(p);\n  out.onError = (e) => live()?.onError?.(e);\n  return out;\n}\n\nexport function McpAppFrame({\n  app,\n  resource,\n  input,\n  output,\n  sandbox,\n  handlers,\n  hostInfo,\n  hostContext,\n  maxHeight = DEFAULT_MAX_HEIGHT,\n}: McpAppFrameProps) {\n  const bridgeRef = useRef<McpAppBridge | null>(null);\n  const lastSentInputRef = useRef<unknown>(undefined);\n  const lastSentOutputRef = useRef<unknown>(undefined);\n  const lastSentHostContextRef = useRef<McpAppHostContext | undefined>(\n    undefined,\n  );\n  // Per MCP Apps spec, the host should defer notifications until the widget\n  // signals readiness via `notifications/initialized`. Until then, we record\n  // pending values and flush them on init.\n  const widgetReadyRef = useRef(false);\n  const pendingInputRef = useRef<unknown>(undefined);\n  const pendingOutputRef = useRef<unknown>(undefined);\n  const pendingHostContextRef = useRef<McpAppHostContext | undefined>(\n    undefined,\n  );\n\n  const liveRef = useRef<LiveSnapshot>(null!);\n  liveRef.current = {\n    handlers,\n    hostInfo,\n    hostContext,\n    input,\n    output,\n  };\n\n  const createBridge = (\n    frame: SandboxHostFrame,\n    host: SandboxHostApi,\n  ): SandboxBridge => {\n    const current = liveRef.current;\n    let initTimeoutId: ReturnType<typeof setTimeout> | null = null;\n\n    const flushPending = () => {\n      if (widgetReadyRef.current) return;\n      widgetReadyRef.current = true;\n      const b = bridgeRef.current;\n      if (!b) return;\n      if (pendingInputRef.current !== undefined) {\n        b.notifyToolInput(pendingInputRef.current);\n        lastSentInputRef.current = pendingInputRef.current;\n        pendingInputRef.current = undefined;\n      }\n      if (pendingOutputRef.current !== undefined) {\n        b.notifyToolResult(pendingOutputRef.current);\n        lastSentOutputRef.current = pendingOutputRef.current;\n        pendingOutputRef.current = undefined;\n      }\n      if (pendingHostContextRef.current !== undefined) {\n        b.notifyHostContextChanged(pendingHostContextRef.current);\n        lastSentHostContextRef.current = pendingHostContextRef.current;\n        pendingHostContextRef.current = undefined;\n      }\n    };\n\n    const liveHandlers = buildLiveHandlers(current.handlers, liveRef);\n    const liveOnInitialized = liveHandlers.onInitialized;\n    const wrappedHandlers: McpAppBridgeHandlers = {\n      ...liveHandlers,\n      onInitialized: () => {\n        if (initTimeoutId !== null) {\n          clearTimeout(initTimeoutId);\n          initTimeoutId = null;\n        }\n        flushPending();\n        liveOnInitialized?.();\n      },\n      onSizeChange: (p) => {\n        if (p.height != null) host.setHeight(p.height);\n        liveHandlers.onSizeChange?.(p);\n      },\n    };\n\n    // Safety net: if the widget never sends notifications/initialized (broken\n    // or non-spec-compliant), flush the queue anyway so the host doesn't\n    // appear hung.\n    initTimeoutId = setTimeout(() => {\n      initTimeoutId = null;\n      flushPending();\n    }, INIT_TIMEOUT_MS);\n\n    const bridge = createMcpAppBridge({\n      frame,\n      handlers: wrappedHandlers,\n      hostInfo: current.hostInfo,\n      hostContext: current.hostContext,\n    });\n    bridgeRef.current = bridge;\n\n    if (current.input !== undefined) pendingInputRef.current = current.input;\n    if (current.output !== undefined) pendingOutputRef.current = current.output;\n    // hostContext is delivered inside the ui/initialize response; subsequent\n    // changes flow through useBridgeNotify's pending path.\n\n    return {\n      onMessage: bridge.onMessage,\n      dispose: () => {\n        if (initTimeoutId !== null) {\n          clearTimeout(initTimeoutId);\n          initTimeoutId = null;\n        }\n        bridge.dispose();\n        bridgeRef.current = null;\n        lastSentInputRef.current = undefined;\n        lastSentOutputRef.current = undefined;\n        lastSentHostContextRef.current = undefined;\n        widgetReadyRef.current = false;\n        pendingInputRef.current = undefined;\n        pendingOutputRef.current = undefined;\n        pendingHostContextRef.current = undefined;\n      },\n    };\n  };\n\n  useBridgeNotify(\n    input,\n    bridgeRef,\n    widgetReadyRef,\n    pendingInputRef,\n    lastSentInputRef,\n    (b, v) => b.notifyToolInput(v),\n  );\n  useBridgeNotify(\n    output,\n    bridgeRef,\n    widgetReadyRef,\n    pendingOutputRef,\n    lastSentOutputRef,\n    (b, v) => b.notifyToolResult(v),\n  );\n  useBridgeNotify(\n    hostContext,\n    bridgeRef,\n    widgetReadyRef,\n    pendingHostContextRef,\n    lastSentHostContextRef,\n    (b, v) => b.notifyHostContextChanged(v),\n  );\n\n  return (\n    <SandboxHost\n      content={{ html: resource.html }}\n      contentKey={resource.uri}\n      sandbox={{ ...sandbox, product: sandbox?.product ?? DEFAULT_PRODUCT }}\n      maxHeight={maxHeight}\n      createBridge={createBridge}\n      onError={(err) => liveRef.current.handlers?.onError?.(err)}\n      containerProps={{\n        \"data-mcp-app-resource\": app.resourceUri,\n        \"data-mcp-app-prefers-border\": resource.meta?.prefersBorder\n          ? \"\"\n          : undefined,\n      }}\n    />\n  );\n}\n"],"mappings":"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"}