@assistant-ui/react-ag-ui 0.0.57 → 0.0.58

package/dist/useAgUiRuntime.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAgUiRuntime.js","names":[],"sources":["../src/useAgUiRuntime.ts"],"sourcesContent":["\"use client\";\n\nimport {\n  useCallback,\n  useEffect,\n  useMemo,\n  useRef,\n  useState,\n  useSyncExternalStore,\n} from \"react\";\nimport {\n  useExternalStoreRuntime,\n  useExternalStoreSharedOptions,\n  useRuntimeAdapters,\n} from \"@assistant-ui/core/react\";\nimport { createMessageQueue } from \"@assistant-ui/core\";\nimport type {\n  MessageQueueController,\n  ToolExecutionStatus,\n} 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\";\nimport type { QueueItemState } from \"@assistant-ui/core/store\";\n\nconst EMPTY_INTERRUPTS: readonly AgUiInterrupt[] = [];\nconst EMPTY_QUEUE_ITEMS: readonly QueueItemState[] = Object.freeze([]);\nconst subscribeNoop = () => () => {};\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  useEffect(() => {\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\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  const isRunning = core.isRunning() || hasExecutingTools;\n\n  // The driver sends through the agent core rather than the runtime, because\n  // the runtime's append routes every tail append back into this queue.\n  const queueRef = useRef<MessageQueueController | null>(null);\n  // Counts rendered busy edges, whether a run start or an interrupt arriving.\n  // A dispatch whose count never moves was never observed as busy, so no\n  // falling edge is coming to release the queue.\n  const busyEdgesRef = useRef(0);\n  if (options.unstable_enableMessageQueue && !queueRef.current) {\n    queueRef.current = createMessageQueue({\n      run: (message) => {\n        const controller = queueRef.current;\n        const edgesAtDispatch = busyEdgesRef.current;\n        // The queue drops the item before dispatching and stays busy until an\n        // idle edge. An append observed as busy is released by that falling\n        // edge, and releasing again here would advance the queue twice; one\n        // that never runs (a pre-run rejection, or startRun false) has to be\n        // released here or every later send buffers forever. An interrupt is\n        // rechecked because a run that resolves without yielding to React\n        // reaches here before the effect below has seen either edge.\n        const releaseIfNoRun = () => {\n          if (\n            queueRef.current !== controller ||\n            busyEdgesRef.current !== edgesAtDispatch ||\n            core.getPendingInterrupts() !== null\n          )\n            return;\n          controller?.notifyIdle();\n        };\n        void core.append(message).then(releaseIfNoRun, (e: unknown) => {\n          releaseIfNoRun();\n          logger.error?.(\"[agui] queued message failed to send\", e);\n        });\n      },\n    });\n  } else if (!options.unstable_enableMessageQueue && queueRef.current) {\n    queueRef.current.clear();\n    queueRef.current = null;\n  }\n  const queueController = options.unstable_enableMessageQueue\n    ? queueRef.current\n    : null;\n\n  // Feeds the store memo below: the runtime core skips an adapter whose\n  // identity is unchanged, so queue items have to move the store reference or\n  // subscribers never see composer.queue change.\n  const queueItems = useSyncExternalStore(\n    queueController?.subscribe ?? subscribeNoop,\n    () => queueController?.adapter.items ?? EMPTY_QUEUE_ITEMS,\n    () => EMPTY_QUEUE_ITEMS,\n  );\n  const steerQueueItems = useSyncExternalStore(\n    queueController?.subscribe ?? subscribeNoop,\n    () => queueController?.adapter.steerItems ?? EMPTY_QUEUE_ITEMS,\n    () => EMPTY_QUEUE_ITEMS,\n  );\n\n  // Holds the queue while client-side tools are still executing, and while an\n  // interrupt is unanswered: `append` refuses a new run until it is resolved,\n  // and the queue drops an item before dispatching it, so draining into that\n  // refusal would lose the message instead of keeping it visible.\n  const queueBusy = isRunning || core.getPendingInterrupts() !== null;\n  useEffect(() => {\n    if (queueBusy) {\n      busyEdgesRef.current++;\n      queueController?.notifyBusy();\n    } else {\n      queueController?.notifyIdle();\n    }\n  }, [queueBusy, queueController]);\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(),\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) => {\n          queueController?.clear();\n          return core.edit(message);\n        },\n        onReload: (parentId: string | null, config: { runConfig?: any }) => {\n          queueController?.clear();\n          return core.reload(parentId, config);\n        },\n        onCancel: async () => {\n          queueController?.notifyCancelled();\n          core.cancel();\n        },\n        onAddToolResult: (options) => core.addToolResult(options),\n        onRespondToToolApproval: (options) =>\n          core.respondToToolApproval(options).catch((error: unknown) => {\n            core.reportError(error);\n          }),\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        ...(queueController && { queue: queueController.adapter }),\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    [\n      adapterAdapters,\n      core,\n      _version,\n      isRunning,\n      queueController,\n      queueItems,\n      steerQueueItems,\n      shared,\n    ],\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 {\n  useCallback,\n  useEffect,\n  useMemo,\n  useRef,\n  useState,\n  useSyncExternalStore,\n} from \"react\";\nimport {\n  useExternalStoreRuntime,\n  useExternalStoreSharedOptions,\n  useRuntimeAdapters,\n} from \"@assistant-ui/core/react\";\nimport { createMessageQueue } from \"@assistant-ui/core\";\nimport type {\n  MessageQueueController,\n  ToolExecutionStatus,\n} 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\";\nimport type { QueueItemState } from \"@assistant-ui/core/store\";\n\nconst EMPTY_INTERRUPTS: readonly AgUiInterrupt[] = [];\nconst EMPTY_QUEUE_ITEMS: readonly QueueItemState[] = Object.freeze([]);\nconst subscribeNoop = () => () => {};\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  useEffect(() => {\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\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  const isRunning = core.isRunning() || hasExecutingTools;\n\n  // The driver sends through the agent core rather than the runtime, because\n  // the runtime's append routes every tail append back into this queue.\n  const queueRef = useRef<MessageQueueController | null>(null);\n  // Counts rendered busy edges, whether a run start or an interrupt arriving.\n  // A dispatch whose count never moves was never observed as busy, so no\n  // falling edge is coming to release the queue.\n  const busyEdgesRef = useRef(0);\n  if (options.unstable_enableMessageQueue && !queueRef.current) {\n    queueRef.current = createMessageQueue({\n      run: (message) => {\n        const controller = queueRef.current;\n        const edgesAtDispatch = busyEdgesRef.current;\n        // The queue drops the item before dispatching and stays busy until an\n        // idle edge. An append observed as busy is released by that falling\n        // edge, and releasing again here would advance the queue twice; one\n        // that never runs (a pre-run rejection, or startRun false) has to be\n        // released here or every later send buffers forever. An interrupt is\n        // rechecked because a run that resolves without yielding to React\n        // reaches here before the effect below has seen either edge.\n        const releaseIfNoRun = () => {\n          if (\n            queueRef.current !== controller ||\n            busyEdgesRef.current !== edgesAtDispatch ||\n            core.getPendingInterrupts() !== null\n          )\n            return;\n          controller?.notifyIdle();\n        };\n        void core.append(message).then(releaseIfNoRun, (e: unknown) => {\n          releaseIfNoRun();\n          logger.error?.(\"[agui] queued message failed to send\", e);\n        });\n      },\n    });\n  } else if (!options.unstable_enableMessageQueue && queueRef.current) {\n    queueRef.current.clear();\n    queueRef.current = null;\n  }\n  const queueController = options.unstable_enableMessageQueue\n    ? queueRef.current\n    : null;\n\n  // Feeds the store memo below: the runtime core skips an adapter whose\n  // identity is unchanged, so queue items have to move the store reference or\n  // subscribers never see composer.queue change.\n  const queueItems = useSyncExternalStore(\n    queueController?.subscribe ?? subscribeNoop,\n    () => queueController?.adapter.items ?? EMPTY_QUEUE_ITEMS,\n    () => EMPTY_QUEUE_ITEMS,\n  );\n  const steerQueueItems = useSyncExternalStore(\n    queueController?.subscribe ?? subscribeNoop,\n    () => queueController?.adapter.steerItems ?? EMPTY_QUEUE_ITEMS,\n    () => EMPTY_QUEUE_ITEMS,\n  );\n\n  // Holds the queue while client-side tools are still executing, and while an\n  // interrupt is unanswered: `append` refuses a new run until it is resolved,\n  // and the queue drops an item before dispatching it, so draining into that\n  // refusal would lose the message instead of keeping it visible.\n  const queueBusy = isRunning || core.getPendingInterrupts() !== null;\n  useEffect(() => {\n    if (queueBusy) {\n      busyEdgesRef.current++;\n      queueController?.notifyBusy();\n    } else {\n      queueController?.notifyIdle();\n    }\n  }, [queueBusy, queueController]);\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(),\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) => {\n          queueController?.clear();\n          return core.edit(message);\n        },\n        onReload: (parentId: string | null, config: { runConfig?: any }) => {\n          queueController?.clear();\n          return core.reload(parentId, config);\n        },\n        onCancel: async () => {\n          queueController?.notifyCancelled();\n          core.cancel();\n        },\n        onAddToolResult: (options) => core.addToolResult(options),\n        onRespondToToolApproval: (options) =>\n          core.respondToToolApproval(options).catch((error: unknown) => {\n            core.reportError(error);\n            throw error;\n          }),\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        ...(queueController && { queue: queueController.adapter }),\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    [\n      adapterAdapters,\n      core,\n      _version,\n      isRunning,\n      queueController,\n      queueItems,\n      steerQueueItems,\n      shared,\n    ],\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.57",
+  "version": "0.0.58",
   "description": "AG-UI protocol adapter for assistant-ui",
   "keywords": [
     "ag-ui",
@@ -29,11 +29,11 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@ag-ui/client": "^0.0.58",
-    "@assistant-ui/core": "^0.3.16",
-    "@assistant-ui/react-generative-ui": "^0.0.16",
-    "@assistant-ui/store": "^0.3.11",
-    "assistant-stream": "^0.3.40",
+    "@ag-ui/client": "^0.0.59",
+    "@assistant-ui/core": "^0.3.17",
+    "@assistant-ui/react-generative-ui": "^0.0.17",
+    "@assistant-ui/store": "^0.3.12",
+    "assistant-stream": "^0.3.41",
     "fast-json-patch": "^3.1.1"
   },
   "peerDependencies": {
@@ -46,14 +46,14 @@
     }
   },
   "devDependencies": {
-    "@assistant-ui/x-buildutils": "0.0.24",
+    "@assistant-ui/x-buildutils": "0.0.25",
     "@testing-library/dom": "^10.4.1",
-    "@testing-library/react": "^16.3.2",
+    "@testing-library/react": "^16.3.3",
     "@types/react": "^19.2.18",
     "jsdom": "^30.0.1",
     "react": "^19.2.8",
     "vitest": "^4.1.11",
-    "zod": "^4.4.3"
+    "zod": "^4.5.4"
   },
   "publishConfig": {
     "access": "public",

package/src/runtime/AgUiThreadRuntimeCore.ts

@@ -23,6 +23,8 @@ import type {
 import {
   createMessageRepositorySession,
   invokeUserCallback,
+  iterateToolCallParts,
+  mapToolCallPartsDeep,
 } from "@assistant-ui/core/internal";
 import type {
   AbstractAgent,
@@ -74,8 +76,6 @@ const isResolvedToolCall = (
 ): boolean =>
   part.type === "tool-call" && "result" in part && part.result !== undefined;
 
-const symbolResumeShim = Symbol("agui-resume-shim");
-
 type RunConfig = NonNullable<AppendMessage["runConfig"]>;
 type ResumeStream = (
   options: ChatModelRunOptions,
@@ -187,7 +187,6 @@ export class AgUiThreadRuntimeCore {
     this.onCancel = options.onCancel;
     this.history = options.history;
     this.notifyUpdate = options.notifyUpdate;
-    this.installResumeShim();
   }
 
   updateOptions(options: Omit<CoreOptions, "notifyUpdate">) {
@@ -199,8 +198,6 @@ export class AgUiThreadRuntimeCore {
     this.onCancel = options.onCancel;
     const previousHistory = this.history;
     this.history = options.history;
-    this.installResumeShim();
-
     if (
       this._loadRequested &&
       !this._loadPromise &&
@@ -439,8 +436,7 @@ export class AgUiThreadRuntimeCore {
     const assistant = this.findRequiresActionAssistant("tool-calls");
     if (!assistant) return null;
     const toolCallIds: string[] = [];
-    for (const part of assistant.content) {
-      if (part.type !== "tool-call") continue;
+    for (const part of iterateToolCallParts(assistant.content)) {
       if (isResolvedToolCall(part)) continue;
       toolCallIds.push(part.toolCallId);
     }
@@ -498,9 +494,9 @@ export class AgUiThreadRuntimeCore {
   }
 
   /**
-   * The core seams that reach `respondToToolApproval` discard the promise they
-   * receive, so a rejected decision would otherwise surface only as an
-   * unhandled rejection. A failure raised by the resumed run itself was already
+   * A rejected decision reaches the caller through the approval seam, and
+   * `onError` in addition, because a consumer watching only the runtime would
+   * otherwise miss it. A failure raised by the resumed run itself was already
    * reported by `startRun` before it rethrew, so reporting it here again would
    * give the consumer two notifications for one failure.
    */
@@ -557,9 +553,9 @@ export class AgUiThreadRuntimeCore {
     const gated = projectAgUiToolApprovals(
       pending.interrupts,
       new Set(
-        (gatedMessage?.content ?? [])
-          .filter((part) => part.type === "tool-call")
-          .map((part) => part.toolCallId),
+        Array.from(iterateToolCallParts(gatedMessage?.content ?? [])).map(
+          (part) => part.toolCallId,
+        ),
       ),
     );
     const isGated = [...gated.values()].some(
@@ -774,9 +770,8 @@ export class AgUiThreadRuntimeCore {
     for (let index = messages.length - 1; index >= 0; index--) {
       const message = messages[index];
       if (!message || message.role !== "assistant") continue;
-      for (const part of message.content) {
-        if (part.type !== "tool-call" || part.toolCallId !== toolCallId)
-          continue;
+      for (const part of iterateToolCallParts(message.content)) {
+        if (part.toolCallId !== toolCallId) continue;
         if (!isResolvedToolCall(part)) {
           return message.id;
         }
@@ -790,8 +785,8 @@ export class AgUiThreadRuntimeCore {
     const updated = this.session.updateMessage(messageId, (message) => {
       if (message.role !== "assistant") return message;
       const assistant = message as ThreadAssistantMessage;
-      const content = assistant.content.map((part) => {
-        if (part.type !== "tool-call" || isResolvedToolCall(part)) return part;
+      const { content } = mapToolCallPartsDeep(assistant.content, (part) => {
+        if (isResolvedToolCall(part)) return part;
         return {
           ...part,
           result: { error: "Tool call cancelled by user" },
@@ -804,13 +799,19 @@ export class AgUiThreadRuntimeCore {
   }
 
   addToolResult(options: AddToolResultOptions): void {
-    const updated = this.session.updateMessage(options.messageId, (message) => {
+    // Core's ToolInvocationTracker resolves a nested call to the nested
+    // subagent message's id, which is not a session message; re-anchor on the
+    // top-level message that owns the tree so the update can land.
+    const sessionMessageId = this.session.tryGetMessage(options.messageId)
+      ? options.messageId
+      : this.findMessageIdForToolCall(options.toolCallId);
+    if (sessionMessageId === undefined) return;
+    const updated = this.session.updateMessage(sessionMessageId, (message) => {
       if (message.role !== "assistant") return message;
       const assistant = message as ThreadAssistantMessage;
       let matchedToolCall = false;
-      const content = assistant.content.map((part) => {
-        if (part.type !== "tool-call" || part.toolCallId !== options.toolCallId)
-          return part;
+      const { content } = mapToolCallPartsDeep(assistant.content, (part) => {
+        if (part.toolCallId !== options.toolCallId) return part;
         matchedToolCall = true;
         return {
           ...part,
@@ -825,7 +826,7 @@ export class AgUiThreadRuntimeCore {
 
     if (!updated) return;
     this.notifyUpdate();
-    this.maybeResumeAfterToolResults(options.messageId);
+    this.maybeResumeAfterToolResults(sessionMessageId);
   }
 
   sendA2uiAction(action: Record<string, unknown>): void {
@@ -878,9 +879,13 @@ export class AgUiThreadRuntimeCore {
     ) {
       return false;
     }
-    const allResolved = assistant.content.every(
-      (part) => part.type !== "tool-call" || isResolvedToolCall(part),
-    );
+    let allResolved = true;
+    for (const part of iterateToolCallParts(assistant.content)) {
+      if (!isResolvedToolCall(part)) {
+        allResolved = false;
+        break;
+      }
+    }
     if (!allResolved) return false;
 
     const updated = this.session.updateMessage(messageId, (current) =>
@@ -1319,27 +1324,6 @@ export class AgUiThreadRuntimeCore {
     return input;
   }
 
-  private installResumeShim(): void {
-    const agent = this.agent as any;
-    if (agent[symbolResumeShim]) return;
-    agent[symbolResumeShim] = true;
-    const onInstance = Object.hasOwn(agent, "prepareRunAgentInput");
-    const original = onInstance
-      ? agent.prepareRunAgentInput
-      : Object.getPrototypeOf(agent)?.prepareRunAgentInput;
-    if (typeof original !== "function") return;
-    agent.prepareRunAgentInput = function (
-      this: unknown,
-      params: { resume?: unknown } | undefined,
-    ) {
-      const input = original.call(this, params);
-      if (params?.resume !== undefined && input && typeof input === "object") {
-        return { ...(input as object), resume: params.resume };
-      }
-      return input;
-    };
-  }
-
   private setRunning(running: boolean) {
     this.isRunningFlag = running;
     this.notifyUpdate();
@@ -1498,19 +1482,17 @@ export class AgUiThreadRuntimeCore {
     next: ThreadAssistantMessage["content"],
   ): ThreadAssistantMessage["content"] {
     const resolved = new Map<string, ToolCallMessagePart>();
-    for (const part of previous) {
-      if (part.type === "tool-call" && isResolvedToolCall(part)) {
+    for (const part of iterateToolCallParts(previous)) {
+      if (isResolvedToolCall(part)) {
         resolved.set(part.toolCallId, part);
       }
     }
     if (resolved.size === 0) return next;
 
-    let changed = false;
-    const merged = next.map((part) => {
-      if (part.type !== "tool-call" || isResolvedToolCall(part)) return part;
+    const { content: merged, changed } = mapToolCallPartsDeep(next, (part) => {
+      if (isResolvedToolCall(part)) return part;
       const prior = resolved.get(part.toolCallId);
       if (!prior) return part;
-      changed = true;
       return {
         ...part,
         result: prior.result,
@@ -1518,7 +1500,7 @@ export class AgUiThreadRuntimeCore {
         ...(prior.isError !== undefined ? { isError: prior.isError } : {}),
       };
     });
-    return changed ? (merged as ThreadAssistantMessage["content"]) : next;
+    return changed ? merged : next;
   }
 
   private mergeAssistantMetadata(
@@ -1623,9 +1605,8 @@ export class AgUiThreadRuntimeCore {
       const assistant = message as ThreadAssistantMessage;
       const mcpAppUri = readMcpAppResourceUri(event.mcpResult?._meta);
       let matchedToolCall = false;
-      const content = assistant.content.map((part) => {
-        if (part.type !== "tool-call" || part.toolCallId !== event.toolCallId)
-          return part;
+      const { content } = mapToolCallPartsDeep(assistant.content, (part) => {
+        if (part.toolCallId !== event.toolCallId) return part;
         matchedToolCall = true;
         // An applied activity snapshot owns part.result; a later result only
         // fills what is missing, mirroring the aggregator's finishToolCall.
@@ -1709,9 +1690,8 @@ export class AgUiThreadRuntimeCore {
       if (message.role !== "assistant") return message;
       const assistant = message as ThreadAssistantMessage;
       let matchedToolCall = false;
-      const content = assistant.content.map((part) => {
-        if (part.type !== "tool-call" || part.toolCallId !== toolCallId)
-          return part;
+      const { content } = mapToolCallPartsDeep(assistant.content, (part) => {
+        if (part.toolCallId !== toolCallId) return part;
         matchedToolCall = true;
         return {
           ...part,

package/src/runtime/adapter/conversions.ts

@@ -5,6 +5,7 @@ import { generateId } from "@assistant-ui/core";
 import type {
   ThreadMessageLike as CoreThreadMessageLike,
   PartProviderMetadata,
+  ThreadMessage,
   ToolCallMessagePartMcpMetadata,
   ToolModelContentPart,
 } from "@assistant-ui/core";
@@ -106,8 +107,17 @@ type ToolCallPart = {
   modelContent?: readonly ToolModelContentPart[];
   unstable_toolMessageId?: string;
   mcp?: ToolCallMessagePartMcpMetadata;
+  messages?: readonly ThreadMessage[];
+  approval?: CoreToolCallPartApproval;
 };
 
+type CoreToolCallPartApproval = NonNullable<
+  Extract<
+    Exclude<CoreThreadMessageLike["content"], string>[number],
+    { type: "tool-call" }
+  >["approval"]
+>;
+
 const isObject = (value: unknown): value is Record<string, unknown> =>
   typeof value === "object" && value !== null;
 
@@ -1051,36 +1061,96 @@ function convertAssistantMessage(
     return;
   }
 
+  // A subagent's tool calls live on nested assistant messages. Before
+  // subagent attribution they flattened to root and went out with this
+  // assistant record as their antecedent, so the resume payload restores
+  // exactly that shape: the calls join this record's toolCalls and their
+  // results follow as tool records — never a tool record without its call.
+  // The nested assistant content itself is backend-owned state and is not
+  // re-sent.
+  const nestedToolCalls: {
+    id: string;
+    call: AgUiToolCall;
+    part: ToolCallPart;
+  }[] = [];
+  for (const { part } of toolCalls) {
+    collectNestedToolCalls(part, nestedToolCalls);
+  }
+
   converted.push({
     id: message.id,
     role: "assistant",
     content,
     ...(message.name ? { name: message.name } : {}),
-    ...(toolCalls.length > 0
-      ? { toolCalls: toolCalls.map((entry) => entry.call) }
+    ...(toolCalls.length + nestedToolCalls.length > 0
+      ? {
+          toolCalls: [...toolCalls, ...nestedToolCalls].map(
+            (entry) => entry.call,
+          ),
+        }
       : {}),
   });
 
   for (const { id: toolCallId, part } of toolCalls) {
-    if (part.result === undefined) continue;
-
-    const resultContent =
-      part.modelContent !== undefined
-        ? extractText(part.modelContent)
-        : typeof part.result === "string"
-          ? part.result
-          : JSON.stringify(part.result);
+    emitToolResult(toolCallId, part, converted);
+  }
+  for (const { id: toolCallId, part } of nestedToolCalls) {
+    // A result recorded while the call's approval gate is still open must not
+    // reach the backend as if the gate had been decided.
+    const gateOpen =
+      part.approval != null &&
+      part.approval.approved === undefined &&
+      part.approval.resolution === undefined;
+    if (gateOpen) continue;
+    emitToolResult(toolCallId, part, converted);
+  }
+}
 
-    converted.push({
-      id: part.unstable_toolMessageId ?? `${toolCallId}:tool`,
-      role: "tool",
-      content: resultContent,
-      toolCallId,
-      ...(part.isError ? { error: resultContent } : {}),
-    });
+function collectNestedToolCalls(
+  part: ToolCallPart,
+  out: { id: string; call: AgUiToolCall; part: ToolCallPart }[],
+): void {
+  for (const nested of part.messages ?? []) {
+    if (!isObject(nested) || nested.role !== "assistant") continue;
+    const nestedContent = Array.isArray(nested.content) ? nested.content : [];
+    for (const nestedPart of nestedContent) {
+      if (!isObject(nestedPart) || nestedPart.type !== "tool-call") continue;
+      const nestedToolCall = nestedPart as ToolCallPart;
+      if (
+        typeof nestedToolCall.toolCallId !== "string" ||
+        nestedToolCall.toolCallId.startsWith("a2ui:")
+      ) {
+        continue;
+      }
+      out.push({ ...normalizeToolCall(nestedToolCall), part: nestedToolCall });
+      collectNestedToolCalls(nestedToolCall, out);
+    }
   }
 }
 
+function emitToolResult(
+  toolCallId: string,
+  part: ToolCallPart,
+  converted: AgUiMessage[],
+): void {
+  if (part.result === undefined) return;
+
+  const resultContent =
+    part.modelContent !== undefined
+      ? extractText(part.modelContent)
+      : typeof part.result === "string"
+        ? part.result
+        : JSON.stringify(part.result);
+
+  converted.push({
+    id: part.unstable_toolMessageId ?? `${toolCallId}:tool`,
+    role: "tool",
+    content: resultContent,
+    toolCallId,
+    ...(part.isError ? { error: resultContent } : {}),
+  });
+}
+
 function convertToolMessage(
   message: NormalizedThreadMessageLike,
   converted: AgUiMessage[],

package/src/runtime/adapter/run-aggregator.approval.test.ts

@@ -100,4 +100,132 @@ describe("RunAggregator tool approval projection", () => {
         ?.interrupts,
     ).toEqual([GATE]);
   });
+
+  /**
+   * `boundToolCallIds` names every call the run produced, root or nested, so a
+   * gate on a call inside a subagent message is bound and projects onto the
+   * nested part rather than collapsing the batch. The approval seams walk
+   * `ToolCallMessagePart.messages`, which is what makes a subagent-scoped gate
+   * answerable the same way a root one is.
+   */
+  it("projects a batch that names a subagent-scoped tool call onto both the root and nested parts", () => {
+    const emitted: ChatModelRunResult[] = [];
+    const aggregator = new RunAggregator({
+      showThinking: false,
+      logger: noopLogger,
+      emit: (result) => {
+        emitted.push(result);
+      },
+    });
+
+    const ROOT_GATE: AgUiInterrupt = {
+      id: "int-root",
+      reason: "tool_call",
+      toolCallId: "tc-root",
+      message: "Delete /tmp/root?",
+    };
+    const SUBAGENT_GATE: AgUiInterrupt = {
+      id: "int-sub",
+      reason: "tool_call",
+      toolCallId: "tc-sub",
+      message: "Delete /tmp/sub?",
+    };
+
+    aggregator.handle({ type: "RUN_STARTED", runId: "run-1" });
+    aggregator.handle({
+      type: "TOOL_CALL_START",
+      toolCallId: "tc-root",
+      toolCallName: "delete_file",
+    });
+    aggregator.handle({
+      type: "TOOL_CALL_ARGS",
+      toolCallId: "tc-root",
+      delta: '{"path":"/tmp/root"}',
+    });
+    aggregator.handle({ type: "TOOL_CALL_END", toolCallId: "tc-root" });
+    aggregator.handle({
+      type: "SUBAGENT_STARTED",
+      subagentRunId: "sub-1",
+      name: "cleanup",
+      parentToolCallId: "tc-root",
+    } as any);
+    aggregator.handle({
+      type: "TOOL_CALL_START",
+      toolCallId: "tc-sub",
+      toolCallName: "delete_file",
+      subagentRunId: "sub-1",
+    } as any);
+    aggregator.handle({
+      type: "TOOL_CALL_ARGS",
+      toolCallId: "tc-sub",
+      delta: '{"path":"/tmp/sub"}',
+      subagentRunId: "sub-1",
+    } as any);
+    aggregator.handle({
+      type: "TOOL_CALL_END",
+      toolCallId: "tc-sub",
+      subagentRunId: "sub-1",
+    } as any);
+    aggregator.handle({
+      type: "RUN_FINISHED",
+      runId: "run-1",
+      outcome: {
+        type: "interrupt",
+        interrupts: [ROOT_GATE, SUBAGENT_GATE],
+      },
+    } as any);
+
+    const result = emitted[emitted.length - 1]!;
+    expect(result.status).toMatchObject({
+      type: "requires-action",
+      reason: "interrupt",
+    });
+    const content = result.content ?? [];
+    const rootPart = content.find(
+      (p: any) => p.type === "tool-call" && p.toolCallId === "tc-root",
+    ) as any;
+    expect(rootPart?.approval).toEqual({
+      id: "int-root",
+      prompt: "Delete /tmp/root?",
+    });
+    const nestedPart = rootPart?.messages?.[0]?.content.find(
+      (p: any) => p.type === "tool-call" && p.toolCallId === "tc-sub",
+    );
+    expect(nestedPart?.approval).toEqual({
+      id: "int-sub",
+      prompt: "Delete /tmp/sub?",
+    });
+    // The interrupts survive on the message metadata so the app's bespoke
+    // interrupt hooks (useAgUiSubmitInterruptResponses / steerAway) can still
+    // resolve the batch.
+    expect(
+      (result.metadata?.custom as Record<string, any> | undefined)?.agui
+        ?.interrupts,
+    ).toEqual([ROOT_GATE, SUBAGENT_GATE]);
+  });
+
+  it("still projects a root gate whose batch is entirely root-scoped, even while an unrelated subagent tool call is in flight", () => {
+    const { aggregator, last } = gatedAggregator();
+
+    aggregator.handle({
+      type: "SUBAGENT_STARTED",
+      subagentRunId: "sub-1",
+      name: "cleanup",
+    } as any);
+    aggregator.handle({
+      type: "TOOL_CALL_START",
+      toolCallId: "tc-unrelated",
+      toolCallName: "noop",
+      subagentRunId: "sub-1",
+    } as any);
+
+    expect(last().status).toMatchObject({
+      type: "requires-action",
+      reason: "interrupt",
+    });
+    expect(approvalOf(last())).toEqual({
+      id: "int-1",
+      prompt: "Delete /tmp/a?",
+    });
+  });
 });