@assistant-ui/react-ag-ui 0.0.48 → 0.0.50

package/dist/runtime/mcp-tool-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-tool-result.js","names":[],"sources":["../../src/runtime/mcp-tool-result.ts"],"sourcesContent":["import { isRecord } from \"@assistant-ui/core/internal\";\nimport { isMcpAppUri } from \"@assistant-ui/core\";\n\nexport type McpToolCallResult = Record<string, unknown> & {\n  content: unknown[];\n  structuredContent?: Record<string, unknown>;\n  _meta?: Record<string, unknown>;\n  isError?: boolean;\n};\n\nexport const parseMcpToolCallResult = (\n  source: Record<string, unknown>,\n  modelContent: string,\n): McpToolCallResult | undefined => {\n  const structuredContent = isRecord(source.structuredContent)\n    ? source.structuredContent\n    : undefined;\n  const meta = isRecord(source._meta) ? source._meta : undefined;\n  if (!structuredContent && !meta) return undefined;\n\n  return {\n    content: modelContent ? [{ type: \"text\", text: modelContent }] : [],\n    ...(structuredContent ? { structuredContent } : {}),\n    ...(meta ? { _meta: meta } : {}),\n    ...(typeof source.isError === \"boolean\" ? { isError: source.isError } : {}),\n  };\n};\n\n// _meta[\"ui/resourceUri\"] is the MCP-UI pointer react-ai-sdk reads off\n// CallToolResult._meta; only ui:// URIs identify an MCP Apps widget. A\n// structured carrier is deliberately not read until upstream AG-UI settles\n// one (agno-agi/agno#9087).\nexport const readMcpAppResourceUri = (meta: unknown): string | undefined => {\n  if (!isRecord(meta)) return undefined;\n  const uri = meta[\"ui/resourceUri\"];\n  return typeof uri === \"string\" && isMcpAppUri(uri) ? uri : undefined;\n};\n"],"mappings":";;;AAUA,MAAa,0BACX,QACA,iBACkC;CAClC,MAAM,oBAAoB,SAAS,OAAO,iBAAiB,IACvD,OAAO,oBACP,KAAA;CACJ,MAAM,OAAO,SAAS,OAAO,KAAK,IAAI,OAAO,QAAQ,KAAA;CACrD,IAAI,CAAC,qBAAqB,CAAC,MAAM,OAAO,KAAA;CAExC,OAAO;EACL,SAAS,eAAe,CAAC;GAAE,MAAM;GAAQ,MAAM;EAAa,CAAC,IAAI,CAAC;EAClE,GAAI,oBAAoB,EAAE,kBAAkB,IAAI,CAAC;EACjD,GAAI,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;EAC9B,GAAI,OAAO,OAAO,YAAY,YAAY,EAAE,SAAS,OAAO,QAAQ,IAAI,CAAC;CAC3E;AACF;AAMA,MAAa,yBAAyB,SAAsC;CAC1E,IAAI,CAAC,SAAS,IAAI,GAAG,OAAO,KAAA;CAC5B,MAAM,MAAM,KAAK;CACjB,OAAO,OAAO,QAAQ,YAAY,YAAY,GAAG,IAAI,MAAM,KAAA;AAC7D"}
+{"version":3,"file":"mcp-tool-result.js","names":[],"sources":["../../src/runtime/mcp-tool-result.ts"],"sourcesContent":["import { isRecord } from \"@assistant-ui/core/internal\";\nimport { isMcpAppUri } from \"@assistant-ui/core\";\n\nexport type McpToolCallResult = Record<string, unknown> & {\n  content: unknown[];\n  structuredContent?: Record<string, unknown>;\n  _meta?: Record<string, unknown>;\n  isError?: boolean;\n};\n\nexport const parseMcpToolCallResult = (\n  source: Record<string, unknown>,\n  modelContent: string,\n): McpToolCallResult | undefined => {\n  const structuredContent = isRecord(source.structuredContent)\n    ? source.structuredContent\n    : undefined;\n  const meta = isRecord(source._meta) ? source._meta : undefined;\n  if (!structuredContent && !meta) return undefined;\n\n  return {\n    content: modelContent ? [{ type: \"text\", text: modelContent }] : [],\n    ...(structuredContent ? { structuredContent } : {}),\n    ...(meta ? { _meta: meta } : {}),\n    ...(typeof source.isError === \"boolean\" ? { isError: source.isError } : {}),\n  };\n};\n\n// The MCP Apps pointer on CallToolResult._meta: canonical nested `ui.resourceUri`\n// per the Apps spec (2026-01-26), with the deprecated flat `\"ui/resourceUri\"` kept\n// for legacy producers. Only ui:// URIs identify a widget.\nexport const readMcpAppResourceUri = (meta: unknown): string | undefined => {\n  if (!isRecord(meta)) return undefined;\n  const ui = meta[\"ui\"];\n  const nested = isRecord(ui) ? ui[\"resourceUri\"] : undefined;\n  if (typeof nested === \"string\" && isMcpAppUri(nested)) return nested;\n  const flat = meta[\"ui/resourceUri\"];\n  return typeof flat === \"string\" && isMcpAppUri(flat) ? flat : undefined;\n};\n"],"mappings":";;;AAUA,MAAa,0BACX,QACA,iBACkC;CAClC,MAAM,oBAAoB,SAAS,OAAO,iBAAiB,IACvD,OAAO,oBACP,KAAA;CACJ,MAAM,OAAO,SAAS,OAAO,KAAK,IAAI,OAAO,QAAQ,KAAA;CACrD,IAAI,CAAC,qBAAqB,CAAC,MAAM,OAAO,KAAA;CAExC,OAAO;EACL,SAAS,eAAe,CAAC;GAAE,MAAM;GAAQ,MAAM;EAAa,CAAC,IAAI,CAAC;EAClE,GAAI,oBAAoB,EAAE,kBAAkB,IAAI,CAAC;EACjD,GAAI,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;EAC9B,GAAI,OAAO,OAAO,YAAY,YAAY,EAAE,SAAS,OAAO,QAAQ,IAAI,CAAC;CAC3E;AACF;AAKA,MAAa,yBAAyB,SAAsC;CAC1E,IAAI,CAAC,SAAS,IAAI,GAAG,OAAO,KAAA;CAC5B,MAAM,KAAK,KAAK;CAChB,MAAM,SAAS,SAAS,EAAE,IAAI,GAAG,iBAAiB,KAAA;CAClD,IAAI,OAAO,WAAW,YAAY,YAAY,MAAM,GAAG,OAAO;CAC9D,MAAM,OAAO,KAAK;CAClB,OAAO,OAAO,SAAS,YAAY,YAAY,IAAI,IAAI,OAAO,KAAA;AAChE"}

package/dist/runtime/types.d.ts

@@ -71,6 +71,7 @@ type AgUiResumeEntry = {
 };
 type AgUiRuntimeExtras = {
   interrupts: readonly AgUiInterrupt[];
+  sendA2uiAction: (action: Record<string, unknown>) => void;
   submitInterruptResponses: (responses: readonly AgUiResumeEntry[]) => Promise<void>;
   steerAway: (message: CreateAppendMessage, responses?: readonly AgUiResumeEntry[]) => Promise<void>;
   state: ReadonlyJSONValue | undefined;
@@ -166,6 +167,8 @@ type AgUiEvent = {
   type: "ACTIVITY_SNAPSHOT";
   activityType: string;
   content: Record<string, unknown>;
+  messageId?: string;
+  replace?: boolean;
 } | {
   type: "RAW";
   event: any;

package/dist/runtime/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","names":[],"sources":["../../src/runtime/types.ts"],"mappings":";;;;;;;;;;;;KAuBK;EACH,mBAAmB;EACnB,QAAQ;;;;;;EAMR;;KAGU,2BAA2B,KACrC;EAGA,qBAEM,qBACG,QAAQ,wBAAwB;;KAI/B;EACV,cAAc;EACd,SAAS;EACT,YAAY;EACZ,QAAQ;EACR,WAAW;EACX,UAAU;;;;EAIV,aAAa;;KAGH,wBAAwB;EAClC,OAAO;EACP,SAAS,QAAQ;EACjB;;;;;;;;;;;EAWA;EACA,WAAW,GAAG;EACd;EACA,WAAW;;KAGD;KAMA;EACV;EACA,QAAQ;EACR;EACA;EACA,iBAAiB;EACjB;EACA,WAAW;;KAGD;EACV;EACA;EACA;;KAGU;EACV,qBAAqB;EACrB,2BACE,oBAAoB,sBACjB;EACL,YACE,SAAS,qBACT,qBAAqB,sBAClB;EACL,OAAO;EACP,WACE,MACI,sBACE,MAAM,kCAAkC;;KAItC;EACN;;EACA;EAAmB,YAAY;;KAEzB;EACN;EAAqB;;EAErB;EACA;EACA,UAAU;;EAEV;EAAuB;;EACvB;EAAmB;EAAkB;;EACrC;EAA4B;;EAC5B;EAA8B;EAAoB;;EAClD;EAA0B;;EAC1B;EAA4B;;EAC5B;EAAwB;;EACxB;;EACA;EAAuC;;EACvC;;EACA;;EACA;EAAyB;;EACzB;EAAiC;;EACjC;EAAmC;EAAoB;;EACvD;EAA+B;;EAC/B;EAAuB;;EAEvB;EACA;EACA;EACA;;EAEA;EAAwB;EAAoB;;EAC5C;EAAuB;;EAEvB;EACA;EACA;EACA;EACA;;EAGA;EACA;EACA;EACA;EACA;EACA,YAAY;;EAGZ;EACA;EACA,SAAS;;EAET;EAAa;EAAY;;EACzB;EAAgB;EAAc;;EAC9B;EAAwB;;EACxB;EAAqB;;EACrB;EAA2B"}
+{"version":3,"file":"types.d.ts","names":[],"sources":["../../src/runtime/types.ts"],"mappings":";;;;;;;;;;;;KAuBK;EACH,mBAAmB;EACnB,QAAQ;;;;;;EAMR;;KAGU,2BAA2B,KACrC;EAGA,qBAEM,qBACG,QAAQ,wBAAwB;;KAI/B;EACV,cAAc;EACd,SAAS;EACT,YAAY;EACZ,QAAQ;EACR,WAAW;EACX,UAAU;;;;EAIV,aAAa;;KAGH,wBAAwB;EAClC,OAAO;EACP,SAAS,QAAQ;EACjB;;;;;;;;;;;EAWA;EACA,WAAW,GAAG;EACd;EACA,WAAW;;KAGD;KAMA;EACV;EACA,QAAQ;EACR;EACA;EACA,iBAAiB;EACjB;EACA,WAAW;;KAGD;EACV;EACA;EACA;;KAGU;EACV,qBAAqB;EACrB,iBAAiB,QAAQ;EACzB,2BACE,oBAAoB,sBACjB;EACL,YACE,SAAS,qBACT,qBAAqB,sBAClB;EACL,OAAO;EACP,WACE,MACI,sBACE,MAAM,kCAAkC;;KAItC;EACN;;EACA;EAAmB,YAAY;;KAEzB;EACN;EAAqB;;EAErB;EACA;EACA,UAAU;;EAEV;EAAuB;;EACvB;EAAmB;EAAkB;;EACrC;EAA4B;;EAC5B;EAA8B;EAAoB;;EAClD;EAA0B;;EAC1B;EAA4B;;EAC5B;EAAwB;;EACxB;;EACA;EAAuC;;EACvC;;EACA;;EACA;EAAyB;;EACzB;EAAiC;;EACjC;EAAmC;EAAoB;;EACvD;EAA+B;;EAC/B;EAAuB;;EAEvB;EACA;EACA;EACA;;EAEA;EAAwB;EAAoB;;EAC5C;EAAuB;;EAEvB;EACA;EACA;EACA;EACA;;EAGA;EACA;EACA;EACA;EACA;EACA,YAAY;;EAGZ;EACA;EACA,SAAS;EACT;EACA;;EAEA;EAAa;EAAY;;EACzB;EAAgB;EAAc;;EAC9B;EAAwB;;EACxB;EAAqB;;EACrB;EAA2B"}

package/dist/useAgUiRuntime.js

@@ -2,8 +2,8 @@
 import { agUiExtras } from "./agUiExtras.js";
 import { makeLogger } from "./runtime/logger.js";
 import { AgUiThreadRuntimeCore } from "./runtime/AgUiThreadRuntimeCore.js";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useExternalStoreRuntime, useExternalStoreSharedOptions, useRuntimeAdapters } from "@assistant-ui/core/react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 //#region src/useAgUiRuntime.ts
 const EMPTY_INTERRUPTS = [];
 function useAgUiRuntime(options) {
@@ -79,6 +79,7 @@ function useAgUiRuntime(options) {
 			isRunning: core.isRunning() || hasExecutingTools,
 			extras: agUiExtras.provide({
 				interrupts: core.getPendingInterrupts()?.interrupts ?? EMPTY_INTERRUPTS,
+				sendA2uiAction: (action) => core.sendA2uiAction(action),
 				submitInterruptResponses: (responses) => core.submitInterruptResponses(responses),
 				steerAway: (message, responses) => core.steerAway(message, responses),
 				state: core.getState(),

package/dist/useAgUiRuntime.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAgUiRuntime.js","names":[],"sources":["../src/useAgUiRuntime.ts"],"sourcesContent":["\"use client\";\n\nimport { useCallback, useEffect, useMemo, useRef, useState } from \"react\";\nimport {\n  useExternalStoreRuntime,\n  useExternalStoreSharedOptions,\n  useRuntimeAdapters,\n} from \"@assistant-ui/core/react\";\nimport type { ToolExecutionStatus } from \"@assistant-ui/core\";\nimport type {\n  AssistantRuntime,\n  AppendMessage,\n  ExternalStoreAdapter,\n  ThreadMessage,\n} from \"@assistant-ui/core\";\nimport type { ReadonlyJSONValue } from \"assistant-stream/utils\";\nimport { makeLogger } from \"./runtime/logger\";\nimport type {\n  AgUiInterrupt,\n  AgUiResumeEntry,\n  UseAgUiRuntimeOptions,\n} from \"./runtime/types\";\nimport { AgUiThreadRuntimeCore } from \"./runtime/AgUiThreadRuntimeCore\";\nimport { agUiExtras } from \"./agUiExtras\";\n\nconst EMPTY_INTERRUPTS: readonly AgUiInterrupt[] = [];\n\nexport type AgUiAssistantRuntime = AssistantRuntime & {\n  /**\n   * @deprecated Use the `useAgUiInterrupts()` hook instead. This method is kept\n   * for backward compatibility and will be removed in a future major release.\n   */\n  unstable_getPendingInterrupts: () => readonly AgUiInterrupt[];\n  /**\n   * @deprecated Use the `useAgUiSubmitInterruptResponses()` hook instead. This\n   * method is kept for backward compatibility and will be removed in a future\n   * major release.\n   */\n  unstable_submitInterruptResponses: (\n    responses: readonly AgUiResumeEntry[],\n  ) => Promise<void>;\n};\n\nexport function useAgUiRuntime(\n  options: UseAgUiRuntimeOptions,\n): AgUiAssistantRuntime {\n  const logger = useMemo(() => makeLogger(options.logger), [options.logger]);\n  const [_version, setVersion] = useState(0);\n  const notifyUpdate = useCallback(() => setVersion((v) => v + 1), []);\n  const coreRef = useRef<AgUiThreadRuntimeCore | null>(null);\n  const runtimeAdapters = useRuntimeAdapters();\n\n  const historyAdapter = options.adapters?.history ?? runtimeAdapters?.history;\n  const threadListAdapter = options.adapters?.threadList;\n\n  if (!coreRef.current) {\n    coreRef.current = new AgUiThreadRuntimeCore({\n      agent: options.agent,\n      logger,\n      showThinking: options.showThinking ?? true,\n      autoCancelPendingToolCalls: options.autoCancelPendingToolCalls,\n      ...(options.onError && { onError: options.onError }),\n      ...(options.onCancel && { onCancel: options.onCancel }),\n      ...(historyAdapter && { history: historyAdapter }),\n      notifyUpdate,\n    });\n  }\n\n  const core = coreRef.current;\n  core.updateOptions({\n    agent: options.agent,\n    logger,\n    showThinking: options.showThinking ?? true,\n    autoCancelPendingToolCalls: options.autoCancelPendingToolCalls,\n    ...(options.onError && { onError: options.onError }),\n    ...(options.onCancel && { onCancel: options.onCancel }),\n    ...(historyAdapter && { history: historyAdapter }),\n  });\n\n  const [toolStatuses, setToolStatuses] = useState<\n    Record<string, ToolExecutionStatus>\n  >({});\n\n  const hasExecutingTools = Object.values(toolStatuses).some(\n    (s) => s?.type === \"executing\",\n  );\n\n  const threadList = useMemo(() => {\n    if (!threadListAdapter) return undefined;\n\n    const { onSwitchToNewThread, onSwitchToThread, ...rest } =\n      threadListAdapter;\n\n    return {\n      ...rest,\n      onSwitchToNewThread: onSwitchToNewThread\n        ? async () => {\n            await onSwitchToNewThread();\n            core.applyExternalMessages([]);\n            core.resetState();\n          }\n        : undefined,\n      onSwitchToThread: onSwitchToThread\n        ? async (threadId: string) => {\n            // Clear before the thread id flips, or the old messages leak\n            // into the new thread as a sibling branch.\n            core.applyExternalMessages([]);\n            const result = await onSwitchToThread(threadId);\n            core.applyExternalMessages(result.messages);\n            if (result.state !== undefined) {\n              core.loadExternalState(result.state);\n            } else {\n              core.resetState();\n            }\n            if (result.unstable_resume) {\n              void core.resumeInFlightRun(result.messages);\n            }\n          }\n        : undefined,\n    };\n  }, [threadListAdapter, core]);\n\n  const adapters = options.adapters;\n  const adapterAdapters = useMemo(\n    () => ({\n      attachments: adapters?.attachments ?? runtimeAdapters?.attachments,\n      speech: adapters?.speech,\n      dictation: adapters?.dictation,\n      voice: adapters?.voice,\n      feedback: adapters?.feedback,\n      threadList,\n    }),\n    [adapters, runtimeAdapters, threadList],\n  );\n\n  const shared = useExternalStoreSharedOptions(options);\n  const store = useMemo(\n    () => {\n      void _version; // rerender on version change\n\n      return {\n        ...shared,\n        isLoading: core.isLoading,\n        messageRepository: core.getMessageRepository(),\n        state: core.getState(),\n        isRunning: core.isRunning() || hasExecutingTools,\n        extras: agUiExtras.provide({\n          interrupts:\n            core.getPendingInterrupts()?.interrupts ?? EMPTY_INTERRUPTS,\n          submitInterruptResponses: (responses) =>\n            core.submitInterruptResponses(responses),\n          steerAway: (message, responses) => core.steerAway(message, responses),\n          state: core.getState(),\n          setState: (next) => core.setState(next),\n        }),\n        unstable_enableToolInvocations: true,\n        setToolStatuses,\n        onNew: (message: AppendMessage) => core.append(message),\n        onEdit: (message: AppendMessage) => core.edit(message),\n        onReload: (parentId: string | null, config: { runConfig?: any }) =>\n          core.reload(parentId, config),\n        onCancel: async () => {\n          core.cancel();\n        },\n        onAddToolResult: (options) => core.addToolResult(options),\n        onResume: (config) => core.resume(config),\n        setMessages: (messages: readonly ThreadMessage[]) =>\n          core.applyExternalMessages(messages),\n        onImport: (messages: readonly ThreadMessage[]) =>\n          core.applyExternalMessages(messages),\n        onLoadExternalState: (state: ReadonlyJSONValue) =>\n          core.loadExternalState(state),\n        adapters: adapterAdapters,\n      } satisfies ExternalStoreAdapter<ThreadMessage>;\n    },\n    // _version is intentionally included to trigger re-computation when core state changes via notifyUpdate\n    // toolInvocations intentionally excluded: abort/resume use refs internally and work with stale captures\n    [adapterAdapters, core, _version, hasExecutingTools, shared],\n  );\n\n  const baseRuntime = useExternalStoreRuntime(store);\n\n  const runtime = useMemo<AgUiAssistantRuntime>(() => {\n    const wrapper = Object.create(baseRuntime) as AgUiAssistantRuntime;\n    wrapper.unstable_getPendingInterrupts = () =>\n      core.getPendingInterrupts()?.interrupts ?? [];\n    wrapper.unstable_submitInterruptResponses = (responses) =>\n      core.submitInterruptResponses(responses);\n    return wrapper;\n  }, [baseRuntime, core]);\n\n  useEffect(() => {\n    core.attachRuntime(runtime);\n    return () => {\n      core.detachRuntime();\n    };\n  }, [core, runtime]);\n\n  useEffect(() => {\n    core.__internal_load();\n  }, [core]);\n\n  return runtime;\n}\n"],"mappings":"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"}
+{"version":3,"file":"useAgUiRuntime.js","names":[],"sources":["../src/useAgUiRuntime.ts"],"sourcesContent":["\"use client\";\n\nimport { useCallback, useEffect, useMemo, useRef, useState } from \"react\";\nimport {\n  useExternalStoreRuntime,\n  useExternalStoreSharedOptions,\n  useRuntimeAdapters,\n} from \"@assistant-ui/core/react\";\nimport type { ToolExecutionStatus } from \"@assistant-ui/core\";\nimport type {\n  AssistantRuntime,\n  AppendMessage,\n  ExternalStoreAdapter,\n  ThreadMessage,\n} from \"@assistant-ui/core\";\nimport type { ReadonlyJSONValue } from \"assistant-stream/utils\";\nimport { makeLogger } from \"./runtime/logger\";\nimport type {\n  AgUiInterrupt,\n  AgUiResumeEntry,\n  UseAgUiRuntimeOptions,\n} from \"./runtime/types\";\nimport { AgUiThreadRuntimeCore } from \"./runtime/AgUiThreadRuntimeCore\";\nimport { agUiExtras } from \"./agUiExtras\";\n\nconst EMPTY_INTERRUPTS: readonly AgUiInterrupt[] = [];\n\nexport type AgUiAssistantRuntime = AssistantRuntime & {\n  /**\n   * @deprecated Use the `useAgUiInterrupts()` hook instead. This method is kept\n   * for backward compatibility and will be removed in a future major release.\n   */\n  unstable_getPendingInterrupts: () => readonly AgUiInterrupt[];\n  /**\n   * @deprecated Use the `useAgUiSubmitInterruptResponses()` hook instead. This\n   * method is kept for backward compatibility and will be removed in a future\n   * major release.\n   */\n  unstable_submitInterruptResponses: (\n    responses: readonly AgUiResumeEntry[],\n  ) => Promise<void>;\n};\n\nexport function useAgUiRuntime(\n  options: UseAgUiRuntimeOptions,\n): AgUiAssistantRuntime {\n  const logger = useMemo(() => makeLogger(options.logger), [options.logger]);\n  const [_version, setVersion] = useState(0);\n  const notifyUpdate = useCallback(() => setVersion((v) => v + 1), []);\n  const coreRef = useRef<AgUiThreadRuntimeCore | null>(null);\n  const runtimeAdapters = useRuntimeAdapters();\n\n  const historyAdapter = options.adapters?.history ?? runtimeAdapters?.history;\n  const threadListAdapter = options.adapters?.threadList;\n\n  if (!coreRef.current) {\n    coreRef.current = new AgUiThreadRuntimeCore({\n      agent: options.agent,\n      logger,\n      showThinking: options.showThinking ?? true,\n      autoCancelPendingToolCalls: options.autoCancelPendingToolCalls,\n      ...(options.onError && { onError: options.onError }),\n      ...(options.onCancel && { onCancel: options.onCancel }),\n      ...(historyAdapter && { history: historyAdapter }),\n      notifyUpdate,\n    });\n  }\n\n  const core = coreRef.current;\n  core.updateOptions({\n    agent: options.agent,\n    logger,\n    showThinking: options.showThinking ?? true,\n    autoCancelPendingToolCalls: options.autoCancelPendingToolCalls,\n    ...(options.onError && { onError: options.onError }),\n    ...(options.onCancel && { onCancel: options.onCancel }),\n    ...(historyAdapter && { history: historyAdapter }),\n  });\n\n  const [toolStatuses, setToolStatuses] = useState<\n    Record<string, ToolExecutionStatus>\n  >({});\n\n  const hasExecutingTools = Object.values(toolStatuses).some(\n    (s) => s?.type === \"executing\",\n  );\n\n  const threadList = useMemo(() => {\n    if (!threadListAdapter) return undefined;\n\n    const { onSwitchToNewThread, onSwitchToThread, ...rest } =\n      threadListAdapter;\n\n    return {\n      ...rest,\n      onSwitchToNewThread: onSwitchToNewThread\n        ? async () => {\n            await onSwitchToNewThread();\n            core.applyExternalMessages([]);\n            core.resetState();\n          }\n        : undefined,\n      onSwitchToThread: onSwitchToThread\n        ? async (threadId: string) => {\n            // Clear before the thread id flips, or the old messages leak\n            // into the new thread as a sibling branch.\n            core.applyExternalMessages([]);\n            const result = await onSwitchToThread(threadId);\n            core.applyExternalMessages(result.messages);\n            if (result.state !== undefined) {\n              core.loadExternalState(result.state);\n            } else {\n              core.resetState();\n            }\n            if (result.unstable_resume) {\n              void core.resumeInFlightRun(result.messages);\n            }\n          }\n        : undefined,\n    };\n  }, [threadListAdapter, core]);\n\n  const adapters = options.adapters;\n  const adapterAdapters = useMemo(\n    () => ({\n      attachments: adapters?.attachments ?? runtimeAdapters?.attachments,\n      speech: adapters?.speech,\n      dictation: adapters?.dictation,\n      voice: adapters?.voice,\n      feedback: adapters?.feedback,\n      threadList,\n    }),\n    [adapters, runtimeAdapters, threadList],\n  );\n\n  const shared = useExternalStoreSharedOptions(options);\n  const store = useMemo(\n    () => {\n      void _version; // rerender on version change\n\n      return {\n        ...shared,\n        isLoading: core.isLoading,\n        messageRepository: core.getMessageRepository(),\n        state: core.getState(),\n        isRunning: core.isRunning() || hasExecutingTools,\n        extras: agUiExtras.provide({\n          interrupts:\n            core.getPendingInterrupts()?.interrupts ?? EMPTY_INTERRUPTS,\n          sendA2uiAction: (action) => core.sendA2uiAction(action),\n          submitInterruptResponses: (responses) =>\n            core.submitInterruptResponses(responses),\n          steerAway: (message, responses) => core.steerAway(message, responses),\n          state: core.getState(),\n          setState: (next) => core.setState(next),\n        }),\n        unstable_enableToolInvocations: true,\n        setToolStatuses,\n        onNew: (message: AppendMessage) => core.append(message),\n        onEdit: (message: AppendMessage) => core.edit(message),\n        onReload: (parentId: string | null, config: { runConfig?: any }) =>\n          core.reload(parentId, config),\n        onCancel: async () => {\n          core.cancel();\n        },\n        onAddToolResult: (options) => core.addToolResult(options),\n        onResume: (config) => core.resume(config),\n        setMessages: (messages: readonly ThreadMessage[]) =>\n          core.applyExternalMessages(messages),\n        onImport: (messages: readonly ThreadMessage[]) =>\n          core.applyExternalMessages(messages),\n        onLoadExternalState: (state: ReadonlyJSONValue) =>\n          core.loadExternalState(state),\n        adapters: adapterAdapters,\n      } satisfies ExternalStoreAdapter<ThreadMessage>;\n    },\n    // _version is intentionally included to trigger re-computation when core state changes via notifyUpdate\n    // toolInvocations intentionally excluded: abort/resume use refs internally and work with stale captures\n    [adapterAdapters, core, _version, hasExecutingTools, shared],\n  );\n\n  const baseRuntime = useExternalStoreRuntime(store);\n\n  const runtime = useMemo<AgUiAssistantRuntime>(() => {\n    const wrapper = Object.create(baseRuntime) as AgUiAssistantRuntime;\n    wrapper.unstable_getPendingInterrupts = () =>\n      core.getPendingInterrupts()?.interrupts ?? [];\n    wrapper.unstable_submitInterruptResponses = (responses) =>\n      core.submitInterruptResponses(responses);\n    return wrapper;\n  }, [baseRuntime, core]);\n\n  useEffect(() => {\n    core.attachRuntime(runtime);\n    return () => {\n      core.detachRuntime();\n    };\n  }, [core, runtime]);\n\n  useEffect(() => {\n    core.__internal_load();\n  }, [core]);\n\n  return runtime;\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react-ag-ui",
-  "version": "0.0.48",
+  "version": "0.0.50",
   "description": "AG-UI protocol adapter for assistant-ui",
   "keywords": [
     "ag-ui",
@@ -30,9 +30,10 @@
   "sideEffects": false,
   "dependencies": {
     "@ag-ui/client": "^0.0.57",
-    "@assistant-ui/core": "^0.3.0",
-    "@assistant-ui/store": "^0.3.0",
-    "assistant-stream": "^0.3.29",
+    "@assistant-ui/core": "^0.3.4",
+    "@assistant-ui/react-generative-ui": "^0.0.11",
+    "@assistant-ui/store": "^0.3.3",
+    "assistant-stream": "^0.3.32",
     "fast-json-patch": "^3.1.1"
   },
   "peerDependencies": {

package/src/agUiExtras.ts

@@ -1,4 +1,4 @@
-import { createRuntimeExtras } from "@assistant-ui/core/internal";
+import { createRuntimeExtras } from "@assistant-ui/core/react";
 import type { AgUiRuntimeExtras } from "./runtime/types";
 
 export const agUiExtras =

package/src/hooks.ts

@@ -1,5 +1,6 @@
 "use client";
 
+import { useCallback } from "react";
 import { useAui } from "@assistant-ui/store";
 import type { CreateAppendMessage } from "@assistant-ui/core";
 import type { ReadonlyJSONValue } from "assistant-stream/utils";
@@ -15,6 +16,19 @@ const EMPTY_INTERRUPTS: readonly AgUiInterrupt[] = [];
 export const useAgUiInterrupts = (): readonly AgUiInterrupt[] =>
   agUiExtras.use((e) => e.interrupts, EMPTY_INTERRUPTS);
 
+/**
+ * Returns a stable function that sends an A2UI action back to the agent and
+ * resumes the run.
+ */
+export const useAgUiSendA2uiAction = () => {
+  const aui = useAui();
+  return useCallback(
+    (action: Record<string, unknown>): void =>
+      agUiExtras.get(aui).sendA2uiAction(action),
+    [aui],
+  );
+};
+
 /**
  * Returns a function that submits responses (each `resolved` or `cancelled`)
  * for the pending AG-UI interrupts and resumes the run.

package/src/index.ts

@@ -2,6 +2,7 @@ export { useAgUiRuntime } from "./useAgUiRuntime";
 export type { AgUiAssistantRuntime } from "./useAgUiRuntime";
 export {
   useAgUiInterrupts,
+  useAgUiSendA2uiAction,
   useAgUiSubmitInterruptResponses,
   useAgUiSteerAway,
   useAgUiState,

package/src/runtime/AgUiThreadRuntimeCore.ts

@@ -99,6 +99,8 @@ export class AgUiThreadRuntimeCore {
   private _isLoading = false;
   private _loadPromise: Promise<void> | undefined;
   private pendingResumeMessageId: string | null = null;
+  private pendingA2uiResume = false;
+  private pendingA2uiAction: Record<string, unknown> | undefined;
 
   constructor(options: CoreOptions) {
     this.agent = options.agent;
@@ -688,6 +690,31 @@ export class AgUiThreadRuntimeCore {
     this.maybeResumeAfterToolResults(options.messageId);
   }
 
+  sendA2uiAction(action: Record<string, unknown>): void {
+    this.assertNoPendingInterrupts();
+    this.maybeAutoCancelPendingToolCalls();
+    const parentId = this.repository.headId;
+    if (parentId === null) {
+      this.logger.debug(
+        "[agui] sendA2uiAction: no messages to resume, dropping action",
+      );
+      return;
+    }
+
+    const userAction = { ...action };
+    delete userAction.type;
+    if (!("timestamp" in userAction)) {
+      userAction.timestamp = new Date().toISOString();
+    }
+    this.pendingA2uiAction = userAction;
+
+    if (this.isRunningFlag) {
+      this.pendingA2uiResume = true;
+      return;
+    }
+    this.startResumeRun(parentId);
+  }
+
   // The continuation fires whether the frontend result lands before
   // RUN_FINISHED (the status flips to requires-action only later, while the
   // run is still draining) or after it.
@@ -739,6 +766,8 @@ export class AgUiThreadRuntimeCore {
   }
 
   applyExternalMessages(messages: readonly ThreadMessage[]): void {
+    this.pendingA2uiResume = false;
+    this.pendingA2uiAction = undefined;
     this.assistantHistoryParents.clear();
 
     if (messages.length === 0) {
@@ -892,20 +921,38 @@ export class AgUiThreadRuntimeCore {
     this.pendingError = null;
     const assistantParentId = parent ? parentId : this.repository.headId;
     let assistantMessageId: string | undefined;
-    const ensureAssistant = () => {
-      if (assistantMessageId) return assistantMessageId;
-      const created = this.insertAssistantPlaceholder(
-        assistantParentId ?? null,
-      );
+    // A snapshot the preserve gate declines still evicts the in-flight
+    // assistant; recreating under the cached id on the next content-bearing
+    // emit keeps both the stream and the message identity. Status-only emits
+    // and server-id collisions must not recreate.
+    let assistantCollided = false;
+    const ensureAssistant = (allowRecreate = false): string => {
+      const cached = assistantMessageId;
+      if (cached !== undefined && this.tryGetMessage(cached)) return cached;
+      if (cached !== undefined && (assistantCollided || !allowRecreate)) {
+        return cached;
+      }
+      const parentId =
+        cached === undefined &&
+        assistantParentId &&
+        this.hasMessage(assistantParentId)
+          ? assistantParentId
+          : this.repository.headId;
+      const created = this.insertAssistantPlaceholder(parentId, cached);
       assistantMessageId = created;
-      this.markPendingAssistantHistory(created, assistantParentId ?? null);
+      this.markPendingAssistantHistory(created, parentId);
       return created;
     };
 
     if (shouldEagerlyInsertAssistant) ensureAssistant();
 
     const applyUpdate = (update: ChatModelRunResult) => {
-      const resolved = this.updateAssistantMessage(ensureAssistant(), update);
+      const hasContent =
+        Array.isArray(update.content) && update.content.length > 0;
+      const resolved = this.updateAssistantMessage(
+        ensureAssistant(hasContent),
+        update,
+      );
       if (resolved !== assistantMessageId) {
         assistantMessageId = resolved;
       }
@@ -916,14 +963,17 @@ export class AgUiThreadRuntimeCore {
       logger: this.logger,
       emit: applyUpdate,
       onServerMessageId: (serverId) => {
-        const placeholder = ensureAssistant();
+        const placeholder = ensureAssistant(true);
         if (placeholder === serverId) return;
         if (this.reassignAssistantId(placeholder, serverId)) {
           assistantMessageId = serverId;
+        } else {
+          assistantCollided = true;
         }
       },
     });
-    const dispatch = (event: AgUiEvent) => this.handleEvent(aggregator, event);
+    const dispatch = (event: AgUiEvent) =>
+      this.handleEvent(aggregator, event, assistantMessageId);
 
     const abortController = new AbortController();
     const abortSignal = abortController.signal;
@@ -1001,6 +1051,8 @@ export class AgUiThreadRuntimeCore {
       const err = this.pendingError;
       this.pendingError = null;
       this.pendingResumeMessageId = null;
+      this.pendingA2uiResume = false;
+      this.pendingA2uiAction = undefined;
       throw err;
     }
 
@@ -1011,6 +1063,33 @@ export class AgUiThreadRuntimeCore {
       this.pendingResumeMessageId = null;
       if (!abortSignal.aborted) {
         this.startResumeRun(resumeMessageId);
+      } else {
+        this.pendingA2uiAction = undefined;
+      }
+    }
+
+    if (this.pendingA2uiResume) {
+      this.pendingA2uiResume = false;
+      if (!abortSignal.aborted && this.pendingA2uiAction !== undefined) {
+        if (this.getPendingInterrupts()) {
+          this.pendingA2uiAction = undefined;
+          this.logger.debug(
+            "[agui] sendA2uiAction: pending interrupts, dropping action",
+          );
+          return;
+        }
+        this.maybeAutoCancelPendingToolCalls();
+        const parentId = this.repository.headId;
+        if (parentId !== null) {
+          this.startResumeRun(parentId);
+        } else {
+          this.pendingA2uiAction = undefined;
+          this.logger.debug(
+            "[agui] sendA2uiAction: no messages to resume, dropping action",
+          );
+        }
+      } else {
+        this.pendingA2uiAction = undefined;
       }
     }
   }
@@ -1029,6 +1108,8 @@ export class AgUiThreadRuntimeCore {
       getAssistantMessageId: () => string | undefined;
     },
   ): Promise<void> {
+    this.pendingA2uiAction = undefined;
+    this.pendingA2uiResume = false;
     const assistantId = ctx.ensureAssistant();
     const currentId = () => ctx.getAssistantMessageId() ?? assistantId;
     const options: ChatModelRunOptions = {
@@ -1084,7 +1165,7 @@ export class AgUiThreadRuntimeCore {
       historyMessages ?? this.repository.getMessages(),
     );
     const context = this.runtime?.thread.getModelContext();
-    return {
+    const input = {
       threadId,
       runId,
       state: this.stateSnapshot ?? null,
@@ -1097,9 +1178,14 @@ export class AgUiThreadRuntimeCore {
         ...(context?.callSettings ?? {}),
         ...(context?.config ?? {}),
         ...(runConfig?.custom ? { runConfig: runConfig.custom } : {}),
+        ...(this.pendingA2uiAction
+          ? { a2uiAction: { userAction: this.pendingA2uiAction } }
+          : {}),
       },
       ...(resume !== undefined ? { resume } : {}),
     };
+    this.pendingA2uiAction = undefined;
+    return input;
   }
 
   private installResumeShim(): void {
@@ -1135,8 +1221,10 @@ export class AgUiThreadRuntimeCore {
     this.setRunning(false);
   }
 
-  private insertAssistantPlaceholder(parentId: string | null): string {
-    const id = generateOptimisticId();
+  private insertAssistantPlaceholder(
+    parentId: string | null,
+    id: string = generateOptimisticId(),
+  ): string {
     const assistant: ThreadAssistantMessage = {
       id,
       role: "assistant",
@@ -1148,7 +1236,7 @@ export class AgUiThreadRuntimeCore {
         unstable_annotations: [],
         unstable_data: [],
         steps: [],
-        isOptimistic: true,
+        isOptimistic: isOptimisticId(id),
         custom: {},
       },
     };
@@ -1307,7 +1395,11 @@ export class AgUiThreadRuntimeCore {
     };
   }
 
-  private handleEvent(aggregator: RunAggregator, event: AgUiEvent) {
+  private handleEvent(
+    aggregator: RunAggregator,
+    event: AgUiEvent,
+    activeAssistantId: string | undefined,
+  ) {
     switch (event.type) {
       case "STATE_SNAPSHOT": {
         this.stateSnapshot = event.snapshot as ReadonlyJSONValue;
@@ -1332,7 +1424,7 @@ export class AgUiThreadRuntimeCore {
         return;
       }
       case "MESSAGES_SNAPSHOT": {
-        this.importMessagesSnapshot(event.messages);
+        this.importMessagesSnapshot(event.messages, activeAssistantId);
         return;
       }
       case "TOOL_CALL_RESULT": {
@@ -1504,8 +1596,16 @@ export class AgUiThreadRuntimeCore {
     this.maybeCompleteAfterToolResults(messageId);
   }
 
-  private importMessagesSnapshot(rawMessages: readonly unknown[]) {
+  private importMessagesSnapshot(
+    rawMessages: readonly unknown[],
+    activeAssistantId: string | undefined,
+  ) {
     try {
+      const activeMessage = activeAssistantId
+        ? this.tryGetMessage(activeAssistantId)?.message
+        : undefined;
+      const activeAssistant =
+        activeMessage?.role === "assistant" ? activeMessage : undefined;
       const normalized = fromAgUiMessages(rawMessages, {
         showThinking: this.showThinking,
       });
@@ -1522,7 +1622,23 @@ export class AgUiThreadRuntimeCore {
           );
         }
       }
+      const snapshotHeadId = converted.at(-1)?.id ?? null;
+      const snapshotContainsActiveAssistant = converted.some(
+        (message) => message.id === activeAssistant?.id,
+      );
+      const preservesActiveAssistant =
+        activeAssistant !== undefined &&
+        !snapshotContainsActiveAssistant &&
+        (activeAssistant.metadata.isOptimistic !== true ||
+          converted.at(-1)?.role !== "assistant");
+      if (preservesActiveAssistant) {
+        converted.push(activeAssistant);
+      }
       this.applyExternalMessages(converted);
+      if (preservesActiveAssistant) {
+        this.recordedHistoryIds.delete(activeAssistant.id);
+        this.markPendingAssistantHistory(activeAssistant.id, snapshotHeadId);
+      }
     } catch (error) {
       this.logger.error?.("[agui] failed to import messages snapshot", error);
     }

package/src/runtime/adapter/conversions.ts

@@ -15,8 +15,15 @@ import { type Tool, toToolsJSONSchema } from "assistant-stream";
 import type { ReadonlyJSONObject } from "assistant-stream/utils";
 import {
   AG_UI_METADATA_NAMESPACE,
+  A2UI_SURFACE_ACTIVITY_TYPE,
   type AgUiCustomMetadata,
 } from "./run-aggregator";
+import {
+  applyA2uiOperations,
+  convertSurfaceToUISpec,
+  type A2uiState,
+  type A2uiSurfaceState,
+} from "@assistant-ui/react-generative-ui/a2ui";
 import type { AgUiInterrupt } from "../types";
 import {
   parseMcpToolCallResult,
@@ -154,12 +161,14 @@ function mediaTypeForMime(mimeType: string | undefined): MediaInputType {
 
 // Build an AG-UI multimodal source from a data URL, raw base64 payload, or an
 // http(s) URL. A `url` source may omit the mime type; a `data` source always
-// resolves one (falling back to application/octet-stream).
+// resolves one (falling back to application/octet-stream). An explicit
+// `sourceType: "url"` on the part forces the url leg for non-http references.
 function buildInputSource(
   value: string,
   declaredMimeType: string | undefined,
+  sourceType?: string,
 ): InputContentSource {
-  if (httpUrlPattern.test(value)) {
+  if (sourceType === "url" || httpUrlPattern.test(value)) {
     return declaredMimeType !== undefined
       ? { type: "url", value, mimeType: declaredMimeType }
       : { type: "url", value };
@@ -197,7 +206,11 @@ function toInputContent(
     if (data === undefined) return null;
     const declaredMimeType = getString(part, "mimeType") || fallbackMimeType;
     const filename = getString(part, "filename");
-    const source = buildInputSource(data, declaredMimeType);
+    const source = buildInputSource(
+      data,
+      declaredMimeType,
+      getString(part, "sourceType"),
+    );
     const metadata = filename !== undefined ? { filename } : undefined;
     switch (mediaTypeForMime(source.mimeType)) {
       case "image":
@@ -211,6 +224,21 @@ function toInputContent(
     }
   }
 
+  if (type === "audio") {
+    const audio = part.audio;
+    if (!isObject(audio)) return null;
+    const data = getString(audio, "data");
+    const format = getString(audio, "format");
+    if (data === undefined || format === undefined) return null;
+    return {
+      type: "audio",
+      source: buildInputSource(
+        parseDataUrl(data)?.data ?? data,
+        `audio/${format}`,
+      ),
+    };
+  }
+
   return null;
 }
 
@@ -223,14 +251,18 @@ const mediaInputTypes = new Set(["image", "audio", "video", "document"]);
 // Inverse of buildInputSource.
 function inputSourceToString(
   value: unknown,
-): { value: string; mimeType?: string } | null {
+): { value: string; mimeType?: string; isUrl?: boolean } | null {
   if (!isObject(value)) return null;
   const sourceValue = getString(value, "value");
   if (sourceValue === undefined) return null;
   const mimeType = getString(value, "mimeType");
   const type = getString(value, "type");
   if (type === "url") {
-    return { value: sourceValue, ...(mimeType !== undefined && { mimeType }) };
+    return {
+      value: sourceValue,
+      isUrl: true,
+      ...(mimeType !== undefined && { mimeType }),
+    };
   }
   if (type === "data") {
     const resolvedMimeType = mimeType ?? "application/octet-stream";
@@ -315,6 +347,7 @@ function toSnapshotAttachments(content: unknown): SnapshotAttachment[] {
           type: "file",
           data: source.value,
           mimeType,
+          ...(source.isUrl && { sourceType: "url" as const }),
           ...(filename !== undefined && { filename }),
         },
       ],
@@ -324,13 +357,7 @@ function toSnapshotAttachments(content: unknown): SnapshotAttachment[] {
 }
 
 function buildUserContent(message: ThreadMessageLike): string | InputContent[] {
-  // File parts in message.content are intentionally skipped: the canonical
-  // binary payload for files always flows through message.attachments.
-  const contentParts = Array.isArray(message.content)
-    ? message.content.filter(
-        (part) => !(isObject(part) && part.type === "file"),
-      )
-    : [];
+  const contentParts = Array.isArray(message.content) ? message.content : [];
 
   const attachments = message.attachments ?? [];
 
@@ -517,6 +544,42 @@ function toUserOrSystemSnapshotMessage(
   };
 }
 
+// Rebuilds the a2ui:<surfaceId> "present" tool-call parts for one owning
+// assistant message from a bucket of rebuilt surface state, mirroring the
+// live RunAggregator.synthesizeA2uiToolCalls shape. Non-a2ui parts (text,
+// other tool calls) are preserved; existing a2ui parts are replaced wholesale
+// so create/update/delete within the bucket all converge on the rebuilt set.
+function attachA2uiSurfaces(
+  message: CoreThreadMessageLike,
+  state: A2uiState,
+): CoreThreadMessageLike {
+  const a2uiParts: ToolCallPart[] = [];
+  for (const [surfaceId, surface] of state) {
+    const { spec } = convertSurfaceToUISpec(surface);
+    if (!spec) continue;
+    a2uiParts.push({
+      type: "tool-call",
+      toolCallId: `a2ui:${surfaceId}`,
+      toolName: "present",
+      args: spec as unknown as ReadonlyJSONObject,
+      argsText: JSON.stringify(spec),
+      result: {},
+    });
+  }
+
+  const content = Array.isArray(message.content) ? message.content : [];
+  const preserved = content.filter(
+    (part) =>
+      !(
+        isObject(part) &&
+        part.type === "tool-call" &&
+        typeof part.toolCallId === "string" &&
+        part.toolCallId.startsWith("a2ui:")
+      ),
+  );
+  return { ...message, content: [...preserved, ...a2uiParts] };
+}
+
 export type FromAgUiMessagesOptions = {
   /**
    * Whether to convert `reasoning` messages into visible reasoning parts.
@@ -531,6 +594,8 @@ export function fromAgUiMessages(
 ): CoreThreadMessageLike[] {
   const showThinking = options?.showThinking ?? true;
   const converted: CoreThreadMessageLike[] = [];
+  const a2uiBuckets = new Map<string, A2uiState>();
+  const a2uiBucketOwnerIndices = new Map<string, number>();
 
   for (const rawMessage of messages) {
     if (!isObject(rawMessage)) continue;
@@ -638,6 +703,47 @@ export function fromAgUiMessages(
       continue;
     }
 
+    if (role === "activity") {
+      // Only a2ui-surface activity messages have an assistant-part equivalent
+      // to rehydrate; other activity types still have no surface to repaint.
+      const activityType = getString(rawMessage, "activityType");
+      if (activityType !== A2UI_SURFACE_ACTIVITY_TYPE) continue;
+      const activityContent = isObject(rawMessage.content)
+        ? (rawMessage.content as Record<string, unknown>)
+        : null;
+      const operations = activityContent?.["a2ui_operations"];
+      if (!Array.isArray(operations)) continue;
+
+      let ownerIndex = -1;
+      for (let i = converted.length - 1; i >= 0; i--) {
+        const candidate = converted[i];
+        if (candidate && candidate.role === "assistant") {
+          ownerIndex = i;
+          break;
+        }
+      }
+      if (ownerIndex === -1) continue;
+
+      const owner = converted[ownerIndex]!;
+      const bucketKey = getString(rawMessage, "id") ?? "a2ui:anonymous";
+      const { state } = applyA2uiOperations(new Map(), operations);
+      a2uiBuckets.delete(bucketKey);
+      a2uiBucketOwnerIndices.delete(bucketKey);
+      a2uiBuckets.set(bucketKey, state);
+      a2uiBucketOwnerIndices.set(bucketKey, ownerIndex);
+
+      const ownerState = new Map<string, A2uiSurfaceState>();
+      for (const [candidateBucketKey, candidateState] of a2uiBuckets) {
+        if (a2uiBucketOwnerIndices.get(candidateBucketKey) !== ownerIndex)
+          continue;
+        for (const [surfaceId, surface] of candidateState) {
+          ownerState.set(surfaceId, surface);
+        }
+      }
+      converted[ownerIndex] = attachA2uiSurfaces(owner, ownerState);
+      continue;
+    }
+
     if (role === "assistant") {
       converted.push(toAssistantSnapshotMessage(rawMessage));
       continue;
@@ -702,7 +808,12 @@ function convertAssistantMessage(
   const contentArray = Array.isArray(message.content) ? message.content : [];
 
   const toolCallParts = contentArray.filter(
-    (part): part is ToolCallPart => part?.type === "tool-call",
+    (part): part is ToolCallPart =>
+      part?.type === "tool-call" &&
+      !(
+        typeof part.toolCallId === "string" &&
+        part.toolCallId.startsWith("a2ui:")
+      ),
   );
 
   const toolCalls = toolCallParts.map((part) => ({